diff --git a/app.vue b/app.vue
index 0553092..a17849c 100644
--- a/app.vue
+++ b/app.vue
@@ -40,8 +40,6 @@ NuxtLayout
 </template>
 
 <style lang="postcss">
-@import url(~/assets/index.postcss);
-
 main a {
   @apply underline
 }
@@ -58,4 +56,94 @@ body {
 .dark body {
   @apply bg-dark-300 transition duration-1000 text-light-200;
 }
+
+.page {
+  transition: all ease-in-out 0.12s;
+}
+
+.page-enter-active,
+.page-leave-active {
+  transition: all ease-in-out 0.12s;
+}
+
+.page-leave-to {
+  opacity: 0.4;
+  filter: blur(0.1rem);
+  transform: translate(-4px, 0px);
+}
+
+.page-enter-from {
+  opacity: 0.4;
+  filter: blur(0.1rem);
+  transform: translate(4px, 0);
+}
+
+.fade-enter-active,
+.fade-leave-active {
+  transition: opacity 1s ease;
+}
+
+.fade-enter-from,
+.fade-leave-to {
+  opacity: 0;
+}
+
+form input {
+  @apply p-2 text-lg rounded bg-light-200 dark-bg-dark-100;
+  flex: 1 1 200px;
+}
+
+form button,
+form button[type="submit"] {
+  @apply p-4 rounded-xl bg-purple-500 shadow-xl text-xl;
+}
+
+form label {
+  @apply p-2 text-lg flex-1 text-right;
+}
+
+pre {
+  @apply p-4 max-w-full;
+}
+
+html {
+  @apply overscroll-y-none;
+  font-family: var(--font-family-base);
+}
+
+.glass {
+  @apply transition bg-light-500/90 dark-bg-dark-500/90 rounded-lg shadow-lg hover-shadow-xl filter backdrop-blur hover-backdrop-blur-xl;
+}
+
+/* Fonts */
+
+:root {
+  --font-family-base: "Commissioner", -apple-system, BlinkMacSystemFont,
+    "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Fira Sans", "Droid Sans",
+    "Helvetica Neue", sans-serif;
+  --font-family-mono: "Fira Code", source-code-pro, Menlo, Monaco, Consolas,
+    "Courier New", monospace;
+}
+
+@font-face {
+  font-family: "Commissioner";
+  font-style: normal;
+  font-weight: 400;
+  src: local(""),
+    url("/fonts/commissioner-v3-latin_cyrillic-ext_cyrillic-regular.woff2") format("woff2"),
+    /* Chrome 26+, Opera 23+, Firefox 39+ */
+    url("/fonts/commissioner-v3-latin_cyrillic-ext_cyrillic-regular.woff") format("woff");
+  /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
+
+@font-face {
+  font-family: "Commissioner";
+  font-style: normal;
+  font-weight: 700;
+  src: local(""),
+    url("/fonts/commissioner-v3-latin_cyrillic-ext_cyrillic-700.woff2") format("woff2"),
+    /* Chrome 26+, Opera 23+, Firefox 39+ */
+    url("/fonts/commissioner-v3-latin_cyrillic-ext_cyrillic-700.woff") format("woff");
+  /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
 </style>
\ No newline at end of file
diff --git a/assets/index.postcss b/assets/index.postcss
deleted file mode 100644
index 8ab2cb5..0000000
--- a/assets/index.postcss
+++ /dev/null
@@ -1,93 +0,0 @@
-.page {
-	transition: all ease-in-out 0.12s;
-}
-
-.page-enter-active,
-.page-leave-active {
-	transition: all ease-in-out 0.12s;
-}
-
-.page-leave-to {
-	opacity: 0.4;
-	filter: blur(0.1rem);
-	transform: translate(-4px, 0px);
-}
-
-.page-enter-from {
-	opacity: 0.4;
-	filter: blur(0.1rem);
-	transform: translate(4px, 0);
-}
-
-.fade-enter-active,
-.fade-leave-active {
-	transition: opacity 1s ease;
-}
-
-.fade-enter-from,
-.fade-leave-to {
-	opacity: 0;
-}
-
-form input {
-	@apply p-2 text-lg rounded bg-light-200  dark-bg-dark-100;
-	flex: 1 1 200px;
-}
-
-form button,
-form button[type="submit"] {
-	@apply p-4 rounded-xl bg-purple-500 shadow-xl text-xl;
-}
-
-form label {
-	@apply p-2 text-lg flex-1 text-right;
-}
-
-pre {
-	@apply p-4 max-w-full;
-}
-
-html {
-	@apply overscroll-y-none;
-	font-family: var(--font-family-base);
-}
-
-.glass {
-	@apply transition  bg-light-500/90 dark-bg-dark-500/90 rounded-lg shadow-lg hover-shadow-xl filter backdrop-blur hover-backdrop-blur-xl;
-}
-
-/* Fonts */
-
-:root {
-	--font-family-base: "Commissioner", -apple-system, BlinkMacSystemFont,
-		"Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Fira Sans", "Droid Sans",
-		"Helvetica Neue", sans-serif;
-	--font-family-mono: "Fira Code", source-code-pro, Menlo, Monaco, Consolas,
-		"Courier New", monospace;
-}
-
-@font-face {
-	font-family: "Commissioner";
-	font-style: normal;
-	font-weight: 400;
-	src: local(""),
-		url("/fonts/commissioner-v3-latin_cyrillic-ext_cyrillic-regular.woff2")
-			format("woff2"),
-		/* Chrome 26+, Opera 23+, Firefox 39+ */
-			url("/fonts/commissioner-v3-latin_cyrillic-ext_cyrillic-regular.woff")
-			format("woff");
-	/* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
-
-@font-face {
-	font-family: "Commissioner";
-	font-style: normal;
-	font-weight: 700;
-	src: local(""),
-		url("/fonts/commissioner-v3-latin_cyrillic-ext_cyrillic-700.woff2")
-			format("woff2"),
-		/* Chrome 26+, Opera 23+, Firefox 39+ */
-			url("/fonts/commissioner-v3-latin_cyrillic-ext_cyrillic-700.woff")
-			format("woff");
-	/* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
diff --git a/assets/logo.svg b/assets/logo.svg
deleted file mode 100644
index 835320c..0000000
--- a/assets/logo.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 62.35 62.55"><defs><style>.cls-1{fill:#333132;}.cls-2{fill:#f1f2f2;}.cls-3{fill:#ef372f;}.cls-4{fill:#e21a58;}.cls-5{fill:#eb0d8c;}.cls-6{fill:#922a8e;}.cls-7{fill:#2e3690;}.cls-8{fill:#0d73bb;}.cls-9{fill:#2bace2;}.cls-10{fill:#00a99d;}.cls-11{fill:#06a64f;}.cls-12{fill:#88c541;}.cls-13{fill:#fcee23;}.cls-14{fill:#f89521;}</style></defs><g id="Layer_3" data-name="Layer 3"><path class="cls-1" d="M48.42,13.62A6.12,6.12,0,0,0,37.82,7.5a6.52,6.52,0,0,0-.43.93h0v.06a7.61,7.61,0,0,0-.28,1L33.3,23.84a2,2,0,0,0,3.37,1.95l11-11.11A7,7,0,0,0,48.42,13.62Z"/><path class="cls-2" d="M55,24.59A6.12,6.12,0,0,0,48.85,14a5.51,5.51,0,0,0-.84.59h0l0,0a6.06,6.06,0,0,0-.76.76L36.77,25.88a2,2,0,0,0,1.94,3.37l15.06-4.13A6.36,6.36,0,0,0,55,24.59Z"/><path class="cls-2" d="M55.16,37.36a6.12,6.12,0,1,0,0-12.24,6.79,6.79,0,0,0-1,.09h0a5.89,5.89,0,0,0-1,.28l-14.3,3.88a2,2,0,0,0,0,3.89l15.11,3.95A6.09,6.09,0,0,0,55.16,37.36Z"/><path class="cls-1" d="M48.94,48.51a6.11,6.11,0,0,0,6.11-10.59,5.88,5.88,0,0,0-.92-.43h-.05a5.73,5.73,0,0,0-1-.28L38.71,33.4a2,2,0,0,0-1.94,3.37l11.11,11A5.87,5.87,0,0,0,48.94,48.51Z"/><path class="cls-2" d="M38,55.06A6.12,6.12,0,0,0,48.57,49a7.4,7.4,0,0,0-.59-.84h0l0,0a5.46,5.46,0,0,0-.76-.76L36.67,36.86a2,2,0,0,0-3.37,2l4.14,15.06A6,6,0,0,0,38,55.06Z"/><path class="cls-1" d="M25.2,55.25a6.12,6.12,0,1,0,12.23,0,5.66,5.66,0,0,0-.09-1h0l0-.06a5.23,5.23,0,0,0-.28-1L33.18,38.84a2,2,0,0,0-3.9,0L25.34,54A5.63,5.63,0,0,0,25.2,55.25Z"/><path class="cls-2" d="M14,49a6.12,6.12,0,0,0,10.6,6.12,7,7,0,0,0,.43-.92h0l0-.06a6.25,6.25,0,0,0,.27-1l3.8-14.33a2,2,0,0,0-3.38-2L14.81,48A6.24,6.24,0,0,0,14,49Z"/><path class="cls-2" d="M7.49,38.07a6.12,6.12,0,1,0,7,10h0l0,0a5.38,5.38,0,0,0,.75-.76L25.69,36.77a2,2,0,0,0-1.94-3.37L8.69,37.54A5.78,5.78,0,0,0,7.49,38.07Z"/><path class="cls-1" d="M7.3,25.29a6.12,6.12,0,0,0,0,12.24,5.69,5.69,0,0,0,1-.09h0l0,0a5.89,5.89,0,0,0,1-.28l14.3-3.88a2,2,0,0,0,0-3.89L8.6,25.43A6.16,6.16,0,0,0,7.3,25.29Z"/><path class="cls-2" d="M13.52,14.14A6.12,6.12,0,1,0,7.4,24.74a7.07,7.07,0,0,0,.93.43h0l.05,0a6.36,6.36,0,0,0,1,.27l14.33,3.79a2,2,0,0,0,1.94-3.37l-11.11-11A5.87,5.87,0,0,0,13.52,14.14Z"/><path class="cls-1" d="M24.49,7.59a6.12,6.12,0,1,0-10.6,6.12,5.42,5.42,0,0,0,.59.83h0l0,0a6.82,6.82,0,0,0,.76.76L25.78,25.79a2,2,0,0,0,3.38-1.95L25,8.78A6.57,6.57,0,0,0,24.49,7.59Z"/><path class="cls-2" d="M37.26,7.4A6.12,6.12,0,1,0,25,7.4a6.65,6.65,0,0,0,.09,1h0v.05a7.24,7.24,0,0,0,.28,1l3.88,14.3a2,2,0,0,0,3.9,0L37.12,8.7A6.16,6.16,0,0,0,37.26,7.4Z"/><path class="cls-3" d="M26.38,8.7c-1.71-6.41,8-9,9.69-2.6S28.1,15.11,26.38,8.7Z"/><path class="cls-4" d="M15.72,14.15C11,9.46,18.12,2.37,22.81,7.06S20.42,18.86,15.72,14.15Z"/><path class="cls-5" d="M9.21,24.21c-6.4-1.72-3.82-11.41,2.6-9.69S15.62,25.93,9.21,24.21Z"/><path class="cls-6" d="M8.6,36.17c-6.4,1.72-9-8-2.6-9.68S15,34.45,8.6,36.17Z"/><path class="cls-7" d="M14.05,46.84C9.37,51.53,2.27,44.44,7,39.75S18.75,42.14,14.05,46.84Z"/><path class="cls-8" d="M24.11,53.35c-1.71,6.4-11.4,3.81-9.69-2.6S25.83,46.93,24.11,53.35Z"/><path class="cls-9" d="M36.08,54c1.71,6.4-8,9-9.69,2.59S34.36,47.54,36.08,54Z"/><path class="cls-10" d="M46.74,48.5c4.69,4.69-2.4,11.79-7.09,7.09S42,43.81,46.74,48.5Z"/><path class="cls-11" d="M53.25,38.45c6.41,1.71,3.82,11.4-2.6,9.68S46.84,36.73,53.25,38.45Z"/><path class="cls-12" d="M53.86,26.48c6.4-1.71,9,8,2.59,9.69S47.45,28.2,53.86,26.48Z"/><path class="cls-13" d="M48.4,15.82c4.69-4.69,11.79,2.39,7.1,7.09S43.7,20.52,48.4,15.82Z"/><path class="cls-14" d="M38.35,9.31C40.06,2.9,49.75,5.49,48,11.9S36.63,15.72,38.35,9.31Z"/></g></svg>
\ No newline at end of file
diff --git a/auth/components/AuthSignup.vue b/auth/components/AuthSignup.vue
index 3efbeb9..136b778 100644
--- a/auth/components/AuthSignup.vue
+++ b/auth/components/AuthSignup.vue
@@ -26,7 +26,6 @@ const onSubmit = async () => {
 <template lang='pug'>
 .glass.p-4.flex.flex-col.gap-4
   slot  
-    .text-2xl.p-2 Sign Up
   form.p-4.flex.flex-col.gap-4(
     @submit.prevent.stop="onSubmit()")
     .flex.gap-4
@@ -34,6 +33,11 @@ const onSubmit = async () => {
       input#first_name(
         type="text"
         v-model="u.first_name")
+    .flex.gap-4
+      label(for="last_name") Last name
+      input#last_name(
+        type="text"
+        v-model="u.last_name")
     .flex.gap-4
       label(for="email") Email
       input#email(
diff --git a/auth/pages/auth/login.vue b/auth/pages/auth/login.vue
index 756769a..1d288db 100644
--- a/auth/pages/auth/login.vue
+++ b/auth/pages/auth/login.vue
@@ -1,5 +1,4 @@
 <script setup>
-import PricePanel from '~/components/PricePanel.vue';
 const email = ref('')
 </script>
 
diff --git a/components/ApplicationForm.vue b/membership/components/ApplicationForm.vue
similarity index 100%
rename from components/ApplicationForm.vue
rename to membership/components/ApplicationForm.vue
diff --git a/components/PricePanel.vue b/membership/components/PricePanel.vue
similarity index 96%
rename from components/PricePanel.vue
rename to membership/components/PricePanel.vue
index 1ed5263..7f74d3c 100644
--- a/components/PricePanel.vue
+++ b/membership/components/PricePanel.vue
@@ -24,6 +24,7 @@ const sending = ref(false)
 const error = ref('')
 
 async function subscribe() {
+  if (!user?.value?.email) return
 
   sending.value = true
 
@@ -54,7 +55,10 @@ async function subscribe() {
 
   slot
 
-  .flex.flex-col.gap-6(style="flex: 2 1 400px")
+  .flex.flex-col.gap-6(
+    style="flex: 2 1 400px"
+
+    )
     .text-xl Choose your plan
     .flex.flex-wrap.gap-4
       .shadow.p-4.border-2.flex.flex-wrap.gap-2.rounded-xl.cursor-pointer.relative(
diff --git a/components/WaitList.vue b/membership/components/WaitList.vue
similarity index 100%
rename from components/WaitList.vue
rename to membership/components/WaitList.vue
diff --git a/membership/nuxt.config.js b/membership/nuxt.config.js
new file mode 100644
index 0000000..a5fdfff
--- /dev/null
+++ b/membership/nuxt.config.js
@@ -0,0 +1 @@
+export default defineNuxtConfig({})
\ No newline at end of file
diff --git a/pages/membership/cancel.vue b/membership/pages/membership/cancel.vue
similarity index 100%
rename from pages/membership/cancel.vue
rename to membership/pages/membership/cancel.vue
diff --git a/pages/membership/index.vue b/membership/pages/membership/index.vue
similarity index 100%
rename from pages/membership/index.vue
rename to membership/pages/membership/index.vue
diff --git a/pages/membership/subscribe.vue b/membership/pages/membership/subscribe.vue
similarity index 100%
rename from pages/membership/subscribe.vue
rename to membership/pages/membership/subscribe.vue
diff --git a/pages/membership/success.vue b/membership/pages/membership/success.vue
similarity index 100%
rename from pages/membership/success.vue
rename to membership/pages/membership/success.vue
diff --git a/nuxt.config.js b/nuxt.config.js
index 4b2776b..73abe3e 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -1,5 +1,5 @@
 export default defineNuxtConfig({
-  extends: ['./auth'],
+  extends: ['./auth', './theme', './membership'],
   app: {
     pageTransition: { name: 'page', mode: 'out-in' }
   },
diff --git a/components/CourseBlock.vue b/theme/components/CourseBlock.vue
similarity index 100%
rename from components/CourseBlock.vue
rename to theme/components/CourseBlock.vue
diff --git a/components/DarkToggle.vue b/theme/components/DarkToggle.vue
similarity index 100%
rename from components/DarkToggle.vue
rename to theme/components/DarkToggle.vue
diff --git a/components/EventCard.vue b/theme/components/EventCard.vue
similarity index 100%
rename from components/EventCard.vue
rename to theme/components/EventCard.vue
diff --git a/components/EventSchedule.vue b/theme/components/EventSchedule.vue
similarity index 100%
rename from components/EventSchedule.vue
rename to theme/components/EventSchedule.vue
diff --git a/components/NavBar.vue b/theme/components/NavBar.vue
similarity index 100%
rename from components/NavBar.vue
rename to theme/components/NavBar.vue
diff --git a/components/PageCover.vue b/theme/components/PageCover.vue
similarity index 100%
rename from components/PageCover.vue
rename to theme/components/PageCover.vue
diff --git a/components/PageFooter.vue b/theme/components/PageFooter.vue
similarity index 100%
rename from components/PageFooter.vue
rename to theme/components/PageFooter.vue
diff --git a/components/ProgramBlock.vue b/theme/components/ProgramBlock.vue
similarity index 100%
rename from components/ProgramBlock.vue
rename to theme/components/ProgramBlock.vue
diff --git a/components/ProjectCard.vue b/theme/components/ProjectCard.vue
similarity index 100%
rename from components/ProjectCard.vue
rename to theme/components/ProjectCard.vue
diff --git a/components/UserCard.vue b/theme/components/UserCard.vue
similarity index 100%
rename from components/UserCard.vue
rename to theme/components/UserCard.vue
diff --git a/composables/useMeta.js b/theme/composables/useMeta.js
similarity index 100%
rename from composables/useMeta.js
rename to theme/composables/useMeta.js
diff --git a/composables/usePublicDirectus.js b/theme/composables/usePublicDirectus.js
similarity index 100%
rename from composables/usePublicDirectus.js
rename to theme/composables/usePublicDirectus.js
diff --git a/layouts/default.vue b/theme/layouts/default.vue
similarity index 100%
rename from layouts/default.vue
rename to theme/layouts/default.vue
diff --git a/theme/nuxt.config.js b/theme/nuxt.config.js
new file mode 100644
index 0000000..a5fdfff
--- /dev/null
+++ b/theme/nuxt.config.js
@@ -0,0 +1 @@
+export default defineNuxtConfig({})
\ No newline at end of file
diff --git a/public/fonts/commissioner-v3-latin_cyrillic-ext_cyrillic-700.woff b/theme/public/fonts/commissioner-v3-latin_cyrillic-ext_cyrillic-700.woff
similarity index 100%
rename from public/fonts/commissioner-v3-latin_cyrillic-ext_cyrillic-700.woff
rename to theme/public/fonts/commissioner-v3-latin_cyrillic-ext_cyrillic-700.woff
diff --git a/public/fonts/commissioner-v3-latin_cyrillic-ext_cyrillic-700.woff2 b/theme/public/fonts/commissioner-v3-latin_cyrillic-ext_cyrillic-700.woff2
similarity index 100%
rename from public/fonts/commissioner-v3-latin_cyrillic-ext_cyrillic-700.woff2
rename to theme/public/fonts/commissioner-v3-latin_cyrillic-ext_cyrillic-700.woff2
diff --git a/public/fonts/commissioner-v3-latin_cyrillic-ext_cyrillic-regular.woff b/theme/public/fonts/commissioner-v3-latin_cyrillic-ext_cyrillic-regular.woff
similarity index 100%
rename from public/fonts/commissioner-v3-latin_cyrillic-ext_cyrillic-regular.woff
rename to theme/public/fonts/commissioner-v3-latin_cyrillic-ext_cyrillic-regular.woff
diff --git a/public/fonts/commissioner-v3-latin_cyrillic-ext_cyrillic-regular.woff2 b/theme/public/fonts/commissioner-v3-latin_cyrillic-ext_cyrillic-regular.woff2
similarity index 100%
rename from public/fonts/commissioner-v3-latin_cyrillic-ext_cyrillic-regular.woff2
rename to theme/public/fonts/commissioner-v3-latin_cyrillic-ext_cyrillic-regular.woff2
diff --git a/public/front.png b/theme/public/front.png
similarity index 100%
rename from public/front.png
rename to theme/public/front.png
diff --git a/public/line.svg b/theme/public/line.svg
similarity index 100%
rename from public/line.svg
rename to theme/public/line.svg
diff --git a/public/logo.svg b/theme/public/logo.svg
similarity index 100%
rename from public/logo.svg
rename to theme/public/logo.svg