diff --git a/src/index.css b/src/index.css
index 864316a..8dd5ed4 100644
--- a/src/index.css
+++ b/src/index.css
@@ -21,56 +21,23 @@ code {
 }
 
 [data-theme='1'] {
-    --primary: #06c;
-    --primary-content: #fff;
-    --secondary: #f000b8;
-    --secondary-content: #fff;
-    --accent: #37cdbe;
-    --accent-content: #163835;
-    --neutral: #3d4451;
-    --neutral-content: #fff;
-    --base-100: #fff;
-    --base-200: #f2f2f2;
-    --base-300: #e5e6e6;
-    --base-content: #1f2937;
+
+    --background: #FFFFFF;
+    --color: #000000;
 }
 
 [data-theme='2'] {
-    --primary: #661ae6;
-    --primary-content: #fff;
-    --secondary: #d926aa;
-    --secondary-content: #fff;
-    --accent: #1fb2a5;
-    --accent-content: #fff;
-    --neutral: #191d24;
-    --neutral-focus: #111318;
-    --neutral-content: #a6adbb;
-    --base-100: #2a303c;
-    --base-200: #242933;
-    --base-300: #20252e;
-    --base-content: #a6adbb;
+    --color: #000000;
+    --background: #DDEEFF;
 }
 
 [data-theme='3'] {
-    --primary: #ef9995;
-    --primary-content: #282425;
-    --secondary: #a4cbb4;
-    --secondary-content: #282425;
-    --accent: #ebdc99;
-    --accent-content: #282425;
-    --neutral: #7d7259;
-    --neutral-content: #e4d8b4;
-    --base-100: #e4d8b4;
-    --base-200: #d2c59d;
-    --base-300: #c6b386;
-    --base-content: #282425;
-    --info: #2563eb;
-    --success: #16a34a;
-    --warning: #d97706;
-    --error: #dc2626;
+    --color: #FFFFFF;
+    --background: #212A34;
+
 }
 
 html {
-    background-color: var(--base-100);
-    color: var(--base-content);
+    background-color: var(--background);
+    color: var(--color);
 }
diff --git a/src/s2-homeworks/hw07/common/c5-SuperSelect/SuperSelect.module.css b/src/s2-homeworks/hw07/common/c5-SuperSelect/SuperSelect.module.css
index afa0f29..ef8942a 100644
--- a/src/s2-homeworks/hw07/common/c5-SuperSelect/SuperSelect.module.css
+++ b/src/s2-homeworks/hw07/common/c5-SuperSelect/SuperSelect.module.css
@@ -10,7 +10,7 @@
     background-repeat: no-repeat;
     border-radius: 2px;
     border: 1px solid #C2C2C2;
-    color: #000000;
+    color: inherit;
     font-family: 'Montserrat', sans-serif;
     font-weight: 400;
     font-size: 14px;
@@ -20,16 +20,6 @@
     outline: none;
 }
 
-.option {
-    /*padding: 30px;*/
-    color: var(--primary-content);
-    background: var(--primary);
-}
-
-.option:checked {
-    color: var(--secondary-content);
-    background: var(--primary);
-}
 
 .option:hover {
     box-shadow: 0 0 10px 100px #fed20f inset;
diff --git a/src/s2-homeworks/hw12/HW12.tsx b/src/s2-homeworks/hw12/HW12.tsx
index e180f2e..22427c2 100644
--- a/src/s2-homeworks/hw12/HW12.tsx
+++ b/src/s2-homeworks/hw12/HW12.tsx
@@ -7,8 +7,8 @@ import { changeThemeId } from './bll/themeReducer'
 
 const themes = [
     { id: 1, value: 'light' },
-    { id: 2, value: 'dark' },
-    { id: 3, value: 'retro' },
+    { id: 2, value: 'blue' },
+    { id: 3, value: 'dark' },
 ]
 
 const HW12 = () => {
@@ -21,19 +21,18 @@ const HW12 = () => {
     }
 
     return (
-        <div id={'hw12'} className={s2.hw + ' ' + s[theme]}>
-            <div
-                id={'hw12-text'}
-                className={s2.hwTitle + ' ' + s[theme + '-text']}
-            >
-                homeworks 12
+        <div id={'hw12'}>
+            <div id={'hw12-text'} className={s2.hwTitle}>
+                Homework #12
+            </div>
+            <div className={s2.hw}>
+                <SuperSelect
+                    id={'hw12-select-theme'}
+                    value={themeId}
+                    options={themes}
+                    onChangeOption={change}
+                />
             </div>
-            <SuperSelect
-                id={'hw12-select-theme'}
-                value={themeId}
-                options={themes}
-                onChangeOption={change}
-            />
         </div>
     )
 }