diff --git a/frontend/src/App.svelte b/frontend/src/App.svelte
index 4944ec4..17e0ee9 100644
--- a/frontend/src/App.svelte
+++ b/frontend/src/App.svelte
@@ -1,116 +1,60 @@
-<!-- App.svelte -->
+<!-- src/App.svelte -->
 <script>
-import Header from './components/Header.svelte';
-import Tabs from './components/Tabs.svelte';
-import Overview from './components/Overview.svelte';
-import Settings from './components/Settings.svelte';
-import Terminal from './components/Terminal.svelte';
+  import './app.css';
+  import { onMount } from 'svelte';
+  import { activeTab } from './stores/appStore';
+  
+  import Header from './components/Header.svelte';
+  import Tabs from './components/Tabs.svelte';
+  import Overview from './components/Overview.svelte';
+  import Settings from './components/Settings.svelte';
+  import Terminal from './components/Terminal.svelte';
 
-let activeTab = 'overview';
-let status = 'Status';
-let uptime = '0s';
-let qrCodesFound = 0;
-let isOnline = false;
-let terminalLines = [
-    'Window()',
-    '[Fx] INVOKE main.main.func1()',
-    '[Fx] BEFORE RUN provide: git.weirdcat.su/weirdcat/auto-attendance/internal/ui.NewBuilder()',
-    '[Fx] RUN provide: git.weirdcat.su/weirdcat/auto-attendance/internal/ui.NewBuilder() in',
-    '46.723905ms',
-    '[Fx] BEFORE RUN provide: git.weirdcat.su/weirdcat/auto-attendance/internal/ui.NewMainWindow()',
-    '[Fx] RUN provide: git.weirdcat.su/weirdcat/auto-attendance/internal/ui.NewMainWindow()',
-    'in 11.655448ms',
-    '[Fx] RUNNING',
-    'Window()',
-    '[Fx] INVOKE main.main.func1()',
-    '[Fx] BEFORE RUN provide: git.weirdcat.su/weirdcat/auto-attendance/internal/ui.NewBuilder()',
-    '[Fx] RUN provide: git.weirdcat.su/weirdcat/auto-attendance/internal/ui.NewBuilder() in',
-    '46.723905ms',
-    '[Fx] BEFORE RUN provide: git.weirdcat.su/weirdcat/auto-attendance/internal/ui.NewMainWindow()',
-    '[Fx] RUN provide: git.weirdcat.su/weirdcat/auto-attendance/internal/ui.NewMainWindow()',
-    'in 11.655448ms',
-    '[Fx] RUNNING',
-    ' '
-];
-
-document.addEventListener('contextmenu', function(event) {
-    event.preventDefault();
-});
+  onMount(() => {
+    // Prevent context menu
+    const handleContextMenu = (event) => event.preventDefault();
+    document.addEventListener('contextmenu', handleContextMenu);
+    
+    return () => {
+      document.removeEventListener('contextmenu', handleContextMenu);
+    };
+  });
 </script>
 
 <div class="app-window">
-    <Header {isOnline} />
-
-    <Tabs bind:activeTab />
-
-    <main class="main-layout">
-        {#if activeTab === 'overview'}
-            <Overview {status} {uptime} {qrCodesFound} />
-        {:else}
-            <Settings />
-        {/if}
-    </main>
-    <!-- Terminal Output -->
-    <aside class="terminal-layout">
-        <Terminal {terminalLines} />
-    </aside>
+  <Header />
+  <Tabs />
+  
+  <main class="main-layout">
+    {#if $activeTab === 'overview'}
+      <Overview />
+    {:else if $activeTab === 'settings'}
+      <Settings />
+    {/if}
+  </main>
+  
+  <aside class="terminal-layout">
+    <Terminal />
+  </aside>
 </div>
 
 <style>
-:root {
-    --bg-primary: #1c1c1c;
-    --bg-secondary: #121212;
-    --bg-header: #811A10;
-    --accent-primary: #a02c2c;
-    --accent-secondary: #7a2727;
-    --text-primary: #ebebeb;
-    --text-secondary: rgba(235, 235, 235, 0.7);
-    --text-dim: rgba(235, 235, 235, 0.5);
-    --border-color: rgba(0, 0, 0, 0.26);
-    --success: #a0662c;
-    --warning: #2ca02c;
-    --error: #2ca0a0;
-
-    --spacing-xs: 4px;
-    --spacing-sm: 8px;
-    --spacing-md: 12px;
-    --spacing-lg: 16px;
-    --spacing-xl: 24px;
-
-    --border-radius-sm: 10px;
-    --border-radius-md: 6px;
-    --border-radius-lg: 8px;
-
-    --shadow-sm: 0 1px 1px rgba(0, 0, 0, 0.12), 0 1px 2px rgba(0, 0, 0, 0.24);
-    --shadow-md: 0 3px 3px rgba(0, 0, 0, 0.16), 0 3px 3px rgba(0, 0, 0, 0.23);
-    --shadow-lg: 0 14px 14px rgba(0, 0, 0, 0.25), 0 10px 5px rgba(0, 0, 0, 0.22);
-    touch-action: manipulation;
-    user-select: none; /* Standard syntax */
-    -webkit-user-select: none;
-    -moz-user-select: none;
-    -ms-user-select: none;
-}
-
-* {
-    margin: 0;
-    padding: 0;
-    box-sizing: border-box;
-}
-
-.app-window {
+  .app-window {
     border-radius: var(--border-radius-md);
     background-color: var(--bg-primary);
     height: 100vh;
     color: var(--text-primary);
     display: flex;
     flex-direction: column;
-    justify-content: space-between;
-}
+  }
 
-.main-layout {
+  .main-layout {
     padding: var(--spacing-lg);
     overflow: hidden;
-    flex-grow: 1;
-}
+    flex: 1;
+  }
 
+  .terminal-layout {
+    flex-shrink: 0;
+  }
 </style>
diff --git a/frontend/src/app.css b/frontend/src/app.css
index 59d06f6..349c3ef 100644
--- a/frontend/src/app.css
+++ b/frontend/src/app.css
@@ -1,54 +1,57 @@
-#logo {
-    display: block;
-    width: 50%;
-    height: 50%;
-    margin: auto;
-    padding: 10% 0 0;
-    background-position: center;
-    background-repeat: no-repeat;
-    background-size: 100% 100%;
-    background-origin: content-box;
+/* src/app.css */
+:root {
+    --bg-primary: #1c1c1c;
+    --bg-secondary: #121212;
+    --bg-header: #811A10;
+    --accent-primary: #a02c2c;
+    --accent-secondary: #7a2727;
+    --text-primary: #ebebeb;
+    --text-secondary: rgba(235, 235, 235, 0.7);
+    --text-dim: rgba(235, 235, 235, 0.5);
+    --border-color: rgba(0, 0, 0, 0.26);
+    --success: #a0662c;
+    --warning: #2ca02c;
+    --error: #2ca0a0;
+
+    --spacing-xs: 4px;
+    --spacing-sm: 8px;
+    --spacing-md: 12px;
+    --spacing-lg: 16px;
+    --spacing-xl: 24px;
+
+    --border-radius-sm: 10px;
+    --border-radius-md: 6px;
+    --border-radius-lg: 8px;
+
+    --shadow-sm: 0 1px 1px rgba(0, 0, 0, 0.12), 0 1px 2px rgba(0, 0, 0, 0.24);
+    --shadow-md: 0 3px 3px rgba(0, 0, 0, 0.16), 0 3px 3px rgba(0, 0, 0, 0.23);
+    --shadow-lg: 0 14px 14px rgba(0, 0, 0, 0.25), 0 10px 5px rgba(0, 0, 0, 0.22);
 }
 
-.result {
-    height: 20px;
-    line-height: 20px;
-    margin: 1.5rem auto;
+* {
+    margin: 0;
+    padding: 0;
+    box-sizing: border-box;
 }
 
-.input-box .btn {
-    width: 60px;
-    height: 30px;
-    line-height: 30px;
-    border-radius: 3px;
-    border: none;
-    margin: 0 0 0 20px;
-    padding: 0 8px;
-    cursor: pointer;
+body {
+    font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
+    background-color: var(--bg-primary);
+    color: var(--text-primary);
+    touch-action: manipulation;
+    user-select: none;
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    height: 100vh;
+    overflow: hidden;
 }
 
-.input-box .btn:hover {
-    background-image: linear-gradient(to top, #cfd9df 0%, #e2ebf0 100%);
-    color: #333333;
+/* Utility classes */
+.text-dim { 
+    color: var(--text-dim); 
 }
 
-.input-box .input {
-    border: none;
-    border-radius: 3px;
-    outline: none;
-    height: 30px;
-    line-height: 30px;
-    padding: 0 10px;
-    background-color: rgba(240, 240, 240, 1);
-    -webkit-font-smoothing: antialiased;
+.text-secondary { 
+    color: var(--text-secondary); 
 }
-
-.input-box .input:hover {
-    border: none;
-    background-color: rgba(255, 255, 255, 1);
-}
-
-.input-box .input:focus {
-    border: none;
-    background-color: rgba(255, 255, 255, 1);
-}
\ No newline at end of file
diff --git a/frontend/src/assets/app.css b/frontend/src/assets/app.css
new file mode 100644
index 0000000..a5fc6dd
--- /dev/null
+++ b/frontend/src/assets/app.css
@@ -0,0 +1,27 @@
+:root {
+  /* CSS variables from theme.js would be injected here */
+  --bg-primary: #1c1c1c;
+  --bg-secondary: #121212;
+  /* ... all other theme variables */
+}
+
+* {
+  margin: 0;
+  padding: 0;
+  box-sizing: border-box;
+}
+
+body {
+  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
+  background-color: var(--bg-primary);
+  color: var(--text-primary);
+  touch-action: manipulation;
+  user-select: none;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+}
+
+/* Utility classes */
+.text-dim { color: var(--text-dim); }
+.text-secondary { color: var(--text-secondary); }
diff --git a/frontend/src/components/Header.svelte b/frontend/src/components/Header.svelte
index 54f888e..3edc193 100644
--- a/frontend/src/components/Header.svelte
+++ b/frontend/src/components/Header.svelte
@@ -1,76 +1,33 @@
-<!-- components/Header.svelte -->
+<!-- src/components/Header.svelte -->
 <script>
-export let isOnline = true;
+  import { isOnline } from '../stores/appStore';
 </script>
 
 <header class="headerbar">
-    <div class="header-status">
-        {#if isOnline}
-            <span>Online</span>
-        {:else}
-            <span class="text-dim">Offline</span>
-        {/if}
-    </div>
+  <div class="header-status">
+    {#if $isOnline}
+      <span>Online</span>
+    {:else}
+      <span class="text-dim">Offline</span>
+    {/if}
+  </div>
 </header>
 
 <style>
-.headerbar {
+  .headerbar {
     background-color: var(--bg-header);
     padding: var(--spacing-md) var(--spacing-lg);
     display: flex;
     align-items: center;
     justify-content: space-between;
     position: relative;
-}
+  }
 
-.header-title {
-    font-size: 16px;
-    font-weight: bold;
-    color: var(--text-primary);
-    line-height: 0;
-}
-
-.header-status {
+  .header-status {
     font-size: 0.875rem;
     color: var(--text-secondary);
     position: absolute;
     left: 50%;
     transform: translateX(-50%);
-}
-
-.header-controls {
-    display: flex;
-    align-items: center;
-    gap: var(--spacing-sm);
-}
-
-.control-button {
-    width: 24px;
-    height: 24px;
-    border-radius: 50%;
-    border: none;
-    cursor: pointer;
-    transition: all 0.2s ease;
-}
-
-.control-button:hover {
-    transform: scale(1.1);
-}
-
-.control-button.toggle {
-    background-color: var(--accent-primary);
-    position: relative;
-}
-
-.toggle-indicator {
-    width: 12px;
-    height: 12px;
-    background-color: var(--bg-primary);
-    border-radius: 50%;
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%, -50%);
-    transition: all 0.3s ease;
-}
+  }
 </style>
diff --git a/frontend/src/components/Overview.svelte b/frontend/src/components/Overview.svelte
index fcbcccf..4f0b803 100644
--- a/frontend/src/components/Overview.svelte
+++ b/frontend/src/components/Overview.svelte
@@ -1,16 +1,11 @@
 <!-- components/Overview.svelte -->
 <script>
-import StatusPanel from './StatusPanel.svelte';
-
-export let status = 'Looking for QR-codes';
-export let uptime = '1h 12m 15s';
-export let qrCodesFound = 12;
+  import StatusPanel from './StatusPanel.svelte';
 </script>
 
 <div class="overview-layout">
     <div class="grid-layout">
-        <!-- Status Panel -->
-        <StatusPanel {status} {uptime} {qrCodesFound} />
+        <StatusPanel />
     </div>
 </div>
 
@@ -20,7 +15,6 @@ export let qrCodesFound = 12;
     flex-direction: column;
     gap: var(--spacing-lg);
     height: 100%;
-
 }
 
 .grid-layout {
diff --git a/frontend/src/components/Settings.svelte b/frontend/src/components/Settings.svelte
index e2fbe97..d4ca83a 100644
--- a/frontend/src/components/Settings.svelte
+++ b/frontend/src/components/Settings.svelte
@@ -1,6 +1,5 @@
 <!-- components/Settings.svelte -->
 <script>
-// Settings logic will go here
 </script>
 
 <div class="settings-content">
diff --git a/frontend/src/components/StatusPanel.svelte b/frontend/src/components/StatusPanel.svelte
index c1bdd68..ec0bdb9 100644
--- a/frontend/src/components/StatusPanel.svelte
+++ b/frontend/src/components/StatusPanel.svelte
@@ -1,66 +1,60 @@
-<!-- components/StatusPanel.svelte -->
+<!-- src/components/StatusPanel.svelte -->
 <script>
-export let status = '';
-export let uptime = '';
-export let qrCodesFound = 0;
+  import { status, uptime, qrCodesFound } from '../stores/appStore';
 </script>
 
 <div class="status-panel">
-    <div class="status-row">
-        <span class="status-label">Status</span>
-        <span class="status-value">{status}</span>
-    </div>
-    <div class="status-row">
-        <span class="status-label">Uptime</span>
-        <span class="status-value">{uptime}</span>
-    </div>
-    <div class="status-row">
-        <span class="status-label">QR-codes found</span>
-        <span class="status-value">{qrCodesFound}</span>
-    </div>
-    <div class="status-row">
-        <span class="status-label">Link</span>
-        <span class="status-value link">Click here! (2 s)</span>
-    </div>
+  <div class="status-row">
+    <span class="status-label">Status</span>
+    <span class="status-value">{$status}</span>
+  </div>
+  <div class="status-row">
+    <span class="status-label">Uptime</span>
+    <span class="status-value">{$uptime}</span>
+  </div>
+  <div class="status-row">
+    <span class="status-label">QR-codes found</span>
+    <span class="status-value">{$qrCodesFound}</span>
+  </div>
+  <div class="status-row">
+    <span class="status-label">Link</span>
+    <span class="status-value link">Click here! (2 s)</span>
+  </div>
 </div>
 
 <style>
-.status-panel {
+  .status-panel {
     padding: var(--spacing-lg);
     width: 80%;
-}
+  }
 
-.status-row {
+  .status-row {
     display: grid;
     grid-template-columns: 1fr 1fr;
     padding: var(--spacing-sm) 0;
-}
+  }
 
-.status-row:last-child {
-    border-bottom: none;
-}
-
-.status-row > *:nth-child(2) {
+  .status-row > *:nth-child(2) {
     margin-left: auto;
-}
+  }
 
-.status-label {
+  .status-label {
     color: var(--text-secondary);
     font-size: 0.875rem;
-}
+  }
 
-.status-value {
+  .status-value {
     color: var(--text-primary);
     font-weight: 500;
-}
+  }
 
-.status-value.link {
+  .status-value.link {
     color: var(--accent-primary);
     cursor: pointer;
     text-decoration: underline;
-}
+  }
 
-.status-value.link:hover {
+  .status-value.link:hover {
     color: #bd6b6b;
-}
+  }
 </style>
diff --git a/frontend/src/components/Tabs.svelte b/frontend/src/components/Tabs.svelte
index 8d41f82..36e0978 100644
--- a/frontend/src/components/Tabs.svelte
+++ b/frontend/src/components/Tabs.svelte
@@ -1,31 +1,27 @@
-<!-- components/Tabs.svelte -->
+<!-- src/components/Tabs.svelte -->
 <script>
-export let activeTab = 'overview';
-export let tabs = [
-    { id: 'overview', label: 'Overview' },
-    { id: 'settings', label: 'Settings' }
-];
+  import { activeTab, TABS } from '../stores/appStore';
 </script>
 
 <div class="tabs-container">
-    {#each tabs as tab}
-        <button 
-            class="tab {activeTab === tab.id ? 'active' : ''}"
-            on:click={() => activeTab = tab.id}
-        >
-            {tab.label}
-        </button>
-    {/each}
+  {#each TABS as tab}
+    <button 
+      class="tab {$activeTab === tab.id ? 'active' : ''}"
+      on:click={() => $activeTab = tab.id}
+    >
+      {tab.label}
+    </button>
+  {/each}
 </div>
 
 <style>
-.tabs-container {
+  .tabs-container {
     background-color: var(--bg-primary);
     border-bottom: 1px solid var(--border-color);
     display: flex;
-}
+  }
 
-.tab {
+  .tab {
     flex: 1;
     padding: var(--spacing-md) var(--spacing-lg);
     background: transparent;
@@ -35,17 +31,17 @@ export let tabs = [
     position: relative;
     transition: color 0.2s ease;
     font-size: 0.875rem;
-}
+  }
 
-.tab:hover {
+  .tab:hover {
     color: var(--text-primary);
-}
+  }
 
-.tab.active {
+  .tab.active {
     color: var(--text-primary);
-}
+  }
 
-.tab.active::after {
+  .tab.active::after {
     content: '';
     position: absolute;
     bottom: 0;
@@ -53,5 +49,5 @@ export let tabs = [
     right: 0;
     height: 2px;
     background-color: var(--accent-primary);
-}
+  }
 </style>
diff --git a/frontend/src/components/Terminal.svelte b/frontend/src/components/Terminal.svelte
index 7407b53..1ee7004 100644
--- a/frontend/src/components/Terminal.svelte
+++ b/frontend/src/components/Terminal.svelte
@@ -1,6 +1,7 @@
-<!-- components/Terminal.svelte -->
+<!-- src/components/Terminal.svelte -->
 <script>
-  export let terminalLines = [];
+  import { terminalLines } from '../stores/appStore';
+  import { onMount, onDestroy } from 'svelte';
   
   let terminalRef;
   let isResizing = false;
@@ -9,7 +10,7 @@
   function handleMouseDown(e) {
     isResizing = true;
     startY = e.clientY;
-    startHeight = parseInt(document.defaultView.getComputedStyle(terminalRef).height, 10);
+    startHeight = parseInt(getComputedStyle(terminalRef).height, 10);
     
     document.addEventListener('mousemove', handleMouseMove);
     document.addEventListener('mouseup', handleMouseUp);
@@ -34,24 +35,29 @@
     document.removeEventListener('mouseup', handleMouseUp);
   }
   
-  // Scroll to bottom when new lines are added
-  $: {
-    if (terminalLines.length > 0) {
-      setTimeout(() => {
-        const content = terminalRef?.querySelector('.terminal-content');
-        if (content) {
-          content.scrollTop = content.scrollHeight;
-        }
-      }, 0);
+  function scrollToBottom() {
+    if (terminalRef) {
+      const content = terminalRef.querySelector('.terminal-content');
+      if (content) {
+        content.scrollTop = content.scrollHeight;
+      }
     }
   }
+  
+  // Auto-scroll when new lines are added
+  $: $terminalLines, setTimeout(scrollToBottom, 0);
+  
+  onDestroy(() => {
+    document.removeEventListener('mousemove', handleMouseMove);
+    document.removeEventListener('mouseup', handleMouseUp);
+  });
 </script>
 
 <div class="terminal" bind:this={terminalRef}>
   <div class="resize-handle" on:mousedown={handleMouseDown}></div>
   <div class="terminal-header">Logs</div>
   <div class="terminal-content">
-    {#each terminalLines as line}
+    {#each $terminalLines as line}
       <div class="terminal-line">{line}</div>
     {/each}
   </div>
@@ -62,13 +68,11 @@
     background-color: var(--bg-secondary);
     border: 1px solid var(--border-color);
     border-radius: var(--border-radius-sm);
-    margin: 20px;
-    margin-top: auto;
-    height: 200px; /* Default height */
+    margin: var(--spacing-lg);
+    height: 200px;
     position: relative;
     display: flex;
     flex-direction: column;
-    resize: vertical;
     overflow: hidden;
   }
 
@@ -90,7 +94,7 @@
   }
 
   .resize-handle:hover {
-    background-color: var(--accent-color);
+    background-color: var(--accent-primary);
   }
 
   .terminal-header {
@@ -109,13 +113,10 @@
     font-size: 0.75rem;
     line-height: 1.4;
     color: var(--text-primary);
-    flex-grow: 1;
+    flex: 1;
     overflow-y: auto;
-    white-space: nowrap;
+    white-space: pre-wrap;
     user-select: text;
-    -webkit-user-select: text;
-    -moz-user-select: text;
-    -ms-user-select: text;
   }
 
   .terminal-line {
diff --git a/frontend/src/constants/theme.js b/frontend/src/constants/theme.js
new file mode 100644
index 0000000..f510aea
--- /dev/null
+++ b/frontend/src/constants/theme.js
@@ -0,0 +1,41 @@
+export const THEME = {
+  colors: {
+    bg: {
+      primary: '#1c1c1c',
+      secondary: '#121212',
+      header: '#811A10'
+    },
+    accent: {
+      primary: '#a02c2c',
+      secondary: '#7a2727'
+    },
+    text: {
+      primary: '#ebebeb',
+      secondary: 'rgba(235, 235, 235, 0.7)',
+      dim: 'rgba(235, 235, 235, 0.5)'
+    },
+    status: {
+      success: '#a0662c',
+      warning: '#2ca02c',
+      error: '#2ca0a0'
+    },
+    border: 'rgba(0, 0, 0, 0.26)'
+  },
+  spacing: {
+    xs: '4px',
+    sm: '8px',
+    md: '12px',
+    lg: '16px',
+    xl: '24px'
+  },
+  borderRadius: {
+    sm: '10px',
+    md: '6px',
+    lg: '8px'
+  },
+  shadows: {
+    sm: '0 1px 1px rgba(0, 0, 0, 0.12), 0 1px 2px rgba(0, 0, 0, 0.24)',
+    md: '0 3px 3px rgba(0, 0, 0, 0.16), 0 3px 3px rgba(0, 0, 0, 0.23)',
+    lg: '0 14px 14px rgba(0, 0, 0, 0.25), 0 10px 5px rgba(0, 0, 0, 0.22)'
+  }
+};
diff --git a/frontend/src/stores/appStore.js b/frontend/src/stores/appStore.js
new file mode 100644
index 0000000..25e22b8
--- /dev/null
+++ b/frontend/src/stores/appStore.js
@@ -0,0 +1,20 @@
+import { writable } from 'svelte/store';
+
+// App state
+export const activeTab = writable('overview');
+export const status = writable('Looking for QR-codes');
+export const uptime = writable('1h 12m 15s');
+export const qrCodesFound = writable(12);
+export const isOnline = writable(true);
+export const terminalLines = writable([
+  'Window()',
+  '[Fx] INVOKE main.main.func1()',
+  '[Fx] BEFORE RUN provide: git.weirdcat.su/weirdcat/auto-attendance/internal/ui.NewBuilder()',
+  '[Fx] RUN provide: git.weirdcat.su/weirdcat/auto-attendance/internal/ui.NewBuilder() in 46.723905ms',
+]);
+
+// Constants
+export const TABS = [
+  { id: 'overview', label: 'Overview' },
+  { id: 'settings', label: 'Settings' }
+];