diff --git a/README.md b/README.md
index 22fcaa3d..c4d57c9b 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ Ultimately I want this project to become the Wordpress or Linux for Education. A
 
 ## Installation of modules
 
-```
+```js
 npm i --legacy-peer-deps --registry=https://registry.npmjs.org
 ```
 
@@ -36,7 +36,7 @@ Note: Make sure you are using Node 18
 
 ## Environment variable
 
-```
+```env
 PUBLIC_SUPABASE_ANON_KEY=
 PUBLIC_SUPABASE_URL=
 NETLIFY_API_KEY=
diff --git a/package.json b/package.json
index 6352af29..a10354e8 100644
--- a/package.json
+++ b/package.json
@@ -44,6 +44,7 @@
     "nodemailer": "^6.9.5",
     "openai-edge": "^1.2.2",
     "pluralize": "^8.0.0",
+    "posthog-js": "^1.87.2",
     "sirv": "^2.0.3",
     "svelte-email": "^0.0.4",
     "unsplash-js": "^7.0.18",
diff --git a/src/lib/components/Hotjar/index.svelte b/src/lib/components/Hotjar/index.svelte
deleted file mode 100644
index d55bdd40..00000000
--- a/src/lib/components/Hotjar/index.svelte
+++ /dev/null
@@ -1,19 +0,0 @@
-<svelte:head>
-  <!-- Hotjar Tracking Code for https://classroomio.com -->
-  <!-- Hotjar Tracking Code for https://classroomio.com -->
-  <script>
-    (function (h, o, t, j, a, r) {
-      h.hj =
-        h.hj ||
-        function () {
-          (h.hj.q = h.hj.q || []).push(arguments);
-        };
-      h._hjSettings = { hjid: 3679523, hjsv: 6 };
-      a = o.getElementsByTagName('head')[0];
-      r = o.createElement('script');
-      r.async = 1;
-      r.src = t + h._hjSettings.hjid + j + h._hjSettings.hjsv;
-      a.appendChild(r);
-    })(window, document, 'https://static.hotjar.com/c/hotjar-', '.js?sv=');
-  </script>
-</svelte:head>
diff --git a/src/lib/utils/store/user.js b/src/lib/utils/store/user.js
deleted file mode 100644
index 82969655..00000000
--- a/src/lib/utils/store/user.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import { writable } from 'svelte/store';
-
-export const user = writable({
-  openAuthModal: false,
-  fetchingUser: false,
-  isLoggedIn: false,
-  currentSession: null,
-  expiresAt: 0
-});
-
-export const profile = writable({
-  id: null,
-  fullname: '',
-  avatar_url: 'https://pbs.twimg.com/profile_images/1416443682157473795/dGtFbtht_normal.jpg',
-  username: 'Elon',
-  user_id: '',
-  email: '',
-  role: '',
-  goal: '',
-  source: '',
-  telegram_chat_id: null
-});
diff --git a/src/lib/utils/store/user.ts b/src/lib/utils/store/user.ts
new file mode 100644
index 00000000..f51a65b5
--- /dev/null
+++ b/src/lib/utils/store/user.ts
@@ -0,0 +1,41 @@
+import { writable } from 'svelte/store';
+import type { User } from '@supabase/supabase-js';
+
+export const user = writable<{
+  openAuthModal: boolean;
+  fetchingUser: boolean;
+  isLoggedIn: boolean;
+  currentSession: User | undefined;
+  expiresAt: number;
+}>({
+  openAuthModal: false,
+  fetchingUser: false,
+  isLoggedIn: false,
+  currentSession: undefined,
+  expiresAt: 0
+});
+
+export const profile = writable<{
+  id: string | number | undefined;
+  fullname: string;
+  avatar_url: string;
+  profile_url?: string;
+  username: string;
+  user_id: string;
+  email: string;
+  role: string;
+  goal: string;
+  source: string;
+  telegram_chat_id: number | null;
+}>({
+  id: undefined,
+  fullname: '',
+  avatar_url: 'https://pbs.twimg.com/profile_images/1416443682157473795/dGtFbtht_normal.jpg',
+  username: 'Elon',
+  user_id: '',
+  email: '',
+  role: '',
+  goal: '',
+  source: '',
+  telegram_chat_id: null
+});
diff --git a/src/routes/+layout.server.js b/src/routes/+layout.server.ts
similarity index 80%
rename from src/routes/+layout.server.js
rename to src/routes/+layout.server.ts
index 74aabe4d..2c8eebc0 100644
--- a/src/routes/+layout.server.js
+++ b/src/routes/+layout.server.ts
@@ -2,22 +2,31 @@
 import { blockedSubdomain } from '$lib/utils/constants/app';
 import { getCurrentOrg } from '$lib/utils/services/org';
 import { getSupabase, supabase } from '$lib/utils/functions/supabase';
+import type { CurrentOrg } from '$lib/utils/types/org';
 
 if (!supabase) {
   getSupabase();
 }
 
-/** @type {import('./$types').LayoutServerLoad} */
-export const load = async ({ url, cookies }) => {
+interface LoadOutput {
+  orgSiteName: string;
+  isOrgSite: boolean;
+  skipAuth: boolean;
+  org: CurrentOrg;
+}
+
+export const load = async ({ url, cookies }): LoadOutput => {
   // if (url.hostname === 'classroomio.com') {
   //   throw redirect(301, 'https://about.classroomio.com');
   // }
 
-  let response = {
+  let response: LoadOutput = {
     orgSiteName: '',
     isOrgSite: false,
     skipAuth: false,
-    org: {}
+    org: {
+      theme: ''
+    }
   };
 
   const _orgSiteName = cookies.get('_orgSiteName');
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index fd65ff35..cf6dba1d 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -1,4 +1,4 @@
-<script>
+<script lang="ts">
   import { onMount } from 'svelte';
   import { derived } from 'svelte/store';
   import { goto } from '$app/navigation';
@@ -8,7 +8,9 @@
   import * as Sentry from '@sentry/browser';
   import { Integrations } from '@sentry/tracing';
   import { CaptureConsole } from '@sentry/integrations';
+  import posthog from 'posthog-js';
   import { Theme } from 'carbon-components-svelte';
+  import type { CarbonTheme } from 'carbon-components-svelte/types/Theme/Theme.svelte';
   import { Moon } from 'svelte-loading-spinners';
   import LandingNavigation from '$lib/components/Navigation/index.svelte';
   import OrgNavigation from '$lib/components/Navigation/app.svelte';
@@ -45,30 +47,45 @@
 
   let supabase = getSupabase();
   let path = $page.url?.pathname?.replace('/', '');
-  let carbonTheme = 'white';
+  let carbonTheme: CarbonTheme = 'white';
 
   const delayedPreloading = derived(navigating, (currentPreloading, set) => {
     setTimeout(() => set(currentPreloading), 250);
   });
 
   function setupSentry() {
-    if (!dev) {
-      Sentry.init({
-        dsn: 'https://c966f7e8cb1d4306be20b26bb4f0cc96@o476906.ingest.sentry.io/5999999',
-        integrations: [
-          new Integrations.BrowserTracing(),
-          new CaptureConsole({
-            levels: ['error']
-          }),
-          new Sentry.Replay()
-        ],
-        environment: !dev ? 'production' : 'development',
-        // This sets the sample rate to be 10%. You may want this to be 100% while
-        // in development and sample at a lower rate in production
-        replaysSessionSampleRate: 0.5,
-        // If the entire session is not sampled, use the below sample rate to sample
-        // sessions when an error occurs.
-        replaysOnErrorSampleRate: 1.0
+    Sentry.init({
+      dsn: 'https://c966f7e8cb1d4306be20b26bb4f0cc96@o476906.ingest.sentry.io/5999999',
+      integrations: [
+        new Integrations.BrowserTracing(),
+        new CaptureConsole({
+          levels: ['error']
+        }),
+        new Sentry.Replay()
+      ],
+      environment: !dev ? 'production' : 'development',
+      // This sets the sample rate to be 10%. You may want this to be 100% while
+      // in development and sample at a lower rate in production
+      replaysSessionSampleRate: 0.5,
+      // If the entire session is not sampled, use the below sample rate to sample
+      // sessions when an error occurs.
+      replaysOnErrorSampleRate: 1.0
+    });
+  }
+
+  function setupPosthug() {
+    posthog.init('phc_JfdHOZ6v0cVlGELBYx1Tmoen2nxNOrAzvgvrPA6Ksov', {
+      api_host: 'https://eu.posthog.com'
+    });
+  }
+
+  function setSentryUser() {
+    if ($profile) {
+      Sentry.setUser({
+        id: $profile.id,
+        username: $profile.username,
+        email: $profile.email,
+        fullname: $profile.fullname
       });
     }
   }
@@ -99,7 +116,7 @@
 
       const [regexUsernameMatch] = [...(authUser.email?.matchAll(/(.*)@/g) || [])];
 
-      const { data, error } = await supabase
+      const { data: newProfileData, error } = await supabase
         .from('profile')
         .insert({
           id: authUser.id,
@@ -110,15 +127,15 @@
         .select();
 
       // Profile created, go to onboarding or lms
-      if (!error && data) {
+      if (!error && newProfileData) {
         $user.fetchingUser = false;
         $user.isLoggedIn = true;
         $user.currentSession = authUser;
 
-        profile.set(data[0]);
+        profile.set(newProfileData[0]);
 
         // Set user in sentry
-        Sentry.setUser($profile);
+        setSentryUser();
 
         if (data.isOrgSite) {
           const { data, error } = await supabase
@@ -160,7 +177,7 @@
       profile.set(profileData);
 
       // Set user in sentry
-      Sentry.setUser($profile);
+      setSentryUser();
 
       const orgRes = await getOrganizations($profile.id);
 
@@ -212,7 +229,10 @@
       }
     }
 
-    setupSentry();
+    if (!dev) {
+      setupSentry();
+      setupPosthug();
+    }
 
     handleResize();
 
@@ -262,9 +282,7 @@
 
     return () => {
       console.log('unsubscribed');
-      if (typeof authListener?.unsubscribe === 'function') {
-        authListener?.unsubscribe();
-      }
+      authListener.subscription.unsubscribe();
     };
   });
 
diff --git a/src/routes/courses/[id]/lessons/[...lessonParams]/+page.svelte b/src/routes/courses/[id]/lessons/[...lessonParams]/+page.svelte
index 344499b7..ccedcb52 100644
--- a/src/routes/courses/[id]/lessons/[...lessonParams]/+page.svelte
+++ b/src/routes/courses/[id]/lessons/[...lessonParams]/+page.svelte
@@ -29,7 +29,7 @@
   import { currentOrg } from '$lib/utils/store/org';
   import { snackbar } from '$lib/components/Snackbar/store';
   import type { LessonCompletion } from '$lib/utils/types';
-  import { profile } from '$lib/utils/store/user.js';
+  import { profile } from '$lib/utils/store/user';
   import { getIsLessonComplete } from '$lib/components/Course/components/Lesson/functions';
 
   export let data;
diff --git a/src/routes/invite/s/[hash]/+page.svelte b/src/routes/invite/s/[hash]/+page.svelte
index ced58377..637000b0 100644
--- a/src/routes/invite/s/[hash]/+page.svelte
+++ b/src/routes/invite/s/[hash]/+page.svelte
@@ -9,7 +9,7 @@
   import { addGroupMember } from '$lib/utils/services/courses';
   import type { CurrentOrg } from '$lib/utils/types/org.js';
   import { ROLE } from '$lib/utils/constants/roles';
-  import { profile } from '$lib/utils/store/user.js';
+  import { profile } from '$lib/utils/store/user';
   import {
     triggerSendEmail,
     NOTIFICATION_NAME
@@ -50,7 +50,15 @@
       .from('groupmember')
       .select('id, profile(email)')
       .eq('group_id', data.groupId)
-      .eq('role_id', ROLE.TUTOR);
+      .eq('role_id', ROLE.TUTOR)
+      .returns<
+        {
+          id: string;
+          profile: {
+            email: string;
+          };
+        }[]
+      >();
 
     const teachers: Array<string> =
       teacherMembers.data?.map((teacher) => {