From 44b30a9bd8c01d0528356da65adf13323c66b609 Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Fri, 15 Dec 2023 17:34:50 +0300
Subject: [PATCH] Refactoring: use clsx to clarify classNames

---
 README.md                                     |  5 +-
 rsconcept/frontend/README.md                  | 21 ++++++
 rsconcept/frontend/package-lock.json          |  1 +
 rsconcept/frontend/package.json               |  1 +
 rsconcept/frontend/src/App.tsx                | 17 ++++-
 .../frontend/src/components/Common/Button.tsx | 41 ++++++----
 .../src/components/Common/Checkbox.tsx        | 57 +++++++-------
 .../src/components/Common/ConceptLoader.tsx   | 20 +++--
 .../src/components/Common/ConceptSearch.tsx   | 16 ++--
 .../src/components/Common/ConceptTab.tsx      | 12 ++-
 .../src/components/Common/ConceptTooltip.tsx  |  8 +-
 .../src/components/Common/Divider.tsx         | 13 +++-
 .../src/components/Common/Dropdown.tsx        | 34 +++++++--
 .../src/components/Common/DropdownButton.tsx  | 17 ++++-
 .../components/Common/DropdownCheckbox.tsx    | 12 ++-
 .../src/components/Common/EmbedYoutube.tsx    | 13 +++-
 .../src/components/Common/FileInput.tsx       | 13 ++--
 .../src/components/Common/GraphUI.tsx         |  1 +
 .../frontend/src/components/Common/Label.tsx  | 13 +++-
 .../{LabeledText.tsx => LabeledValue.tsx}     |  8 +-
 .../src/components/Common/MiniButton.tsx      | 16 +++-
 .../frontend/src/components/Common/Modal.tsx  | 32 ++++++--
 .../src/components/Common/Overlay.tsx         |  2 +-
 .../src/components/Common/PDFViewer.tsx       |  5 +-
 .../src/components/Common/PageControls.tsx    |  8 +-
 .../src/components/Common/SelectorButton.tsx  | 19 +++--
 .../src/components/Common/SubmitButton.tsx    | 13 +++-
 .../src/components/Common/SwitchButton.tsx    | 12 ++-
 .../src/components/Common/TextArea.tsx        | 29 +++++---
 .../src/components/Common/TextInput.tsx       | 35 ++++++---
 .../src/components/Common/TextURL.tsx         |  2 +-
 .../src/components/Common/Tristate.tsx        | 30 ++++----
 .../src/components/Common/commonInterfaces.ts |  2 +-
 .../src/components/ConceptToaster.tsx         |  2 +-
 .../components/DataTable/PaginationTools.tsx  | 17 +++--
 .../src/components/DataTable/SortingIcon.tsx  |  2 +-
 .../frontend/src/components/ErrorFallback.tsx |  4 +-
 .../src/components/ExpectedAnonymous.tsx      |  4 +-
 rsconcept/frontend/src/components/Footer.tsx  | 15 +++-
 .../src/components/Help/HelpButton.tsx        |  4 +-
 rsconcept/frontend/src/components/Icons.tsx   |  2 +-
 .../frontend/src/components/InfoError.tsx     |  4 +-
 .../src/components/Navigation/Logo.tsx        |  2 +-
 .../src/components/Navigation/Navigation.tsx  | 23 ++++--
 .../Navigation/NavigationButton.tsx           | 15 +++-
 .../components/Navigation/ThemeSwitcher.tsx   |  2 +-
 .../Navigation/ToggleNavigationButton.tsx     | 25 +++++--
 .../components/Navigation/UserDropdown.tsx    |  2 +-
 .../src/components/Navigation/UserMenu.tsx    |  2 +-
 .../src/components/RSInput/RSInput.tsx        | 16 ++--
 .../src/components/RSInput/textEditing.ts     |  2 +-
 .../src/components/RSInput/tooltip.ts         |  3 +-
 .../src/components/RefsInput/RefsInput.tsx    | 74 +++++++------------
 .../src/components/RefsInput/tooltip.ts       |  3 +-
 .../frontend/src/components/RequireAuth.tsx   |  2 +-
 .../components/Shared/ConstituentaBadge.tsx   | 17 +++--
 .../components/Shared/ConstituentaPicker.tsx  | 10 +--
 .../src/components/Shared/GrammemeBadge.tsx   | 11 ++-
 .../components/Shared/InfoConstituenta.tsx    |  2 +-
 .../src/components/Shared/InfoCstClass.tsx    | 12 ++-
 .../src/components/Shared/InfoCstStatus.tsx   | 18 +++--
 .../frontend/src/context/AuthContext.tsx      |  2 +-
 .../DlgConstituentaTemplate/ArgumentsTab.tsx  | 50 +++++++++----
 .../DlgConstituentaTemplate.tsx               |  8 +-
 .../frontend/src/dialogs/DlgCreateCst.tsx     |  6 +-
 .../dialogs/DlgDeleteCst/ConstituentsList.tsx | 10 ++-
 .../DlgEditReference/DlgEditReference.tsx     | 10 +--
 .../dialogs/DlgEditReference/EntityTab.tsx    |  4 +-
 .../DlgEditReference/WordformButton.tsx       | 11 ++-
 .../DlgEditWordForms/DlgEditWordForms.tsx     | 23 ++++--
 .../DlgEditWordForms/WordFormsTable.tsx       |  2 +-
 .../frontend/src/dialogs/DlgRenameCst.tsx     |  8 +-
 rsconcept/frontend/src/dialogs/DlgShowAST.tsx |  2 +-
 .../frontend/src/dialogs/DlgUploadRSForm.tsx  |  2 +-
 rsconcept/frontend/src/index.css              | 15 ++--
 rsconcept/frontend/src/main.tsx               |  2 +-
 .../frontend/src/models/languageAPI.test.ts   |  2 +-
 .../frontend/src/models/libraryAPI.test.ts    |  2 +-
 rsconcept/frontend/src/models/rsformAPI.ts    |  6 +-
 .../frontend/src/pages/CreateRSFormPage.tsx   |  8 +-
 rsconcept/frontend/src/pages/HomePage.tsx     |  6 +-
 .../src/pages/LibraryPage/ItemIcons.tsx       |  7 +-
 .../src/pages/LibraryPage/SearchPanel.tsx     | 23 +++++-
 .../src/pages/LibraryPage/ViewLibrary.tsx     |  8 +-
 rsconcept/frontend/src/pages/LoginPage.tsx    |  8 +-
 .../src/pages/ManualsPage/TopicsList.tsx      | 30 ++++++--
 .../ConstituentaToolbar.tsx                   | 12 +--
 .../EditorConstituenta/FormConstituenta.tsx   |  6 +-
 .../EditorRSExpression/EditorRSExpression.tsx |  2 +-
 .../EditorRSExpression/ParsingResult.tsx      |  2 +-
 .../EditorRSExpression/RSAnalyzer.tsx         |  2 +-
 .../EditorRSExpression/StatusBar.tsx          |  8 +-
 .../RSFormPage/EditorRSForm/RSFormStats.tsx   | 32 ++++----
 .../RSFormPage/EditorRSForm/RSFormToolbar.tsx | 10 +--
 .../RSFormPage/EditorRSList/RSListToolbar.tsx | 12 +--
 .../pages/RSFormPage/EditorRSList/RSTable.tsx |  2 +-
 .../EditorTermGraph/EditorTermGraph.tsx       | 19 ++++-
 .../EditorTermGraph/GraphToolbar.tsx          | 14 ++--
 .../src/pages/RSFormPage/RSFormPage.tsx       |  2 +-
 .../frontend/src/pages/RSFormPage/RSTabs.tsx  | 32 +++++---
 .../src/pages/RSFormPage/RSTabsMenu.tsx       | 26 +++----
 .../ViewConstituents/ConstituentsSearch.tsx   | 14 +---
 .../ViewConstituents/ConstituentsTable.tsx    | 12 ++-
 rsconcept/frontend/src/pages/RegisterPage.tsx |  2 +-
 .../pages/UserProfilePage/EditorPassword.tsx  |  9 ++-
 .../pages/UserProfilePage/EditorProfile.tsx   |  5 +-
 .../src/pages/UserProfilePage/UserTabs.tsx    |  4 +-
 .../UserProfilePage/ViewSubscriptions.tsx     |  9 ++-
 rsconcept/frontend/src/utils/codemirror.ts    | 44 ++++++++---
 rsconcept/frontend/src/utils/constants.ts     |  1 +
 110 files changed, 899 insertions(+), 460 deletions(-)
 create mode 100644 rsconcept/frontend/README.md
 rename rsconcept/frontend/src/components/Common/{LabeledText.tsx => LabeledValue.tsx} (59%)

diff --git a/README.md b/README.md
index 1d5ce40f..d80e5085 100644
--- a/README.md
+++ b/README.md
@@ -12,17 +12,18 @@ This readme file is used mostly to document project dependencies
 <summary>npm install</summary>
   <pre>
   - axios
+  - clsx
   - react-router-dom 
   - react-toastify
   - react-loader-spinner
-  - js-file-download
   - react-tabs
   - react-intl
   - react-select
   - react-error-boundary
   - react-pdf
-  - reagraph
   - react-tooltip
+  - js-file-download
+  - reagraph
   - @tanstack/react-table
   - @uiw/react-codemirror
   - @uiw/codemirror-themes
diff --git a/rsconcept/frontend/README.md b/rsconcept/frontend/README.md
new file mode 100644
index 00000000..8cbcd381
--- /dev/null
+++ b/rsconcept/frontend/README.md
@@ -0,0 +1,21 @@
+# Frontend Developer guidelines
+
+Styling conventions
+- static > conditional static > props. All dynamic styling should go in styles props
+- dimensions = rectangle + outer layout
+
+<details>
+<summary>clsx className groupind and order</summary>
+  <pre>
+  - layer: z-position
+  - outer layout: fixed bottom-1/2 left-0 -translate-x-1/2
+  - rectangle: mt-3 w-full min-w-10 h-fit
+  - inner layout: px-3 py-2 flex flex-col gap-3 justify-start items-center
+  - overflow behavior: overflow-auto
+  - border: borer-2 outline-none shadow-md
+  - colors: clr-controls
+  - text: text-start text-sm font-semibold whitespace-nowrap
+  - behavior modifiers: select-none disabled:cursor-not-allowed
+  - transitions: 
+  </pre>
+</details>
\ No newline at end of file
diff --git a/rsconcept/frontend/package-lock.json b/rsconcept/frontend/package-lock.json
index 32144628..c758342c 100644
--- a/rsconcept/frontend/package-lock.json
+++ b/rsconcept/frontend/package-lock.json
@@ -13,6 +13,7 @@
         "@uiw/codemirror-themes": "^4.21.21",
         "@uiw/react-codemirror": "^4.21.21",
         "axios": "^1.6.2",
+        "clsx": "^2.0.0",
         "js-file-download": "^0.4.12",
         "react": "^18.2.0",
         "react-dom": "^18.2.0",
diff --git a/rsconcept/frontend/package.json b/rsconcept/frontend/package.json
index a8cc4bb8..4cbe4713 100644
--- a/rsconcept/frontend/package.json
+++ b/rsconcept/frontend/package.json
@@ -17,6 +17,7 @@
     "@uiw/codemirror-themes": "^4.21.21",
     "@uiw/react-codemirror": "^4.21.21",
     "axios": "^1.6.2",
+    "clsx": "^2.0.0",
     "js-file-download": "^0.4.12",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
diff --git a/rsconcept/frontend/src/App.tsx b/rsconcept/frontend/src/App.tsx
index 8a5abc9f..73feda82 100644
--- a/rsconcept/frontend/src/App.tsx
+++ b/rsconcept/frontend/src/App.tsx
@@ -1,3 +1,4 @@
+import clsx from 'clsx';
 import { createBrowserRouter, Outlet, RouterProvider } from 'react-router-dom';
 
 import ConceptToaster from './components/ConceptToaster';
@@ -21,7 +22,11 @@ function Root() {
   const { noNavigation, noFooter, viewportHeight, mainHeight, showScroll } = useConceptTheme();
   return (
   <NavigationState>
-  <div className='w-screen antialiased clr-app min-w-[30rem] overflow-hidden'>
+  <div className={clsx(
+    'w-screen min-w-[30rem]',
+    'clr-app',
+    'antialiased'
+  )}>
 
     <ConceptToaster
       className='mt-[4rem] text-sm'
@@ -39,7 +44,13 @@ function Root() {
         overflowY: showScroll ? 'scroll': 'auto'
       }}
     >
-      <main className='flex flex-col items-center w-full h-full min-w-fit' style={{minHeight: mainHeight}}>
+      <main
+        className={clsx(
+          'w-full h-full min-w-fit',
+          'flex flex-col items-center'
+        )}
+        style={{minHeight: mainHeight}}
+      >
         <Outlet />
       </main>
       
@@ -101,4 +112,4 @@ function App () {
   );
 }
 
-export default App;
+export default App;
\ No newline at end of file
diff --git a/rsconcept/frontend/src/components/Common/Button.tsx b/rsconcept/frontend/src/components/Common/Button.tsx
index 40e38e69..945f69c0 100644
--- a/rsconcept/frontend/src/components/Common/Button.tsx
+++ b/rsconcept/frontend/src/components/Common/Button.tsx
@@ -1,3 +1,5 @@
+import clsx from 'clsx';
+
 import { IColorsProps, IControlProps } from './commonInterfaces';
 
 interface ButtonProps
@@ -17,21 +19,30 @@ function Button({
   loading,
   ...restProps
 }: ButtonProps) {
-  const borderClass = noBorder ? '' : 'border rounded';
-  const padding = dense ? 'px-1' : 'px-3 py-2';
-  const outlineClass = noOutline ? 'outline-none': 'clr-outline';
-  const cursor = 'disabled:cursor-not-allowed ' + (loading ? 'cursor-progress ' : 'cursor-pointer ');
   return (
-    <button type='button'
-      disabled={disabled ?? loading}
-      title={tooltip}
-      className={`inline-flex items-center gap-2 align-middle justify-center select-none ${padding} ${colors} ${outlineClass} ${borderClass} ${dimensions} ${cursor}`}
-      {...restProps}
-    >
-      {icon ? icon : null}
-      {text ? <span className='font-semibold'>{text}</span> : null}
-    </button>
-  );
+  <button type='button'
+    disabled={disabled ?? loading}
+    title={tooltip}
+    className={clsx(
+      'inline-flex gap-2 items-center justify-center',
+      'select-none disabled:cursor-not-allowed',
+      {
+        'border rounded': !noBorder,
+        'px-1': dense,
+        'px-3 py-2': !dense,
+        'cursor-progress': loading,
+        'cursor-pointer': !loading,
+        'outline-none': noOutline,
+        'clr-outline': !noOutline,
+      },
+      colors,
+      dimensions
+    )}
+    {...restProps}
+  >
+    {icon ? icon : null}
+    {text ? <span className='font-semibold'>{text}</span> : null}
+  </button>);
 }
 
-export default Button;
+export default Button;
\ No newline at end of file
diff --git a/rsconcept/frontend/src/components/Common/Checkbox.tsx b/rsconcept/frontend/src/components/Common/Checkbox.tsx
index 74fa52d8..9646c26c 100644
--- a/rsconcept/frontend/src/components/Common/Checkbox.tsx
+++ b/rsconcept/frontend/src/components/Common/Checkbox.tsx
@@ -1,3 +1,4 @@
+import clsx from 'clsx';
 import { useMemo } from 'react';
 
 import { CheckboxCheckedIcon } from '../Icons';
@@ -25,14 +26,10 @@ function Checkbox({
     } else if (setValue) {
       return 'cursor-pointer';
     } else {
-      return ''
+      return '';
     }
   }, [disabled, setValue]);
-  const bgColor = useMemo(
-  () => {
-    return value !== false ? 'clr-primary' : 'clr-app'
-  }, [value]);
-  
+
   function handleClick(event: React.MouseEvent<HTMLButtonElement, MouseEvent>): void {
     event.preventDefault();
     if (disabled || !setValue) {
@@ -42,27 +39,31 @@ function Checkbox({
   }
 
   return (
-    <button type='button' id={id}
-      className={`flex items-center outline-none ${dimensions}`}
-      title={tooltip}
-      disabled={disabled}
-      onClick={handleClick}
-      {...restProps}
-    >
-      <div className={`max-w-[1rem] min-w-[1rem] h-4 mt-0.5 border rounded-sm ${bgColor} ${cursor}`} >
-        {value ?
-        <div className='mt-[1px] ml-[1px]'>
-          <CheckboxCheckedIcon />
-        </div> : null}
-      </div>
-      {label ?
-      <Label
-        className={`${cursor} px-2 text-start`}
-        text={label}
-        htmlFor={id}
-      /> : null}
-    </button>
-  );
+  <button type='button' id={id}
+    className={clsx(
+      'flex items-center gap-2',
+      'outline-none',
+      'text-start',
+      dimensions,
+      cursor
+    )}
+    title={tooltip}
+    disabled={disabled}
+    onClick={handleClick}
+    {...restProps}
+  >
+    <div className={clsx(
+      'max-w-[1rem] min-w-[1rem] h-4',
+      'border rounded-sm',
+      {
+        'clr-primary': value !== false,
+        'clr-app': value === false
+      }
+    )}>
+      {value ? <div className='mt-[1px] ml-[1px]'><CheckboxCheckedIcon /></div> : null}
+    </div>
+    <Label className={cursor} text={label} htmlFor={id} />
+  </button>);
 }
 
-export default Checkbox;
+export default Checkbox;
\ No newline at end of file
diff --git a/rsconcept/frontend/src/components/Common/ConceptLoader.tsx b/rsconcept/frontend/src/components/Common/ConceptLoader.tsx
index c19bec4a..9ad8b364 100644
--- a/rsconcept/frontend/src/components/Common/ConceptLoader.tsx
+++ b/rsconcept/frontend/src/components/Common/ConceptLoader.tsx
@@ -10,15 +10,13 @@ interface ConceptLoaderProps {
 
 export function ConceptLoader({size=10}: ConceptLoaderProps) {
   const {colors} = useConceptTheme();
-
   return (
-    <div className='flex justify-center w-full h-full'>
-      <ThreeDots
-        color={colors.bgSelected}
-        height={size*10}
-        width={size*10}
-        radius={size}
-      />
-    </div>
-  );
-}
+  <div className='flex justify-center w-full h-full'>
+    <ThreeDots
+      color={colors.bgSelected}
+      height={size*10}
+      width={size*10}
+      radius={size}
+    />
+  </div>);
+}
\ No newline at end of file
diff --git a/rsconcept/frontend/src/components/Common/ConceptSearch.tsx b/rsconcept/frontend/src/components/Common/ConceptSearch.tsx
index d7220225..bb6a03ba 100644
--- a/rsconcept/frontend/src/components/Common/ConceptSearch.tsx
+++ b/rsconcept/frontend/src/components/Common/ConceptSearch.tsx
@@ -5,31 +5,27 @@ import TextInput from './TextInput';
 interface ConceptSearchProps  {
   value: string
   onChange?: (newValue: string) => void
-  dense?: boolean
   noBorder?: boolean
   dimensions?: string
 }
 
-function ConceptSearch({ value, onChange, noBorder, dimensions, dense }: ConceptSearchProps) {
-  const borderClass = dense && !noBorder ? 'border-t border-x': '';
+function ConceptSearch({ value, onChange, noBorder, dimensions }: ConceptSearchProps) {
   return (
   <div className={dimensions}>
     <Overlay
-      position='top-0 left-3 translate-y-1/2'
-      className='flex items-center pointer-events-none text-controls'
+      position='top-[-0.125rem] left-3 translate-y-1/2'
+      className='pointer-events-none clr-text-controls'
     >
       <MagnifyingGlassIcon size={5} />
     </Overlay>
     <TextInput noOutline
       placeholder='Поиск'
-      dimensions={`w-full pl-10 hover:text-clip outline-none ${borderClass}`}
-      noBorder={dense || noBorder}
+      dimensions='w-full pl-10'
+      noBorder={noBorder}
       value={value}
       onChange={event => (onChange ? onChange(event.target.value) : undefined)}
     />
   </div>);
 }
 
-export default ConceptSearch;
-
-
+export default ConceptSearch;
\ No newline at end of file
diff --git a/rsconcept/frontend/src/components/Common/ConceptTab.tsx b/rsconcept/frontend/src/components/Common/ConceptTab.tsx
index 26a3bbb6..c7e67a63 100644
--- a/rsconcept/frontend/src/components/Common/ConceptTab.tsx
+++ b/rsconcept/frontend/src/components/Common/ConceptTab.tsx
@@ -1,3 +1,4 @@
+import clsx from 'clsx';
 import type { TabProps } from 'react-tabs';
 import { Tab } from 'react-tabs';
 
@@ -11,7 +12,14 @@ extends Omit<TabProps, 'title' | 'children'> {
 function ConceptTab({ label, tooltip, className, ...otherProps }: ConceptTabProps) {
   return (
   <Tab
-    className={`px-2 py-1 h-full min-w-[6rem] flex justify-center text-sm hover:cursor-pointer clr-tab whitespace-nowrap small-caps select-none font-semibold ${className}`}
+    className={clsx(
+      'h-full min-w-[6rem]',
+      'px-2 py-1 flex justify-center',
+      'clr-tab',
+      'text-sm whitespace-nowrap small-caps font-semibold',
+      'select-none hover:cursor-pointer',
+      className
+    )}
     title={tooltip}
     {...otherProps}
   >
@@ -21,4 +29,4 @@ function ConceptTab({ label, tooltip, className, ...otherProps }: ConceptTabProp
 
 ConceptTab.tabsRole = 'Tab';
 
-export default ConceptTab;
+export default ConceptTab;
\ No newline at end of file
diff --git a/rsconcept/frontend/src/components/Common/ConceptTooltip.tsx b/rsconcept/frontend/src/components/Common/ConceptTooltip.tsx
index d93cc884..b9dd2c6c 100644
--- a/rsconcept/frontend/src/components/Common/ConceptTooltip.tsx
+++ b/rsconcept/frontend/src/components/Common/ConceptTooltip.tsx
@@ -1,5 +1,6 @@
 'use client';
 
+import clsx from 'clsx';
 import { createPortal } from 'react-dom';
 import { ITooltip, Tooltip } from 'react-tooltip';
 
@@ -26,7 +27,12 @@ function ConceptTooltip({
   <Tooltip
     opacity={0.97}
     style={{...{ paddingTop: '2px', paddingBottom: '2px'}, ...style}}
-    className={`overflow-auto border shadow-md ${layer} ${className}`}
+    className={clsx(
+      'overflow-auto',
+      'border shadow-md',
+      layer,
+      className
+    )}
     variant={(darkMode ? 'dark' : 'light')}
     place={place}
     {...restProps}
diff --git a/rsconcept/frontend/src/components/Common/Divider.tsx b/rsconcept/frontend/src/components/Common/Divider.tsx
index dd6dd1e9..8b542f00 100644
--- a/rsconcept/frontend/src/components/Common/Divider.tsx
+++ b/rsconcept/frontend/src/components/Common/Divider.tsx
@@ -1,3 +1,5 @@
+import clsx from 'clsx';
+
 interface DividerProps {
   vertical?: boolean
   margins?: string
@@ -5,8 +7,13 @@ interface DividerProps {
 
 function Divider({ vertical, margins = 'mx-2' }: DividerProps) {
   return (
-    <div className={`${margins} ${vertical ? 'border-x h-full': 'border-y w-full'}`} />
-  );
+  <div className={clsx(
+    margins, 
+    {
+      'border-x h-full': vertical,
+      'border-y w-full': !vertical
+    }
+  )}/>);
 }
 
-export default Divider;
+export default Divider;
\ No newline at end of file
diff --git a/rsconcept/frontend/src/components/Common/Dropdown.tsx b/rsconcept/frontend/src/components/Common/Dropdown.tsx
index f2e9a239..17119d1d 100644
--- a/rsconcept/frontend/src/components/Common/Dropdown.tsx
+++ b/rsconcept/frontend/src/components/Common/Dropdown.tsx
@@ -1,16 +1,36 @@
+import clsx from 'clsx';
+
+import Overlay from './Overlay';
+
 interface DropdownProps {
-  children: React.ReactNode
   stretchLeft?: boolean
   dimensions?: string
+  children: React.ReactNode
 }
 
-function Dropdown({ children, dimensions = 'w-fit', stretchLeft }: DropdownProps) {
+function Dropdown({
+  dimensions = 'w-fit',
+  stretchLeft,
+  children
+}: DropdownProps) {
   return (
-  <div className='relative text-sm'>
-  <div className={`absolute ${stretchLeft ? 'right-0' : 'left-0'} mt-3 z-modal-tooltip flex flex-col items-stretch justify-start origin-top-right border rounded-md shadow-lg clr-input ${dimensions}`}>
+  <Overlay 
+    layer='z-modal-tooltip'
+    position='mt-3'
+    className={clsx(
+      'flex flex-col items-stretch justify-start',
+      'border rounded-md shadow-lg',
+      'text-sm',
+      'clr-input',
+      {
+        'right-0': stretchLeft,
+        'left-0': !stretchLeft
+      },
+      dimensions
+  )}
+  >
     {children}
-  </div>
-  </div>);
+  </Overlay>);
 }
 
-export default Dropdown;
+export default Dropdown;
\ No newline at end of file
diff --git a/rsconcept/frontend/src/components/Common/DropdownButton.tsx b/rsconcept/frontend/src/components/Common/DropdownButton.tsx
index 62f56f63..280e201e 100644
--- a/rsconcept/frontend/src/components/Common/DropdownButton.tsx
+++ b/rsconcept/frontend/src/components/Common/DropdownButton.tsx
@@ -1,3 +1,5 @@
+import clsx from 'clsx';
+
 interface DropdownButtonProps {
   tooltip?: string | undefined
   onClick?: () => void
@@ -6,17 +8,24 @@ interface DropdownButtonProps {
 }
 
 function DropdownButton({ tooltip, onClick, disabled, children }: DropdownButtonProps) {
-  const behavior = onClick ? 'cursor-pointer disabled:cursor-not-allowed clr-hover' : 'cursor-default';
-  const text = disabled ? 'text-controls' : '';
   return (
   <button type='button'
     disabled={disabled}
     title={tooltip}
     onClick={onClick}
-    className={`px-3 py-1 text-left overflow-ellipsis whitespace-nowrap ${behavior} ${text}`}
+    className={clsx(
+      'px-3 py-1',
+      'text-left overflow-ellipsis whitespace-nowrap',
+      'disabled:clr-text-controls',
+      {
+        'clr-hover': onClick,
+        'cursor-pointer disabled:cursor-not-allowed': onClick,
+        'cursor-default': !onClick
+      }
+    )}
   >
     {children}
   </button>);
 }
 
-export default DropdownButton;
+export default DropdownButton;
\ No newline at end of file
diff --git a/rsconcept/frontend/src/components/Common/DropdownCheckbox.tsx b/rsconcept/frontend/src/components/Common/DropdownCheckbox.tsx
index 404a8725..c4d08c88 100644
--- a/rsconcept/frontend/src/components/Common/DropdownCheckbox.tsx
+++ b/rsconcept/frontend/src/components/Common/DropdownCheckbox.tsx
@@ -1,3 +1,5 @@
+import clsx from 'clsx';
+
 import Checkbox from './Checkbox';
 
 interface DropdownCheckboxProps {
@@ -9,11 +11,15 @@ interface DropdownCheckboxProps {
 }
 
 function DropdownCheckbox({ tooltip, setValue, disabled, ...restProps }: DropdownCheckboxProps) {
-  const behavior = (setValue && !disabled) ? 'clr-hover' : '';
   return (
   <div
     title={tooltip}
-    className={`px-4 py-1 text-left overflow-ellipsis ${behavior} w-full whitespace-nowrap`}
+    className={clsx(
+      'px-3 py-1',
+      'text-left overflow-ellipsis whitespace-nowrap',
+      'disabled:clr-text-controls',
+      !!setValue && !disabled && 'clr-hover'
+    )}
   >
     <Checkbox 
       dimensions='w-full'
@@ -24,4 +30,4 @@ function DropdownCheckbox({ tooltip, setValue, disabled, ...restProps }: Dropdow
   </div>);
 }
 
-export default DropdownCheckbox;
+export default DropdownCheckbox;
\ No newline at end of file
diff --git a/rsconcept/frontend/src/components/Common/EmbedYoutube.tsx b/rsconcept/frontend/src/components/Common/EmbedYoutube.tsx
index 88fd20d7..db3734ce 100644
--- a/rsconcept/frontend/src/components/Common/EmbedYoutube.tsx
+++ b/rsconcept/frontend/src/components/Common/EmbedYoutube.tsx
@@ -11,13 +11,20 @@ function EmbedYoutube({ videoID, pxHeight, pxWidth }: EmbedYoutubeProps) {
   return (
   <div 
     className='relative'
-    style={{height: 0, paddingBottom: `${pxHeight}px`, paddingLeft: `${pxWidth}px`}}
+    style={{
+      height: 0,
+      paddingBottom: `${pxHeight}px`,
+      paddingLeft: `${pxWidth}px`
+    }}
   >
     <iframe allowFullScreen
       title='Встроенное видео Youtube'
       allow='accelerometer; clipboard-write; encrypted-media; gyroscope; picture-in-picture'
       className='absolute top-0 left-0 border'
-      style={{minHeight: `${pxHeight}px`, minWidth: `${pxWidth}px`}}
+      style={{
+        minHeight: `${pxHeight}px`,
+        minWidth: `${pxWidth}px`
+      }}
       width={`${pxWidth}px`}
       height={`${pxHeight}px`}
       src={`https://www.youtube.com/embed/${videoID}`}
@@ -25,4 +32,4 @@ function EmbedYoutube({ videoID, pxHeight, pxWidth }: EmbedYoutubeProps) {
   </div>);
 }
 
-export default EmbedYoutube;
+export default EmbedYoutube;
\ No newline at end of file
diff --git a/rsconcept/frontend/src/components/Common/FileInput.tsx b/rsconcept/frontend/src/components/Common/FileInput.tsx
index 83c7feaa..1bb725c5 100644
--- a/rsconcept/frontend/src/components/Common/FileInput.tsx
+++ b/rsconcept/frontend/src/components/Common/FileInput.tsx
@@ -1,5 +1,6 @@
 'use client';
 
+import clsx from 'clsx';
 import { useRef, useState } from 'react';
 
 import { UploadIcon } from '../Icons';
@@ -40,7 +41,11 @@ function FileInput({
   };
 
   return (
-  <div className={`flex flex-col gap-2 py-2 items-start ${dimensions}`}>
+  <div className={clsx(
+    'py-2',
+    'flex flex-col gap-2 items-start',
+    dimensions
+  )}>
     <input type='file'
       ref={inputRef}
       style={{ display: 'none' }}
@@ -54,10 +59,8 @@ function FileInput({
       onClick={handleUploadClick}
       tooltip={tooltip}
     />
-    <Label
-      text={fileName}
-    />
+    <Label text={fileName} />
   </div>);
 }
 
-export default FileInput;
+export default FileInput;
\ No newline at end of file
diff --git a/rsconcept/frontend/src/components/Common/GraphUI.tsx b/rsconcept/frontend/src/components/Common/GraphUI.tsx
index 162a0275..865d28b5 100644
--- a/rsconcept/frontend/src/components/Common/GraphUI.tsx
+++ b/rsconcept/frontend/src/components/Common/GraphUI.tsx
@@ -1,3 +1,4 @@
+// Reexporting reagraph types to wrap in 'use client'.
 'use client';
 
 import { GraphCanvas as GraphUI } from 'reagraph';
diff --git a/rsconcept/frontend/src/components/Common/Label.tsx b/rsconcept/frontend/src/components/Common/Label.tsx
index d6b8c12b..bd182ac4 100644
--- a/rsconcept/frontend/src/components/Common/Label.tsx
+++ b/rsconcept/frontend/src/components/Common/Label.tsx
@@ -1,15 +1,22 @@
+import clsx from 'clsx';
 import { LabelHTMLAttributes } from 'react';
 
 interface LabelProps 
 extends Omit<React.DetailedHTMLProps<LabelHTMLAttributes<HTMLLabelElement>, HTMLLabelElement>, 'children' | 'title'> {
-  text: string
+  text?: string
   tooltip?: string
 }
 
 function Label({ text, tooltip, className, ...restProps }: LabelProps) {
+  if (!text) {
+    return null;
+  }
   return (
   <label
-    className={`text-sm font-semibold whitespace-nowrap ${className}`}
+    className={clsx(
+      'text-sm font-semibold whitespace-nowrap',
+      className
+    )}
     title={tooltip}
     {...restProps}
   >
@@ -17,4 +24,4 @@ function Label({ text, tooltip, className, ...restProps }: LabelProps) {
   </label>);
 }
 
-export default Label;
+export default Label;
\ No newline at end of file
diff --git a/rsconcept/frontend/src/components/Common/LabeledText.tsx b/rsconcept/frontend/src/components/Common/LabeledValue.tsx
similarity index 59%
rename from rsconcept/frontend/src/components/Common/LabeledText.tsx
rename to rsconcept/frontend/src/components/Common/LabeledValue.tsx
index e44cc2a7..75d94132 100644
--- a/rsconcept/frontend/src/components/Common/LabeledText.tsx
+++ b/rsconcept/frontend/src/components/Common/LabeledValue.tsx
@@ -1,13 +1,13 @@
-interface LabeledTextProps {
+interface LabeledValueProps {
   id?: string
   label: string
   text: string | number
   tooltip?: string
 }
 
-function LabeledText({ id, label, text, tooltip }: LabeledTextProps) {
+function LabeledValue({ id, label, text, tooltip }: LabeledValueProps) {
   return (
-  <div className='flex justify-between gap-4'>
+  <div className='flex justify-between gap-3'>
     <label
       className='font-semibold'
       title={tooltip}
@@ -21,4 +21,4 @@ function LabeledText({ id, label, text, tooltip }: LabeledTextProps) {
   </div>);
 }
 
-export default LabeledText;
+export default LabeledValue;
\ No newline at end of file
diff --git a/rsconcept/frontend/src/components/Common/MiniButton.tsx b/rsconcept/frontend/src/components/Common/MiniButton.tsx
index 0a5cad0b..bd51f350 100644
--- a/rsconcept/frontend/src/components/Common/MiniButton.tsx
+++ b/rsconcept/frontend/src/components/Common/MiniButton.tsx
@@ -1,3 +1,5 @@
+import clsx from 'clsx';
+
 interface MiniButtonProps
 extends Omit<React.ButtonHTMLAttributes<HTMLButtonElement>, 'className' | 'title' | 'children' > {
   icon: React.ReactNode
@@ -15,11 +17,21 @@ function MiniButton({
   <button type='button'
     title={tooltip}
     tabIndex={tabIndex ?? -1}
-    className={`px-1 py-1 rounded-full cursor-pointer disabled:cursor-not-allowed clr-btn-clear ${noHover ? 'outline-none' : 'clr-hover'} ${dimensions}`}
+    className={clsx(
+      'px-1 py-1',
+      'rounded-full',
+      'clr-btn-clear',
+      'cursor-pointer disabled:cursor-not-allowed',
+      {
+        'outline-none': noHover,
+        'clr-hover': !noHover
+      },
+      dimensions
+    )}
     {...restProps}
   >
     {icon}
   </button>);
 }
 
-export default MiniButton;
+export default MiniButton;
\ No newline at end of file
diff --git a/rsconcept/frontend/src/components/Common/Modal.tsx b/rsconcept/frontend/src/components/Common/Modal.tsx
index 1cf7d070..9f510d32 100644
--- a/rsconcept/frontend/src/components/Common/Modal.tsx
+++ b/rsconcept/frontend/src/components/Common/Modal.tsx
@@ -1,5 +1,6 @@
 'use client';
 
+import clsx from 'clsx';
 import { useRef } from 'react';
 
 import useEscapeKey from '@/hooks/useEscapeKey';
@@ -44,9 +45,19 @@ function Modal({
 
   return (
   <>
-    <div className='fixed top-0 left-0 w-full h-full z-navigation clr-modal-backdrop' />
+    <div className={clsx(
+      'z-navigation',
+      'fixed top-0 left-0',
+      'w-full h-full',
+      'clr-modal-backdrop'
+    )}/>
     <div ref={ref}
-      className='fixed -translate-x-1/2 translate-y-1/2 border shadow-md bottom-1/2 left-1/2 z-modal clr-app'
+      className={clsx(
+        'z-modal',
+        'fixed bottom-1/2 left-1/2 -translate-x-1/2 translate-y-1/2',
+        'border shadow-md',
+        'clr-app'
+      )}
     >
       <Overlay position='right-[0.3rem] top-2' className='text-disabled'>
         <MiniButton
@@ -56,20 +67,27 @@ function Modal({
         />
       </Overlay>
       
-      {title ? <h1 className='px-12 py-2 text-lg select-none'>{title}</h1> : null}
+      {title ? <h1 className='px-12 py-2 select-none'>{title}</h1> : null}
 
       <div
-        className={`w-full h-fit ${className}`}
+        className={clsx(
+          'w-full h-fit',
+          'overflow-auto',
+          className
+        )}
         style={{
           maxHeight: 'calc(100vh - 8rem)',
           maxWidth: 'calc(100vw - 2rem)',
-          overflow: 'auto'
         }}
       >
         {children}
       </div>
 
-      <div className='flex justify-center w-full gap-12 px-6 py-3 z-modal-controls min-w-fit'>
+      <div className={clsx(
+        'w-full min-w-fit',
+        'z-modal-controls',
+        'px-6 py-3 flex gap-12 justify-center'
+      )}>
         {!readonly ? 
         <Button autoFocus
           text={submitText}
@@ -89,4 +107,4 @@ function Modal({
   </>);
 }
 
-export default Modal;
+export default Modal;
\ No newline at end of file
diff --git a/rsconcept/frontend/src/components/Common/Overlay.tsx b/rsconcept/frontend/src/components/Common/Overlay.tsx
index 7016f999..a9a383d5 100644
--- a/rsconcept/frontend/src/components/Common/Overlay.tsx
+++ b/rsconcept/frontend/src/components/Common/Overlay.tsx
@@ -19,4 +19,4 @@ function Overlay({
   </div>);
 }
 
-export default Overlay;
+export default Overlay;
\ No newline at end of file
diff --git a/rsconcept/frontend/src/components/Common/PDFViewer.tsx b/rsconcept/frontend/src/components/Common/PDFViewer.tsx
index ebf1a27f..6497f422 100644
--- a/rsconcept/frontend/src/components/Common/PDFViewer.tsx
+++ b/rsconcept/frontend/src/components/Common/PDFViewer.tsx
@@ -40,7 +40,10 @@ function PDFViewer({ file }: PDFViewerProps) {
     loading='Загрузка PDF файла...'
     error='Не удалось загрузить файл.'
   >
-    <Overlay position='top-6 left-1/2 -translate-x-1/2' className='flex select-none'>
+    <Overlay
+      position='top-6 left-1/2 -translate-x-1/2'
+      className='flex select-none'
+    >
       <PageControls 
         pageCount={pageCount}
         pageNumber={pageNumber}
diff --git a/rsconcept/frontend/src/components/Common/PageControls.tsx b/rsconcept/frontend/src/components/Common/PageControls.tsx
index 047d782f..36c52a21 100644
--- a/rsconcept/frontend/src/components/Common/PageControls.tsx
+++ b/rsconcept/frontend/src/components/Common/PageControls.tsx
@@ -12,14 +12,14 @@ function PageControls({
   return (
   <>
     <button type='button'
-      className='clr-hover text-controls'
+      className='clr-hover clr-text-controls'
       onClick={() => setPageNumber(1)}
       disabled={pageNumber < 2}
     >
       <GotoFirstIcon />
     </button>
     <button type='button'
-      className='clr-hover text-controls'
+      className='clr-hover clr-text-controls'
       onClick={() => setPageNumber(prev => prev - 1)}
       disabled={pageNumber < 2}
     >
@@ -27,14 +27,14 @@ function PageControls({
     </button>
     <p className='px-3 text-black'>Страница {pageNumber} из {pageCount}</p>
     <button type='button'
-      className='clr-hover text-controls'
+      className='clr-hover clr-text-controls'
       onClick={() => setPageNumber(prev => prev + 1)}
       disabled={pageNumber >= pageCount}
     >
       <GotoNextIcon />
     </button>
     <button type='button'
-      className='clr-hover text-controls'
+      className='clr-hover clr-text-controls'
       onClick={() => setPageNumber(pageCount)}
       disabled={pageNumber >= pageCount}
     >
diff --git a/rsconcept/frontend/src/components/Common/SelectorButton.tsx b/rsconcept/frontend/src/components/Common/SelectorButton.tsx
index c6a4d73f..479a0f3a 100644
--- a/rsconcept/frontend/src/components/Common/SelectorButton.tsx
+++ b/rsconcept/frontend/src/components/Common/SelectorButton.tsx
@@ -1,3 +1,5 @@
+import clsx from 'clsx';
+
 interface SelectorButtonProps
 extends Omit<React.ButtonHTMLAttributes<HTMLButtonElement>, 'className' | 'children' | 'title' | 'type'> {
   text?: string
@@ -9,7 +11,6 @@ extends Omit<React.ButtonHTMLAttributes<HTMLButtonElement>, 'className' | 'child
   transparent?: boolean
 }
 
-
 function SelectorButton({
   text, icon, tooltip,
   colors = 'clr-btn-default',
@@ -17,12 +18,20 @@ function SelectorButton({
   transparent,
   ...restProps
 }: SelectorButtonProps) {
-  const cursor = 'disabled:cursor-not-allowed cursor-pointer';
-  const position = `px-1 flex flex-start items-center gap-1 ${dimensions}`;
-  const design = (transparent ? 'clr-hover' : `border ${colors}`) + ' text-btn text-controls';
   return (
   <button type='button'
-    className={`text-sm small-caps select-none ${cursor} ${position} ${design}`}
+    className={clsx(
+      'px-1 flex flex-start items-center gap-1',
+      'text-sm small-caps select-none',
+      'text-btn clr-text-controls',
+      'disabled:cursor-not-allowed cursor-pointer',
+      {
+        'clr-hover': transparent,
+        'border': !transparent,
+      },
+      !transparent && colors,
+      dimensions
+  )}
     title={tooltip}
     {...restProps}
   >
diff --git a/rsconcept/frontend/src/components/Common/SubmitButton.tsx b/rsconcept/frontend/src/components/Common/SubmitButton.tsx
index f0125985..217a8d6a 100644
--- a/rsconcept/frontend/src/components/Common/SubmitButton.tsx
+++ b/rsconcept/frontend/src/components/Common/SubmitButton.tsx
@@ -1,3 +1,5 @@
+import clsx from 'clsx';
+
 interface SubmitButtonProps
 extends Omit<React.ButtonHTMLAttributes<HTMLButtonElement>, 'className' | 'children' | 'title'> {
   text?: string
@@ -14,7 +16,16 @@ function SubmitButton({
   return (
   <button type='submit'
     title={tooltip}
-    className={`px-3 py-2 inline-flex items-center gap-2 align-middle justify-center font-semibold select-none disabled:cursor-not-allowed border clr-btn-primary ${dimensions} ${loading ? ' cursor-progress' : ''}`}
+    className={clsx(
+      'px-3 py-2',
+      'inline-flex items-center gap-2 align-middle justify-center',
+      'border',
+      'font-semibold',
+      'clr-btn-primary',
+      'select-none disabled:cursor-not-allowed',
+      loading && 'cursor-progress',
+      dimensions
+    )}
     disabled={disabled ?? loading}
     {...restProps}
   >
diff --git a/rsconcept/frontend/src/components/Common/SwitchButton.tsx b/rsconcept/frontend/src/components/Common/SwitchButton.tsx
index 447e8ede..74db2327 100644
--- a/rsconcept/frontend/src/components/Common/SwitchButton.tsx
+++ b/rsconcept/frontend/src/components/Common/SwitchButton.tsx
@@ -1,3 +1,5 @@
+import clsx from 'clsx';
+
 interface SwitchButtonProps<ValueType> {
   id?: string
   value: ValueType
@@ -19,7 +21,15 @@ function SwitchButton<ValueType>({
   <button type='button' tabIndex={-1}
     title={tooltip}
     onClick={() => onSelect(value)}
-    className={`px-2 py-1 border font-semibold small-caps rounded-none cursor-pointer clr-btn-clear clr-hover ${dimensions} ${isSelected ? 'clr-selected': ''}`}
+    className={clsx(
+      'px-2 py-1',
+      'border rounded-none',
+      'font-semibold small-caps',
+      'clr-btn-clear clr-hover',
+      'cursor-pointer',
+      isSelected && 'clr-selected',
+      dimensions
+    )}
     {...restProps}
   >
     {icon ? icon : null}
diff --git a/rsconcept/frontend/src/components/Common/TextArea.tsx b/rsconcept/frontend/src/components/Common/TextArea.tsx
index ce966c4e..69041a1c 100644
--- a/rsconcept/frontend/src/components/Common/TextArea.tsx
+++ b/rsconcept/frontend/src/components/Common/TextArea.tsx
@@ -1,3 +1,4 @@
+import clsx from 'clsx';
 import { TextareaHTMLAttributes } from 'react';
 
 import { IColorsProps, IEditorProps } from './commonInterfaces';
@@ -15,18 +16,28 @@ function TextArea({
   colors = 'clr-input',
   ...restProps
 }: TextAreaProps) {
-  const borderClass = noBorder ? '': 'border';
-  const outlineClass = noOutline ? '': 'clr-outline';
   return (
-  <div className={`flex ${dense ? 'items-center gap-4 ' + dimensions : 'flex-col items-start gap-2'}`}>
-    {label && 
-    <Label
-      text={label}
-      htmlFor={id}
-    />}
+  <div className={clsx(
+    {
+      'flex items-center gap-3': dense,
+      'flex flex-col items-start gap-2': !dense
+    },
+    dense && dimensions,
+  )}>
+    <Label text={label} htmlFor={id} />
     <textarea id={id}
       title={tooltip}
-      className={`px-3 py-2 leading-tight ${outlineClass} ${borderClass} ${colors} ${dense ? 'w-full' : dimensions}`}
+      className={clsx(
+        'px-3 py-2',
+        'leading-tight',
+        {
+          'w-full': dense,
+          'border': !noBorder,
+          'clr-outline': !noOutline
+        },
+        colors, 
+        !dense && dimensions
+      )}
       rows={rows}
       required={required}
       {...restProps}
diff --git a/rsconcept/frontend/src/components/Common/TextInput.tsx b/rsconcept/frontend/src/components/Common/TextInput.tsx
index d42d6274..ba9b000f 100644
--- a/rsconcept/frontend/src/components/Common/TextInput.tsx
+++ b/rsconcept/frontend/src/components/Common/TextInput.tsx
@@ -1,3 +1,5 @@
+import clsx from 'clsx';
+
 import { IColorsProps, IEditorProps } from './commonInterfaces';
 import Label from './Label';
 
@@ -14,24 +16,37 @@ function preventEnterCapture(event: React.KeyboardEvent<HTMLInputElement>) {
 }
 
 function TextInput({
-  id, label, dense, tooltip, noBorder, noOutline, allowEnter, onKeyDown,
+  id, label, dense, tooltip, noBorder, noOutline, allowEnter, disabled,
   dimensions = 'w-full',
   colors = 'clr-input',
+  onKeyDown,
   ...restProps
 }: TextInputProps) {
-  const borderClass = noBorder ? '' : 'border px-3';
-  const outlineClass = noOutline ? '' : 'clr-outline';
   return (
-  <div className={`flex ${dense ? 'items-center gap-4 ' + dimensions : 'flex-col items-start gap-2'}`}>
-    {label ?
-    <Label
-      text={label}
-      htmlFor={id}
-    /> : null}
+  <div className={clsx(
+    {
+      'flex flex-col items-start gap-2': !dense,
+      'flex items-center gap-3': dense,
+    },
+    dense && dimensions
+  )}>
+    <Label text={label} htmlFor={id} />
     <input id={id}
       title={tooltip}
+      className={clsx(
+        'py-2',
+        'leading-tight truncate hover:text-clip',
+        {
+          'px-3': !noBorder || !disabled,
+          'w-full': dense,
+          'border': !noBorder,
+          'clr-outline': !noOutline
+        },
+        colors, 
+        !dense && dimensions
+      )}
       onKeyDown={!allowEnter && !onKeyDown ? preventEnterCapture : onKeyDown}
-      className={`py-2 leading-tight truncate hover:text-clip ${colors} ${outlineClass} ${borderClass} ${dense ? 'w-full' : dimensions}`}
+      disabled={disabled}
       {...restProps}
     />
   </div>);
diff --git a/rsconcept/frontend/src/components/Common/TextURL.tsx b/rsconcept/frontend/src/components/Common/TextURL.tsx
index 1ff58628..09890a6a 100644
--- a/rsconcept/frontend/src/components/Common/TextURL.tsx
+++ b/rsconcept/frontend/src/components/Common/TextURL.tsx
@@ -9,7 +9,7 @@ interface TextURLProps {
   onClick?: () => void
 }
 
-function TextURL({ text, href, tooltip, color='text-url', onClick }: TextURLProps) {
+function TextURL({ text, href, tooltip, color='clr-text-url', onClick }: TextURLProps) {
   const design = `cursor-pointer hover:underline ${color}`;
   if (href) {
     return (
diff --git a/rsconcept/frontend/src/components/Common/Tristate.tsx b/rsconcept/frontend/src/components/Common/Tristate.tsx
index 7eb0e0c9..77828224 100644
--- a/rsconcept/frontend/src/components/Common/Tristate.tsx
+++ b/rsconcept/frontend/src/components/Common/Tristate.tsx
@@ -1,4 +1,5 @@
 
+import clsx from 'clsx';
 import { useMemo } from 'react';
 
 import { CheckboxCheckedIcon, CheckboxNullIcon } from '../Icons';
@@ -27,11 +28,7 @@ function Tristate({
       return ''
     }
   }, [disabled, setValue]);
-  const bgColor = useMemo(
-  () => {
-    return value !== false ? 'clr-primary' : 'clr-app'
-  }, [value]);
-  
+
   function handleClick(event: React.MouseEvent<HTMLButtonElement, MouseEvent>): void {
     event.preventDefault();
     if (disabled || !setValue) {
@@ -48,22 +45,29 @@ function Tristate({
 
   return (
   <button type='button' id={id}
-    className={`flex items-center clr-outline focus:outline-dotted focus:outline-1 ${dimensions}`}
+  className={clsx(
+      'flex items-center gap-2 text-start',
+      'outline-none',
+      dimensions,
+      cursor
+    )}
     title={tooltip}
     disabled={disabled}
     onClick={handleClick}
     {...restProps}
   >
-    <div className={`w-4 h-4 shrink-0 mt-0.5 border rounded-sm ${bgColor} ${cursor}`} >
+    <div className={clsx(
+      'w-4 h-4',
+      'border rounded-sm',
+      {
+        'clr-primary': value !== false,
+        'clr-app': value === false
+      }
+    )}>
       {value ? <div className='mt-[1px] ml-[1px]'><CheckboxCheckedIcon /></div> : null}
       {value == null ? <div className='mt-[1px] ml-[1px]'><CheckboxNullIcon /></div> : null}
     </div>
-    {label ? 
-    <Label
-      className={`${cursor} px-2 text-start`}
-      text={label}
-      htmlFor={id}
-    /> : null}
+    <Label className={cursor} text={label} htmlFor={id} />
   </button>);
 }
 
diff --git a/rsconcept/frontend/src/components/Common/commonInterfaces.ts b/rsconcept/frontend/src/components/Common/commonInterfaces.ts
index 45a962c9..c24655c9 100644
--- a/rsconcept/frontend/src/components/Common/commonInterfaces.ts
+++ b/rsconcept/frontend/src/components/Common/commonInterfaces.ts
@@ -14,4 +14,4 @@ export interface IEditorProps extends IControlProps {
 
 export interface IColorsProps {
   colors?: string
-}
+}
\ No newline at end of file
diff --git a/rsconcept/frontend/src/components/ConceptToaster.tsx b/rsconcept/frontend/src/components/ConceptToaster.tsx
index 884a6cf8..3fcd86c7 100644
--- a/rsconcept/frontend/src/components/ConceptToaster.tsx
+++ b/rsconcept/frontend/src/components/ConceptToaster.tsx
@@ -14,4 +14,4 @@ function ToasterThemed(props: ToasterThemedProps) {
   />);
 }
 
-export default ToasterThemed;
+export default ToasterThemed;
\ No newline at end of file
diff --git a/rsconcept/frontend/src/components/DataTable/PaginationTools.tsx b/rsconcept/frontend/src/components/DataTable/PaginationTools.tsx
index 43fd3ae8..9b87752c 100644
--- a/rsconcept/frontend/src/components/DataTable/PaginationTools.tsx
+++ b/rsconcept/frontend/src/components/DataTable/PaginationTools.tsx
@@ -1,6 +1,7 @@
 'use client';
 
 import { Table } from '@tanstack/react-table';
+import clsx from 'clsx';
 import { useCallback } from 'react';
 
 import { prefixes } from '@/utils/constants';
@@ -24,7 +25,13 @@ function PaginationTools<TData>({ table, paginationOptions, onChangePaginationOp
   }, [onChangePaginationOption, table]);
   
   return (
-  <div className='flex items-center justify-end w-full my-2 text-sm select-none text-controls'>
+  <div className={clsx(
+    'flex justify-end items-center',
+    'w-full my-2',
+    'text-sm', 
+    'clr-text-controls',
+    'select-none'
+  )}>
     <div className='flex items-center gap-1 mr-3'>
       <div className=''>
         {table.getState().pagination.pageIndex * table.getState().pagination.pageSize + 1}
@@ -36,14 +43,14 @@ function PaginationTools<TData>({ table, paginationOptions, onChangePaginationOp
     </div>
     <div className='flex'>
       <button type='button'
-        className='clr-hover text-controls'
+        className='clr-hover clr-text-controls'
         onClick={() => table.setPageIndex(0)}
         disabled={!table.getCanPreviousPage()}
       >
         <GotoFirstIcon />
       </button>
       <button type='button'
-        className='clr-hover text-controls'
+        className='clr-hover clr-text-controls'
         onClick={() => table.previousPage()}
         disabled={!table.getCanPreviousPage()}
       >
@@ -61,14 +68,14 @@ function PaginationTools<TData>({ table, paginationOptions, onChangePaginationOp
         }}
       />
       <button type='button'
-        className='clr-hover text-controls'
+        className='clr-hover clr-text-controls'
         onClick={() => table.nextPage()}
         disabled={!table.getCanNextPage()}
       >
         <GotoNextIcon />
       </button>
       <button type='button'
-        className='clr-hover text-controls'
+        className='clr-hover clr-text-controls'
         onClick={() => table.setPageIndex(table.getPageCount() - 1)}
         disabled={!table.getCanNextPage()}
       >
diff --git a/rsconcept/frontend/src/components/DataTable/SortingIcon.tsx b/rsconcept/frontend/src/components/DataTable/SortingIcon.tsx
index 1c47770c..a3f45e36 100644
--- a/rsconcept/frontend/src/components/DataTable/SortingIcon.tsx
+++ b/rsconcept/frontend/src/components/DataTable/SortingIcon.tsx
@@ -17,4 +17,4 @@ function SortingIcon<TData>({ column }: SortingIconProps<TData>) {
   </>);
 }
 
-export default SortingIcon;
+export default SortingIcon;
\ No newline at end of file
diff --git a/rsconcept/frontend/src/components/ErrorFallback.tsx b/rsconcept/frontend/src/components/ErrorFallback.tsx
index cae3eb9f..51a3b6c3 100644
--- a/rsconcept/frontend/src/components/ErrorFallback.tsx
+++ b/rsconcept/frontend/src/components/ErrorFallback.tsx
@@ -6,7 +6,7 @@ import InfoError from './InfoError';
 function ErrorFallback({ error, resetErrorBoundary }: FallbackProps) {
   return (
   <div className='flex flex-col items-center antialiased clr-app' role='alert'>
-    <h1 className='text-lg font-semibold'>Что-то пошло не так!</h1>
+    <h1>Что-то пошло не так!</h1>
     <Button
       onClick={resetErrorBoundary}
       text='Попробовать еще раз'
@@ -15,4 +15,4 @@ function ErrorFallback({ error, resetErrorBoundary }: FallbackProps) {
   </div>);
 }
 
-export default ErrorFallback;
+export default ErrorFallback;
\ No newline at end of file
diff --git a/rsconcept/frontend/src/components/ExpectedAnonymous.tsx b/rsconcept/frontend/src/components/ExpectedAnonymous.tsx
index b09c0fba..1a59466c 100644
--- a/rsconcept/frontend/src/components/ExpectedAnonymous.tsx
+++ b/rsconcept/frontend/src/components/ExpectedAnonymous.tsx
@@ -22,7 +22,7 @@ function ExpectedAnonymous() {
       <TextURL text='Справка' href='/manuals'/>
       <span> | </span>
       <span
-        className='cursor-pointer hover:underline text-url'
+        className='cursor-pointer hover:underline clr-text-url'
         onClick={logoutAndRedirect}
       >
         Выйти
@@ -31,4 +31,4 @@ function ExpectedAnonymous() {
   </div>);
 }
 
-export default ExpectedAnonymous;
+export default ExpectedAnonymous;
\ No newline at end of file
diff --git a/rsconcept/frontend/src/components/Footer.tsx b/rsconcept/frontend/src/components/Footer.tsx
index 1d18c363..3be504c8 100644
--- a/rsconcept/frontend/src/components/Footer.tsx
+++ b/rsconcept/frontend/src/components/Footer.tsx
@@ -1,17 +1,26 @@
+import clsx from 'clsx';
+
 import { urls } from '@/utils/constants';
+
 import TextURL from './Common/TextURL';
 
 function Footer() {
   return (
-  <footer tabIndex={-1} className='flex flex-col items-center w-full gap-1 px-4 py-2 text-sm select-none z-navigation whitespace-nowrap'>
-    <div className='flex gap-3 text-center'>
+  <footer tabIndex={-1}
+    className={clsx(
+      'w-full z-navigation',
+      'px-4 py-2 flex flex-col items-center gap-1',
+      'text-sm select-none whitespace-nowrap'
+    )}
+  >
+    <div className='flex gap-3'>
       <TextURL text='Библиотека' href='/library' color='clr-footer'/>
       <TextURL text='Справка' href='/manuals' color='clr-footer'/>
       <TextURL text='Центр Концепт' href={urls.concept} color='clr-footer'/>
       <TextURL text='Экстеор' href='/manuals?topic=exteor' color='clr-footer'/>
     </div>
     <div>
-      <p className='mt-0.5 text-center clr-footer'>© 2023 ЦИВТ КОНЦЕПТ</p>
+      <p className='clr-footer'>© 2023 ЦИВТ КОНЦЕПТ</p>
     </div>
   </footer>);
 }
diff --git a/rsconcept/frontend/src/components/Help/HelpButton.tsx b/rsconcept/frontend/src/components/Help/HelpButton.tsx
index e7feaf6b..67ccf833 100644
--- a/rsconcept/frontend/src/components/Help/HelpButton.tsx
+++ b/rsconcept/frontend/src/components/Help/HelpButton.tsx
@@ -16,9 +16,9 @@ function HelpButton({ topic, offset, dimensions }: HelpButtonProps) {
   <>
     <div
       id={`help-${topic}`}
-      className='px-1 py-1'
+      className='p-1'
     >
-      <HelpIcon color='text-primary' size={5} />
+      <HelpIcon color='clr-text-primary' size={5} />
     </div>
     <ConceptTooltip clickable
       anchorSelect={`#help-${topic}`}
diff --git a/rsconcept/frontend/src/components/Icons.tsx b/rsconcept/frontend/src/components/Icons.tsx
index 5f45e1de..2c02c074 100644
--- a/rsconcept/frontend/src/components/Icons.tsx
+++ b/rsconcept/frontend/src/components/Icons.tsx
@@ -529,4 +529,4 @@ export function CrossIcon(props: IconProps) {
       </g>
     </IconSVG>
   );
-}
+}
\ No newline at end of file
diff --git a/rsconcept/frontend/src/components/InfoError.tsx b/rsconcept/frontend/src/components/InfoError.tsx
index 952cd82a..d29021e7 100644
--- a/rsconcept/frontend/src/components/InfoError.tsx
+++ b/rsconcept/frontend/src/components/InfoError.tsx
@@ -46,9 +46,9 @@ function DescribeError({error} : {error: ErrorData}) {
 
 function InfoError({ error }: InfoErrorProps) {
   return (
-  <div className='px-3 py-2 min-w-[15rem] text-sm font-semibold select-text text-warning'>
+  <div className='px-3 py-2 min-w-[15rem] text-sm font-semibold select-text clr-text-warning'>
     <DescribeError error={error} />
   </div>);
 }
 
-export default InfoError;
+export default InfoError;
\ No newline at end of file
diff --git a/rsconcept/frontend/src/components/Navigation/Logo.tsx b/rsconcept/frontend/src/components/Navigation/Logo.tsx
index 18fa300a..2c8dd019 100644
--- a/rsconcept/frontend/src/components/Navigation/Logo.tsx
+++ b/rsconcept/frontend/src/components/Navigation/Logo.tsx
@@ -4,7 +4,7 @@ function Logo() {
   const { darkMode } = useConceptTheme();
   return (
   <img alt='Логотип КонцептПортал'
-    className='max-h-[1.6rem]'
+    className='max-h-[1.6rem] min-w-[11rem]'
     src={!darkMode ? '/logo_full.svg' : '/logo_full_dark.svg'}
   />);
 }
diff --git a/rsconcept/frontend/src/components/Navigation/Navigation.tsx b/rsconcept/frontend/src/components/Navigation/Navigation.tsx
index da306328..2a0024eb 100644
--- a/rsconcept/frontend/src/components/Navigation/Navigation.tsx
+++ b/rsconcept/frontend/src/components/Navigation/Navigation.tsx
@@ -1,7 +1,9 @@
+import clsx from 'clsx';
+
+import { EducationIcon, LibraryIcon, PlusIcon } from '@/components/Icons';
 import { useConceptNavigation } from '@/context/NagivationContext';
 import { useConceptTheme } from '@/context/ThemeContext';
 
-import { EducationIcon, LibraryIcon, PlusIcon } from '@/components/Icons';
 import Logo from './Logo';
 import NavigationButton from './NavigationButton';
 import ToggleNavigationButton from './ToggleNavigationButton';
@@ -17,14 +19,25 @@ function Navigation () {
   const navigateCreateNew = () => router.push('/library/create');
 
   return (
-  <nav className='sticky top-0 left-0 right-0 select-none clr-app z-navigation'>
+  <nav className={clsx(
+    'z-navigation',
+    'sticky top-0 left-0 right-0', 
+    'clr-app',
+    'select-none'
+  )}>
     <ToggleNavigationButton />
     {!noNavigation ?
-    <div className='flex items-stretch justify-between pl-2 pr-[0.8rem] border-b-2 rounded-none h-[3rem]'>
+    <div
+      className={clsx(
+        'pl-2 pr-[0.8rem] h-[3rem]',
+        'flex justify-between',
+        'border-b-2 rounded-none'
+      )}
+    >
       <div className='flex items-center mr-2 cursor-pointer' onClick={navigateHome} tabIndex={-1}>
         <Logo />
       </div>
-      <div className='flex items-center h-full'>
+      <div className='flex'>
         <NavigationButton
           text='Новая схема'
           description='Создать новую схему'
@@ -49,4 +62,4 @@ function Navigation () {
   </nav>);
 }
 
-export default Navigation;
+export default Navigation;
\ No newline at end of file
diff --git a/rsconcept/frontend/src/components/Navigation/NavigationButton.tsx b/rsconcept/frontend/src/components/Navigation/NavigationButton.tsx
index e5bb44ff..d51c10fa 100644
--- a/rsconcept/frontend/src/components/Navigation/NavigationButton.tsx
+++ b/rsconcept/frontend/src/components/Navigation/NavigationButton.tsx
@@ -1,3 +1,5 @@
+import clsx from 'clsx';
+
 interface NavigationButtonProps {
   id?: string
   text?: string
@@ -11,11 +13,20 @@ function NavigationButton({ id, icon, description, onClick, text }: NavigationBu
   <button id={id} type='button' tabIndex={-1}
     title={description}
     onClick={onClick}
-    className={`flex items-center h-full gap-1 ${text ? 'px-2' : 'px-4'} mr-1 small-caps whitespace-nowrap clr-btn-nav`}
+    className={clsx(
+      'mr-1 h-full',
+      'flex items-center gap-1',
+      'clr-btn-nav',
+      'small-caps whitespace-nowrap',
+      {
+        'px-2': text,
+        'px-4': !text
+      }
+    )}
   >
     {icon ? <span>{icon}</span> : null}
     {text ? <span className='font-semibold'>{text}</span> : null}
   </button>);
 }
 
-export default NavigationButton;
+export default NavigationButton;
\ No newline at end of file
diff --git a/rsconcept/frontend/src/components/Navigation/ThemeSwitcher.tsx b/rsconcept/frontend/src/components/Navigation/ThemeSwitcher.tsx
index aec6e831..b3a595d6 100644
--- a/rsconcept/frontend/src/components/Navigation/ThemeSwitcher.tsx
+++ b/rsconcept/frontend/src/components/Navigation/ThemeSwitcher.tsx
@@ -22,4 +22,4 @@ function ThemeSwitcher() {
   }
 }
 
-export default ThemeSwitcher;
+export default ThemeSwitcher;
\ No newline at end of file
diff --git a/rsconcept/frontend/src/components/Navigation/ToggleNavigationButton.tsx b/rsconcept/frontend/src/components/Navigation/ToggleNavigationButton.tsx
index 1df53799..e573ae14 100644
--- a/rsconcept/frontend/src/components/Navigation/ToggleNavigationButton.tsx
+++ b/rsconcept/frontend/src/components/Navigation/ToggleNavigationButton.tsx
@@ -1,19 +1,32 @@
+import clsx from 'clsx';
 import { useMemo } from 'react';
 
 import { useConceptTheme } from '@/context/ThemeContext';
 
 function ToggleNavigationButton() {
   const { noNavigation, toggleNoNavigation } = useConceptTheme();
-  const dimensions = useMemo(() => (noNavigation ? 'px-1 h-[1.6rem]' : 'w-[1.2rem] h-[3rem]'), [noNavigation]);
   const text = useMemo(() => (
-    noNavigation ? '∨∨∨' : <><p>{'>'}</p><p>{'>'}</p></>), [noNavigation]
+    noNavigation ?
+      '∨∨∨'
+      :
+      <>
+        <p>{'>'}</p>
+        <p>{'>'}</p>
+      </>
+    ), [noNavigation]
   );
-  const tooltip = useMemo(() => (noNavigation ? 'Показать навигацию' : 'Скрыть навигацию'), [noNavigation]);
-
   return (
   <button type='button' tabIndex={-1}
-    title={tooltip}
-    className={`absolute top-0 right-0 border-b-2 border-l-2 rounded-none z-navigation clr-btn-nav ${dimensions}`}
+    title={noNavigation ? 'Показать навигацию' : 'Скрыть навигацию'}
+    className={clsx(
+      'absolute top-0 right-0 z-navigation',
+      'border-b-2 border-l-2 rounded-none',
+      'clr-btn-nav',
+      {
+        'px-1 h-[1.6rem]': noNavigation,
+        'w-[1.2rem] h-[3rem]': !noNavigation
+      }
+    )}
     onClick={toggleNoNavigation}
   >
     {text}
diff --git a/rsconcept/frontend/src/components/Navigation/UserDropdown.tsx b/rsconcept/frontend/src/components/Navigation/UserDropdown.tsx
index a1e05ac5..9057e159 100644
--- a/rsconcept/frontend/src/components/Navigation/UserDropdown.tsx
+++ b/rsconcept/frontend/src/components/Navigation/UserDropdown.tsx
@@ -44,4 +44,4 @@ function UserDropdown({ hideDropdown }: UserDropdownProps) {
   </Dropdown>);
 }
 
-export default UserDropdown;
+export default UserDropdown;
\ No newline at end of file
diff --git a/rsconcept/frontend/src/components/Navigation/UserMenu.tsx b/rsconcept/frontend/src/components/Navigation/UserMenu.tsx
index 7472d61e..1e4ae942 100644
--- a/rsconcept/frontend/src/components/Navigation/UserMenu.tsx
+++ b/rsconcept/frontend/src/components/Navigation/UserMenu.tsx
@@ -35,4 +35,4 @@ function UserMenu() {
   </div>);
 }
 
-export default UserMenu;
+export default UserMenu;
\ No newline at end of file
diff --git a/rsconcept/frontend/src/components/RSInput/RSInput.tsx b/rsconcept/frontend/src/components/RSInput/RSInput.tsx
index c62a73f6..6ea9f612 100644
--- a/rsconcept/frontend/src/components/RSInput/RSInput.tsx
+++ b/rsconcept/frontend/src/components/RSInput/RSInput.tsx
@@ -1,8 +1,10 @@
+'use client';
 
 import { Extension } from '@codemirror/state';
 import { tags } from '@lezer/highlight';
 import { createTheme } from '@uiw/codemirror-themes';
 import CodeMirror, { BasicSetupOptions, ReactCodeMirrorProps, ReactCodeMirrorRef } from '@uiw/react-codemirror';
+import clsx from 'clsx';
 import { EditorView } from 'codemirror';
 import { RefObject, useCallback, useMemo, useRef } from 'react';
 
@@ -122,12 +124,12 @@ function RSInput({
   }, [thisRef]);
 
   return (
-  <div className={`flex flex-col gap-2 ${dimensions} ${cursor}`}>
-    {label ?
-    <Label
-      text={label}
-      htmlFor={id}
-    /> : null}
+  <div className={clsx(
+    'flex flex-col gap-2',
+    dimensions,
+    cursor
+  )}>
+    <Label text={label} htmlFor={id}/>
     <CodeMirror id={id}
       ref={thisRef}
       basicSetup={editorSetup}
@@ -142,4 +144,4 @@ function RSInput({
   </div>);
 }
 
-export default RSInput;
+export default RSInput;
\ No newline at end of file
diff --git a/rsconcept/frontend/src/components/RSInput/textEditing.ts b/rsconcept/frontend/src/components/RSInput/textEditing.ts
index 222309cb..3f572304 100644
--- a/rsconcept/frontend/src/components/RSInput/textEditing.ts
+++ b/rsconcept/frontend/src/components/RSInput/textEditing.ts
@@ -228,4 +228,4 @@ export class RSTextWrapper extends CodeMirrorWrapper {
     }
     return false;
   }
-}
+}
\ No newline at end of file
diff --git a/rsconcept/frontend/src/components/RSInput/tooltip.ts b/rsconcept/frontend/src/components/RSInput/tooltip.ts
index 0aa03ad7..3179e6a8 100644
--- a/rsconcept/frontend/src/components/RSInput/tooltip.ts
+++ b/rsconcept/frontend/src/components/RSInput/tooltip.ts
@@ -6,6 +6,7 @@ import { EditorState } from '@uiw/react-codemirror';
 import { IConstituenta } from '@/models/rsform';
 import { findEnvelopingNodes } from '@/utils/codemirror';
 import { domTooltipConstituenta } from '@/utils/codemirror';
+
 import { GlobalTokens } from './rslang';
 
 function findAliasAt(pos: number, state: EditorState) {
@@ -43,4 +44,4 @@ const globalsHoverTooltip = (items: IConstituenta[]) => {
 
 export function rsHoverTooltip(items: IConstituenta[]): Extension {
   return [globalsHoverTooltip(items)];
-}
+}
\ No newline at end of file
diff --git a/rsconcept/frontend/src/components/RefsInput/RefsInput.tsx b/rsconcept/frontend/src/components/RefsInput/RefsInput.tsx
index 136bed19..f1c0baac 100644
--- a/rsconcept/frontend/src/components/RefsInput/RefsInput.tsx
+++ b/rsconcept/frontend/src/components/RefsInput/RefsInput.tsx
@@ -1,18 +1,17 @@
+'use client';
 
 import { Extension } from '@codemirror/state';
 import { tags } from '@lezer/highlight';
 import { createTheme } from '@uiw/codemirror-themes';
 import CodeMirror, { BasicSetupOptions, ReactCodeMirrorProps, ReactCodeMirrorRef } from '@uiw/react-codemirror';
+import clsx from 'clsx';
 import { EditorView } from 'codemirror';
 import { RefObject, useCallback, useMemo, useRef, useState } from 'react';
 
 import Label from '@/components/Common/Label';
-import Modal from '@/components/Common/Modal';
-import PrettyJson from '@/components/Common/PrettyJSON';
 import { useRSForm } from '@/context/RSFormContext';
 import { useConceptTheme } from '@/context/ThemeContext';
 import DlgEditReference from '@/dialogs/DlgEditReference';
-import useResolveText from '@/hooks/useResolveText';
 import { ReferenceType } from '@/models/language';
 import { IConstituenta } from '@/models/rsform';
 import { CodeMirrorWrapper } from '@/utils/codemirror';
@@ -73,9 +72,6 @@ function RefsInput({
   const { darkMode, colors } = useConceptTheme();
   const { schema } = useRSForm();
 
-  const { resolveText, refsData } = useResolveText({schema: schema});
-
-  const [showResolve, setShowResolve] = useState(false);
   const [isFocused, setIsFocused] = useState(false);
 
   const [showEditor, setShowEditor] = useState(false);
@@ -135,15 +131,6 @@ function RefsInput({
       event.preventDefault();
       return;
     }
-    if (event.altKey) {
-      if (event.key === 'r' && value) {
-        event.preventDefault();
-        resolveText(value, () => {
-          setShowResolve(true);
-        });
-        return;
-      }
-    }
     if (event.ctrlKey && event.code === 'Space') {
       const wrap = new CodeMirrorWrapper(thisRef.current as Required<ReactCodeMirrorRef>);
       wrap.fixSelection(ReferenceTokens);
@@ -164,7 +151,7 @@ function RefsInput({
 
       setShowEditor(true);
     }
-  }, [thisRef, resolveText, value]);
+  }, [thisRef]);
 
   const handleInputReference = useCallback(
   (referenceText: string) => {
@@ -176,37 +163,26 @@ function RefsInput({
     wrap.replaceWith(referenceText);
   }, [thisRef]);
 
-  return (
-  <>
-    {showEditor ?
-    <DlgEditReference
-      hideWindow={() => setShowEditor(false)}
-      items={items ?? []}
-      initial={{
-        type: currentType,
-        refRaw: refText,
-        text: hintText,
-        basePosition: basePosition,
-        mainRefs: mainRefs
-      }}
-      onSave={handleInputReference}
-    /> : null}
-    {showResolve ?
-    <Modal
-      readonly
-      hideWindow={() => setShowResolve(false)}
-    >
-      <div className='max-h-[60vh] max-w-[80vw] overflow-auto'>
-        <PrettyJson data={refsData} />
-      </div>
-    </Modal> : null}
-    <div className={`flex flex-col  w-full ${cursor}`}>
-    {label ? 
-    <Label
-      text={label}
-      htmlFor={id}
-      className='mb-2'
-    /> : null}
+  return (<>
+  {showEditor ?
+  <DlgEditReference
+    hideWindow={() => setShowEditor(false)}
+    items={items ?? []}
+    initial={{
+      type: currentType,
+      refRaw: refText,
+      text: hintText,
+      basePosition: basePosition,
+      mainRefs: mainRefs
+    }}
+    onSave={handleInputReference}
+  /> : null}
+  <div className={clsx(
+    'w-full',
+    'flex flex-col gap-2',
+    cursor
+  )}>
+    <Label text={label} htmlFor={id} />
     <CodeMirror id={id} ref={thisRef}
       basicSetup={editorSetup}
       theme={customTheme}
@@ -223,8 +199,8 @@ function RefsInput({
       // spellCheck= // TODO: figure out while automatic spellcheck doesnt work or implement with extension
       {...restProps}
     />
-    </div>
+  </div>
   </>);
 }
 
-export default RefsInput;
+export default RefsInput;
\ No newline at end of file
diff --git a/rsconcept/frontend/src/components/RefsInput/tooltip.ts b/rsconcept/frontend/src/components/RefsInput/tooltip.ts
index 5c69bd8a..60e3b86c 100644
--- a/rsconcept/frontend/src/components/RefsInput/tooltip.ts
+++ b/rsconcept/frontend/src/components/RefsInput/tooltip.ts
@@ -6,6 +6,7 @@ import { parseEntityReference, parseSyntacticReference } from '@/models/language
 import { IConstituenta } from '@/models/rsform';
 import { domTooltipEntityReference, domTooltipSyntacticReference, findContainedNodes, findEnvelopingNodes } from '@/utils/codemirror';
 import { IColorTheme } from '@/utils/color';
+
 import { ReferenceTokens } from './parse';
 import { RefEntity, RefSyntactic } from './parse/parser.terms';
 
@@ -58,4 +59,4 @@ export const globalsHoverTooltip = (items: IConstituenta[], colors: IColorTheme)
 
 export function refsHoverTooltip(items: IConstituenta[], colors: IColorTheme): Extension {
   return [globalsHoverTooltip(items, colors)];
-}
+}
\ No newline at end of file
diff --git a/rsconcept/frontend/src/components/RequireAuth.tsx b/rsconcept/frontend/src/components/RequireAuth.tsx
index 4c5edb84..826434b8 100644
--- a/rsconcept/frontend/src/components/RequireAuth.tsx
+++ b/rsconcept/frontend/src/components/RequireAuth.tsx
@@ -24,4 +24,4 @@ function RequireAuth({ children }: RequireAuthProps) {
   }
 }
 
-export default RequireAuth;
+export default RequireAuth;
\ No newline at end of file
diff --git a/rsconcept/frontend/src/components/Shared/ConstituentaBadge.tsx b/rsconcept/frontend/src/components/Shared/ConstituentaBadge.tsx
index 6d8bb1ce..59c1da56 100644
--- a/rsconcept/frontend/src/components/Shared/ConstituentaBadge.tsx
+++ b/rsconcept/frontend/src/components/Shared/ConstituentaBadge.tsx
@@ -1,3 +1,5 @@
+import clsx from 'clsx';
+
 import ConceptTooltip from '@/components/Common/ConceptTooltip';
 import ConstituentaTooltip from '@/components/Help/ConstituentaTooltip';
 import { IConstituenta } from '@/models/rsform';
@@ -17,13 +19,16 @@ function ConstituentaBadge({ value, prefixID, shortTooltip, theme }: Constituent
   <div className='w-fit'>
     <div
       id={`${prefixID}${value.alias}`}
-      className='min-w-[3.1rem] max-w-[3.1rem] px-1 text-center rounded-md whitespace-nowrap'
+      className={clsx(
+        'min-w-[3.1rem] max-w-[3.1rem]',
+        'px-1',
+        'border rounded-md',
+        'text-center font-semibold whitespace-nowrap'
+      )}
       style={{
-        borderWidth: '1px', 
         borderColor: colorfgCstStatus(value.status, theme),
         color: colorfgCstStatus(value.status, theme),
-        backgroundColor: isMockCst(value) ? theme.bgWarning : theme.bgInput,
-        fontWeight: 600
+        backgroundColor: isMockCst(value) ? theme.bgWarning : theme.bgInput
       }}
     >
       {value.alias}
@@ -38,9 +43,9 @@ function ConstituentaBadge({ value, prefixID, shortTooltip, theme }: Constituent
       anchorSelect={`#${prefixID}${value.alias}`}
       place='right'
     >
-      <p><span className='font-semibold'>Статус</span>: {describeExpressionStatus(value.status)}</p>
+      <p><b>Статус</b>: {describeExpressionStatus(value.status)}</p>
     </ConceptTooltip> : null}
   </div>);
 }
 
-export default ConstituentaBadge;
+export default ConstituentaBadge;
\ No newline at end of file
diff --git a/rsconcept/frontend/src/components/Shared/ConstituentaPicker.tsx b/rsconcept/frontend/src/components/Shared/ConstituentaPicker.tsx
index 5d33db34..3cbb15b6 100644
--- a/rsconcept/frontend/src/components/Shared/ConstituentaPicker.tsx
+++ b/rsconcept/frontend/src/components/Shared/ConstituentaPicker.tsx
@@ -82,8 +82,8 @@ function ConstituentaPicker({
   }], [value, colors]);
 
   return (
-  <>
-    <ConceptSearch dense
+  <div>
+    <ConceptSearch
       value={filterText}
       onChange={newValue => setFilterText(newValue)}
     />
@@ -96,7 +96,7 @@ function ConstituentaPicker({
         columns={columns}
         conditionalRowStyles={conditionalRowStyles}
         noDataComponent={
-          <span className='flex flex-col justify-center p-2 text-center min-h-[5rem]'>
+          <span className='p-2 min-h-[5rem] flex flex-col justify-center text-center'>
             <p>Список конституент пуст</p>
             <p>Измените параметры фильтра</p>
           </span>
@@ -104,7 +104,7 @@ function ConstituentaPicker({
         onRowClicked={onSelectValue}
       />
     </div>
-  </>);
+  </div>);
 }
 
-export default ConstituentaPicker;
+export default ConstituentaPicker;
\ No newline at end of file
diff --git a/rsconcept/frontend/src/components/Shared/GrammemeBadge.tsx b/rsconcept/frontend/src/components/Shared/GrammemeBadge.tsx
index 75318a24..4644c5ec 100644
--- a/rsconcept/frontend/src/components/Shared/GrammemeBadge.tsx
+++ b/rsconcept/frontend/src/components/Shared/GrammemeBadge.tsx
@@ -1,3 +1,5 @@
+import clsx from 'clsx';
+
 import { useConceptTheme } from '@/context/ThemeContext';
 import { GramData } from '@/models/language';
 import { colorfgGrammeme } from '@/utils/color';
@@ -13,12 +15,15 @@ function GrammemeBadge({ key, grammeme }: GrammemeBadgeProps) {
   return (
   <div
     key={key}
-    className='min-w-[3rem] px-1 text-sm text-center rounded-md whitespace-nowrap'
+    className={clsx(
+      'min-w-[3rem]',
+      'px-1',
+      'border rounded-md',
+      'text-sm font-semibold text-center whitespace-nowrap'
+    )}
     style={{
-      borderWidth: '1px', 
       borderColor: colorfgGrammeme(grammeme, colors),
       color: colorfgGrammeme(grammeme, colors), 
-      fontWeight: 600,
       backgroundColor: colors.bgInput
     }}
   >
diff --git a/rsconcept/frontend/src/components/Shared/InfoConstituenta.tsx b/rsconcept/frontend/src/components/Shared/InfoConstituenta.tsx
index 6adcc19c..56969449 100644
--- a/rsconcept/frontend/src/components/Shared/InfoConstituenta.tsx
+++ b/rsconcept/frontend/src/components/Shared/InfoConstituenta.tsx
@@ -36,4 +36,4 @@ function InfoConstituenta({ data, ...restProps }: InfoConstituentaProps) {
   </div>);
 }
 
-export default InfoConstituenta;
+export default InfoConstituenta;
\ No newline at end of file
diff --git a/rsconcept/frontend/src/components/Shared/InfoCstClass.tsx b/rsconcept/frontend/src/components/Shared/InfoCstClass.tsx
index 5067a39e..6112fc1a 100644
--- a/rsconcept/frontend/src/components/Shared/InfoCstClass.tsx
+++ b/rsconcept/frontend/src/components/Shared/InfoCstClass.tsx
@@ -1,3 +1,5 @@
+import clsx from 'clsx';
+
 import { useConceptTheme } from '@/context/ThemeContext';
 import { CstClass } from '@/models/rsform';
 import { colorbgCstClass } from '@/utils/color';
@@ -19,7 +21,13 @@ function InfoCstClass({ title }: InfoCstClassProps) {
       return (
       <p key={`${prefixes.cst_status_list}${index}`}>
         <span
-          className='px-1 inline-block font-semibold min-w-[7rem] text-center border text-sm small-caps'
+          className={clsx(
+            'inline-block',
+            'min-w-[7rem]',
+            'px-1',
+            'border',
+            'text-center text-sm small-caps font-semibold'
+          )}
           style={{backgroundColor: colorbgCstClass(cclass, colors)}}
         >
           {labelCstClass(cclass)}
@@ -33,4 +41,4 @@ function InfoCstClass({ title }: InfoCstClassProps) {
   </div>);
 }
 
-export default InfoCstClass;
+export default InfoCstClass;
\ No newline at end of file
diff --git a/rsconcept/frontend/src/components/Shared/InfoCstStatus.tsx b/rsconcept/frontend/src/components/Shared/InfoCstStatus.tsx
index 32acf88a..966b6c3d 100644
--- a/rsconcept/frontend/src/components/Shared/InfoCstStatus.tsx
+++ b/rsconcept/frontend/src/components/Shared/InfoCstStatus.tsx
@@ -1,3 +1,5 @@
+import clsx from 'clsx';
+
 import { useConceptTheme } from '@/context/ThemeContext';
 import { ExpressionStatus } from '@/models/rsform';
 import { colorbgCstStatus } from '@/utils/color';
@@ -17,11 +19,16 @@ function InfoCstStatus({ title }: InfoCstStatusProps) {
     {Object.values(ExpressionStatus)
       .filter(status => status !== ExpressionStatus.UNDEFINED)
       .map(
-      (status, index) => {
-        return (
+      (status, index) =>
         <p key={`${prefixes.cst_status_list}${index}`}>
           <span
-            className='px-1 inline-block font-semibold min-w-[7rem] text-center border text-sm small-caps'
+            className={clsx(
+              'inline-block',
+              'min-w-[7rem]',
+              'px-1',
+              'border',
+              'text-center text-sm small-caps font-semibold'
+            )}
             style={{backgroundColor: colorbgCstStatus(status, colors)}}
           >
             {labelExpressionStatus(status)}
@@ -30,10 +37,9 @@ function InfoCstStatus({ title }: InfoCstStatusProps) {
           <span>
             {describeExpressionStatus(status)}
           </span>
-        </p>);
-      }
+        </p>
     )}
   </div>);
 }
 
-export default InfoCstStatus;
+export default InfoCstStatus;
\ No newline at end of file
diff --git a/rsconcept/frontend/src/context/AuthContext.tsx b/rsconcept/frontend/src/context/AuthContext.tsx
index 2683dabd..9c0d05eb 100644
--- a/rsconcept/frontend/src/context/AuthContext.tsx
+++ b/rsconcept/frontend/src/context/AuthContext.tsx
@@ -122,4 +122,4 @@ export const AuthState = ({ children }: AuthStateProps) => {
   >
     {children}
   </AuthContext.Provider>);
-};
+};
\ No newline at end of file
diff --git a/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/ArgumentsTab.tsx b/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/ArgumentsTab.tsx
index 79945245..54ca0431 100644
--- a/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/ArgumentsTab.tsx
+++ b/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/ArgumentsTab.tsx
@@ -1,6 +1,7 @@
 'use client';
 
 import { createColumnHelper } from '@tanstack/react-table';
+import clsx from 'clsx';
 import { Dispatch, useCallback, useEffect, useMemo, useState } from 'react';
 
 import MiniButton from '@/components/Common/MiniButton';
@@ -95,7 +96,10 @@ function ArgumentsTab({ state, schema, partialUpdate  }: ArgumentsTabProps) {
       size: 40,
       minSize: 40,
       maxSize: 40,
-      cell: props => <div className='w-full text-center'>{props.getValue()}</div>
+      cell: props => 
+        <div className='w-full text-center'>
+          {props.getValue()}
+        </div>
     }),
     argumentsHelper.accessor(arg => arg.value || 'свободный аргумент', {
       id: 'value',
@@ -111,7 +115,13 @@ function ArgumentsTab({ state, schema, partialUpdate  }: ArgumentsTabProps) {
       minSize: 150,
       maxSize: 150,
       enableHiding: true,
-      cell: props => <div className='text-sm min-w-[9.3rem] max-w-[9.3rem] break-words'>{props.getValue()}</div>
+      cell: props => 
+        <div className={clsx(
+          'min-w-[9.3rem] max-w-[9.3rem]',
+          'text-sm break-words'
+        )}>
+          {props.getValue()}
+        </div>
     }),
     argumentsHelper.display({
       id: 'actions',
@@ -120,13 +130,13 @@ function ArgumentsTab({ state, schema, partialUpdate  }: ArgumentsTabProps) {
       maxSize: 50,
       cell: props => 
         <div className='max-h-[1.2rem]'>
-        {props.row.original.value && 
+        {props.row.original.value ?
         <MiniButton
           tooltip='Очистить значение'
-          icon={<CrossIcon size={3} color='text-warning'/>}
+          icon={<CrossIcon size={3} color='clr-text-warning'/>}
           noHover
           onClick={() => handleClearArgument(props.row.original)}
-        />}
+        /> : null}
         </div>
     })
   ], [handleClearArgument]);
@@ -139,21 +149,35 @@ function ArgumentsTab({ state, schema, partialUpdate  }: ArgumentsTabProps) {
 
   return (
   <div className='flex flex-col gap-3'>
-    <div className='overflow-y-auto text-sm border select-none max-h-[5.8rem] min-h-[5.8rem]'>
+    <div className={clsx(
+      'max-h-[5.8rem] min-h-[5.8rem]',
+      'overflow-y-auto',
+      'text-sm',
+      'border',
+      'select-none'
+    )}>
       <DataTable dense noFooter
         data={state.arguments}
         columns={columns}
         conditionalRowStyles={conditionalRowStyles}
         noDataComponent={
-          <span className='flex flex-col justify-center p-2 text-center min-h-[3.6rem]'>
-            <p>Аргументы отсутствуют</p>
-          </span>
+          <p className={clsx(
+            'min-h-[3.6rem] w-full',
+            'p-2',
+            'text-center'
+          )}>
+            Аргументы отсутствуют
+          </p>
         }
         onRowClicked={handleSelectArgument}
       />
     </div>
 
-    <div className='flex items-center justify-center w-full gap-2 py-1 select-none'>
+    <div className={clsx(
+      'py-1 flex gap-2 justify-center items-center',
+      'w-full',
+      'select-none'
+    )}>
       <span title='Выберите аргумент из списка сверху и значение из списка снизу'
         className='font-semibold text-center'
       >
@@ -168,7 +192,7 @@ function ArgumentsTab({ state, schema, partialUpdate  }: ArgumentsTabProps) {
       <div className='flex'>
         <MiniButton
           tooltip='Подставить значение аргумента'
-          icon={<CheckIcon size={5} color={!argumentValue || !selectedArgument ? 'text-disabled' : 'text-success'} />}
+          icon={<CheckIcon size={5} color={!argumentValue || !selectedArgument ? 'text-disabled' : 'clr-text-success'} />}
           disabled={!argumentValue || !selectedArgument}
           onClick={() => handleAssignArgument(selectedArgument!, argumentValue)}
         />
@@ -176,12 +200,12 @@ function ArgumentsTab({ state, schema, partialUpdate  }: ArgumentsTabProps) {
           tooltip='Откатить значение'
           disabled={!isModified}
           onClick={handleReset}
-          icon={<ArrowsRotateIcon size={5} color={isModified ? 'text-primary' : ''} />}
+          icon={<ArrowsRotateIcon size={5} color={isModified ? 'clr-text-primary' : ''} />}
         />
         <MiniButton
           tooltip='Очистить значение аргумента'
           disabled={!selectedClearable}
-          icon={<CrossIcon size={5} color={!selectedClearable ? 'text-disabled' : 'text-warning'}/>}
+          icon={<CrossIcon size={5} color={!selectedClearable ? 'text-disabled' : 'clr-text-warning'}/>}
           onClick={() => selectedArgument ? handleClearArgument(selectedArgument) : undefined}
         />
       </div>
diff --git a/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/DlgConstituentaTemplate.tsx b/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/DlgConstituentaTemplate.tsx
index 42317950..974bd52e 100644
--- a/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/DlgConstituentaTemplate.tsx
+++ b/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/DlgConstituentaTemplate.tsx
@@ -117,7 +117,7 @@ function DlgConstituentaTemplate({ hideWindow, schema, onCreate, insertAfter }:
     canSubmit={validated}
     onSubmit={handleSubmit}
     submitText='Создать'
-    className='max-w-[43rem] min-w-[43rem] min-h-[35rem] px-6'
+    className='max-w-[43rem] min-w-[43rem] min-h-[36rem] px-6'
   >
   <Tabs defaultFocus forceRenderTabPanel
     selectedTabClassName='clr-selected'
@@ -129,16 +129,16 @@ function DlgConstituentaTemplate({ hideWindow, schema, onCreate, insertAfter }:
     </Overlay>
     
     <TabList className='flex justify-center mb-3'>
-      <div className='flex border w-fit'>
+      <div className='flex border divide-x rounded-none w-fit'>
         <ConceptTab
           label='Шаблон'
           tooltip='Выбор шаблона выражения'
-          className='border-r w-[8rem]'
+          className='w-[8rem]'
         />
         <ConceptTab
           label='Аргументы'
           tooltip='Подстановка аргументов шаблона'
-          className='border-r w-[8rem]'
+          className='w-[8rem]'
         />
         <ConceptTab
           label='Конституента'
diff --git a/rsconcept/frontend/src/dialogs/DlgCreateCst.tsx b/rsconcept/frontend/src/dialogs/DlgCreateCst.tsx
index e3f49f69..f062deb0 100644
--- a/rsconcept/frontend/src/dialogs/DlgCreateCst.tsx
+++ b/rsconcept/frontend/src/dialogs/DlgCreateCst.tsx
@@ -1,5 +1,6 @@
 'use client';
 
+import clsx from 'clsx';
 import { useEffect, useLayoutEffect, useState } from 'react';
 
 import Modal, { ModalProps } from '@/components/Common/Modal';
@@ -54,7 +55,10 @@ function DlgCreateCst({ hideWindow, initial, schema, onCreate }: DlgCreateCstPro
     canSubmit={validated}
     onSubmit={handleSubmit}
     submitText='Создать'
-    className='h-fit min-w-[35rem] py-2 flex flex-col justify-stretch gap-3 px-6'
+    className={clsx(
+      'h-fit min-w-[35rem]',
+      'py-2 px-6 flex flex-col gap-3 justify-stretch'
+    )}
   >
     <div className='flex justify-center w-full gap-6'>
       <SelectSingle
diff --git a/rsconcept/frontend/src/dialogs/DlgDeleteCst/ConstituentsList.tsx b/rsconcept/frontend/src/dialogs/DlgDeleteCst/ConstituentsList.tsx
index 8f990563..94ab2bd8 100644
--- a/rsconcept/frontend/src/dialogs/DlgDeleteCst/ConstituentsList.tsx
+++ b/rsconcept/frontend/src/dialogs/DlgDeleteCst/ConstituentsList.tsx
@@ -1,3 +1,5 @@
+import clsx from 'clsx';
+
 import { IConstituenta } from '@/models/rsform';
 import { labelConstituenta } from '@/utils/labels';
 
@@ -15,7 +17,13 @@ function ConstituentsList({ list, items, title, prefix }: ConstituentsListProps)
     <p className='pb-1'>
       {title}: <b>{list.length}</b>
     </p> : null}
-    <div className='px-3 border h-[9rem] overflow-y-auto whitespace-nowrap'>
+    <div className={clsx(
+      'h-[9rem]',
+      'px-3',
+      'overflow-y-auto', 
+      'border',
+      'whitespace-nowrap'
+    )}>
       {list.map(
       (id) => {
         const cst = items.find(cst => cst.id === id);
diff --git a/rsconcept/frontend/src/dialogs/DlgEditReference/DlgEditReference.tsx b/rsconcept/frontend/src/dialogs/DlgEditReference/DlgEditReference.tsx
index b089dddc..e4c6beb2 100644
--- a/rsconcept/frontend/src/dialogs/DlgEditReference/DlgEditReference.tsx
+++ b/rsconcept/frontend/src/dialogs/DlgEditReference/DlgEditReference.tsx
@@ -50,7 +50,7 @@ function DlgEditReference({ hideWindow, items, initial, onSave }: DlgEditReferen
     hideWindow={hideWindow}
     canSubmit={isValid}
     onSubmit={handleSubmit}
-    className='items-center min-w-[40rem] max-w-[40rem] px-6 min-h-[34rem]'
+    className='min-w-[40rem] max-w-[40rem] px-6 min-h-[34rem]'
   >
   <Tabs defaultFocus
     selectedTabClassName='clr-selected'
@@ -62,15 +62,15 @@ function DlgEditReference({ hideWindow, items, initial, onSave }: DlgEditReferen
     </Overlay>
 
     <TabList className='flex justify-center mb-3'>
-      <div className='flex border w-fit'>
+      <div className='flex border divide-x rounded-none w-fit'>
         <ConceptTab
-          label={labelReferenceType(ReferenceType.ENTITY)}
           tooltip='Отсылка на термин в заданной словоформе'
-          className='w-[12rem] border-r-2'
+          label={labelReferenceType(ReferenceType.ENTITY)}
+          className='w-[12rem]'
         />
         <ConceptTab
-          label={labelReferenceType(ReferenceType.SYNTACTIC)}
           tooltip='Установление синтаксической связи с отсылкой на термин'
+          label={labelReferenceType(ReferenceType.SYNTACTIC)}
           className='w-[12rem]'
         />
       </div>
diff --git a/rsconcept/frontend/src/dialogs/DlgEditReference/EntityTab.tsx b/rsconcept/frontend/src/dialogs/DlgEditReference/EntityTab.tsx
index d0cecef4..48b74764 100644
--- a/rsconcept/frontend/src/dialogs/DlgEditReference/EntityTab.tsx
+++ b/rsconcept/frontend/src/dialogs/DlgEditReference/EntityTab.tsx
@@ -73,11 +73,11 @@ function EntityTab({ initial, items, setIsValid, setReference }: EntityTabProps)
       rows={8}
     />
 
-    <div className='flex gap-4 flex-start'>
+    <div className='flex gap-6 flex-start'>
       <TextInput dense
         label='Отсылаемая конституента'
         placeholder='Имя'
-        dimensions='max-w-[16rem] min-w-[16rem] whitespace-nowrap'
+        dimensions='max-w-[17rem] min-w-[17rem]'
         value={alias}
         onChange={event => setAlias(event.target.value)}
       />
diff --git a/rsconcept/frontend/src/dialogs/DlgEditReference/WordformButton.tsx b/rsconcept/frontend/src/dialogs/DlgEditReference/WordformButton.tsx
index 4a2750f1..0584601b 100644
--- a/rsconcept/frontend/src/dialogs/DlgEditReference/WordformButton.tsx
+++ b/rsconcept/frontend/src/dialogs/DlgEditReference/WordformButton.tsx
@@ -1,3 +1,5 @@
+import clsx from 'clsx';
+
 import { Grammeme } from '@/models/language';
 
 interface WordformButtonProps {
@@ -12,7 +14,14 @@ function WordformButton({ text, example, grams, onSelectGrams, isSelected, ...re
   return (
   <button type='button' tabIndex={-1}
     onClick={() => onSelectGrams(grams)}
-    className={`min-w-[6rem] p-1 border rounded-none cursor-pointer clr-btn-clear clr-hover ${isSelected ? 'clr-selected': ''}`}
+    className={clsx(
+      'min-w-[6rem]',
+      'p-1',
+      'border rounded-none',
+      'cursor-pointer',
+      'clr-btn-clear clr-hover',
+      isSelected && 'clr-selected'
+    )}
     {...restProps}
   >
     <p className='font-semibold'>{text}</p>
diff --git a/rsconcept/frontend/src/dialogs/DlgEditWordForms/DlgEditWordForms.tsx b/rsconcept/frontend/src/dialogs/DlgEditWordForms/DlgEditWordForms.tsx
index ccf21139..f4d1a2ba 100644
--- a/rsconcept/frontend/src/dialogs/DlgEditWordForms/DlgEditWordForms.tsx
+++ b/rsconcept/frontend/src/dialogs/DlgEditWordForms/DlgEditWordForms.tsx
@@ -1,5 +1,6 @@
 'use client';
 
+import clsx from 'clsx';
 import { useLayoutEffect, useState } from 'react';
 
 import Label from '@/components/Common/Label';
@@ -151,7 +152,7 @@ function DlgEditWordForms({ hideWindow, target, onSave }: DlgEditWordFormsProps)
         <div className='max-w-min'>
           <MiniButton
             tooltip='Генерировать словоформу'
-            icon={<ArrowLeftIcon size={5} color={inputGrams.length == 0 ? 'text-disabled' : 'text-primary'} />}
+            icon={<ArrowLeftIcon size={5} color={inputGrams.length == 0 ? 'text-disabled' : 'clr-text-primary'} />}
             disabled={textProcessor.loading || inputGrams.length == 0}
             onClick={handleInflect}
           />
@@ -159,7 +160,7 @@ function DlgEditWordForms({ hideWindow, target, onSave }: DlgEditWordFormsProps)
             tooltip='Определить граммемы'
             icon={<ArrowRightIcon
               size={5}
-              color={!inputText ? 'text-disabled' : 'text-primary'}
+              color={!inputText ? 'text-disabled' : 'clr-text-primary'}
             />}
             disabled={textProcessor.loading || !inputText}
             onClick={handleParse}
@@ -180,7 +181,7 @@ function DlgEditWordForms({ hideWindow, target, onSave }: DlgEditWordFormsProps)
         tooltip='Внести словоформу'
         icon={<CheckIcon
           size={5}
-          color={!inputText || inputGrams.length == 0 ? 'text-disabled' : 'text-success'}
+          color={!inputText || inputGrams.length == 0 ? 'text-disabled' : 'clr-text-success'}
         />}
         disabled={textProcessor.loading || !inputText || inputGrams.length == 0}
         onClick={handleAddForm}
@@ -189,16 +190,26 @@ function DlgEditWordForms({ hideWindow, target, onSave }: DlgEditWordFormsProps)
         tooltip='Генерировать стандартные словоформы'
         icon={<ChevronDoubleDownIcon
           size={5}
-          color={!inputText ? 'text-disabled' : 'text-primary'}
+          color={!inputText ? 'text-disabled' : 'clr-text-primary'}
         />}
         disabled={textProcessor.loading || !inputText}
         onClick={handleGenerateLexeme}
       />
     </Overlay>
     
-    <h1 className='mt-3 mb-2 text-sm'>Заданные вручную словоформы [{forms.length}]</h1>
+    <div className={clsx(
+      'mt-3 mb-2', 
+      'text-sm text-center font-semibold'
+    )}>
+      Заданные вручную словоформы [{forms.length}]
+    </div>
     
-    <div className='border overflow-y-auto max-h-[17.4rem] min-h-[17.4rem] mb-2'>
+    <div className={clsx(
+      'mb-2',
+      'max-h-[17.4rem] min-h-[17.4rem]',
+      'border',
+      'overflow-y-auto'
+    )}>
     <WordFormsTable
       forms={forms}
       setForms={setForms}
diff --git a/rsconcept/frontend/src/dialogs/DlgEditWordForms/WordFormsTable.tsx b/rsconcept/frontend/src/dialogs/DlgEditWordForms/WordFormsTable.tsx
index 4467d9a1..bab871b8 100644
--- a/rsconcept/frontend/src/dialogs/DlgEditWordForms/WordFormsTable.tsx
+++ b/rsconcept/frontend/src/dialogs/DlgEditWordForms/WordFormsTable.tsx
@@ -89,7 +89,7 @@ function WordFormsTable({ forms, setForms, onFormSelect, loading }: WordFormsTab
       columns={columns}
       headPosition='0'
       noDataComponent={
-        <span className='flex flex-col justify-center p-2 text-center min-h-[2rem]'>
+        <span className='p-2 text-center min-h-[2rem]'>
           <p>Список пуст</p>
           <p>Добавьте словоформу</p>
         </span>
diff --git a/rsconcept/frontend/src/dialogs/DlgRenameCst.tsx b/rsconcept/frontend/src/dialogs/DlgRenameCst.tsx
index 3436640f..0d1bcb7d 100644
--- a/rsconcept/frontend/src/dialogs/DlgRenameCst.tsx
+++ b/rsconcept/frontend/src/dialogs/DlgRenameCst.tsx
@@ -1,5 +1,6 @@
 'use client';
 
+import clsx from 'clsx';
 import { useLayoutEffect, useState } from 'react';
 
 import Modal, { ModalProps } from '@/components/Common/Modal';
@@ -49,7 +50,10 @@ function DlgRenameCst({ hideWindow, initial, onRename }: DlgRenameCstProps) {
     hideWindow={hideWindow}
     canSubmit={validated}
     onSubmit={handleSubmit}
-    className='flex justify-center items-center gap-6 w-full min-w-[24rem] py-6 px-6'
+    className={clsx(
+      'w-full min-w-[24rem]',
+      'py-6 px-6 flex gap-6 justify-center items-center'
+    )}
   >
     <SelectSingle
       placeholder='Выберите тип'
@@ -72,4 +76,4 @@ function DlgRenameCst({ hideWindow, initial, onRename }: DlgRenameCstProps) {
   </Modal>);
 }
 
-export default DlgRenameCst;
+export default DlgRenameCst;
\ No newline at end of file
diff --git a/rsconcept/frontend/src/dialogs/DlgShowAST.tsx b/rsconcept/frontend/src/dialogs/DlgShowAST.tsx
index cecbde6a..141079b3 100644
--- a/rsconcept/frontend/src/dialogs/DlgShowAST.tsx
+++ b/rsconcept/frontend/src/dialogs/DlgShowAST.tsx
@@ -68,7 +68,7 @@ function DlgShowAST({ hideWindow, syntaxTree, expression }: DlgShowASTProps) {
         <span>{expression.slice(hoverNode.finish)}</span>
       </div> : null}
     </div>
-    <div className='flex-wrap w-full h-full overflow-auto'>
+    <div className='w-full h-full overflow-auto'>
     <div 
       className='relative'
       style={{
diff --git a/rsconcept/frontend/src/dialogs/DlgUploadRSForm.tsx b/rsconcept/frontend/src/dialogs/DlgUploadRSForm.tsx
index f05d497c..be4e07cf 100644
--- a/rsconcept/frontend/src/dialogs/DlgUploadRSForm.tsx
+++ b/rsconcept/frontend/src/dialogs/DlgUploadRSForm.tsx
@@ -63,4 +63,4 @@ function DlgUploadRSForm({ hideWindow }: DlgUploadRSFormProps) {
   </Modal>);
 }
 
-export default DlgUploadRSForm;
+export default DlgUploadRSForm;
\ No newline at end of file
diff --git a/rsconcept/frontend/src/index.css b/rsconcept/frontend/src/index.css
index b4a3994f..48ac80e9 100644
--- a/rsconcept/frontend/src/index.css
+++ b/rsconcept/frontend/src/index.css
@@ -167,6 +167,7 @@
     .divide-x, .divide-y, .divide-x-2, .divide-y-2
   ) {
     border-color: var(--cl-bg-40);
+    @apply divide-inherit;
     .dark & {
       border-color: var(--cd-bg-40);
     }
@@ -264,8 +265,8 @@
     }
   }
 
-  :is(.text-primary,
-    .text-url
+  :is(.clr-text-primary,
+    .clr-text-url
   ) {
     color: var(--cl-prim-fg-80);
     .dark & {
@@ -280,7 +281,7 @@
     }
   }
 
-  :is(.text-controls,
+  :is(.clr-text-controls,
     .clr-btn-nav,
     .clr-btn-clear
   ) {
@@ -303,21 +304,21 @@
     }
   }
 
-  .text-default {
+  .clr-text-default {
     color: var(--cl-fg-100);
     .dark & {
       color: var(--cd-fg-100);
     }
   }
 
-  .text-warning {
+  .clr-text-warning {
     color: var(--cl-red-fg-100);
     .dark & {
       color: var(--cd-red-fg-100);
     }
   }
 
-  .text-success {
+  .clr-text-success {
     color: var(--cl-green-fg-100);
     .dark & {
       color: var(--cd-green-fg-100);
@@ -341,7 +342,7 @@
     border-color: var(--cd-bg-40);
     outline-color: var(--cd-prim-bg-100);
   }
-  @apply border rounded outline-2 outline
+  @apply outline-2 outline
 }
 
 .cm-editor .cm-placeholder {
diff --git a/rsconcept/frontend/src/main.tsx b/rsconcept/frontend/src/main.tsx
index 15759f65..f61440d3 100644
--- a/rsconcept/frontend/src/main.tsx
+++ b/rsconcept/frontend/src/main.tsx
@@ -11,4 +11,4 @@ createRoot(document.getElementById('root')!).render(
     <App />
   
   </GlobalProviders>
-)
+)
\ No newline at end of file
diff --git a/rsconcept/frontend/src/models/languageAPI.test.ts b/rsconcept/frontend/src/models/languageAPI.test.ts
index ac8cff5b..ad3dd7f7 100644
--- a/rsconcept/frontend/src/models/languageAPI.test.ts
+++ b/rsconcept/frontend/src/models/languageAPI.test.ts
@@ -136,4 +136,4 @@ describe('Testing reference parsing', () => {
     expect(parseSyntacticReference('@{-1|test test}')).toStrictEqual({offset: -1, nominal: 'test test'});
     expect(parseSyntacticReference('@{-99|test test}')).toStrictEqual({offset: -99, nominal: 'test test'});
   });
-});
+});
\ No newline at end of file
diff --git a/rsconcept/frontend/src/models/libraryAPI.test.ts b/rsconcept/frontend/src/models/libraryAPI.test.ts
index ebcd1545..e0e3a488 100644
--- a/rsconcept/frontend/src/models/libraryAPI.test.ts
+++ b/rsconcept/frontend/src/models/libraryAPI.test.ts
@@ -45,4 +45,4 @@ describe('Testing matching LibraryItem', () => {
     expect(matchLibraryItem(item1, item1.time_create)).toEqual(false);
     expect(matchLibraryItem(item1, item1.comment)).toEqual(false);
   });
-});
+});
\ No newline at end of file
diff --git a/rsconcept/frontend/src/models/rsformAPI.ts b/rsconcept/frontend/src/models/rsformAPI.ts
index 06730b29..97d214a2 100644
--- a/rsconcept/frontend/src/models/rsformAPI.ts
+++ b/rsconcept/frontend/src/models/rsformAPI.ts
@@ -195,19 +195,17 @@ export function inferClass(type: CstType, isTemplate: boolean): CstClass {
  * Creates a mock {@link IConstituenta} object with the provided parameters and default values for other properties.
  */
 export function createMockConstituenta(
-  schema: number,
   id: number,
   alias: string,
-  type: CstType,
   comment: string
 ): IConstituenta {
   return {
     id: id,
     order: -1,
-    schema: schema,
+    schema: -1,
     alias: alias,
     convention: comment,
-    cst_type: type,
+    cst_type: CstType.BASE,
     term_raw: '',
     term_resolved: '',
     term_forms: [],
diff --git a/rsconcept/frontend/src/pages/CreateRSFormPage.tsx b/rsconcept/frontend/src/pages/CreateRSFormPage.tsx
index c104cb65..b96387d9 100644
--- a/rsconcept/frontend/src/pages/CreateRSFormPage.tsx
+++ b/rsconcept/frontend/src/pages/CreateRSFormPage.tsx
@@ -1,5 +1,6 @@
 'use client';
 
+import clsx from 'clsx';
 import { useEffect, useRef, useState } from 'react';
 import { toast } from 'react-toastify';
 
@@ -79,7 +80,10 @@ function CreateRSFormPage() {
   return (
   <RequireAuth>
   <form
-    className='flex flex-col w-full max-w-lg gap-3 px-6 py-3'
+    className={clsx(
+      'w-full max-w-lg',
+      'px-6 py-3 flex flex-col gap-3'
+    )}
     onSubmit={handleSubmit}
   >
     <h1>Создание концептуальной схемы</h1>
@@ -91,7 +95,7 @@ function CreateRSFormPage() {
       />
       <MiniButton
         tooltip='Загрузить из Экстеор'
-        icon={<DownloadIcon size={5} color='text-primary'/>}
+        icon={<DownloadIcon size={5} color='clr-text-primary'/>}
         onClick={() => inputRef.current?.click()}
       />
     </Overlay>
diff --git a/rsconcept/frontend/src/pages/HomePage.tsx b/rsconcept/frontend/src/pages/HomePage.tsx
index 4935eb63..65cdb0aa 100644
--- a/rsconcept/frontend/src/pages/HomePage.tsx
+++ b/rsconcept/frontend/src/pages/HomePage.tsx
@@ -1,3 +1,4 @@
+import clsx from 'clsx';
 import { useLayoutEffect } from 'react';
 
 import { useAuth } from '@/context/AuthContext';
@@ -21,7 +22,10 @@ function HomePage() {
   }, [router, user])
 
   return (
-  <div className='flex flex-col items-center justify-center w-full px-4 py-2'>
+  <div className={clsx(
+    'w-full',
+    'px-4 py-2 flex flex-col justify-center items-center'
+  )}>
     {user?.is_staff ?
     <p>
       Лендинг находится в разработке. Данная страница видна только пользователям с правами администратора.
diff --git a/rsconcept/frontend/src/pages/LibraryPage/ItemIcons.tsx b/rsconcept/frontend/src/pages/LibraryPage/ItemIcons.tsx
index e1702652..fbaaf4b8 100644
--- a/rsconcept/frontend/src/pages/LibraryPage/ItemIcons.tsx
+++ b/rsconcept/frontend/src/pages/LibraryPage/ItemIcons.tsx
@@ -1,3 +1,5 @@
+import clsx from 'clsx';
+
 import { EducationIcon, GroupIcon, SubscribedIcon } from '@/components/Icons';
 import { ICurrentUser, ILibraryItem } from '@/models/library';
 import { prefixes } from '@/utils/constants';
@@ -10,7 +12,10 @@ interface ItemIconsProps {
 function ItemIcons({ user, item }: ItemIconsProps) {
   return (
   <div
-    className='inline-flex items-center justify-start gap-1 min-w-[2.75rem]'
+    className={clsx(
+      'min-w-[2.75rem]',
+      'inline-flex gap-1'
+    )}
     id={`${prefixes.library_list}${item.id}`}
   >
     {(user && user.subscriptions.includes(item.id)) ?
diff --git a/rsconcept/frontend/src/pages/LibraryPage/SearchPanel.tsx b/rsconcept/frontend/src/pages/LibraryPage/SearchPanel.tsx
index a91be672..765c3051 100644
--- a/rsconcept/frontend/src/pages/LibraryPage/SearchPanel.tsx
+++ b/rsconcept/frontend/src/pages/LibraryPage/SearchPanel.tsx
@@ -1,5 +1,6 @@
 'use client';
 
+import clsx from 'clsx';
 import { useCallback } from 'react';
 
 import ConceptSearch from '@/components/Common/ConceptSearch';
@@ -41,18 +42,32 @@ function SearchPanel({ total, filtered, query, setQuery, strategy, setFilter }:
   }, [strategy, router]);
 
   return (
-  <div className='sticky top-0 left-0 right-0 flex items-stretch justify-start w-full border-b clr-input max-h-[2.3rem] pr-40'>
-    <div className='px-2 py-1 select-none whitespace-nowrap min-w-[10rem]'>
+  <div className={clsx(
+    'sticky top-0',
+    'w-full max-h-[2.3rem]',
+    'pr-40 flex justify-start items-stretch',
+    'border-b',
+    'clr-input'
+  )}>
+    <div className={clsx(
+      'min-w-[10rem]',
+      'px-2 self-center',
+      'select-none',
+      'whitespace-nowrap', 
+    )}>
       Фильтр
       <span className='ml-2'>
         {filtered} из {total}
       </span>
     </div>
-    <div className='flex items-center justify-center w-full gap-1'>
+    <div className={clsx(
+      'w-full',
+      'flex gap-1 justify-center items-center'
+    )}>
       <ConceptSearch noBorder
+        dimensions='min-w-[10rem]'
         value={query}
         onChange={handleChangeQuery}
-        dimensions='min-w-[10rem] '
       />
       <PickerStrategy
         value={strategy}
diff --git a/rsconcept/frontend/src/pages/LibraryPage/ViewLibrary.tsx b/rsconcept/frontend/src/pages/LibraryPage/ViewLibrary.tsx
index f8c255a4..7571a728 100644
--- a/rsconcept/frontend/src/pages/LibraryPage/ViewLibrary.tsx
+++ b/rsconcept/frontend/src/pages/LibraryPage/ViewLibrary.tsx
@@ -1,5 +1,6 @@
 'use client';
 
+import clsx from 'clsx';
 import { useMemo } from 'react';
 import { useIntl } from 'react-intl';
 
@@ -92,7 +93,12 @@ function ViewLibrary({ items, resetQuery: cleanQuery }: ViewLibraryProps) {
   return (
   <>
     <div className='sticky top-[2.3rem] w-full'>
-    <div className='absolute top-[0.125rem] left-[0.25rem] flex gap-1 ml-3 z-pop'>
+    <div className={clsx(
+      'z-pop',
+      'absolute top-[0.125rem] left-[0.25rem]',
+      'ml-3',
+      'flex gap-1'
+    )}>
       <HelpButton
         topic={HelpTopic.LIBRARY}
         dimensions='max-w-[35rem]'
diff --git a/rsconcept/frontend/src/pages/LoginPage.tsx b/rsconcept/frontend/src/pages/LoginPage.tsx
index d4fc5ce2..296ffae6 100644
--- a/rsconcept/frontend/src/pages/LoginPage.tsx
+++ b/rsconcept/frontend/src/pages/LoginPage.tsx
@@ -1,6 +1,7 @@
 'use client';
 
 import axios from 'axios';
+import clsx from 'clsx';
 import { useEffect, useState } from 'react';
 
 import SubmitButton from '@/components/Common/SubmitButton';
@@ -18,7 +19,7 @@ import { resources } from '@/utils/constants';
 function ProcessError({error}: { error: ErrorData }): React.ReactElement {
   if (axios.isAxiosError(error) && error.response && error.response.status === 400) {
     return (
-    <div className='text-sm select-text text-warning'>
+    <div className='text-sm select-text clr-text-warning'>
       На Портале отсутствует такое сочетание имени пользователя и пароля
     </div>);
   } else {
@@ -65,7 +66,10 @@ function LoginPage() {
   }
   return (
   <form
-    className='pt-12 pb-6 px-6 flex flex-col gap-3 w-[24rem]'
+    className={clsx(
+      'w-[24rem]', 
+      'pt-12 pb-6 px-6 flex flex-col gap-3'
+    )}
     onSubmit={handleSubmit}
   >
     <img alt='Концепт Портал'
diff --git a/rsconcept/frontend/src/pages/ManualsPage/TopicsList.tsx b/rsconcept/frontend/src/pages/ManualsPage/TopicsList.tsx
index 83161143..ca4cf42d 100644
--- a/rsconcept/frontend/src/pages/ManualsPage/TopicsList.tsx
+++ b/rsconcept/frontend/src/pages/ManualsPage/TopicsList.tsx
@@ -1,3 +1,5 @@
+import clsx from 'clsx';
+
 import { HelpTopic } from '@/models/miscelanious';
 import { prefixes } from '@/utils/constants';
 import { describeHelpTopic, labelHelpTopic } from '@/utils/labels';
@@ -9,20 +11,32 @@ interface TopicsListProps {
 
 function TopicsList({ activeTopic, onChangeTopic }: TopicsListProps) {
   return (
-  <div className='sticky top-0 left-0 border-x min-w-[13rem] select-none flex flex-col clr-controls small-caps h-fit'>
-    <div className='my-2 text-lg text-center'>Справка</div>
+  <div className={clsx(
+    'sticky top-0 left-0',
+    'min-w-[13rem] h-fit',
+    'flex flex-col',
+    'border-x',
+    'clr-controls',
+    'small-caps',
+    'select-none'
+  )}>
+    <h1 className='mt-2 mb-1'>Справка</h1>
     {Object.values(HelpTopic).map(
-    (topic, index) => {
-      const isActive = activeTopic === topic;
-      return (
+    (topic, index) => 
         <div key={`${prefixes.topic_list}${index}`}
-          className={`px-3 py-1 border-y cursor-pointer clr-hover ${isActive ? 'clr-selected ' : ''}`}
+          className={clsx(
+            'px-3 py-1',
+            'border-y',
+            'clr-hover',
+            'cursor-pointer',
+            activeTopic === topic && 'clr-selected'
+          )}
           title={describeHelpTopic(topic)}
           onClick={() => onChangeTopic(topic)}
         >
           {labelHelpTopic(topic)}
-        </div>);
-    })}
+        </div>
+    )}
   </div>);
 }
 
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/ConstituentaToolbar.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/ConstituentaToolbar.tsx
index 8c824160..92ec7c2f 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/ConstituentaToolbar.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/ConstituentaToolbar.tsx
@@ -34,30 +34,30 @@ function ConstituentaToolbar({
     <MiniButton
       tooltip='Сохранить изменения [Ctrl + S]'
       disabled={!canSave}
-      icon={<SaveIcon size={5} color={canSave ? 'text-primary' : ''}/>}
+      icon={<SaveIcon size={5} color={canSave ? 'clr-text-primary' : ''}/>}
       onClick={onSubmit}
     />
     <MiniButton
       tooltip='Сбросить несохраненные изменения'
       disabled={!canSave}
       onClick={onReset}
-      icon={<ArrowsRotateIcon size={5} color={canSave ? 'text-primary' : ''} />}
+      icon={<ArrowsRotateIcon size={5} color={canSave ? 'clr-text-primary' : ''} />}
     />
     <MiniButton
       tooltip='Создать конституенту после данной'
       disabled={!isMutable}
       onClick={onCreate}
-      icon={<SmallPlusIcon size={5} color={isMutable ? 'text-success' : ''} />} 
+      icon={<SmallPlusIcon size={5} color={isMutable ? 'clr-text-success' : ''} />} 
     />
     <MiniButton
       tooltip='Клонировать конституенту [Alt + V]'
       disabled={!isMutable}
       onClick={onClone}
-      icon={<CloneIcon size={5} color={isMutable ? 'text-success' : ''} />} 
+      icon={<CloneIcon size={5} color={isMutable ? 'clr-text-success' : ''} />} 
     />
     <MiniButton
       tooltip='Создать конституенту из шаблона [Alt + E]'
-      icon={<DiamondIcon color={isMutable ? 'text-primary': ''} size={5}/>}
+      icon={<DiamondIcon color={isMutable ? 'clr-text-primary': ''} size={5}/>}
       disabled={!isMutable}
       onClick={onTemplates}
     />
@@ -65,7 +65,7 @@ function ConstituentaToolbar({
       tooltip='Удалить редактируемую конституенту'
       disabled={!isMutable}
       onClick={onDelete}
-      icon={<DumpBinIcon size={5} color={isMutable ? 'text-warning' : ''} />}
+      icon={<DumpBinIcon size={5} color={isMutable ? 'clr-text-warning' : ''} />}
     />
     <HelpButton topic={HelpTopic.CONSTITUENTA} offset={4} />
   </Overlay>);
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/FormConstituenta.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/FormConstituenta.tsx
index e8efdb7e..5442563f 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/FormConstituenta.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/FormConstituenta.tsx
@@ -109,9 +109,9 @@ function FormConstituenta({
       disabled={!readyForEdit}
       noHover
       onClick={onEditTerm}
-      icon={<EditIcon size={4} color={readyForEdit ? 'text-primary' : ''} />}
+      icon={<EditIcon size={4} color={readyForEdit ? 'clr-text-primary' : ''} />}
     />
-    <div className='pt-1 pl-6 text-sm font-semibold w-fit'>
+    <div className='pt-1 pl-[1.375rem] text-sm font-semibold w-fit'>
       <span>Имя </span>
       <span className='ml-1'>{constituenta?.alias ?? ''}</span>
     </div>
@@ -119,7 +119,7 @@ function FormConstituenta({
       tooltip='Переименовать конституенту'
       disabled={!readyForEdit}
       onClick={handleRename}
-      icon={<EditIcon size={4} color={readyForEdit ? 'text-primary' : ''} />}
+      icon={<EditIcon size={4} color={readyForEdit ? 'clr-text-primary' : ''} />}
     />
   </Overlay>
   <form id={id}
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/EditorRSExpression.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/EditorRSExpression.tsx
index 4504682f..3d1c030d 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/EditorRSExpression.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/EditorRSExpression.tsx
@@ -135,7 +135,7 @@ function EditorRSExpression({
       <MiniButton noHover
         tooltip='Дерево разбора выражения'
         onClick={handleShowAST}
-        icon={<ASTNetworkIcon size={5} color='text-primary' />}
+        icon={<ASTNetworkIcon size={5} color='clr-text-primary' />}
       />
      </Overlay>
 
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/ParsingResult.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/ParsingResult.tsx
index 40cf9419..3e422ef5 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/ParsingResult.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/ParsingResult.tsx
@@ -22,7 +22,7 @@ function ParsingResult({ data, disabled, onShowError }: ParsingResultProps) {
       return (
       <p
         key={`error-${index}`}
-        className={`text-warning ${disabled ? '' : 'cursor-pointer'}`}
+        className={`clr-text-warning ${disabled ? '' : 'cursor-pointer'}`}
         onClick={disabled ? undefined : () => onShowError(error)}
       >
         <span className='mr-1 font-semibold underline'>
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/RSAnalyzer.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/RSAnalyzer.tsx
index 0c44cd2c..556c83f6 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/RSAnalyzer.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/RSAnalyzer.tsx
@@ -27,7 +27,7 @@ function RSAnalyzer({
 }: RSAnalyzerProps) {
   return (
   <div className='w-full max-h-[4.5rem] min-h-[4.5rem] flex'>
-    <div className='flex flex-col text-sm'>
+    <div className='flex flex-col'>
       <Button noOutline
         text='Проверить'
         tooltip='Проверить формальное определение'
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/StatusBar.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/StatusBar.tsx
index c927aec7..8fc492f5 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/StatusBar.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/StatusBar.tsx
@@ -1,5 +1,6 @@
 'use client';
 
+import clsx from 'clsx';
 import { useMemo } from 'react';
 
 import { useConceptTheme } from '@/context/ThemeContext';
@@ -31,7 +32,12 @@ function StatusBar({ isModified, constituenta, parseData }: StatusBarProps) {
 
   return (
   <div title={describeExpressionStatus(status)}
-    className='inline-flex items-center justify-center w-full h-full text-sm font-semibold align-middle border rounded-none select-none small-caps'
+    className={clsx(
+      'w-full h-full',
+      'border rounded-none',
+      'text-sm font-semibold small-caps text-center',
+      'select-none'
+    )}
     style={{backgroundColor: colorbgCstStatus(status, colors)}}
   >
     {labelExpressionStatus(status)}
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSForm/RSFormStats.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorRSForm/RSFormStats.tsx
index 5e6367c2..9a0331b6 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSForm/RSFormStats.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorRSForm/RSFormStats.tsx
@@ -1,5 +1,5 @@
 import Divider from '@/components/Common/Divider';
-import LabeledText from '@/components/Common/LabeledText';
+import LabeledValue from '@/components/Common/LabeledValue';
 import { type IRSFormStats } from '@/models/rsform';
 
 interface RSFormStatsProps {
@@ -12,36 +12,36 @@ function RSFormStats({ stats }: RSFormStatsProps) {
   }
   return (
   <div className='flex flex-col gap-1 px-4 mt-8 min-w-[16rem]'>
-    <LabeledText id='count_all'
+    <LabeledValue id='count_all'
       label='Всего конституент '
       text={stats.count_all}
     />
-    <LabeledText id='count_errors'
+    <LabeledValue id='count_errors'
       label='Некорректных'
       text={stats.count_errors}
     />
     {stats.count_property !== 0 ?
-    <LabeledText id='count_property'
+    <LabeledValue id='count_property'
       label='Неразмерных'
       text={stats.count_property}
     /> : null}
     {stats.count_incalc !== 0 ? 
-    <LabeledText id='count_incalc'
+    <LabeledValue id='count_incalc'
       label='Невычислимых'
       text={stats.count_incalc}
     /> : null}
 
     <Divider margins='my-2' />
 
-    <LabeledText id='count_termin'
+    <LabeledValue id='count_termin'
       label='Термины'
       text={stats.count_termin}
     />
-    <LabeledText id='count_definition'
+    <LabeledValue id='count_definition'
       label='Определения'
       text={stats.count_definition}
     />
-    <LabeledText id='count_convention'
+    <LabeledValue id='count_convention'
       label='Конвенции'
       text={stats.count_convention}
     />
@@ -49,42 +49,42 @@ function RSFormStats({ stats }: RSFormStatsProps) {
     <Divider margins='my-2' />
 
     {stats.count_base !== 0 ? 
-    <LabeledText id='count_base'
+    <LabeledValue id='count_base'
       label='Базисные множества '
       text={stats.count_base}
     /> : null}
     { stats.count_constant !== 0 ? 
-    <LabeledText id='count_constant'
+    <LabeledValue id='count_constant'
       label='Константные множества '
       text={stats.count_constant}
     /> : null}
     {stats.count_structured !== 0 ? 
-    <LabeledText id='count_structured'
+    <LabeledValue id='count_structured'
       label='Родовые структуры '
       text={stats.count_structured}
     /> : null}
     {stats.count_axiom !== 0 ? 
-    <LabeledText id='count_axiom'
+    <LabeledValue id='count_axiom'
       label='Аксиомы '
       text={stats.count_axiom}
     /> : null}
     {stats.count_term !== 0 ? 
-    <LabeledText id='count_term'
+    <LabeledValue id='count_term'
       label='Термы '
       text={stats.count_term}
     /> : null}
     {stats.count_function !== 0 ? 
-    <LabeledText id='count_function'
+    <LabeledValue id='count_function'
       label='Терм-функции '
       text={stats.count_function}
     /> : null}
     {stats.count_predicate !== 0 ? 
-    <LabeledText id='count_predicate'
+    <LabeledValue id='count_predicate'
       label='Предикат-функции '
       text={stats.count_predicate}
     /> : null}
     {stats.count_theorem !== 0 ? 
-    <LabeledText id='count_theorem'
+    <LabeledValue id='count_theorem'
       label='Теоремы '
       text={stats.count_theorem}
     /> : null}
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSForm/RSFormToolbar.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorRSForm/RSFormToolbar.tsx
index 7639050d..180baf3c 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSForm/RSFormToolbar.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorRSForm/RSFormToolbar.tsx
@@ -32,22 +32,22 @@ function RSFormToolbar({
     <MiniButton
       tooltip='Сохранить изменения [Ctrl + S]'
       disabled={!canSave}
-      icon={<SaveIcon size={5} color={canSave ? 'text-primary' : ''}/>}
+      icon={<SaveIcon size={5} color={canSave ? 'clr-text-primary' : ''}/>}
       onClick={onSubmit}
     />
     <MiniButton
       tooltip='Поделиться схемой'
-      icon={<ShareIcon size={5} color='text-primary'/>}
+      icon={<ShareIcon size={5} color='clr-text-primary'/>}
       onClick={onShare}
     />
     <MiniButton
       tooltip='Скачать TRS файл'
-      icon={<DownloadIcon size={5} color='text-primary'/>}
+      icon={<DownloadIcon size={5} color='clr-text-primary'/>}
       onClick={onDownload}
     />
     <MiniButton
       tooltip={claimable ? 'Стать владельцем' : 'Невозможно стать владельцем' }
-      icon={<OwnerIcon size={5} color={!claimable ? '' : 'text-success'}/>}
+      icon={<OwnerIcon size={5} color={!claimable ? '' : 'clr-text-success'}/>}
       disabled={!claimable || anonymous}
       onClick={onClaim}
     />
@@ -55,7 +55,7 @@ function RSFormToolbar({
       tooltip='Удалить схему'
       disabled={!isMutable}
       onClick={onDestroy}
-      icon={<DumpBinIcon size={5} color={isMutable ? 'text-warning' : ''} />}
+      icon={<DumpBinIcon size={5} color={isMutable ? 'clr-text-warning' : ''} />}
     />
     <HelpButton topic={HelpTopic.RSFORM} offset={4} />
   </Overlay>);
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSList/RSListToolbar.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorRSList/RSListToolbar.tsx
index 7c804b3b..bca1b58b 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSList/RSListToolbar.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorRSList/RSListToolbar.tsx
@@ -52,13 +52,13 @@ function RSListToolbar({
     />
     <MiniButton
       tooltip='Клонировать конституенту [Alt + V]'
-      icon={<CloneIcon color={isMutable && selectedCount === 1 ? 'text-success': ''} size={5}/>}
+      icon={<CloneIcon color={isMutable && selectedCount === 1 ? 'clr-text-success': ''} size={5}/>}
       disabled={!isMutable || selectedCount !== 1}
       onClick={onClone}
     />
     <MiniButton
       tooltip='Добавить новую конституенту... [Alt + `]'
-      icon={<SmallPlusIcon color={isMutable ? 'text-success': ''} size={5}/>}
+      icon={<SmallPlusIcon color={isMutable ? 'clr-text-success': ''} size={5}/>}
       disabled={!isMutable}
       onClick={() => onCreate()}
     />
@@ -66,7 +66,7 @@ function RSListToolbar({
       <div>
         <MiniButton
           tooltip='Добавить пустую конституенту'
-          icon={<ArrowDropdownIcon color={isMutable ? 'text-success': ''} size={5}/>}
+          icon={<ArrowDropdownIcon color={isMutable ? 'clr-text-success': ''} size={5}/>}
           disabled={!isMutable}
           onClick={insertMenu.toggle}
         />
@@ -89,19 +89,19 @@ function RSListToolbar({
     </div>
     <MiniButton
       tooltip='Создать конституенту из шаблона [Alt + E]'
-      icon={<DiamondIcon color={isMutable ? 'text-primary': ''} size={5}/>}
+      icon={<DiamondIcon color={isMutable ? 'clr-text-primary': ''} size={5}/>}
       disabled={!isMutable}
       onClick={onTemplates}
     />
     <MiniButton
       tooltip='Сброс имен: присвоить порядковые имена [Alt + R]'
-      icon={<UpdateIcon color={isMutable ? 'text-primary': ''} size={5}/>}
+      icon={<UpdateIcon color={isMutable ? 'clr-text-primary': ''} size={5}/>}
       disabled={!isMutable}
       onClick={onReindex}
     />
     <MiniButton
       tooltip='Удалить выбранные [Delete]'
-      icon={<DumpBinIcon color={isMutable && !nothingSelected ? 'text-warning' : ''} size={5}/>}
+      icon={<DumpBinIcon color={isMutable && !nothingSelected ? 'clr-text-warning' : ''} size={5}/>}
       disabled={!isMutable || nothingSelected}
       onClick={onDelete}
     />
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSList/RSTable.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorRSList/RSTable.tsx
index 3aa93bfc..2ff9e7c6 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSList/RSTable.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorRSList/RSTable.tsx
@@ -146,7 +146,7 @@ function RSTable({
       <span className='flex flex-col justify-center p-2 text-center'>
         <p>Список пуст</p>
         <p 
-          className='cursor-pointer text-primary hover:underline'
+          className='cursor-pointer clr-text-primary hover:underline'
           onClick={() => onCreateNew()}
         >
           Создать новую конституенту
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/EditorTermGraph.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/EditorTermGraph.tsx
index 223b9454..3c6ad8d4 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/EditorTermGraph.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/EditorTermGraph.tsx
@@ -1,5 +1,6 @@
 'use client';
 
+import clsx from 'clsx';
 import { useCallback, useLayoutEffect, useMemo, useState } from 'react';
 import { GraphEdge, GraphNode, LayoutTypes } from 'reagraph';
 
@@ -230,16 +231,28 @@ function EditorTermGraph({ onOpenEdit, onCreateCst, onDeleteCst }: EditorTermGra
 
     {hoverCst ?
     <Overlay
-      position='top-[1.6rem] left-[2.6rem] px-3 w-[25rem] h-fit min-h-[11rem] overflow-y-auto'
       layer='z-tooltip'
-      className='border shadow-md clr-app'
+      position='top-[1.6rem] left-[2.6rem]'
+      className={clsx(
+        'w-[25rem] h-fit min-h-[11rem]',
+        'px-3',
+        'overflow-y-auto',
+        'border shadow-md',
+        'clr-app'
+      )}
     >
       <InfoConstituenta
         data={hoverCst}
       />
     </Overlay> : null}
     
-    <Overlay position='top-0 left-0 max-w-[13.5rem] min-w-[13.5rem]' className='flex flex-col gap-3'>
+    <Overlay
+      position='top-0 left-0'
+      className={clsx(
+        'max-w-[13.5rem] min-w-[13.5rem]',
+        'flex flex-col gap-3'
+      )}
+    >
       <GraphSidebar 
         coloring={coloringScheme}
         layout={layout}
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/GraphToolbar.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/GraphToolbar.tsx
index 59e4e729..72afe367 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/GraphToolbar.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/GraphToolbar.tsx
@@ -34,37 +34,37 @@ function GraphToolbar({
   <Overlay position='w-full top-1 right-0 flex items-start justify-center'>
     <MiniButton
       tooltip='Настройки фильтрации узлов и связей'
-      icon={<FilterIcon color='text-primary' size={5} />}
+      icon={<FilterIcon color='clr-text-primary' size={5} />}
       onClick={showParamsDialog}
     />
     <MiniButton
       tooltip={!noText ? 'Скрыть текст' : 'Отобразить текст'}
       icon={
         !noText
-        ? <LetterALinesIcon color='text-success' size={5} />
-        : <LetterAIcon color='text-primary' size={5} />
+        ? <LetterALinesIcon color='clr-text-success' size={5} />
+        : <LetterAIcon color='clr-text-primary' size={5} />
       }
       onClick={toggleNoText}
     />
     <MiniButton
       tooltip='Новая конституента'
-      icon={<SmallPlusIcon color={isMutable ? 'text-success' : ''} size={5} />}
+      icon={<SmallPlusIcon color={isMutable ? 'clr-text-success' : ''} size={5} />}
       disabled={!isMutable}
       onClick={onCreate}
     />
     <MiniButton
       tooltip='Удалить выбранные'
-      icon={<DumpBinIcon color={isMutable && !nothingSelected ? 'text-warning' : ''} size={5} />}
+      icon={<DumpBinIcon color={isMutable && !nothingSelected ? 'clr-text-warning' : ''} size={5} />}
       disabled={!isMutable || nothingSelected}
       onClick={onDelete}
     />
     <MiniButton
-      icon={<ArrowsFocusIcon color='text-primary' size={5} />}
+      icon={<ArrowsFocusIcon color='clr-text-primary' size={5} />}
       tooltip='Восстановить камеру'
       onClick={onResetViewpoint}
     />
     <MiniButton
-      icon={<PlanetIcon color={!is3D ? '' : orbit ? 'text-success' : 'text-primary'} size={5} />}
+      icon={<PlanetIcon color={!is3D ? '' : orbit ? 'clr-text-success' : 'clr-text-primary'} size={5} />}
       tooltip='Анимация вращения'
       disabled={!is3D}
       onClick={toggleOrbit}
diff --git a/rsconcept/frontend/src/pages/RSFormPage/RSFormPage.tsx b/rsconcept/frontend/src/pages/RSFormPage/RSFormPage.tsx
index 66183448..669a30e3 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/RSFormPage.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/RSFormPage.tsx
@@ -14,4 +14,4 @@ function RSFormPage() {
   </RSFormState>);
 }
 
-export default RSFormPage;
+export default RSFormPage;
\ No newline at end of file
diff --git a/rsconcept/frontend/src/pages/RSFormPage/RSTabs.tsx b/rsconcept/frontend/src/pages/RSFormPage/RSTabs.tsx
index 3dc1e508..a3225d54 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/RSTabs.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/RSTabs.tsx
@@ -1,6 +1,7 @@
 'use client';
 
 import axios from 'axios';
+import clsx from 'clsx';
 import fileDownload from 'js-file-download';
 import { useCallback, useLayoutEffect, useMemo, useState } from 'react';
 import { TabList, TabPanel, Tabs } from 'react-tabs';
@@ -377,7 +378,11 @@ function RSTabs() {
     className='flex flex-col w-full'
   >
     <div className='flex justify-center w-[100vw]'>
-    <TabList className='flex border-b-2 border-x-2 justify-stretch w-fit h-[1.9rem]'>
+    <TabList className={clsx(
+      'w-fit h-[1.9rem]',
+      'flex justify-stretch', 
+      'border-b-2 border-x-2 divide-x-2'
+    )}>
       <RSTabsMenu 
         onDownload={onDownloadSchema}
         onDestroy={onDestroySchema}
@@ -389,25 +394,28 @@ function RSTabs() {
       />
       <ConceptTab
         label='Карточка'
-        className='border-x-2'
         tooltip={`Название схемы: ${schema.title ?? ''}`}
       />
       <ConceptTab
         label='Содержание'
-        className='border-r-2'
-        tooltip={`Всего конституент: ${schema.stats?.count_all ?? 0}\nКоличество ошибок: ${schema.stats?.count_errors ?? 0}`}
-      />
-      <ConceptTab
-        label='Редактор'
-        className='border-r-2'
-      />
-      <ConceptTab
-        label='Граф термов'
+        tooltip={[
+          `Всего конституент: ${schema.stats?.count_all ?? 0}`,
+          `Количество ошибок: ${schema.stats?.count_errors ?? 0}`
+        ].join('\n')}
       />
+      <ConceptTab label='Редактор' />
+      <ConceptTab label='Граф термов' />
     </TabList>
     </div>
 
-    <div className='overflow-y-auto min-w-[48rem] w-[100vw] flex justify-center' style={{ maxHeight: panelHeight}}>
+    <div
+      className={clsx(
+        'min-w-[48rem] w-[100vw]',
+        'flex justify-center',
+        'overflow-y-auto'
+      )}
+      style={{ maxHeight: panelHeight}}
+    >
       <TabPanel forceRender style={{ display: activeTab === RSTabID.CARD ? '': 'none' }}>
         <EditorRSForm
           isModified={isModified}
diff --git a/rsconcept/frontend/src/pages/RSFormPage/RSTabsMenu.tsx b/rsconcept/frontend/src/pages/RSFormPage/RSTabsMenu.tsx
index f4ba13bc..9db6563d 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/RSTabsMenu.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/RSTabsMenu.tsx
@@ -76,7 +76,7 @@ function RSTabsMenu({
     <div ref={schemaMenu.ref}>
       <Button noBorder dense tabIndex={-1}
         tooltip='Действия'
-        icon={<MenuIcon color='text-controls' size={5}/>}
+        icon={<MenuIcon color='clr-text-controls' size={5}/>}
         dimensions='h-full w-fit pl-2'
         style={{outlineColor: 'transparent'}}
         onClick={schemaMenu.toggle}
@@ -85,37 +85,37 @@ function RSTabsMenu({
       <Dropdown>
         <DropdownButton onClick={handleShare}>
           <div className='inline-flex items-center justify-start gap-2'>
-            <ShareIcon color='text-primary' size={4}/>
+            <ShareIcon color='clr-text-primary' size={4}/>
             <p>Поделиться</p>
           </div>
         </DropdownButton>
         <DropdownButton onClick={handleClone} disabled={!user} >
           <div className='inline-flex items-center justify-start gap-2'>
-            <CloneIcon color='text-primary' size={4}/>
+            <CloneIcon color='clr-text-primary' size={4}/>
             <p>Клонировать</p>
           </div>
         </DropdownButton>
         <DropdownButton onClick={handleDownload}>
           <div className='inline-flex items-center justify-start gap-2'>
-            <DownloadIcon color='text-primary' size={4}/>
+            <DownloadIcon color='clr-text-primary' size={4}/>
             <p>Выгрузить в Экстеор</p>
           </div>
         </DropdownButton>
         <DropdownButton disabled={!isMutable} onClick={handleUpload}>
           <div className='inline-flex items-center justify-start gap-2'>
-            <UploadIcon color={isMutable ? 'text-warning' : ''} size={4}/>
+            <UploadIcon color={isMutable ? 'clr-text-warning' : ''} size={4}/>
             <p>Загрузить из Экстеора</p>
           </div>
         </DropdownButton>
         <DropdownButton disabled={!isMutable} onClick={handleDelete}>
           <span className='inline-flex items-center justify-start gap-2'>
-            <DumpBinIcon color={isMutable ? 'text-warning' : ''} size={4} />
+            <DumpBinIcon color={isMutable ? 'clr-text-warning' : ''} size={4} />
             <p>Удалить схему</p>
           </span>
         </DropdownButton>
         <DropdownButton onClick={handleCreateNew}>
           <span className='inline-flex items-center justify-start gap-2'>
-            <SmallPlusIcon color='text-url' size={4} />
+            <SmallPlusIcon color='clr-text-url' size={4} />
             <p>Создать новую схему</p>
           </span>
         </DropdownButton>
@@ -126,7 +126,7 @@ function RSTabsMenu({
         tooltip={'измнение: ' + (isMutable ? '[доступно]' : '[запрещено]')}
         dimensions='h-full w-fit'
         style={{outlineColor: 'transparent'}}
-        icon={<EditIcon size={5} color={isMutable ? 'text-success' : 'text-warning'}/>}
+        icon={<EditIcon size={5} color={isMutable ? 'clr-text-success' : 'clr-text-warning'}/>}
         onClick={editMenu.toggle}
       />
       {editMenu.isActive ?
@@ -136,12 +136,12 @@ function RSTabsMenu({
           onClick={!isOwned ? handleClaimOwner : undefined}
           tooltip={!user || !isClaimable ? 'Взять во владение можно общую изменяемую схему' : ''}
         >
-          <div className='flex items-center gap-2 pl-1 text-default'>
+          <div className='flex items-center gap-2 clr-text-default'>
             <span>
-              <OwnerIcon size={4} color={isOwned ? 'text-success' : 'text-controls'} />
+              <OwnerIcon size={4} color={isOwned ? 'clr-text-success' : 'clr-text-controls'} />
             </span>
             <div>
-              {isOwned ? <b className='text-default'>Вы — владелец</b> : null}
+              {isOwned ? <b className='clr-text-default'>Вы — владелец</b> : null}
               {!isOwned ? <b>Стать владельцем</b>  : null}
             </div>
           </div>
@@ -167,8 +167,8 @@ function RSTabsMenu({
         tooltip={'отслеживание: ' + (isTracking ? '[включено]' : '[выключено]')}
         disabled={processing}
         icon={isTracking
-          ? <SubscribedIcon color='text-primary' size={5}/>
-          : <NotSubscribedIcon color='text-controls' size={5}/>
+          ? <SubscribedIcon color='clr-text-primary' size={5}/>
+          : <NotSubscribedIcon color='clr-text-controls' size={5}/>
         }
         dimensions='h-full w-fit pr-2'
         style={{outlineColor: 'transparent'}}
diff --git a/rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/ConstituentsSearch.tsx b/rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/ConstituentsSearch.tsx
index e306ce2b..c715fd7a 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/ConstituentsSearch.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/ConstituentsSearch.tsx
@@ -11,7 +11,7 @@ import useDropdown from '@/hooks/useDropdown';
 import useLocalStorage from '@/hooks/useLocalStorage';
 import { CstMatchMode, DependencyMode } from '@/models/miscelanious';
 import { applyGraphFilter } from '@/models/miscelaniousAPI';
-import { CstType, IConstituenta, IRSForm } from '@/models/rsform';
+import { IConstituenta, IRSForm } from '@/models/rsform';
 import { createMockConstituenta, matchConstituenta } from '@/models/rsformAPI';
 import { extractGlobals } from '@/models/rslangAPI';
 import { prefixes } from '@/utils/constants';
@@ -42,18 +42,12 @@ function ConstituentsSearch({ schema, activeID, activeExpression, setFiltered }:
     if (filterSource === DependencyMode.EXPRESSION) {
       const aliases = extractGlobals(activeExpression);
       result = schema.items.filter((cst) => aliases.has(cst.alias));
-      const names = result.map(cst => cst.alias)
+      const names = result.map(cst => cst.alias);
       const diff = Array.from(aliases).filter(name => !names.includes(name));
       if (diff.length > 0) {
         diff.forEach(
           (alias, index) => result.push(
-            createMockConstituenta(
-              -1,
-              -index,
-              alias,
-              CstType.BASE,
-              'Конституента отсутствует'
-            )
+            createMockConstituenta(-index, alias, 'Конституента отсутствует')
           )
         );
       }
@@ -83,9 +77,9 @@ function ConstituentsSearch({ schema, activeID, activeExpression, setFiltered }:
   return (
   <div className='flex items-stretch border-b clr-input'>
     <ConceptSearch noBorder
+      dimensions='min-w-[6rem] pr-2 w-full'
       value={filterText}
       onChange={setFilterText}
-      dimensions='min-w-[6rem] pr-2 w-full'
     />
    
     <div ref={matchModeMenu.ref}>
diff --git a/rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/ConstituentsTable.tsx b/rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/ConstituentsTable.tsx
index 223341d6..058d3094 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/ConstituentsTable.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/ConstituentsTable.tsx
@@ -1,5 +1,6 @@
 'use client';
 
+import clsx from 'clsx';
 import { useCallback, useLayoutEffect, useMemo, useState } from 'react';
 
 import DataTable, { createColumnHelper,IConditionalStyle, VisibilityState } from '@/components/DataTable';
@@ -67,7 +68,7 @@ function ConstituentsTable({
         <ConstituentaBadge 
           theme={colors}
           value={props.row.original}
-          prefixID={prefixes.cst_list}
+          prefixID={prefixes.cst_sidetable}
         />
     }),
     columnHelper.accessor(cst => describeConstituenta(cst), {
@@ -123,10 +124,15 @@ function ConstituentsTable({
     onColumnVisibilityChange={setColumnVisibility}
 
     noDataComponent={
-      <span className='flex flex-col justify-center p-2 text-center min-h-[5rem] select-none'>
+      <div className={clsx(
+        'min-h-[5rem]',
+        'p-2 flex flex-col justify-center',
+        'text-center',
+        'select-none'
+      )}>
         <p>Список конституент пуст</p>
         <p>Измените параметры фильтра</p>
-      </span>
+      </div>
     }
 
     onRowDoubleClicked={handleDoubleClick}
diff --git a/rsconcept/frontend/src/pages/RegisterPage.tsx b/rsconcept/frontend/src/pages/RegisterPage.tsx
index b668c12a..eb6fb8f6 100644
--- a/rsconcept/frontend/src/pages/RegisterPage.tsx
+++ b/rsconcept/frontend/src/pages/RegisterPage.tsx
@@ -77,7 +77,7 @@ function RegisterPage() {
             id={globalIDs.password_tooltip}
             position='top-[4.8rem] left-[3.4rem] absolute'
           >
-            <HelpIcon color='text-primary' size={5} />
+            <HelpIcon color='clr-text-primary' size={5} />
           </Overlay>
           <ConceptTooltip
             anchorSelect={`#${globalIDs.password_tooltip}`}
diff --git a/rsconcept/frontend/src/pages/UserProfilePage/EditorPassword.tsx b/rsconcept/frontend/src/pages/UserProfilePage/EditorPassword.tsx
index ff39b427..9bd31a55 100644
--- a/rsconcept/frontend/src/pages/UserProfilePage/EditorPassword.tsx
+++ b/rsconcept/frontend/src/pages/UserProfilePage/EditorPassword.tsx
@@ -1,6 +1,7 @@
 'use client';
 
 import axios from 'axios';
+import clsx from 'clsx';
 import { useEffect, useMemo, useState } from 'react';
 import { toast } from 'react-toastify';
 
@@ -14,7 +15,7 @@ import { IUserUpdatePassword } from '@/models/library';
 function ProcessError({error}: {error: ErrorData}): React.ReactElement {
   if (axios.isAxiosError(error) && error.response && error.response.status === 400) {
     return (
-    <div className='text-sm select-text text-warning'>
+    <div className='text-sm select-text clr-text-warning'>
       Неверно введен старый пароль
     </div>);
   } else {
@@ -70,7 +71,11 @@ function EditorPassword() {
 
   return (
   <form
-    className='flex flex-col justify-between px-6 border-l-2 max-w-[14rem] py-2'
+    className={clsx(
+      'max-w-[14rem]',
+      'px-6 py-2 flex flex-col justify-between',
+      'border-l-2'
+    )}
     onSubmit={handleSubmit}
   >
     <div className='flex flex-col gap-3'>
diff --git a/rsconcept/frontend/src/pages/UserProfilePage/EditorProfile.tsx b/rsconcept/frontend/src/pages/UserProfilePage/EditorProfile.tsx
index 438a3e8b..3b1896f7 100644
--- a/rsconcept/frontend/src/pages/UserProfilePage/EditorProfile.tsx
+++ b/rsconcept/frontend/src/pages/UserProfilePage/EditorProfile.tsx
@@ -51,7 +51,10 @@ function EditorProfile() {
   }
 
   return (
-  <form onSubmit={handleSubmit} className='px-6 py-2 flex flex-col gap-8 min-w-[18rem]'>
+  <form
+    onSubmit={handleSubmit}
+    className='px-6 py-2 flex flex-col gap-8 min-w-[18rem]'
+  >
     <div className='flex flex-col gap-3'>
       <TextInput id='username' disabled
         label='Логин'
diff --git a/rsconcept/frontend/src/pages/UserProfilePage/UserTabs.tsx b/rsconcept/frontend/src/pages/UserProfilePage/UserTabs.tsx
index acd025e8..9b8e5930 100644
--- a/rsconcept/frontend/src/pages/UserProfilePage/UserTabs.tsx
+++ b/rsconcept/frontend/src/pages/UserProfilePage/UserTabs.tsx
@@ -38,8 +38,8 @@ function UserTabs() {
           <MiniButton
             tooltip='Показать/Скрыть список отслеживаний'
             icon={showSubs
-              ? <SubscribedIcon color='text-primary' size={5}/>
-              : <NotSubscribedIcon color='text-primary' size={5}/>
+              ? <SubscribedIcon color='clr-text-primary' size={5}/>
+              : <NotSubscribedIcon color='clr-text-primary' size={5}/>
             }
             onClick={() => setShowSubs(prev => !prev)}
           />
diff --git a/rsconcept/frontend/src/pages/UserProfilePage/ViewSubscriptions.tsx b/rsconcept/frontend/src/pages/UserProfilePage/ViewSubscriptions.tsx
index 2c36a5a9..7c36740f 100644
--- a/rsconcept/frontend/src/pages/UserProfilePage/ViewSubscriptions.tsx
+++ b/rsconcept/frontend/src/pages/UserProfilePage/ViewSubscriptions.tsx
@@ -43,13 +43,16 @@ function ViewSubscriptions({items}: ViewSubscriptionsProps) {
       minSize: 150,
       size: 150,
       maxSize: 150,
-      cell: props => <div className='min-w-[8.25rem]'>{new Date(props.cell.getValue()).toLocaleString(intl.locale)}</div>,
+      cell: props =>
+        <div className='min-w-[8.25rem]'>
+          {new Date(props.cell.getValue()).toLocaleString(intl.locale)}
+        </div>,
       enableSorting: true
     })
   ], [intl]);
 
   return (
-  <div className='max-h-[23.8rem] overflow-auto text-sm border w-fit'>
+  <div className='max-h-[23.8rem] w-fit overflow-auto text-sm border'>
   <DataTable dense noFooter
     columns={columns}
     data={items}
@@ -67,4 +70,4 @@ function ViewSubscriptions({items}: ViewSubscriptionsProps) {
   </div>);
 }
 
-export default ViewSubscriptions;
+export default ViewSubscriptions;
\ No newline at end of file
diff --git a/rsconcept/frontend/src/utils/codemirror.ts b/rsconcept/frontend/src/utils/codemirror.ts
index 3cdd1b23..eb32bd0c 100644
--- a/rsconcept/frontend/src/utils/codemirror.ts
+++ b/rsconcept/frontend/src/utils/codemirror.ts
@@ -4,6 +4,7 @@
 import { syntaxTree } from '@codemirror/language';
 import { NodeType, Tree, TreeCursor } from '@lezer/common';
 import { ReactCodeMirrorRef, SelectionRange } from '@uiw/react-codemirror';
+import clsx from 'clsx';
 
 import { IEntityReference, ISyntacticReference } from '@/models/language';
 import { parseGrammemes } from '@/models/languageAPI';
@@ -134,7 +135,14 @@ export function findContainedNodes(start: number, finish: number, tree: Tree, fi
 */
 export function domTooltipConstituenta(cst: IConstituenta) {
   const dom = document.createElement('div');
-  dom.className = 'overflow-y-auto border shadow-md max-h-[25rem] max-w-[25rem] min-w-[10rem] w-fit z-tooltip text-sm px-2 py-2';
+  dom.className = clsx(
+    'z-tooltip',
+    'max-h-[25rem] max-w-[25rem] min-w-[10rem] w-fit',
+    'p-2',
+    'border shadow-md', 
+    'overflow-y-auto',
+    'text-sm'
+  );
   
   const alias = document.createElement('p');
   alias.innerHTML = `<b>${cst.alias}:</b> ${labelCstTypification(cst)}`;
@@ -170,12 +178,17 @@ export function domTooltipConstituenta(cst: IConstituenta) {
  * Create DOM tooltip for {@link IEntityReference}.
 */
 export function domTooltipEntityReference(ref: IEntityReference, cst: IConstituenta | undefined, colors: IColorTheme) {
-  const DIMENSIONS = 'max-h-[25rem] max-w-[25rem] min-w-[10rem] w-fit z-tooltip px-2 py-2';
-  const LAYOUT = 'flex flex-col overflow-y-auto';
-
   const dom = document.createElement('div');
-  dom.className = `${DIMENSIONS} ${LAYOUT} border shadow-md text-sm select-none cursor-auto`;
-
+  dom.className = clsx(
+    'z-tooltip',
+    'max-h-[25rem] max-w-[25rem] min-w-[10rem] w-fit',
+    'p-2 flex flex-col',
+    'border shadow-md',
+    'overflow-y-auto',
+    'text-sm',
+    'select-none cursor-auto'
+  );
+  
   const title = document.createElement('p');
   title.innerHTML = '<b>Ссылка на конституенту</b>';
   dom.appendChild(title);
@@ -190,7 +203,12 @@ export function domTooltipEntityReference(ref: IEntityReference, cst: IConstitue
   gramStr => {
     const gram = document.createElement('div');
     gram.id =`tooltip-${gramStr}`;
-    gram.className='min-w-[3rem] px-1 text-sm text-center rounded-md whitespace-nowrap';
+    gram.className = clsx(
+      'min-w-[3rem]', 
+      'px-1',
+      'border rounded-md',
+      'text-sm text-center whitespace-nowrap'
+    );
     gram.style.borderWidth = '1px';
     gram.style.borderColor = colorfgGrammeme(gramStr, colors);
     gram.style.color = colorfgGrammeme(gramStr, colors);
@@ -207,11 +225,17 @@ export function domTooltipEntityReference(ref: IEntityReference, cst: IConstitue
  * Create DOM tooltip for {@link ISyntacticReference}.
 */
 export function domTooltipSyntacticReference(ref: ISyntacticReference, masterRef: string | undefined) {
-  const DIMENSIONS = 'max-h-[25rem] max-w-[25rem] min-w-[10rem] w-fit z-tooltip px-2 py-2';
-  const LAYOUT = 'flex flex-col overflow-y-auto'
 
   const dom = document.createElement('div');
-  dom.className = `${DIMENSIONS} ${LAYOUT} border shadow-md text-sm select-none cursor-auto`;
+  dom.className = clsx(
+    'z-tooltip',
+    'max-h-[25rem] max-w-[25rem] min-w-[10rem] w-fit',
+    'p-2 flex flex-col',
+    'border shadow-md',
+    'overflow-y-auto',
+    'text-sm',
+    'select-none cursor-auto'
+  );
 
   const title = document.createElement('p');
   title.innerHTML = '<b>Связывание слов</b>';
diff --git a/rsconcept/frontend/src/utils/constants.ts b/rsconcept/frontend/src/utils/constants.ts
index 082f73ca..e0e48236 100644
--- a/rsconcept/frontend/src/utils/constants.ts
+++ b/rsconcept/frontend/src/utils/constants.ts
@@ -87,6 +87,7 @@ export const globalIDs = {
 export const prefixes = {
   page_size: 'page-size-',
   cst_list: 'cst-list-',
+  cst_sidetable: 'cst-sidetable-',
   cst_hidden_list: 'cst-hidden-list-',
   cst_modal_list: 'cst-modal-list-',
   cst_template_ist: 'cst-template-list-',