diff --git a/ui/dev-dist/sw.js b/ui/dev-dist/sw.js
index 58b2a782..572deef5 100644
--- a/ui/dev-dist/sw.js
+++ b/ui/dev-dist/sw.js
@@ -82,7 +82,7 @@ define(['./workbox-54d0af47'], (function (workbox) { 'use strict';
     "revision": "3ca0b8505b4bec776b69afdba2768812"
   }, {
     "url": "index.html",
-    "revision": "0.dsijviet2j8"
+    "revision": "0.jo4tm1om2e8"
   }], {});
   workbox.cleanupOutdatedCaches();
   workbox.registerRoute(new workbox.NavigationRoute(workbox.createHandlerBoundToURL("index.html"), {
diff --git a/ui/package-lock.json b/ui/package-lock.json
index 67b0926a..04f29a35 100644
--- a/ui/package-lock.json
+++ b/ui/package-lock.json
@@ -8,7 +8,7 @@
       "name": "kurs-platform-ui",
       "version": "1.0.4",
       "dependencies": {
-        "@babel/core": "^7.24.0",
+        "@babel/generator": "^7.28.3",
         "@babel/parser": "^7.28.0",
         "@babel/standalone": "^7.28.0",
         "@babel/traverse": "^7.28.0",
@@ -52,7 +52,6 @@
         "react-router-dom": "^6.14.1",
         "react-select": "^5.9.0",
         "redux-state-sync": "^3.1.4",
-        "twin.macro": "^3.4.1",
         "yup": "^1.6.1"
       },
       "devDependencies": {
@@ -96,6 +95,7 @@
     },
     "node_modules/@alloc/quick-lru": {
       "version": "5.2.0",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=10"
@@ -106,6 +106,7 @@
     },
     "node_modules/@ampproject/remapping": {
       "version": "2.2.1",
+      "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
         "@jridgewell/gen-mapping": "^0.3.0",
@@ -130,6 +131,7 @@
     },
     "node_modules/@babel/compat-data": {
       "version": "7.26.3",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
@@ -137,6 +139,7 @@
     },
     "node_modules/@babel/core": {
       "version": "7.26.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
@@ -165,22 +168,24 @@
     },
     "node_modules/@babel/core/node_modules/convert-source-map": {
       "version": "2.0.0",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/@babel/core/node_modules/semver": {
       "version": "6.3.1",
+      "dev": true,
       "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.28.0",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.28.0.tgz",
-      "integrity": "sha512-lJjzvrbEeWrhB4P3QBsH7tey117PjLZnDbLiQEKjQ/fNJTjuq4HSqgFA+UNSwZT8D7dxxbnuSBMsa1lrWzKlQg==",
+      "version": "7.28.3",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.28.3.tgz",
+      "integrity": "sha512-3lSpxGgvnmZznmBkCRnVREPUFJv2wrv9iAoFDvADJc0ypmdOxdUtcLeBgBJ6zE0PMeTKnxeQzyk0xTBq4Ep7zw==",
       "dependencies": {
-        "@babel/parser": "^7.28.0",
-        "@babel/types": "^7.28.0",
+        "@babel/parser": "^7.28.3",
+        "@babel/types": "^7.28.2",
         "@jridgewell/gen-mapping": "^0.3.12",
         "@jridgewell/trace-mapping": "^0.3.28",
         "jsesc": "^3.0.2"
@@ -202,6 +207,7 @@
     },
     "node_modules/@babel/helper-compilation-targets": {
       "version": "7.25.9",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/compat-data": "^7.25.9",
@@ -216,6 +222,7 @@
     },
     "node_modules/@babel/helper-compilation-targets/node_modules/semver": {
       "version": "6.3.1",
+      "dev": true,
       "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
@@ -321,6 +328,7 @@
     },
     "node_modules/@babel/helper-module-transforms": {
       "version": "7.26.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-module-imports": "^7.25.9",
@@ -415,6 +423,7 @@
     },
     "node_modules/@babel/helper-validator-option": {
       "version": "7.25.9",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
@@ -435,6 +444,7 @@
     },
     "node_modules/@babel/helpers": {
       "version": "7.27.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/template": "^7.27.0",
@@ -445,11 +455,11 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.28.0",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.0.tgz",
-      "integrity": "sha512-jVZGvOxOuNSsuQuLRTh13nU0AogFlw32w/MT+LV6D3sP5WdbW61E77RnkbaO2dUvmPAYrBDJXGn5gGS6tH4j8g==",
+      "version": "7.28.3",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.3.tgz",
+      "integrity": "sha512-7+Ey1mAgYqFAx2h0RuoxcQT5+MlG3GTV0TQrgr7/ZliKsm/MNDxVVutlWaziMq7wJNAz8MTqz55XLpWvva6StA==",
       "dependencies": {
-        "@babel/types": "^7.28.0"
+        "@babel/types": "^7.28.2"
       },
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -2294,6 +2304,7 @@
     },
     "node_modules/@isaacs/cliui": {
       "version": "8.0.2",
+      "dev": true,
       "license": "ISC",
       "dependencies": {
         "string-width": "^5.1.2",
@@ -2309,6 +2320,7 @@
     },
     "node_modules/@isaacs/cliui/node_modules/ansi-regex": {
       "version": "6.1.0",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=12"
@@ -2319,6 +2331,7 @@
     },
     "node_modules/@isaacs/cliui/node_modules/ansi-styles": {
       "version": "6.2.1",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=12"
@@ -2329,6 +2342,7 @@
     },
     "node_modules/@isaacs/cliui/node_modules/string-width": {
       "version": "5.1.2",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "eastasianwidth": "^0.2.0",
@@ -2344,6 +2358,7 @@
     },
     "node_modules/@isaacs/cliui/node_modules/strip-ansi": {
       "version": "7.1.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "ansi-regex": "^6.0.1"
@@ -2357,6 +2372,7 @@
     },
     "node_modules/@isaacs/cliui/node_modules/wrap-ansi": {
       "version": "8.1.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "ansi-styles": "^6.1.0",
@@ -2439,6 +2455,7 @@
     },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@nodelib/fs.stat": "2.0.5",
@@ -2450,6 +2467,7 @@
     },
     "node_modules/@nodelib/fs.stat": {
       "version": "2.0.5",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 8"
@@ -2457,6 +2475,7 @@
     },
     "node_modules/@nodelib/fs.walk": {
       "version": "1.2.8",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@nodelib/fs.scandir": "2.1.5",
@@ -2468,6 +2487,7 @@
     },
     "node_modules/@pkgjs/parseargs": {
       "version": "0.11.0",
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "engines": {
@@ -3463,6 +3483,7 @@
     },
     "node_modules/ansi-regex": {
       "version": "5.0.1",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=8"
@@ -3470,6 +3491,7 @@
     },
     "node_modules/ansi-styles": {
       "version": "4.3.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
@@ -3483,10 +3505,12 @@
     },
     "node_modules/any-promise": {
       "version": "1.3.0",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/anymatch": {
       "version": "3.1.3",
+      "dev": true,
       "license": "ISC",
       "dependencies": {
         "normalize-path": "^3.0.0",
@@ -3545,6 +3569,7 @@
     },
     "node_modules/arg": {
       "version": "5.0.2",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/argparse": {
@@ -3750,7 +3775,8 @@
     },
     "node_modules/babel-plugin-macros": {
       "version": "3.1.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz",
+      "integrity": "sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==",
       "dependencies": {
         "@babel/runtime": "^7.12.5",
         "cosmiconfig": "^7.0.0",
@@ -3852,6 +3878,7 @@
     },
     "node_modules/binary-extensions": {
       "version": "2.2.0",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=8"
@@ -3897,6 +3924,7 @@
     },
     "node_modules/braces": {
       "version": "3.0.3",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "fill-range": "^7.1.1"
@@ -3923,6 +3951,7 @@
       "version": "4.25.2",
       "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.25.2.tgz",
       "integrity": "sha512-0si2SJK3ooGzIawRu61ZdPCO1IncZwS8IzuX73sPZsXW6EQ/w/DAfPyKI8l1ETTCr2MnvqWitmlCUxgdul45jA==",
+      "dev": true,
       "funding": [
         {
           "type": "opencollective",
@@ -4061,6 +4090,7 @@
     },
     "node_modules/camelcase-css": {
       "version": "2.0.1",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 6"
@@ -4081,6 +4111,7 @@
       "version": "1.0.30001734",
       "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001734.tgz",
       "integrity": "sha512-uhE1Ye5vgqju6OI71HTQqcBCZrvHugk0MjLak7Q+HfoBgoq5Bi+5YnwjP4fjDgrtYr/l8MVRBvzz9dPD4KyK0A==",
+      "dev": true,
       "funding": [
         {
           "type": "opencollective",
@@ -4128,6 +4159,7 @@
     },
     "node_modules/chalk": {
       "version": "4.1.2",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -4142,6 +4174,7 @@
     },
     "node_modules/chokidar": {
       "version": "3.6.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "anymatch": "~3.1.2",
@@ -4164,6 +4197,7 @@
     },
     "node_modules/chokidar/node_modules/glob-parent": {
       "version": "5.1.2",
+      "dev": true,
       "license": "ISC",
       "dependencies": {
         "is-glob": "^4.0.1"
@@ -4178,6 +4212,7 @@
     },
     "node_modules/color-convert": {
       "version": "2.0.1",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
@@ -4188,6 +4223,7 @@
     },
     "node_modules/color-name": {
       "version": "1.1.4",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/colord": {
@@ -4335,6 +4371,7 @@
     },
     "node_modules/cross-spawn": {
       "version": "7.0.6",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "path-key": "^3.1.0",
@@ -4405,6 +4442,7 @@
     },
     "node_modules/cssesc": {
       "version": "3.0.0",
+      "dev": true,
       "license": "MIT",
       "bin": {
         "cssesc": "bin/cssesc"
@@ -4752,6 +4790,7 @@
     },
     "node_modules/didyoumean": {
       "version": "1.2.2",
+      "dev": true,
       "license": "Apache-2.0"
     },
     "node_modules/dir-glob": {
@@ -4767,6 +4806,7 @@
     },
     "node_modules/dlv": {
       "version": "1.1.3",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/dnd-core": {
@@ -4898,6 +4938,7 @@
     },
     "node_modules/eastasianwidth": {
       "version": "0.2.0",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/easy-peasy": {
@@ -4951,10 +4992,12 @@
     "node_modules/electron-to-chromium": {
       "version": "1.5.200",
       "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.200.tgz",
-      "integrity": "sha512-rFCxROw7aOe4uPTfIAx+rXv9cEcGx+buAF4npnhtTqCJk5KDFRnh3+KYj7rdVh6lsFt5/aPs+Irj9rZ33WMA7w=="
+      "integrity": "sha512-rFCxROw7aOe4uPTfIAx+rXv9cEcGx+buAF4npnhtTqCJk5KDFRnh3+KYj7rdVh6lsFt5/aPs+Irj9rZ33WMA7w==",
+      "dev": true
     },
     "node_modules/emoji-regex": {
       "version": "9.2.2",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/end-of-stream": {
@@ -5169,6 +5212,7 @@
     },
     "node_modules/escalade": {
       "version": "3.2.0",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6"
@@ -5853,6 +5897,7 @@
       "version": "3.3.3",
       "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz",
       "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@nodelib/fs.stat": "^2.0.2",
@@ -5867,6 +5912,7 @@
     },
     "node_modules/fast-glob/node_modules/glob-parent": {
       "version": "5.1.2",
+      "dev": true,
       "license": "ISC",
       "dependencies": {
         "is-glob": "^4.0.1"
@@ -5892,6 +5938,7 @@
     },
     "node_modules/fastq": {
       "version": "1.15.0",
+      "dev": true,
       "license": "ISC",
       "dependencies": {
         "reusify": "^1.0.4"
@@ -5945,6 +5992,7 @@
     },
     "node_modules/fill-range": {
       "version": "7.1.1",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "to-regex-range": "^5.0.1"
@@ -6025,6 +6073,7 @@
     },
     "node_modules/foreground-child": {
       "version": "3.3.0",
+      "dev": true,
       "license": "ISC",
       "dependencies": {
         "cross-spawn": "^7.0.0",
@@ -6123,6 +6172,7 @@
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
       "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
       "optional": true,
@@ -6190,6 +6240,7 @@
     },
     "node_modules/gensync": {
       "version": "1.0.0-beta.2",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
@@ -6279,6 +6330,7 @@
     },
     "node_modules/glob-parent": {
       "version": "6.0.2",
+      "dev": true,
       "license": "ISC",
       "dependencies": {
         "is-glob": "^4.0.3"
@@ -6368,6 +6420,7 @@
     },
     "node_modules/has-flag": {
       "version": "4.0.0",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=8"
@@ -6628,6 +6681,7 @@
     },
     "node_modules/is-binary-path": {
       "version": "2.1.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "binary-extensions": "^2.0.0"
@@ -6691,6 +6745,7 @@
     },
     "node_modules/is-extglob": {
       "version": "2.1.1",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
@@ -6698,6 +6753,7 @@
     },
     "node_modules/is-fullwidth-code-point": {
       "version": "3.0.0",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=8"
@@ -6705,6 +6761,7 @@
     },
     "node_modules/is-glob": {
       "version": "4.0.3",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "is-extglob": "^2.1.1"
@@ -6739,6 +6796,7 @@
     },
     "node_modules/is-number": {
       "version": "7.0.0",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.12.0"
@@ -6911,10 +6969,12 @@
     },
     "node_modules/isexe": {
       "version": "2.0.0",
+      "dev": true,
       "license": "ISC"
     },
     "node_modules/jackspeak": {
       "version": "3.4.3",
+      "dev": true,
       "license": "BlueOak-1.0.0",
       "dependencies": {
         "@isaacs/cliui": "^8.0.2"
@@ -6945,6 +7005,7 @@
     },
     "node_modules/jiti": {
       "version": "1.21.7",
+      "dev": true,
       "license": "MIT",
       "bin": {
         "jiti": "bin/jiti.js"
@@ -7002,6 +7063,7 @@
     },
     "node_modules/json5": {
       "version": "2.2.3",
+      "dev": true,
       "license": "MIT",
       "bin": {
         "json5": "lib/cli.js"
@@ -7186,10 +7248,6 @@
       "version": "4.4.0",
       "license": "MIT"
     },
-    "node_modules/lodash.get": {
-      "version": "4.4.2",
-      "license": "MIT"
-    },
     "node_modules/lodash.groupby": {
       "version": "4.6.0",
       "license": "MIT"
@@ -7252,6 +7310,7 @@
     },
     "node_modules/lru-cache": {
       "version": "5.1.1",
+      "dev": true,
       "license": "ISC",
       "dependencies": {
         "yallist": "^3.0.2"
@@ -7286,6 +7345,7 @@
     },
     "node_modules/merge2": {
       "version": "1.4.1",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 8"
@@ -7293,6 +7353,7 @@
     },
     "node_modules/micromatch": {
       "version": "4.0.8",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "braces": "^3.0.3",
@@ -7342,6 +7403,7 @@
     },
     "node_modules/minipass": {
       "version": "7.1.2",
+      "dev": true,
       "license": "ISC",
       "engines": {
         "node": ">=16 || 14 >=14.17"
@@ -7377,6 +7439,7 @@
     },
     "node_modules/mz": {
       "version": "2.7.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "any-promise": "^1.0.0",
@@ -7395,6 +7458,7 @@
       "version": "3.3.11",
       "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz",
       "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==",
+      "dev": true,
       "funding": [
         {
           "type": "github",
@@ -7416,6 +7480,7 @@
     },
     "node_modules/node-releases": {
       "version": "2.0.19",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/normalize-path": {
@@ -7453,6 +7518,7 @@
     },
     "node_modules/object-hash": {
       "version": "3.0.0",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 6"
@@ -7629,6 +7695,7 @@
     },
     "node_modules/package-json-from-dist": {
       "version": "1.0.1",
+      "dev": true,
       "license": "BlueOak-1.0.0"
     },
     "node_modules/pako": {
@@ -7684,6 +7751,7 @@
     },
     "node_modules/path-key": {
       "version": "3.1.1",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=8"
@@ -7695,6 +7763,7 @@
     },
     "node_modules/path-scurry": {
       "version": "1.11.1",
+      "dev": true,
       "license": "BlueOak-1.0.0",
       "dependencies": {
         "lru-cache": "^10.2.0",
@@ -7709,6 +7778,7 @@
     },
     "node_modules/path-scurry/node_modules/lru-cache": {
       "version": "10.4.3",
+      "dev": true,
       "license": "ISC"
     },
     "node_modules/path-type": {
@@ -7728,6 +7798,7 @@
     },
     "node_modules/picomatch": {
       "version": "2.3.1",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=8.6"
@@ -7738,6 +7809,7 @@
     },
     "node_modules/pify": {
       "version": "2.3.0",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
@@ -7745,6 +7817,7 @@
     },
     "node_modules/pirates": {
       "version": "4.0.6",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 6"
@@ -7764,6 +7837,7 @@
       "version": "8.5.6",
       "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz",
       "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==",
+      "dev": true,
       "funding": [
         {
           "type": "opencollective",
@@ -7909,6 +7983,7 @@
     },
     "node_modules/postcss-import": {
       "version": "15.1.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "postcss-value-parser": "^4.0.0",
@@ -7924,6 +7999,7 @@
     },
     "node_modules/postcss-js": {
       "version": "4.0.1",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "camelcase-css": "^2.0.1"
@@ -8073,6 +8149,7 @@
     },
     "node_modules/postcss-nested": {
       "version": "6.2.0",
+      "dev": true,
       "funding": [
         {
           "type": "opencollective",
@@ -8096,6 +8173,7 @@
     },
     "node_modules/postcss-nested/node_modules/postcss-selector-parser": {
       "version": "6.1.2",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "cssesc": "^3.0.0",
@@ -8358,6 +8436,7 @@
     },
     "node_modules/postcss-value-parser": {
       "version": "4.2.0",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/preact": {
@@ -8448,6 +8527,7 @@
     },
     "node_modules/queue-microtask": {
       "version": "1.2.3",
+      "dev": true,
       "funding": [
         {
           "type": "github",
@@ -8766,6 +8846,7 @@
     },
     "node_modules/read-cache": {
       "version": "1.0.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "pify": "^2.3.0"
@@ -8814,6 +8895,7 @@
     },
     "node_modules/readdirp": {
       "version": "3.6.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "picomatch": "^2.2.1"
@@ -8965,6 +9047,7 @@
     },
     "node_modules/reusify": {
       "version": "1.0.4",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "iojs": ">=1.0.0",
@@ -9019,6 +9102,7 @@
     },
     "node_modules/run-parallel": {
       "version": "1.2.0",
+      "dev": true,
       "funding": [
         {
           "type": "github",
@@ -9129,6 +9213,7 @@
     },
     "node_modules/shebang-command": {
       "version": "2.0.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "shebang-regex": "^3.0.0"
@@ -9139,6 +9224,7 @@
     },
     "node_modules/shebang-regex": {
       "version": "3.0.0",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=8"
@@ -9184,6 +9270,7 @@
     },
     "node_modules/signal-exit": {
       "version": "4.1.0",
+      "dev": true,
       "license": "ISC",
       "engines": {
         "node": ">=14"
@@ -9214,6 +9301,7 @@
     },
     "node_modules/source-map-js": {
       "version": "1.2.1",
+      "dev": true,
       "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
@@ -9274,6 +9362,7 @@
     },
     "node_modules/string-width": {
       "version": "4.2.3",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "emoji-regex": "^8.0.0",
@@ -9287,6 +9376,7 @@
     "node_modules/string-width-cjs": {
       "name": "string-width",
       "version": "4.2.3",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "emoji-regex": "^8.0.0",
@@ -9299,10 +9389,12 @@
     },
     "node_modules/string-width-cjs/node_modules/emoji-regex": {
       "version": "8.0.0",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/string-width/node_modules/emoji-regex": {
       "version": "8.0.0",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/string.prototype.matchall": {
@@ -9380,6 +9472,7 @@
     },
     "node_modules/strip-ansi": {
       "version": "6.0.1",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "ansi-regex": "^5.0.1"
@@ -9391,6 +9484,7 @@
     "node_modules/strip-ansi-cjs": {
       "name": "strip-ansi",
       "version": "6.0.1",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "ansi-regex": "^5.0.1"
@@ -9463,6 +9557,7 @@
     },
     "node_modules/sucrase": {
       "version": "3.35.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@jridgewell/gen-mapping": "^0.3.2",
@@ -9483,6 +9578,7 @@
     },
     "node_modules/sucrase/node_modules/brace-expansion": {
       "version": "2.0.2",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0"
@@ -9490,6 +9586,7 @@
     },
     "node_modules/sucrase/node_modules/commander": {
       "version": "4.1.1",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 6"
@@ -9497,6 +9594,7 @@
     },
     "node_modules/sucrase/node_modules/glob": {
       "version": "10.4.5",
+      "dev": true,
       "license": "ISC",
       "dependencies": {
         "foreground-child": "^3.1.0",
@@ -9515,6 +9613,7 @@
     },
     "node_modules/sucrase/node_modules/minimatch": {
       "version": "9.0.5",
+      "dev": true,
       "license": "ISC",
       "dependencies": {
         "brace-expansion": "^2.0.1"
@@ -9528,6 +9627,7 @@
     },
     "node_modules/supports-color": {
       "version": "7.2.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
@@ -9601,6 +9701,7 @@
     },
     "node_modules/tailwindcss": {
       "version": "3.4.17",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@alloc/quick-lru": "^5.2.0",
@@ -9636,6 +9737,7 @@
     },
     "node_modules/tailwindcss/node_modules/lilconfig": {
       "version": "3.1.3",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=14"
@@ -9646,6 +9748,7 @@
     },
     "node_modules/tailwindcss/node_modules/postcss-load-config": {
       "version": "4.0.2",
+      "dev": true,
       "funding": [
         {
           "type": "opencollective",
@@ -9679,6 +9782,7 @@
     },
     "node_modules/tailwindcss/node_modules/postcss-selector-parser": {
       "version": "6.1.2",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "cssesc": "^3.0.0",
@@ -9795,6 +9899,7 @@
     },
     "node_modules/thenify": {
       "version": "3.3.1",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "any-promise": "^1.0.0"
@@ -9802,6 +9907,7 @@
     },
     "node_modules/thenify-all": {
       "version": "1.6.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "thenify": ">= 3.1.0 < 4"
@@ -9885,6 +9991,7 @@
     },
     "node_modules/to-regex-range": {
       "version": "5.0.1",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "is-number": "^7.0.0"
@@ -9929,6 +10036,7 @@
     },
     "node_modules/ts-interface-checker": {
       "version": "0.1.13",
+      "dev": true,
       "license": "Apache-2.0"
     },
     "node_modules/ts-toolbelt": {
@@ -9970,35 +10078,6 @@
         "domino": "^2.1.6"
       }
     },
-    "node_modules/twin.macro": {
-      "version": "3.4.1",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/template": "^7.22.15",
-        "babel-plugin-macros": "^3.1.0",
-        "chalk": "4.1.2",
-        "lodash.get": "^4.4.2",
-        "lodash.merge": "^4.6.2",
-        "postcss-selector-parser": "^6.0.13"
-      },
-      "engines": {
-        "node": ">=16.14.0"
-      },
-      "peerDependencies": {
-        "tailwindcss": ">=3.3.1"
-      }
-    },
-    "node_modules/twin.macro/node_modules/postcss-selector-parser": {
-      "version": "6.1.2",
-      "license": "MIT",
-      "dependencies": {
-        "cssesc": "^3.0.0",
-        "util-deprecate": "^1.0.2"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/type-check": {
       "version": "0.4.0",
       "dev": true,
@@ -10158,6 +10237,7 @@
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz",
       "integrity": "sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==",
+      "dev": true,
       "funding": [
         {
           "type": "opencollective",
@@ -10374,6 +10454,7 @@
     },
     "node_modules/which": {
       "version": "2.0.2",
+      "dev": true,
       "license": "ISC",
       "dependencies": {
         "isexe": "^2.0.0"
@@ -10762,6 +10843,7 @@
     "node_modules/wrap-ansi-cjs": {
       "name": "wrap-ansi",
       "version": "7.0.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.0.0",
@@ -10785,12 +10867,14 @@
     },
     "node_modules/yallist": {
       "version": "3.1.1",
+      "dev": true,
       "license": "ISC"
     },
     "node_modules/yaml": {
       "version": "2.8.1",
       "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.1.tgz",
       "integrity": "sha512-lcYcMxX2PO9XMGvAJkJ3OsNMw+/7FKes7/hgerGUYWIoWu5j/+YQqcZr5JnPZWzOsEBgMbSbiSTn/dv/69Mkpw==",
+      "dev": true,
       "license": "ISC",
       "bin": {
         "yaml": "bin.mjs"
diff --git a/ui/package.json b/ui/package.json
index 8ad314ec..f969ede8 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -15,7 +15,7 @@
     "format": "npm run prettier:fix && npm run lint:fix"
   },
   "dependencies": {
-    "@babel/core": "^7.24.0",
+    "@babel/generator": "^7.28.3",
     "@babel/parser": "^7.28.0",
     "@babel/standalone": "^7.28.0",
     "@babel/traverse": "^7.28.0",
@@ -59,7 +59,6 @@
     "react-router-dom": "^6.14.1",
     "react-select": "^5.9.0",
     "redux-state-sync": "^3.1.4",
-    "twin.macro": "^3.4.1",
     "yup": "^1.6.1"
   },
   "devDependencies": {
diff --git a/ui/src/components/reports/ReportViewer.tsx b/ui/src/components/reports/ReportViewer.tsx
index e5cc103d..c278e7b5 100644
--- a/ui/src/components/reports/ReportViewer.tsx
+++ b/ui/src/components/reports/ReportViewer.tsx
@@ -274,7 +274,7 @@ export const ReportViewer: React.FC = () => {
               <div className="w-px h-6 bg-gray-300 mx-2"></div>
               <Button
                 onClick={handleDownloadPdf}
-                className="bg-gray-600 hover:bg-gray-700 font-medium px-2 sm:px-3 py-1.5 rounded text-xs flex items-center gap-1"
+                className="bg-white-600 hover:bg-white-700 font-medium px-2 sm:px-3 py-1.5 rounded text-xs flex items-center gap-1"
               >
                 <Download className="h-4 w-4 mr-2" />
                 PDF İndir
diff --git a/ui/src/components/ui/Dialog/Dialog.tsx b/ui/src/components/ui/Dialog/Dialog.tsx
index 340cdf34..e76959d4 100644
--- a/ui/src/components/ui/Dialog/Dialog.tsx
+++ b/ui/src/components/ui/Dialog/Dialog.tsx
@@ -2,7 +2,7 @@ import Modal from 'react-modal'
 import classNames from 'classnames'
 import CloseButton from '../CloseButton'
 import { motion } from 'framer-motion'
-import { theme } from 'twin.macro'
+import { SCREENS } from '@/utils/tailwind'
 import useWindowSize from '../hooks/useWindowSize'
 import type ReactModal from 'react-modal'
 import type { MouseEvent } from 'react'
@@ -56,7 +56,7 @@ const Dialog = (props: DialogProps) => {
 
     if (
       typeof currentSize.width !== 'undefined' &&
-      currentSize.width <= parseInt(theme`screens.sm`.split(/ /)[0].replace(/[^\d]/g, ''))
+      currentSize.width <= SCREENS.sm
     ) {
       contentStyle.content.width = 'auto'
     }
diff --git a/ui/src/components/ui/Select/Select.tsx b/ui/src/components/ui/Select/Select.tsx
index 9fa06849..da2dac92 100644
--- a/ui/src/components/ui/Select/Select.tsx
+++ b/ui/src/components/ui/Select/Select.tsx
@@ -3,7 +3,7 @@ import classNames from 'classnames'
 import ReactSelect from 'react-select'
 import CreatableSelect from 'react-select/creatable'
 import AsyncSelect from 'react-select/async'
-import tw, { theme } from 'twin.macro'
+import { TW_COLORS, BORDER_RADIUS, SPACING } from '@/utils/tailwind'
 import isEmpty from 'lodash/isEmpty'
 import get from 'lodash/get'
 import { useConfig } from '../ConfigProvider'
@@ -139,8 +139,7 @@ function _Select<
 
     const selectSize = size || inputGroupSize || formControlSize || controlSize
 
-    const twColor: Record<string, string> = theme`colors`
-    const twHeight = theme`height`
+    const twColor = TW_COLORS as any
 
     let isInvalid = false
 
@@ -176,16 +175,19 @@ function _Select<
             classNamePrefix={'select'}
             styles={{
                 control: (provided, state) => {
+                    // Tailwind spacing karşılığı: CONTROL_SIZES -> '10' gibi anahtarlar dönüyorsa SPACING ile eşleşir
+                    const sizeKey = String(CONTROL_SIZES[selectSize]) as keyof typeof SPACING
+                    const ctlHeight = (SPACING as any)[sizeKey] as string | undefined
+
                     return {
                         ...provided,
-                        height: twHeight[CONTROL_SIZES[selectSize]],
-                        minHeight: twHeight[CONTROL_SIZES[selectSize]],
+                        ...(ctlHeight ? { height: ctlHeight, minHeight: ctlHeight } : {}),
                         '&:hover': {
                             boxShadow: getBoxShadow(state),
                             cursor: 'pointer',
                         },
                         boxShadow: getBoxShadow(state),
-                        borderRadius: tw`rounded-md`.borderRadius,
+                        borderRadius: BORDER_RADIUS.md,
                         ...(isInvalid
                             ? { borderColor: twColor.red['500'] }
                             : {}),
@@ -210,7 +212,7 @@ function _Select<
                     ...theme.colors,
                     neutral0: mode === 'dark'
                         ? twColor.gray['800']
-                        : twColor.white,
+                        : (TW_COLORS as any).white,
                     neutral20:
                         mode === 'dark'
                             ? twColor.gray['600']
diff --git a/ui/src/constants/chart.constant.ts b/ui/src/constants/chart.constant.ts
index 938b1cbb..512e7ddb 100644
--- a/ui/src/constants/chart.constant.ts
+++ b/ui/src/constants/chart.constant.ts
@@ -1,22 +1,21 @@
-import { theme } from 'twin.macro'
+import { TW_COLORS } from '@/utils/tailwind'
+const C = TW_COLORS as any
 
-const twColor: Record<string, string> = theme`colors`
+export const COLOR_1 = C.indigo[600]
+export const COLOR_2 = C.blue[500]
+export const COLOR_3 = C.emerald[500]
+export const COLOR_4 = C.amber[500]
+export const COLOR_5 = C.red[500]
+export const COLOR_6 = C.purple[500]
+export const COLOR_7 = C.cyan[500]
 
-export const COLOR_1 = twColor.indigo['600']
-export const COLOR_2 = twColor.blue['500']
-export const COLOR_3 = twColor.emerald['500']
-export const COLOR_4 = twColor.amber['500']
-export const COLOR_5 = twColor.red['500']
-export const COLOR_6 = twColor.purple['500']
-export const COLOR_7 = twColor.cyan['500']
-
-export const COLOR_1_LIGHT = twColor.indigo['100']
-export const COLOR_2_LIGHT = twColor.blue['100']
-export const COLOR_3_LIGHT = twColor.emerald['100']
-export const COLOR_4_LIGHT = twColor.amber['100']
-export const COLOR_5_LIGHT = twColor.red['100']
-export const COLOR_6_LIGHT = twColor.purple['100']
-export const COLOR_7_LIGHT = twColor.cyan['100']
+export const COLOR_1_LIGHT = C.indigo[100]
+export const COLOR_2_LIGHT = C.blue[100]
+export const COLOR_3_LIGHT = C.emerald[100]
+export const COLOR_4_LIGHT = C.amber[100]
+export const COLOR_5_LIGHT = C.red[100]
+export const COLOR_6_LIGHT = C.purple[100]
+export const COLOR_7_LIGHT = C.cyan[100]
 
 export const COLORS = [
     COLOR_1,
diff --git a/ui/src/utils/hooks/useResponsive.ts b/ui/src/utils/hooks/useResponsive.ts
index 4faece4c..7624cb8a 100644
--- a/ui/src/utils/hooks/useResponsive.ts
+++ b/ui/src/utils/hooks/useResponsive.ts
@@ -1,26 +1,13 @@
 import { useEffect, useState } from 'react'
-import { theme } from 'twin.macro'
-
-const twBreakpoint = theme<{
-  xs: string
-  sm: string
-  md: string
-  lg: string
-  xl: string
-  '2xl': string
-}>`screens`
-
-const breakpointInt = (str = '') => {
-  return parseInt(str.replace('px', ''))
-}
+import { SCREENS } from '@/utils/tailwind'
 
 const breakpoint = {
-  '2xl': breakpointInt(twBreakpoint['2xl']), // 1536
-  xl: breakpointInt(twBreakpoint.xl), // 1280
-  lg: breakpointInt(twBreakpoint.lg), // 1024
-  md: breakpointInt(twBreakpoint.md), // 768
-  sm: breakpointInt(twBreakpoint.sm), // 640
-  xs: breakpointInt(twBreakpoint.xs), // 576
+  '2xl': SCREENS['2xl'], // 1536
+  xl: SCREENS.xl, // 1280
+  lg: SCREENS.lg, // 1024
+  md: SCREENS.md, // 768
+  sm: SCREENS.sm, // 640
+  xs: SCREENS.xs, // 576
 }
 
 const useResponsive = () => {
diff --git a/ui/src/utils/tailwind.ts b/ui/src/utils/tailwind.ts
new file mode 100644
index 00000000..d3333589
--- /dev/null
+++ b/ui/src/utils/tailwind.ts
@@ -0,0 +1,71 @@
+// src/utils/tailwind.ts
+import colors from 'tailwindcss/colors'
+
+// Tailwind breakpoints (px)
+export const SCREENS = {
+  xs: 576,
+  sm: 640,
+  md: 768,
+  lg: 1024,
+  xl: 1280,
+  '2xl': 1536,
+} as const
+
+// Border radius (Tailwind ile uyumlu)
+export const BORDER_RADIUS = {
+  none: '0px',
+  sm: '0.125rem',
+  DEFAULT: '0.25rem',
+  md: '0.375rem',
+  lg: '0.5rem',
+  xl: '0.75rem',
+  '2xl': '1rem',
+  '3xl': '1.5rem',
+  full: '9999px',
+} as const
+
+// Sıklıkla gereken spacing/height referansları (opsiyonel)
+export const SPACING = {
+  0: '0px',
+  px: '1px',
+  0.5: '0.125rem',
+  1: '0.25rem',
+  1.5: '0.375rem',
+  2: '0.5rem',
+  2.5: '0.625rem',
+  3: '0.75rem',
+  3.5: '0.875rem',
+  4: '1rem',
+  5: '1.25rem',
+  6: '1.5rem',
+  8: '2rem',
+  10: '2.5rem',
+  12: '3rem',
+  16: '4rem',
+  20: '5rem',
+  24: '6rem',
+  32: '8rem',
+  40: '10rem',
+  48: '12rem',
+  56: '14rem',
+  64: '16rem',
+} as const
+
+// Tailwind renk paleti + senin custom 'kurs' renklerin
+export const TW_COLORS = {
+  ...colors,
+  kurs: {
+    main: '#FF99C8',
+    secondary: '#FCF6BD',
+    active: '#D0F4DE',
+    x: '#A9DEF9',
+    y: '#E4C1F9',
+  },
+} as const
+
+// İsteğe bağlı: "indigo-500" gibi stringten renk alan küçük yardımcı
+export function pickColor(name: string, shade: number) {
+  const key = name as keyof typeof TW_COLORS
+  const palette = TW_COLORS[key] as any
+  return palette?.[shade]
+}
diff --git a/ui/vite.config.ts b/ui/vite.config.ts
index 9ad38ca3..ffa0ced1 100644
--- a/ui/vite.config.ts
+++ b/ui/vite.config.ts
@@ -14,15 +14,11 @@ export default defineConfig(async ({ mode }) => {
   const tenantHosts: string[] = []
 
   const allowedHosts = Array.from(new Set(['localhost', ...baseDomains, ...tenantHosts]))
-  console.log('[vite] allowedHosts:', allowedHosts)
+  console.log('> [vite] allowedHosts:', allowedHosts)
 
   return {
     plugins: [
-      react({
-        babel: {
-          plugins: ['babel-plugin-macros'],
-        },
-      }),
+      react(),
       VitePWA({
         // Deploy'dan sonra otomatik güncelle
         registerType: 'autoUpdate',