diff --git a/src/App.tsx b/src/App.tsx
index 975ddaf..0fc3e5f 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -34,8 +34,6 @@ export default class MainApp extends Vue {
 
     Mousetrap.bind('escape', () => {
       const isFocusPassword = document.querySelector('#password:focus') as HTMLInputElement
-      console.log({ isFocusPassword })
-      console.log('Escape')
 
       if (isFocusPassword) {
         isFocusPassword.blur()
diff --git a/src/assets/images/themes/magic/index.png b/src/assets/images/themes/flow/index.png
similarity index 100%
rename from src/assets/images/themes/magic/index.png
rename to src/assets/images/themes/flow/index.png
diff --git a/src/assets/images/themes/learn/index.png b/src/assets/images/themes/sphere/index.png
similarity index 100%
rename from src/assets/images/themes/learn/index.png
rename to src/assets/images/themes/sphere/index.png
diff --git a/src/assets/images/themes/malevich/bottom-left-pattern.svg b/src/assets/images/themes/suprematism/bottom-left-pattern.svg
similarity index 100%
rename from src/assets/images/themes/malevich/bottom-left-pattern.svg
rename to src/assets/images/themes/suprematism/bottom-left-pattern.svg
diff --git a/src/assets/images/themes/malevich/bottom-left.svg b/src/assets/images/themes/suprematism/bottom-left.svg
similarity index 100%
rename from src/assets/images/themes/malevich/bottom-left.svg
rename to src/assets/images/themes/suprematism/bottom-left.svg
diff --git a/src/assets/images/themes/malevich/bottom-right-triangle.svg b/src/assets/images/themes/suprematism/bottom-right-triangle.svg
similarity index 100%
rename from src/assets/images/themes/malevich/bottom-right-triangle.svg
rename to src/assets/images/themes/suprematism/bottom-right-triangle.svg
diff --git a/src/assets/images/themes/malevich/bottom-right.svg b/src/assets/images/themes/suprematism/bottom-right.svg
similarity index 100%
rename from src/assets/images/themes/malevich/bottom-right.svg
rename to src/assets/images/themes/suprematism/bottom-right.svg
diff --git a/src/assets/images/themes/malevich/index.png b/src/assets/images/themes/suprematism/index.png
similarity index 100%
rename from src/assets/images/themes/malevich/index.png
rename to src/assets/images/themes/suprematism/index.png
diff --git a/src/assets/images/themes/malevich/top-left-multi.svg b/src/assets/images/themes/suprematism/top-left-multi.svg
similarity index 100%
rename from src/assets/images/themes/malevich/top-left-multi.svg
rename to src/assets/images/themes/suprematism/top-left-multi.svg
diff --git a/src/assets/images/themes/malevich/top-left.svg b/src/assets/images/themes/suprematism/top-left.svg
similarity index 100%
rename from src/assets/images/themes/malevich/top-left.svg
rename to src/assets/images/themes/suprematism/top-left.svg
diff --git a/src/assets/images/themes/malevich/top-right-circle.svg b/src/assets/images/themes/suprematism/top-right-circle.svg
similarity index 100%
rename from src/assets/images/themes/malevich/top-right-circle.svg
rename to src/assets/images/themes/suprematism/top-right-circle.svg
diff --git a/src/assets/images/themes/malevich/top-right.svg b/src/assets/images/themes/suprematism/top-right.svg
similarity index 100%
rename from src/assets/images/themes/malevich/top-right.svg
rename to src/assets/images/themes/suprematism/top-right.svg
diff --git a/src/components/base/settings/SettingsCustom.tsx b/src/components/base/settings/SettingsCustom.tsx
index 48e4759..1700554 100644
--- a/src/components/base/settings/SettingsCustom.tsx
+++ b/src/components/base/settings/SettingsCustom.tsx
@@ -35,7 +35,6 @@ export default class SettingsCustom extends Vue {
   @Debounce()
   updateQuery() {
     if (this.syncThemeWithQuery) {
-      // console.log('AppModule.syncStoreWithQuery')
       AppModule.syncStoreWithQuery()
     }
   }
diff --git a/src/components/themes/magic/fragment.glsl b/src/components/themes/flow/fragment.glsl
similarity index 100%
rename from src/components/themes/magic/fragment.glsl
rename to src/components/themes/flow/fragment.glsl
diff --git a/src/components/themes/magic/index.tsx b/src/components/themes/flow/index.tsx
similarity index 97%
rename from src/components/themes/magic/index.tsx
rename to src/components/themes/flow/index.tsx
index b683d38..8c66475 100644
--- a/src/components/themes/magic/index.tsx
+++ b/src/components/themes/flow/index.tsx
@@ -4,7 +4,7 @@ import { AppModule } from '@/store/app'
 let render: GL
 
 @Component
-export default class MagicTheme extends Vue {
+export default class FlowTheme extends Vue {
   get animationSpeed() {
     return AppModule.getThemeInput('animation-speed')?.value as number || 45
   }
diff --git a/src/components/themes/magic/vertex.glsl b/src/components/themes/flow/vertex.glsl
similarity index 100%
rename from src/components/themes/magic/vertex.glsl
rename to src/components/themes/flow/vertex.glsl
diff --git a/src/components/themes/shere/fragment.glsl b/src/components/themes/sphere/fragment.glsl
similarity index 100%
rename from src/components/themes/shere/fragment.glsl
rename to src/components/themes/sphere/fragment.glsl
diff --git a/src/components/themes/shere/index.tsx b/src/components/themes/sphere/index.tsx
similarity index 100%
rename from src/components/themes/shere/index.tsx
rename to src/components/themes/sphere/index.tsx
diff --git a/src/components/themes/shere/vertex.glsl b/src/components/themes/sphere/vertex.glsl
similarity index 100%
rename from src/components/themes/shere/vertex.glsl
rename to src/components/themes/sphere/vertex.glsl
diff --git a/src/components/themes/malevich.tsx b/src/components/themes/suprematism.tsx
similarity index 100%
rename from src/components/themes/malevich.tsx
rename to src/components/themes/suprematism.tsx
diff --git a/src/models/app.ts b/src/models/app.ts
index b0fb342..db61709 100644
--- a/src/models/app.ts
+++ b/src/models/app.ts
@@ -142,8 +142,8 @@ export const defaultTheme: AppTheme = {
 export const AppThemes: AppTheme[] = [
   defaultTheme,
   {
-    name: 'shere',
-    component: 'shere',
+    name: 'Sphere',
+    component: 'sphere',
     color: {
       active: '#04ded4',
       background: 'black'
@@ -164,7 +164,7 @@ export const AppThemes: AppTheme[] = [
     ]
   },
   {
-    name: 'planet',
+    name: 'Planet',
     component: 'planet',
     color: {
       active: '#04ded4',
@@ -190,7 +190,7 @@ export const AppThemes: AppTheme[] = [
     ]
   },
   {
-    name: 'destruction',
+    name: 'Destruction',
     component: 'destruction',
     color: {
       active: '#04ded4',
@@ -229,7 +229,7 @@ export const AppThemes: AppTheme[] = [
     ]
   },
   {
-    name: 'rings',
+    name: 'Rings',
     component: 'rings',
     color: {
       active: '#04ded4',
@@ -269,7 +269,7 @@ export const AppThemes: AppTheme[] = [
     ]
   },
   {
-    name: 'tenderness',
+    name: 'Tenderness',
     component: 'tenderness',
     color: {
       active: '#04ded4',
@@ -296,8 +296,8 @@ export const AppThemes: AppTheme[] = [
     ]
   },
   {
-    name: 'Magic',
-    component: 'magic',
+    name: 'Flow',
+    component: 'flow',
     color: {
       active: '#04ded4',
       background: 'black'
@@ -357,8 +357,8 @@ export const AppThemes: AppTheme[] = [
     }
   },
   {
-    name: 'Malevich',
-    component: 'malevich',
+    name: 'Suprematism',
+    component: 'suprematism',
     settings: [
       {
         name: 'activeColor',
diff --git a/src/style/themes/index.styl b/src/style/themes/index.styl
index b324f71..7e4efe2 100644
--- a/src/style/themes/index.styl
+++ b/src/style/themes/index.styl
@@ -1,6 +1,6 @@
 @import './osmos.styl'
 @import './space.styl'
-@import './malevich.styl'
+@import './suprematism.styl'
 
 canvas
   width 100%
diff --git a/src/style/themes/malevich.styl b/src/style/themes/suprematism.styl
similarity index 74%
rename from src/style/themes/malevich.styl
rename to src/style/themes/suprematism.styl
index 69677db..cc6875e 100644
--- a/src/style/themes/malevich.styl
+++ b/src/style/themes/suprematism.styl
@@ -1,4 +1,4 @@
-.malevich
+.suprematism
   position relative
   width 100%
   height 100%
@@ -32,7 +32,7 @@
   bottom 2%
   width 30vmax
   height 35vmin
-  background url(../assets/images/themes/malevich/bottom-right.svg) center/contain no-repeat
+  background url(../assets/images/themes/suprematism/bottom-right.svg) center/contain no-repeat
 
 .parralax-item-bottom-right-triangle
   right 19%
@@ -41,7 +41,7 @@
   height 6.5vmax
   transform-origin 50% 30%
   animation rotateGear 13s linear infinite
-  background url(../assets/images/themes/malevich/bottom-right-triangle.svg) center/contain no-repeat
+  background url(../assets/images/themes/suprematism/bottom-right-triangle.svg) center/contain no-repeat
 
 .parralax-item-top-left
   top 1%
@@ -55,7 +55,7 @@
     width 7vmax
     height 7vmax
     animation rotatePs 20s linear infinite
-    background url(../assets/images/themes/malevich/top-left-multi.svg) center/contain no-repeat
+    background url(../assets/images/themes/suprematism/top-left-multi.svg) center/contain no-repeat
 
 .parralax-item-top-right
   width 15vmin
@@ -68,7 +68,7 @@
   right 18%
   width 4vmin
   height 4vmin
-  background url(../assets/images/themes/malevich/top-right-circle.svg) center/contain no-repeat
+  background url(../assets/images/themes/suprematism/top-right-circle.svg) center/contain no-repeat
 
 @keyframes rotateGear {
   0%,to {