From 31975aa9d3d4da8316861ed74139229a76645865 Mon Sep 17 00:00:00 2001
From: zaelgohary <zainabelgohary19@gmail.com>
Date: Thu, 29 May 2025 08:57:25 +0300
Subject: [PATCH] Add session timeout, refactor session manager, reduce code
 duplication, update icons & styling

---
 crypto_vault_extension/background.js      | 443 ++++++-------
 crypto_vault_extension/icons/icon128.png  | Bin 1958 -> 7701 bytes
 crypto_vault_extension/icons/icon16.png   | Bin 454 -> 676 bytes
 crypto_vault_extension/icons/icon32.png   | Bin 0 -> 1537 bytes
 crypto_vault_extension/icons/icon36.png   | Bin 0 -> 1636 bytes
 crypto_vault_extension/icons/icon48.png   | Bin 1105 -> 2154 bytes
 crypto_vault_extension/js/errorHandler.js |  35 +-
 crypto_vault_extension/manifest.json      |  10 +-
 crypto_vault_extension/popup.html         |  22 +-
 crypto_vault_extension/popup.js           | 763 +++++++++++-----------
 crypto_vault_extension/styles/popup.css   | 311 +++++----
 11 files changed, 765 insertions(+), 819 deletions(-)
 create mode 100644 crypto_vault_extension/icons/icon32.png
 create mode 100644 crypto_vault_extension/icons/icon36.png

diff --git a/crypto_vault_extension/background.js b/crypto_vault_extension/background.js
index 9201ec9..191cd1a 100644
--- a/crypto_vault_extension/background.js
+++ b/crypto_vault_extension/background.js
@@ -2,6 +2,9 @@ let vault = null;
 let isInitialized = false;
 let currentSession = null;
 let keepAliveInterval = null;
+let sessionTimeoutDuration = 15; // Default 15 seconds
+let sessionTimeoutId = null; // Background timer
+let popupPort = null; // Track popup connection
 
 // Utility function to convert Uint8Array to hex
 function toHex(uint8Array) {
@@ -9,53 +12,78 @@ function toHex(uint8Array) {
     .map(b => b.toString(16).padStart(2, '0'))
     .join('');
 }
+// Background session timeout management
+async function loadTimeoutSetting() {
+  const result = await chrome.storage.local.get(['sessionTimeout']);
+  sessionTimeoutDuration = result.sessionTimeout || 15;
+}
 
+function startSessionTimeout() {
+  clearSessionTimeout();
 
+  if (currentSession && sessionTimeoutDuration > 0) {
+    sessionTimeoutId = setTimeout(async () => {
+      if (vault && currentSession) {
+        // Lock the session
+        vault.lock_session();
+        await sessionManager.clear();
+        // Notify popup if it's open
+        if (popupPort) {
+          popupPort.postMessage({
+            type: 'sessionTimeout',
+            message: 'Session timed out due to inactivity'
+          });
+        }
+      }
+    }, sessionTimeoutDuration * 1000);
+  }
+}
+
+function clearSessionTimeout() {
+  if (sessionTimeoutId) {
+    clearTimeout(sessionTimeoutId);
+    sessionTimeoutId = null;
+  }
+}
+
+function resetSessionTimeout() {
+  if (currentSession) {
+    startSessionTimeout();
+  }
+}
 
 // Session persistence functions
 async function saveSession(keyspace) {
   currentSession = { keyspace, timestamp: Date.now() };
 
   // Save to both session and local storage for better persistence
-  try {
-    await chrome.storage.session.set({ cryptoVaultSession: currentSession });
-    await chrome.storage.local.set({ cryptoVaultSessionBackup: currentSession });
-  } catch (error) {
-    console.error('Failed to save session:', error);
-  }
+  await chrome.storage.session.set({ cryptoVaultSession: currentSession });
+  await chrome.storage.local.set({ cryptoVaultSessionBackup: currentSession });
 }
 
 async function loadSession() {
-  try {
-    // Try session storage first
-    let result = await chrome.storage.session.get(['cryptoVaultSession']);
-    if (result.cryptoVaultSession) {
-      currentSession = result.cryptoVaultSession;
-      return currentSession;
-    }
+  // Try session storage first
+  let result = await chrome.storage.session.get(['cryptoVaultSession']);
+  if (result.cryptoVaultSession) {
+    currentSession = result.cryptoVaultSession;
+    return currentSession;
+  }
 
-    // Fallback to local storage
-    result = await chrome.storage.local.get(['cryptoVaultSessionBackup']);
-    if (result.cryptoVaultSessionBackup) {
-      currentSession = result.cryptoVaultSessionBackup;
-      // Restore to session storage
-      await chrome.storage.session.set({ cryptoVaultSession: currentSession });
-      return currentSession;
-    }
-  } catch (error) {
-    console.error('Failed to load session:', error);
+  // Fallback to local storage
+  result = await chrome.storage.local.get(['cryptoVaultSessionBackup']);
+  if (result.cryptoVaultSessionBackup) {
+    currentSession = result.cryptoVaultSessionBackup;
+    // Restore to session storage
+    await chrome.storage.session.set({ cryptoVaultSession: currentSession });
+    return currentSession;
   }
   return null;
 }
 
 async function clearSession() {
   currentSession = null;
-  try {
-    await chrome.storage.session.remove(['cryptoVaultSession']);
-    await chrome.storage.local.remove(['cryptoVaultSessionBackup']);
-  } catch (error) {
-    console.error('Failed to clear session:', error);
-  }
+  await chrome.storage.session.remove(['cryptoVaultSession']);
+  await chrome.storage.local.remove(['cryptoVaultSessionBackup']);
 }
 
 // Keep service worker alive
@@ -64,12 +92,8 @@ function startKeepAlive() {
     clearInterval(keepAliveInterval);
   }
 
-  // Ping every 20 seconds to keep service worker alive
   keepAliveInterval = setInterval(() => {
-    // Simple operation to keep service worker active
-    chrome.storage.session.get(['keepAlive']).catch(() => {
-      // Ignore errors
-    });
+    chrome.storage.session.get(['keepAlive']).catch(() => {});
   }, 20000);
 }
 
@@ -80,54 +104,39 @@ function stopKeepAlive() {
   }
 }
 
-// Enhanced session management with keep-alive
-async function saveSessionWithKeepAlive(keyspace) {
-  await saveSession(keyspace);
-  startKeepAlive();
-}
-
-async function clearSessionWithKeepAlive() {
-  await clearSession();
-  stopKeepAlive();
-}
+// Consolidated session management
+const sessionManager = {
+  async save(keyspace) {
+    await saveSession(keyspace);
+    startKeepAlive();
+    await loadTimeoutSetting();
+    startSessionTimeout();
+  },
+  async clear() {
+    await clearSession();
+    stopKeepAlive();
+    clearSessionTimeout();
+  }
+};
 
 async function restoreSession() {
   const session = await loadSession();
   if (session && vault) {
-    try {
-      // Check if the session is still valid by testing if vault is unlocked
-      const isUnlocked = vault.is_unlocked();
-      if (isUnlocked) {
-        // Restart keep-alive for restored session
-        startKeepAlive();
-        return session;
-      } else {
-        await clearSessionWithKeepAlive();
-      }
-    } catch (error) {
-      console.error('Error checking session validity:', error);
-      await clearSessionWithKeepAlive();
+    // Check if the session is still valid by testing if vault is unlocked
+    const isUnlocked = vault.is_unlocked();
+    if (isUnlocked) {
+      // Restart keep-alive for restored session
+      startKeepAlive();
+      return session;
+    } else {
+      await sessionManager.clear();
     }
   }
   return null;
 }
 
 // Import WASM module functions
-import init, {
-  create_keyspace,
-  init_session,
-  is_unlocked,
-  add_keypair,
-  list_keypairs,
-  select_keypair,
-  current_keypair_metadata,
-  current_keypair_public_key,
-  sign,
-  verify,
-  encrypt_data,
-  decrypt_data,
-  lock_session
-} from './wasm/wasm_app.js';
+import init, * as wasmFunctions from './wasm/wasm_app.js';
 
 // Initialize WASM module
 async function initVault() {
@@ -138,23 +147,8 @@ async function initVault() {
     const wasmUrl = chrome.runtime.getURL('wasm/wasm_app_bg.wasm');
     await init(wasmUrl);
 
-    // Create a vault object with all the imported functions
-    vault = {
-      create_keyspace,
-      init_session,
-      is_unlocked,
-      add_keypair,
-      list_keypairs,
-      select_keypair,
-      current_keypair_metadata,
-      current_keypair_public_key,
-      sign,
-      verify,
-      encrypt_data,
-      decrypt_data,
-      lock_session
-    };
-
+    // Use imported functions directly
+    vault = wasmFunctions;
     isInitialized = true;
 
     // Try to restore previous session
@@ -167,20 +161,108 @@ async function initVault() {
   }
 }
 
-// Handle popup connection/disconnection
-chrome.runtime.onConnect.addListener((port) => {
-  if (port.name === 'popup') {
-    // If we have an active session, ensure keep-alive is running
-    if (currentSession) {
-      startKeepAlive();
-    }
 
-    port.onDisconnect.addListener(() => {
-      // Keep the keep-alive running even after popup disconnects
-      // This ensures session persistence across popup closes
-    });
+// Consolidated message handlers
+const messageHandlers = {
+  createKeyspace: async (request) => {
+    await vault.create_keyspace(request.keyspace, request.password);
+    return { success: true };
+  },
+
+  initSession: async (request) => {
+    await vault.init_session(request.keyspace, request.password);
+    await sessionManager.save(request.keyspace);
+    return { success: true };
+  },
+
+  isUnlocked: () => ({ success: true, unlocked: vault.is_unlocked() }),
+
+  addKeypair: async (request) => {
+    const result = await vault.add_keypair(request.keyType, request.metadata);
+    return { success: true, result };
+  },
+
+  listKeypairs: async () => {
+    if (!vault.is_unlocked()) {
+      return { success: false, error: 'Session is not unlocked' };
+    }
+    const keypairsRaw = await vault.list_keypairs();
+    const keypairs = typeof keypairsRaw === 'string' ? JSON.parse(keypairsRaw) : keypairsRaw;
+    return { success: true, keypairs };
+  },
+
+  selectKeypair: (request) => {
+    vault.select_keypair(request.keyId);
+    return { success: true };
+  },
+
+  getCurrentKeypairMetadata: () => ({ success: true, metadata: vault.current_keypair_metadata() }),
+
+  getCurrentKeypairPublicKey: () => ({ success: true, publicKey: toHex(vault.current_keypair_public_key()) }),
+
+  sign: async (request) => {
+    const signature = await vault.sign(new Uint8Array(request.message));
+    return { success: true, signature };
+  },
+
+  encrypt: async (request) => {
+    if (!vault.is_unlocked()) {
+      return { success: false, error: 'Session is not unlocked' };
+    }
+    const messageBytes = new TextEncoder().encode(request.message);
+    const encryptedData = await vault.encrypt_data(messageBytes);
+    const encryptedMessage = btoa(String.fromCharCode(...new Uint8Array(encryptedData)));
+    return { success: true, encryptedMessage };
+  },
+
+  decrypt: async (request) => {
+    if (!vault.is_unlocked()) {
+      return { success: false, error: 'Session is not unlocked' };
+    }
+    const encryptedBytes = new Uint8Array(atob(request.encryptedMessage).split('').map(c => c.charCodeAt(0)));
+    const decryptedData = await vault.decrypt_data(encryptedBytes);
+    const decryptedMessage = new TextDecoder().decode(new Uint8Array(decryptedData));
+    return { success: true, decryptedMessage };
+  },
+
+  verify: async (request) => {
+    const metadata = vault.current_keypair_metadata();
+    if (!metadata) {
+      return { success: false, error: 'No keypair selected' };
+    }
+    const isValid = await vault.verify(new Uint8Array(request.message), request.signature);
+    return { success: true, isValid };
+  },
+
+  lockSession: async () => {
+    vault.lock_session();
+    await sessionManager.clear();
+    return { success: true };
+  },
+
+  getStatus: async () => {
+    const status = vault ? vault.is_unlocked() : false;
+    const session = await loadSession();
+    return {
+      success: true,
+      status,
+      session: session ? { keyspace: session.keyspace } : null
+    };
+  },
+
+  // Timeout management handlers
+  resetTimeout: async () => {
+    resetSessionTimeout();
+    return { success: true };
+  },
+
+  updateTimeout: async (request) => {
+    sessionTimeoutDuration = request.timeout;
+    await chrome.storage.local.set({ sessionTimeout: request.timeout });
+    resetSessionTimeout(); // Restart with new duration
+    return { success: true };
   }
-});
+};
 
 // Handle messages from popup and content scripts
 chrome.runtime.onMessage.addListener((request, _sender, sendResponse) => {
@@ -190,143 +272,13 @@ chrome.runtime.onMessage.addListener((request, _sender, sendResponse) => {
         await initVault();
       }
 
-      switch (request.action) {
-        case 'createKeyspace':
-          await vault.create_keyspace(request.keyspace, request.password);
-          return { success: true };
-
-        case 'initSession':
-          await vault.init_session(request.keyspace, request.password);
-          await saveSessionWithKeepAlive(request.keyspace);
-          return { success: true };
-
-        case 'isUnlocked':
-          const unlocked = vault.is_unlocked();
-          return { success: true, unlocked };
-
-        case 'addKeypair':
-          const result = await vault.add_keypair(request.keyType, request.metadata);
-          return { success: true, result };
-
-        case 'listKeypairs':
-          // Check if session is unlocked first
-          const isUnlocked = vault.is_unlocked();
-
-          if (!isUnlocked) {
-            return { success: false, error: 'Session is not unlocked' };
-          }
-
-          try {
-            const keypairsRaw = await vault.list_keypairs();
-
-            // Parse JSON string if needed
-            let keypairs;
-            if (typeof keypairsRaw === 'string') {
-              keypairs = JSON.parse(keypairsRaw);
-            } else {
-              keypairs = keypairsRaw;
-            }
-
-            return { success: true, keypairs };
-          } catch (listError) {
-            console.error('Background: Error calling list_keypairs:', listError);
-            throw listError;
-          }
-
-        case 'selectKeypair':
-          vault.select_keypair(request.keyId);
-          return { success: true };
-
-        case 'getCurrentKeypairMetadata':
-          const metadata = vault.current_keypair_metadata();
-          return { success: true, metadata };
-
-        case 'getCurrentKeypairPublicKey':
-          const publicKey = vault.current_keypair_public_key();
-          const hexKey = toHex(publicKey);
-          return { success: true, publicKey: hexKey };
-
-        case 'sign':
-          const signature = await vault.sign(new Uint8Array(request.message));
-          return { success: true, signature };
-
-        case 'encrypt':
-          // Check if session is unlocked
-          if (!vault.is_unlocked()) {
-            return { success: false, error: 'Session is not unlocked' };
-          }
-
-          try {
-            // Convert message to Uint8Array for WASM
-            const messageBytes = new TextEncoder().encode(request.message);
-
-            // Use WASM encrypt_data function with ChaCha20-Poly1305
-            const encryptedData = await vault.encrypt_data(messageBytes);
-
-            // Convert result to base64 for easy handling
-            const encryptedMessage = btoa(String.fromCharCode(...new Uint8Array(encryptedData)));
-            return { success: true, encryptedMessage };
-          } catch (error) {
-            console.error('Encryption error:', error);
-            return { success: false, error: error.message };
-          }
-
-        case 'decrypt':
-          // Check if session is unlocked
-          if (!vault.is_unlocked()) {
-            return { success: false, error: 'Session is not unlocked' };
-          }
-
-          try {
-            // Convert base64 back to Uint8Array
-            const encryptedBytes = new Uint8Array(atob(request.encryptedMessage).split('').map(c => c.charCodeAt(0)));
-
-            // Use WASM decrypt_data function with ChaCha20-Poly1305
-            const decryptedData = await vault.decrypt_data(encryptedBytes);
-
-            // Convert result back to string
-            const decryptedMessage = new TextDecoder().decode(new Uint8Array(decryptedData));
-            return { success: true, decryptedMessage };
-          } catch (error) {
-            console.error('Decryption error:', error);
-            return { success: false, error: error.message };
-          }
-
-        case 'verify':
-          // Check if a keypair is selected
-          try {
-            const metadata = vault.current_keypair_metadata();
-            if (!metadata) {
-              return { success: false, error: 'No keypair selected' };
-            }
-
-            // Use WASM verify function
-            const isValid = await vault.verify(new Uint8Array(request.message), request.signature);
-            return { success: true, isValid };
-          } catch (error) {
-            console.error('Verification error:', error);
-            return { success: false, error: error.message };
-          }
-
-        case 'lockSession':
-          vault.lock_session();
-          await clearSessionWithKeepAlive();
-          return { success: true };
-
-        case 'getStatus':
-          const status = vault ? vault.is_unlocked() : false;
-          const session = await loadSession();
-          return {
-            success: true,
-            status,
-            session: session ? { keyspace: session.keyspace } : null
-          };
-
-        default:
-          throw new Error('Unknown action: ' + request.action);
+      const handler = messageHandlers[request.action];
+      if (handler) {
+        return await handler(request);
+      } else {
+        throw new Error('Unknown action: ' + request.action);
       }
     } catch (error) {
-      console.error('Background script error:', error);
       return { success: false, error: error.message };
     }
   };
@@ -342,4 +294,23 @@ chrome.runtime.onStartup.addListener(() => {
 
 chrome.runtime.onInstalled.addListener(() => {
   initVault();
+});
+
+// Handle popup connection for keep-alive and timeout notifications
+chrome.runtime.onConnect.addListener((port) => {
+  if (port.name === 'popup') {
+    // Track popup connection
+    popupPort = port;
+
+    // If we have an active session, ensure keep-alive is running
+    if (currentSession) {
+      startKeepAlive();
+    }
+
+    port.onDisconnect.addListener(() => {
+      // Popup closed, clear reference and stop keep-alive
+      popupPort = null;
+      stopKeepAlive();
+    });
+  }
 });
\ No newline at end of file
diff --git a/crypto_vault_extension/icons/icon128.png b/crypto_vault_extension/icons/icon128.png
index e5869e4bb9d87bd54ec6a76dcef3fc7a95a210b6..3e8e2e102d12f6192b8ce64578d2c3812586061d 100644
GIT binary patch
literal 7701
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
P00000NkvXXu0mjfBjv06

literal 1958
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
bpOXRd5OR2a!NuD<9~ST=`nuJ-QnUUAymu?0

diff --git a/crypto_vault_extension/icons/icon16.png b/crypto_vault_extension/icons/icon16.png
index 53486793ec88f6c7acce3e13ad5d4ec3c64e059b..0a943c9057e556e0fa3d919317ac27d034631779 100644
GIT binary patch
delta 663
zcmV;I0%-ll1Ed9z8Gi-<001BJ|6u?C00DDSM?wIu&K&6g00Le~L_t(IPmR(|NK{c2
z0N``)eQ$i@n9q5QKa0pviK0y@C4;U+kXl61LIjsB+P0_}L#V)og!s2A4XlBA5<-*)
zZ9`hLDEf8NU~1Mh<4n`cn`Yj;zk5PuMuWz@s|)9xk8|$11b=oNRaJeWD0VZ(P9vg7
z2;qphUX^+MvN17H&(J>U0Lh4=@x193ER#8KNU=T?3VA#p&#)v(R~Tbo2q6{#P;?4)
z$`3W)pe<0&jd_aX5Fpg#Y;yJZfc2&Xgu~%8ilRI<O><4x^&!rAezOa&9XWeUd(hAH
z=(3Jxw`o)!Re#*(qJwm@@wz!s0%m7tFZz7G>0~lF)z{Z|quANvaBEMK7#X8Z!DrZX
zhEi;BG3>WEojDvZE|&mRRWH@n)=s5Tsmb2n-rGfBetNL0CHr_%aaK+MIt2nCaD+_W
zVnfY?`uG;GsvhujsXpjPM|y}Ei&WE<r6OSPgLSqkwSNkUm@H%sa5(v$v*~D_=f_Un
zg7g-UeBuenl~z!oP_uh0yYH3-u<=#^!y*gKH*@EUv29?^9gy92P+(XVux)_YI|%?G
z9o1NC`$%SGvvwPJ<POM^^&fyh?0qEwho2ic*3~xh>%$HZ-UQ4&M{pc~?;ooGkVK;z
zboj^9tA9JdLsvj{J3)b#A7KmlBm;6t#C6u$KAQZz1Kf87WNGg=;0W+_$qNEP=3Aa#
z@Q){7lz{lXiff8w4hRIj<+gwTu)bCeR@N1XYpk>5ZhWHzMDA2HGm)MXDJtavAb^_Y
xS}r8qnYM}ev%l6@wrC%L(pTO`?mtuh0MiN)AQ1Sq63qYr002ovPDHLkV1gk=HCg}w

literal 454
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!Lb6AYF9SoB8UsT^3j@P1pisjL
z28L1t28LG&3=CE?7#PG0=Ijcz0ZNnx_=LCuX@&;6qW}N@v){R72((wVB*-tA!D7q1
zh+lush<$oxl9ke<qv6uG<Ok2QJqunit;w?~TlbAG>ClJ6fgFKA4U9?N?k;Lk95c28
zIqW5#zOL*qSq1nll@Hx){s0u}_jGX#k+^K@@5$6+z_EDo)m`tyUhn(xU!U(r7N6&d
zMg|7wKQ`~xA2jPX8}Kaoe@?4QxIv|F3U|<%2qT}^3CRb868^C+U8NOT=h*ApeZwr`
z_RiNA7rsBBr<`&2k4}5zos2UcMm7gs{J0c7)xw=-q^Cu1-Vhu9?C7<el<#vhipyng
nZF}|j@3}eGYvY$E{%5y7%-_Fn+3in2r!jcC`njxgN@xNAb}yAs

diff --git a/crypto_vault_extension/icons/icon32.png b/crypto_vault_extension/icons/icon32.png
new file mode 100644
index 0000000000000000000000000000000000000000..fac3a65615c1261593ac3760d9a974713d18e540
GIT binary patch
literal 1537
zcmV+c2LAbpP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px)yGcYrR9HvFmwRkfRUXH`=bZbRd+$u?Fw)>Eiy|f)ixCwuO3bpGtjU`AmygCx
zBx{q6`-dhbDk^FQMIo?(aaDGcVptZchL{lJBR>9+eJHwNS4CQlN>N~1+G(fr?45hh
zYcmxp^f4t&6YpO)x#xF&pY#2_&L#MXA2OT&J$v>fwAPmqLQ;$|bMks2M5L4&6ha*B
z?CdOm^Z;UBGQP+%_(B8PQkn!|gzSltTK2ckBb;pC5TLue`zlIlhh<s6W{fQ%gv2Iq
zptY_lC3?e<zmphz<KK&eeOKB{-eMZ6ooM0#C`e5{4I=t>C1P(~m#&^XbB`GTcJ11=
zJmxsh#$5L|mSs`K7zmlVTx$&}C1iD|n9Oz^xsZQ!vB^{_5=Os-?xmV6u?%^Mlw=@?
zjF$=_+kPg*v;aGI?wsd1&gMiSvBtJ-i*t@J45d=4E}=So0zwESgt#%sgj@Io3;SP0
zoQ|T(%|n%tJz3TCYZv<GzQdpJ3~>V&G*^j?hmDi9SC*a%$Fu;uckjN%_x-K$czh}6
zoD_@2|4A9H6#`#dmZeVvL{UT>$5}z6{MN;#*A^{`_CqRyQq6ogKODSp!!`taZwG6?
z%K5!-%P!ZHx)50Z2m`FSVtwsceV>^C9!e&Y>ulR@DHI9_tJRgiTeIdr(<SWQy?a?p
z{=M5Sti1o~LY74+35ucdNMShma~&WJ&^w=rb-1SN_DqEeXJN$E^_Q>XpUnu+-QE2}
zYisKxwr#t^xg5Uy>MNE`rzfPJ407<Pwq?F8Kbdb7Vs&{6k=a)jtaD7F*8&zKEcslE
zC4R+-MpZBblKk=)kJbJOKu@c{WPm$6IvQ5Xhg+^}_fa{pkR12x3#A4s+$>3rLxf<l
zXNZd|`a|T(f`wHfS1o&-A3SFTW&?QhFP-fz(TM{~!u`HUXA}xb1Et9PZ-J{jR-|iv
za|ZD0-*>bpqN4|v6khS?sVwL;dezTg6QokAnNR0(<?XAtqcR1cXGbClW?VO9-Fy%A
zF1^(-EW2DT<0A3WU5z?sK$c!yVk_6rt9;?aM?OPb*T7CmUbm~CyryV*EMmJQmz$P7
z6C9r?<<l=cFT%H5TmI;~@;=itTQzY!fDo+|Y+5?2drj?z)Zp-wL~*LeY8V>=P||Ry
zgwRBehSs4_kuE{Sz7^@}AOR*yc|xo&UiR9OHrYDg<9Auc#P``o#kAjpD#1{%2~P`f
zMf3fE`G<;Ge0_BqV#Zm}_p;Y!+sLFm(P6Qf6X{%tf`DM~uniC63X}!{`@w5A<h!P`
zolsyLfFYCec}KGfgf(E`a11VFU29bgjdur2yz{2a*ucyRba`#IhfFHYJ1o{*2%-qc
z9&+IkF&^wt(*AtSTDN@D$lqoM@T2AdLW1mJ4;~p;KvyI7Z84;eUA;N~T4MmWo&$3M
z0Azc7xJ1@RXE+pCJ1UYqx@z-qxiNsFGAVB^LO^h$CqABp8jwZK-Y*b&|MeS6-!uj=
z=LmoU$9og-iGtQZs7QH~vyIC)jcjZTV4MPIvJVIj9P3TMg@RJh1#W&g8mfC&ZOivG
z2B0dFa+}WqDS_{L=fTseJ{iMYWd3!amRsBKQrcH9L!vUNSRJ6bMkFP{(cV`0M30AH
zOwc2voUVN<F|;q8{_#q8)-dYJcx`q}&W!>JIP&Fu#83GOC8_2G`%~%Q(1z9f&u+&*
zcEUP<C4VTxGbY)&wB9Mh3Ba-M<6u=26wnnxKQ9Q}zj9mdUo+;w=Ue;*t&Z4|a{1jc
zQ=X6Cvus96HU__Mfk*XNJ~B3*6a!lt=0Hyx7V~4bIwo0fQ1vsAI{f)PT0?P3za7c?
zA2Z2rQi|VvZDx4N9GG$;`5+Br!3A(E37R}V-{V$!08t()=!Xj33ogGglN-MQH=Kq|
n_-o2^)}Pa+c0UK>pB&)-fj-<n9dJqN00000NkvXXu0mjfU(D8Z

literal 0
HcmV?d00001

diff --git a/crypto_vault_extension/icons/icon36.png b/crypto_vault_extension/icons/icon36.png
new file mode 100644
index 0000000000000000000000000000000000000000..e21d6327a3671ad012e0c20883df8acb0a2a9f46
GIT binary patch
literal 1636
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

literal 0
HcmV?d00001

diff --git a/crypto_vault_extension/icons/icon48.png b/crypto_vault_extension/icons/icon48.png
index 3d34ec4a92c8a2f8d445ab60442cb8de606dc500..046c9827bdfd8b1274e824141689a43a4a5c6b25 100644
GIT binary patch
delta 2152
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

literal 1105
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-s3dtTpz6=aiY77hwEes65fI<x~
z7#K={3ST8KFj&oCU=S~uvn$Ysfq_vxz$e5NsDPni6rqH`|NsB@Y*N1j44LSXAirP+
z1_`U84VRwq1-+1)#bk2N=FA_39q*>aIsJOnB&PS}8QYXk8Cq8+@I<_NP;r23QeByV
zMZ>lu$AkhdEP3-SCc&p>4~xhOr9<l$8Qkd$*)?y@k2N2>x~}CENO|1gU76wpw1zRs
z+ubGR)eVN}Kn{C}r>`sfOI87XOXWj1n?EoxFgba;IEHu}@10s5y~;u0m^sHm?o1Ia
z4cBFXQcI==MNPY_v$=TJ4c~qLzk58makDYD;NORd<@e;R&s$h4iEy>WJ`=K;|6p1q
z+tKz3PlC?v_bBvKJU9Q`pIf#nll!)GYe%XJ+!QrDG(URoZ<Wk{xu)*w*RIvho}(|)
z-MZ(Et;Xx@E6hgooOP%EeO~1GwT0&`NA6+Ye6_DT7pR-ZraCMCp1$o)PO5bE{2j4{
zTi2>81+3jE`d(s3+8YhyjbW-xyQ??H?BzI`RIB#xt&n!s4*lEa3$)(sK5ph=I&)g|
zI?*Y$S5+9Au3u?hQ1ievYyng6f;%0IvmAHs6i}G8cABOh*Nb-d<8S?z*VdG*&}X=z
zzWjgs?=MICm_JSHxzBd<R50W2*UPHXKm42X_0IWqz6|HI`AoH*w{&Isxm-D9`gQJ!
z7wmtZ`k7qNWN+Y>^Y@PIJMFdOP`tzbij@yuI`$<NF~<bzt!F5xZBDPg_w%XTy1OyV
z55DpF^VJr1WS4JeSkbiX-tR}Y89IBe^C!5jy2qcrddIX{h6Xbx-<mmZE1wB^DC;g#
zQ8#tV;JLPAa)av9`3_-v3Ly;1uWb(Qz5h#?{ZH;e`E@^Kcx}v?rDw{zGAo-Ict7Kw
zS2ve8U7kUIVdytDwe+M}!UnPV52a0xEDz4yUbx>xB_{CO-G#@jy&1mn&wMuBzJ#ga
zi2o_66*WQso_q=Fdg4E|#D#NlJpb?4wagbEuU_4>T4&{5eG$oL+fD!Gt}xoV&sRje
n&1@deG8=nYpJP!wX34Luif;N|_)83!z!*GT{an^LB{Ts5SwfiL

diff --git a/crypto_vault_extension/js/errorHandler.js b/crypto_vault_extension/js/errorHandler.js
index 585f076..662e8ec 100644
--- a/crypto_vault_extension/js/errorHandler.js
+++ b/crypto_vault_extension/js/errorHandler.js
@@ -1,5 +1,3 @@
-// Enhanced Error Handling System for CryptoVault Extension
-
 class CryptoVaultError extends Error {
   constructor(message, code, retryable = false, userMessage = null) {
     super(message);
@@ -11,35 +9,24 @@ class CryptoVaultError extends Error {
   }
 }
 
-// Error codes for different types of errors
 const ERROR_CODES = {
-  // Network/Connection errors (retryable)
   NETWORK_ERROR: 'NETWORK_ERROR',
   TIMEOUT_ERROR: 'TIMEOUT_ERROR',
   SERVICE_UNAVAILABLE: 'SERVICE_UNAVAILABLE',
-
-  // Authentication errors (not retryable)
   INVALID_PASSWORD: 'INVALID_PASSWORD',
   SESSION_EXPIRED: 'SESSION_EXPIRED',
   UNAUTHORIZED: 'UNAUTHORIZED',
-
-  // Crypto errors (not retryable)
   CRYPTO_ERROR: 'CRYPTO_ERROR',
   INVALID_SIGNATURE: 'INVALID_SIGNATURE',
   ENCRYPTION_FAILED: 'ENCRYPTION_FAILED',
-
-  // Validation errors (not retryable)
   INVALID_INPUT: 'INVALID_INPUT',
   MISSING_KEYPAIR: 'MISSING_KEYPAIR',
   INVALID_FORMAT: 'INVALID_FORMAT',
-
-  // System errors (sometimes retryable)
   WASM_ERROR: 'WASM_ERROR',
   STORAGE_ERROR: 'STORAGE_ERROR',
   UNKNOWN_ERROR: 'UNKNOWN_ERROR'
 };
 
-// User-friendly error messages
 const ERROR_MESSAGES = {
   [ERROR_CODES.NETWORK_ERROR]: 'Connection failed. Please check your internet connection and try again.',
   [ERROR_CODES.TIMEOUT_ERROR]: 'Operation timed out. Please try again.',
@@ -62,7 +49,6 @@ const ERROR_MESSAGES = {
   [ERROR_CODES.UNKNOWN_ERROR]: 'An unexpected error occurred. Please try again.'
 };
 
-// Determine if an error is retryable
 const RETRYABLE_ERRORS = new Set([
   ERROR_CODES.NETWORK_ERROR,
   ERROR_CODES.TIMEOUT_ERROR,
@@ -71,11 +57,9 @@ const RETRYABLE_ERRORS = new Set([
   ERROR_CODES.STORAGE_ERROR
 ]);
 
-// Enhanced error classification
 function classifyError(error) {
   const errorMessage = getErrorMessage(error);
 
-  // Network/Connection errors
   if (errorMessage.includes('fetch') || errorMessage.includes('network') || errorMessage.includes('connection')) {
     return new CryptoVaultError(
       errorMessage,
@@ -85,7 +69,6 @@ function classifyError(error) {
     );
   }
 
-  // Authentication errors
   if (errorMessage.includes('password') || errorMessage.includes('Invalid password')) {
     return new CryptoVaultError(
       errorMessage,
@@ -104,7 +87,6 @@ function classifyError(error) {
     );
   }
 
-  // Crypto errors
   if (errorMessage.includes('decryption error') || errorMessage.includes('aead::Error')) {
     return new CryptoVaultError(
       errorMessage,
@@ -123,7 +105,6 @@ function classifyError(error) {
     );
   }
 
-  // Validation errors
   if (errorMessage.includes('No keypair selected')) {
     return new CryptoVaultError(
       errorMessage,
@@ -133,7 +114,6 @@ function classifyError(error) {
     );
   }
 
-  // WASM errors
   if (errorMessage.includes('wasm') || errorMessage.includes('WASM')) {
     return new CryptoVaultError(
       errorMessage,
@@ -143,7 +123,6 @@ function classifyError(error) {
     );
   }
 
-  // Default to unknown error
   return new CryptoVaultError(
     errorMessage,
     ERROR_CODES.UNKNOWN_ERROR,
@@ -152,7 +131,6 @@ function classifyError(error) {
   );
 }
 
-// Get error message from various error types
 function getErrorMessage(error) {
   if (!error) return 'Unknown error';
 
@@ -179,14 +157,13 @@ function getErrorMessage(error) {
         return stringified;
       }
     } catch (e) {
-      // Ignore JSON stringify errors
+      // Silently handle JSON stringify errors
     }
   }
 
   return 'Unknown error';
 }
 
-// Retry logic with exponential backoff
 async function withRetry(operation, options = {}) {
   const {
     maxRetries = 3,
@@ -205,20 +182,16 @@ async function withRetry(operation, options = {}) {
       const classifiedError = classifyError(error);
       lastError = classifiedError;
 
-      // Don't retry if it's the last attempt or error is not retryable
       if (attempt === maxRetries || !classifiedError.retryable) {
         throw classifiedError;
       }
 
-      // Calculate delay with exponential backoff
       const delay = Math.min(baseDelay * Math.pow(backoffFactor, attempt), maxDelay);
 
-      // Call retry callback if provided
       if (onRetry) {
         onRetry(attempt + 1, delay, classifiedError);
       }
 
-      // Wait before retrying
       await new Promise(resolve => setTimeout(resolve, delay));
     }
   }
@@ -226,7 +199,6 @@ async function withRetry(operation, options = {}) {
   throw lastError;
 }
 
-// Enhanced operation wrapper with loading states
 async function executeOperation(operation, options = {}) {
   const {
     loadingElement = null,
@@ -235,7 +207,6 @@ async function executeOperation(operation, options = {}) {
     onProgress = null
   } = options;
 
-  // Show loading state
   if (loadingElement) {
     setButtonLoading(loadingElement, true);
   }
@@ -253,25 +224,21 @@ async function executeOperation(operation, options = {}) {
       }
     });
 
-    // Show success message if provided
     if (successMessage) {
       showToast(successMessage, 'success');
     }
 
     return result;
   } catch (error) {
-    // Show user-friendly error message
     showToast(error.userMessage || error.message, 'error');
     throw error;
   } finally {
-    // Hide loading state
     if (loadingElement) {
       setButtonLoading(loadingElement, false);
     }
   }
 }
 
-// Export for use in other modules
 window.CryptoVaultError = CryptoVaultError;
 window.ERROR_CODES = ERROR_CODES;
 window.classifyError = classifyError;
diff --git a/crypto_vault_extension/manifest.json b/crypto_vault_extension/manifest.json
index bad7309..814bf08 100644
--- a/crypto_vault_extension/manifest.json
+++ b/crypto_vault_extension/manifest.json
@@ -9,17 +9,23 @@
     "activeTab"
   ],
 
+  "icons": {
+    "16": "icons/icon16.png",
+    "32": "icons/icon32.png",
+    "48": "icons/icon48.png",
+    "128": "icons/icon128.png"
+  },
+
   "background": {
     "service_worker": "background.js",
     "type": "module"
   },
 
-
-
   "action": {
     "default_popup": "popup.html",
     "default_icon": {
       "16": "icons/icon16.png",
+      "32": "icons/icon32.png",
       "48": "icons/icon48.png",
       "128": "icons/icon128.png"
     }
diff --git a/crypto_vault_extension/popup.html b/crypto_vault_extension/popup.html
index dee003b..551e4ee 100644
--- a/crypto_vault_extension/popup.html
+++ b/crypto_vault_extension/popup.html
@@ -12,6 +12,23 @@
         <h1>CryptoVault</h1>
       </div>
       <div class="header-actions">
+        <div class="settings-container">
+          <button id="settingsToggle" class="btn-icon-only" title="Settings">
+            <svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+              <circle cx="12" cy="12" r="3"></circle>
+              <path d="M19.4 15a1.65 1.65 0 0 0 .33 1.82l.06.06a2 2 0 0 1 0 2.83 2 2 0 0 1-2.83 0l-.06-.06a1.65 1.65 0 0 0-1.82-.33 1.65 1.65 0 0 0-1 1.51V21a2 2 0 0 1-2 2 2 2 0 0 1-2-2v-.09A1.65 1.65 0 0 0 9 19.4a1.65 1.65 0 0 0-1.82.33l-.06.06a2 2 0 0 1-2.83 0 2 2 0 0 1 0-2.83l.06-.06a1.65 1.65 0 0 0 .33-1.82 1.65 1.65 0 0 0-1.51-1H3a2 2 0 0 1-2-2 2 2 0 0 1 2-2h.09A1.65 1.65 0 0 0 4.6 9a1.65 1.65 0 0 0-.33-1.82l-.06-.06a2 2 0 0 1 0-2.83 2 2 0 0 1 2.83 0l.06.06a1.65 1.65 0 0 0 1.82.33H9a1.65 1.65 0 0 0 1-1.51V3a2 2 0 0 1 2-2 2 2 0 0 1 2 2v.09a1.65 1.65 0 0 0 1 1.51 1.65 1.65 0 0 0 1.82-.33l.06-.06a2 2 0 0 1 2.83 0 2 2 0 0 1 0 2.83l-.06.06a1.65 1.65 0 0 0-.33 1.82V9a1.65 1.65 0 0 0 1.51 1H21a2 2 0 0 1 2 2 2 2 0 0 1-2 2h-.09a1.65 1.65 0 0 0-1.51 1z"></path>
+            </svg>
+          </button>
+          <div class="settings-dropdown hidden" id="settingsDropdown">
+            <div class="settings-item">
+              <label for="timeoutInput">Session Timeout</label>
+              <div class="timeout-input-group">
+                <input type="number" id="timeoutInput" min="3" max="300" value="15">
+                <span>seconds</span>
+              </div>
+            </div>
+          </div>
+        </div>
         <button id="themeToggle" class="btn-icon-only" title="Switch to dark mode">
           <svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
             <path d="M21 12.79A9 9 0 1 1 11.21 3 7 7 0 0 0 21 12.79z"></path>
@@ -44,10 +61,7 @@
       <!-- Status Section -->
       <div class="vault-status" id="vaultStatus">
         <div class="status-indicator" id="statusIndicator">
-          <div class="status-content">
-            <div class="status-dot"></div>
-            <span id="statusText">Initializing...</span>
-          </div>
+          <span id="statusText"></span>
           <button id="lockBtn" class="btn btn-ghost btn-small hidden">
             <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
               <rect x="3" y="11" width="18" height="11" rx="2" ry="2"></rect>
diff --git a/crypto_vault_extension/popup.js b/crypto_vault_extension/popup.js
index fb2bd01..42ffe41 100644
--- a/crypto_vault_extension/popup.js
+++ b/crypto_vault_extension/popup.js
@@ -1,33 +1,27 @@
-// Enhanced toast system
+// Consolidated toast system
 function showToast(message, type = 'info') {
-  // Remove any existing toast
-  const existingToast = document.querySelector('.toast-notification');
-  if (existingToast) {
-    existingToast.remove();
-  }
+  document.querySelector('.toast-notification')?.remove();
 
-  // Create new toast element
-  const toast = document.createElement('div');
-  toast.className = `toast-notification toast-${type}`;
+  const icons = {
+    success: '<polyline points="20,6 9,17 4,12"></polyline>',
+    error: '<circle cx="12" cy="12" r="10"></circle><line x1="15" y1="9" x2="9" y2="15"></line><line x1="9" y1="9" x2="15" y2="15"></line>',
+    info: '<circle cx="12" cy="12" r="10"></circle><line x1="12" y1="16" x2="12" y2="12"></line><line x1="12" y1="8" x2="12.01" y2="8"></line>'
+  };
 
-  // Add icon based on type
-  const icon = getToastIcon(type);
+  const toast = Object.assign(document.createElement('div'), {
+    className: `toast-notification toast-${type}`,
+    innerHTML: `
+      <div class="toast-icon">
+        <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+          ${icons[type] || icons.info}
+        </svg>
+      </div>
+      <div class="toast-content"><div class="toast-message">${message}</div></div>
+    `
+  });
 
-  toast.innerHTML = `
-    <div class="toast-icon">${icon}</div>
-    <div class="toast-content">
-      <div class="toast-message">${message}</div>
-    </div>
-    <button class="toast-close" onclick="this.parentElement.remove()">×</button>
-  `;
-
-  // Add to document
   document.body.appendChild(toast);
-
-  // Trigger entrance animation
   setTimeout(() => toast.classList.add('toast-show'), 10);
-
-  // Auto-remove after 4 seconds
   setTimeout(() => {
     if (toast.parentElement) {
       toast.classList.add('toast-hide');
@@ -36,30 +30,6 @@ function showToast(message, type = 'info') {
   }, 4000);
 }
 
-function getToastIcon(type) {
-  switch (type) {
-    case 'success':
-      return `<svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-        <polyline points="20,6 9,17 4,12"></polyline>
-      </svg>`;
-    case 'error':
-      return `<svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-        <circle cx="12" cy="12" r="10"></circle>
-        <line x1="15" y1="9" x2="9" y2="15"></line>
-        <line x1="9" y1="9" x2="15" y2="15"></line>
-      </svg>`;
-    case 'info':
-    default:
-      return `<svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-        <circle cx="12" cy="12" r="10"></circle>
-        <line x1="12" y1="16" x2="12" y2="12"></line>
-        <line x1="12" y1="8" x2="12.01" y2="8"></line>
-      </svg>`;
-  }
-}
-
-
-
 // Enhanced loading states for buttons
 function setButtonLoading(button, loading = true) {
   if (loading) {
@@ -109,16 +79,17 @@ function showSection(sectionId) {
 }
 
 function setStatus(text, isConnected = false) {
-  document.getElementById('statusText').textContent = text;
-  const indicator = document.getElementById('statusIndicator');
-  indicator.classList.toggle('connected', isConnected);
-
-  // Show/hide lock button - only show when session is unlocked
+  const statusText = document.getElementById('statusText');
+  const statusSection = document.getElementById('vaultStatus');
   const lockBtn = document.getElementById('lockBtn');
-  if (lockBtn) {
-    // Only show lock button when connected AND status indicates unlocked session
-    const isUnlocked = isConnected && text.toLowerCase().startsWith('connected to');
-    lockBtn.classList.toggle('hidden', !isUnlocked);
+
+  if (isConnected && text) {
+    // Show keyspace name and status section
+    statusText.textContent = text;
+    statusSection.classList.remove('hidden');
+    if (lockBtn) {
+      lockBtn.classList.remove('hidden');
+    }
   }
 }
 
@@ -146,12 +117,20 @@ function stringToUint8Array(str) {
 
 // DOM Elements
 const elements = {
+  // Authentication elements
   keyspaceInput: document.getElementById('keyspaceInput'),
   passwordInput: document.getElementById('passwordInput'),
   createKeyspaceBtn: document.getElementById('createKeyspaceBtn'),
   loginBtn: document.getElementById('loginBtn'),
+
+  // Header elements
   lockBtn: document.getElementById('lockBtn'),
   themeToggle: document.getElementById('themeToggle'),
+  settingsToggle: document.getElementById('settingsToggle'),
+  settingsDropdown: document.getElementById('settingsDropdown'),
+  timeoutInput: document.getElementById('timeoutInput'),
+
+  // Keypair management elements
   toggleAddKeypairBtn: document.getElementById('toggleAddKeypairBtn'),
   addKeypairCard: document.getElementById('addKeypairCard'),
   keyTypeSelect: document.getElementById('keyTypeSelect'),
@@ -160,34 +139,91 @@ const elements = {
   cancelAddKeypairBtn: document.getElementById('cancelAddKeypairBtn'),
   keypairsList: document.getElementById('keypairsList'),
 
-  // Sign tab
+  // Crypto operation elements - Sign tab
   messageInput: document.getElementById('messageInput'),
   signBtn: document.getElementById('signBtn'),
   signatureResult: document.getElementById('signatureResult'),
   copySignatureBtn: document.getElementById('copySignatureBtn'),
 
-  // Encrypt tab
+  // Crypto operation elements - Encrypt tab
   encryptMessageInput: document.getElementById('encryptMessageInput'),
   encryptBtn: document.getElementById('encryptBtn'),
   encryptResult: document.getElementById('encryptResult'),
 
-  // Decrypt tab
+  // Crypto operation elements - Decrypt tab
   encryptedMessageInput: document.getElementById('encryptedMessageInput'),
   decryptBtn: document.getElementById('decryptBtn'),
   decryptResult: document.getElementById('decryptResult'),
 
-  // Verify tab
+  // Crypto operation elements - Verify tab
   verifyMessageInput: document.getElementById('verifyMessageInput'),
   signatureToVerifyInput: document.getElementById('signatureToVerifyInput'),
   verifyBtn: document.getElementById('verifyBtn'),
   verifyResult: document.getElementById('verifyResult'),
 };
 
+// Global state variables
 let currentKeyspace = null;
 let selectedKeypairId = null;
 let backgroundPort = null;
+let sessionTimeoutDuration = 15; // Default 15 seconds
 
+// Session timeout management
+function handleError(error, context, shouldShowToast = true) {
+  const errorMessage = error?.message || 'An unexpected error occurred';
 
+  if (shouldShowToast) {
+    showToast(`${context}: ${errorMessage}`, 'error');
+  }
+}
+
+function validateInput(value, fieldName, options = {}) {
+  const { minLength = 1, maxLength = 1000, required = true } = options;
+
+  if (required && (!value || !value.trim())) {
+    showToast(`${fieldName} is required`, 'error');
+    return false;
+  }
+
+  if (value && value.length < minLength) {
+    showToast(`${fieldName} must be at least ${minLength} characters`, 'error');
+    return false;
+  }
+
+  if (value && value.length > maxLength) {
+    showToast(`${fieldName} must be less than ${maxLength} characters`, 'error');
+    return false;
+  }
+
+  return true;
+}
+async function loadTimeoutSetting() {
+  const result = await chrome.storage.local.get(['sessionTimeout']);
+  sessionTimeoutDuration = result.sessionTimeout || 15;
+  if (elements.timeoutInput) {
+    elements.timeoutInput.value = sessionTimeoutDuration;
+  }
+}
+
+async function checkSessionTimeout() {
+  const result = await chrome.storage.local.get(['sessionTimedOut']);
+  if (result.sessionTimedOut) {
+    // Clear the flag
+    await chrome.storage.local.remove(['sessionTimedOut']);
+    // Show timeout notification
+    showToast('Session timed out due to inactivity', 'info');
+  }
+}
+async function saveTimeoutSetting(timeout) {
+  sessionTimeoutDuration = timeout;
+  await sendMessage('updateTimeout', { timeout });
+}
+
+async function resetSessionTimeout() {
+  if (currentKeyspace) {
+    await sendMessage('resetTimeout');
+  }
+}
 
 // Theme management
 function initializeTheme() {
@@ -205,18 +241,46 @@ function toggleTheme() {
   updateThemeIcon(newTheme);
 }
 
+// Settings dropdown management
+function toggleSettingsDropdown() {
+  const dropdown = elements.settingsDropdown;
+  if (dropdown) {
+    dropdown.classList.toggle('hidden');
+  }
+}
+
+function closeSettingsDropdown() {
+  const dropdown = elements.settingsDropdown;
+  if (dropdown) {
+    dropdown.classList.add('hidden');
+  }
+}
+
 function updateThemeIcon(theme) {
   const themeToggle = elements.themeToggle;
   if (!themeToggle) return;
 
   if (theme === 'dark') {
-    themeToggle.innerHTML = '☀️';
+    // Bright sun SVG for dark theme
+    themeToggle.innerHTML = `
+      <svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+        <circle cx="12" cy="12" r="5"></circle>
+        <line x1="12" y1="1" x2="12" y2="3"></line>
+        <line x1="12" y1="21" x2="12" y2="23"></line>
+        <line x1="4.22" y1="4.22" x2="5.64" y2="5.64"></line>
+        <line x1="18.36" y1="18.36" x2="19.78" y2="19.78"></line>
+        <line x1="1" y1="12" x2="3" y2="12"></line>
+        <line x1="21" y1="12" x2="23" y2="12"></line>
+        <line x1="4.22" y1="19.78" x2="5.64" y2="18.36"></line>
+        <line x1="18.36" y1="5.64" x2="19.78" y2="4.22"></line>
+      </svg>
+    `;
     themeToggle.title = 'Switch to light mode';
   } else {
-    // Dark crescent moon SVG for better visibility
+    // Dark crescent moon SVG for light theme
     themeToggle.innerHTML = `
-      <svg width="18" height="18" viewBox="0 0 24 24" fill="currentColor" stroke="none">
-        <path d="M21 12.79A9 9 0 1 1 11.21 3 7 7 0 0 0 21 12.79z" fill="#333"/>
+      <svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+        <path d="M21 12.79A9 9 0 1 1 11.21 3 7 7 0 0 0 21 12.79z"></path>
       </svg>
     `;
     themeToggle.title = 'Switch to dark mode';
@@ -225,14 +289,30 @@ function updateThemeIcon(theme) {
 
 // Establish connection to background script for keep-alive
 function connectToBackground() {
-  try {
-    backgroundPort = chrome.runtime.connect({ name: 'popup' });
-    backgroundPort.onDisconnect.addListener(() => {
-      backgroundPort = null;
-    });
-  } catch (error) {
-    // Silently handle connection errors
-  }
+  backgroundPort = chrome.runtime.connect({ name: 'popup' });
+
+  // Listen for messages from background script
+  backgroundPort.onMessage.addListener((message) => {
+    if (message.type === 'sessionTimeout') {
+      // Update UI state to reflect locked session
+      currentKeyspace = null;
+      selectedKeypairId = null;
+      setStatus('', false);
+      showSection('authSection');
+      clearVaultState();
+
+      // Clear form inputs
+      if (elements.keyspaceInput) elements.keyspaceInput.value = '';
+      if (elements.passwordInput) elements.passwordInput.value = '';
+
+      // Show timeout notification
+      showToast(message.message, 'info');
+    }
+  });
+
+  backgroundPort.onDisconnect.addListener(() => {
+    backgroundPort = null;
+  });
 }
 
 // Initialize
@@ -240,78 +320,78 @@ document.addEventListener('DOMContentLoaded', async function() {
   // Initialize theme first
   initializeTheme();
 
+  // Load timeout setting
+  await loadTimeoutSetting();
+
   // Ensure lock button starts hidden
   const lockBtn = document.getElementById('lockBtn');
   if (lockBtn) {
     lockBtn.classList.add('hidden');
   }
 
-  setStatus('Initializing...', false);
-
   // Connect to background script for keep-alive
   connectToBackground();
 
-  // Event listeners (with null checks)
-  if (elements.createKeyspaceBtn) {
-    elements.createKeyspaceBtn.addEventListener('click', createKeyspace);
-  }
-  if (elements.loginBtn) {
-    elements.loginBtn.addEventListener('click', login);
-  }
-  if (elements.lockBtn) {
-    elements.lockBtn.addEventListener('click', lockSession);
-  }
-  if (elements.themeToggle) {
-    elements.themeToggle.addEventListener('click', toggleTheme);
-  }
+  // Consolidated event listeners
+  const eventMap = {
+    createKeyspaceBtn: createKeyspace,
+    loginBtn: login,
+    lockBtn: lockSession,
+    themeToggle: toggleTheme,
+    settingsToggle: toggleSettingsDropdown,
+    toggleAddKeypairBtn: toggleAddKeypairForm,
+    addKeypairBtn: addKeypair,
+    cancelAddKeypairBtn: hideAddKeypairForm,
+    signBtn: signMessage,
+    encryptBtn: encryptMessage,
+    decryptBtn: decryptMessage,
+    verifyBtn: verifySignature
+  };
 
-  if (elements.toggleAddKeypairBtn) {
-    elements.toggleAddKeypairBtn.addEventListener('click', toggleAddKeypairForm);
-  }
-  if (elements.addKeypairBtn) {
-    elements.addKeypairBtn.addEventListener('click', addKeypair);
-  }
-  if (elements.cancelAddKeypairBtn) {
-    elements.cancelAddKeypairBtn.addEventListener('click', hideAddKeypairForm);
-  }
-
-  // Crypto operation buttons (with null checks)
-  if (elements.signBtn) {
-    elements.signBtn.addEventListener('click', signMessage);
-  }
-  if (elements.encryptBtn) {
-    elements.encryptBtn.addEventListener('click', encryptMessage);
-  }
-  if (elements.decryptBtn) {
-    elements.decryptBtn.addEventListener('click', decryptMessage);
-  }
-  if (elements.verifyBtn) {
-    elements.verifyBtn.addEventListener('click', verifySignature);
-  }
+  Object.entries(eventMap).forEach(([elementKey, handler]) => {
+    elements[elementKey]?.addEventListener('click', handler);
+  });
 
   // Tab functionality
   initializeTabs();
 
-  // Copy button event listeners (with null checks)
-  if (elements.copySignatureBtn) {
-    elements.copySignatureBtn.addEventListener('click', () => {
-      const signature = document.getElementById('signatureValue');
-      if (signature) {
-        copyToClipboard(signature.textContent);
-      }
-    });
-  }
+  // Additional event listeners
+  elements.copySignatureBtn?.addEventListener('click', () => {
+    copyToClipboard(document.getElementById('signatureValue')?.textContent);
+  });
 
-  // Enable sign button when message is entered (with null checks)
-  if (elements.messageInput && elements.signBtn) {
-    elements.messageInput.addEventListener('input', () => {
+  elements.messageInput?.addEventListener('input', () => {
+    if (elements.signBtn) {
       elements.signBtn.disabled = !elements.messageInput.value.trim() || !selectedKeypairId;
-    });
-  }
+    }
+  });
 
-  // Basic keyboard shortcuts
+  // Timeout setting event listener
+  elements.timeoutInput?.addEventListener('change', async (e) => {
+    const timeout = parseInt(e.target.value);
+    if (timeout >= 3 && timeout <= 300) {
+      await saveTimeoutSetting(timeout);
+    } else {
+      e.target.value = sessionTimeoutDuration; // Reset to current value if invalid
+    }
+  });
+
+  // Activity detection - reset timeout on any interaction
+  document.addEventListener('click', (e) => {
+    resetSessionTimeout();
+
+    // Close settings dropdown if clicking outside
+    if (!elements.settingsToggle?.contains(e.target) &&
+        !elements.settingsDropdown?.contains(e.target)) {
+      closeSettingsDropdown();
+    }
+  });
+  document.addEventListener('keydown', resetSessionTimeout);
+  document.addEventListener('input', resetSessionTimeout);
+
+  // Keyboard shortcuts
   document.addEventListener('keydown', (e) => {
-    if (e.key === 'Escape' && elements.addKeypairCard && !elements.addKeypairCard.classList.contains('hidden')) {
+    if (e.key === 'Escape' && !elements.addKeypairCard?.classList.contains('hidden')) {
       hideAddKeypairForm();
     }
     if (e.key === 'Enter' && e.target === elements.keyNameInput && elements.keyNameInput.value.trim()) {
@@ -331,16 +411,16 @@ async function checkExistingSession() {
       // Session is active
       currentKeyspace = response.session.keyspace;
       elements.keyspaceInput.value = currentKeyspace;
-      setStatus(`Connected to ${currentKeyspace}`, true);
+      setStatus(currentKeyspace, true);
       showSection('vaultSection');
       await loadKeypairs();
     } else {
       // No active session
-      setStatus('Ready', false);
+      setStatus('', false);
       showSection('authSection');
     }
   } catch (error) {
-    setStatus('Ready', false);
+    setStatus('', false);
     showSection('authSection');
   }
 }
@@ -370,34 +450,43 @@ function hideAddKeypairForm() {
 
 // Tab functionality
 function initializeTabs() {
-  const tabButtons = document.querySelectorAll('.tab-btn');
-  const tabContents = document.querySelectorAll('.tab-content');
+  const tabContainer = document.querySelector('.operation-tabs');
 
-  tabButtons.forEach(button => {
-    button.addEventListener('click', () => {
-      const targetTab = button.getAttribute('data-tab');
-
-      // Remove active class from all tabs and contents
-      tabButtons.forEach(btn => btn.classList.remove('active'));
-      tabContents.forEach(content => content.classList.remove('active'));
-
-      // Add active class to clicked tab and corresponding content
-      button.classList.add('active');
-      document.getElementById(`${targetTab}-tab`).classList.add('active');
-
-      // Clear results when switching tabs
-      clearTabResults();
-
-      // Update button states
-      updateButtonStates();
+  if (tabContainer) {
+    // Use event delegation for better performance
+    tabContainer.addEventListener('click', (e) => {
+      if (e.target.classList.contains('tab-btn')) {
+        handleTabSwitch(e.target);
+      }
     });
-  });
+  }
 
   // Initialize input validation
   initializeInputValidation();
 }
 
+function handleTabSwitch(clickedTab) {
+  const targetTab = clickedTab.getAttribute('data-tab');
+  const tabButtons = document.querySelectorAll('.tab-btn');
+  const tabContents = document.querySelectorAll('.tab-content');
 
+  // Remove active class from all tabs and contents
+  tabButtons.forEach(btn => btn.classList.remove('active'));
+  tabContents.forEach(content => content.classList.remove('active'));
+
+  // Add active class to clicked tab and corresponding content
+  clickedTab.classList.add('active');
+  const targetContent = document.getElementById(`${targetTab}-tab`);
+  if (targetContent) {
+    targetContent.classList.add('active');
+  }
+
+  // Clear results when switching tabs
+  clearTabResults();
+
+  // Update button states
+  updateButtonStates();
+}
 
 function clearTabResults() {
   // Hide all result sections (with null checks)
@@ -488,8 +577,6 @@ function clearVaultState() {
   selectedKeypairId = null;
   updateButtonStates();
 
-
-
   // Hide add keypair form if open
   hideAddKeypairForm();
 
@@ -499,24 +586,31 @@ function clearVaultState() {
   }
 }
 
-async function createKeyspace() {
+// Validation utilities
+const validateAuth = () => {
   const keyspace = elements.keyspaceInput.value.trim();
   const password = elements.passwordInput.value.trim();
 
-  if (!keyspace || !password) {
-    showToast('Please enter keyspace name and password', 'error');
-    return;
+  if (!validateInput(keyspace, 'Keyspace name', { minLength: 1, maxLength: 100 })) {
+    return null;
   }
 
+  if (!validateInput(password, 'Password', { minLength: 1, maxLength: 1000 })) {
+    return null;
+  }
 
+  return { keyspace, password };
+};
+
+async function createKeyspace() {
+  const auth = validateAuth();
+  if (!auth) return;
 
   try {
     await executeOperation(
       async () => {
-        const response = await sendMessage('createKeyspace', { keyspace, password });
-
-        if (response && response.success) {
-          // Clear any existing state before auto-login
+        const response = await sendMessage('createKeyspace', auth);
+        if (response?.success) {
           clearVaultState();
           await login(); // Auto-login after creation
           return response;
@@ -531,32 +625,25 @@ async function createKeyspace() {
       }
     );
   } catch (error) {
-    console.error('Create keyspace error:', error);
+    handleError(error, 'Create keyspace');
   }
 }
 
 async function login() {
-  const keyspace = elements.keyspaceInput.value.trim();
-  const password = elements.passwordInput.value.trim();
-
-  if (!keyspace || !password) {
-    showToast('Please enter keyspace name and password', 'error');
-    return;
-  }
+  const auth = validateAuth();
+  if (!auth) return;
 
   try {
     await executeOperation(
       async () => {
-        const response = await sendMessage('initSession', { keyspace, password });
-
-        if (response && response.success) {
-          currentKeyspace = keyspace;
-          setStatus(`Connected to ${keyspace}`, true);
+        const response = await sendMessage('initSession', auth);
+        if (response?.success) {
+          currentKeyspace = auth.keyspace;
+          setStatus(auth.keyspace, true);
           showSection('vaultSection');
-
-          // Clear any previous vault state before loading new keyspace
           clearVaultState();
           await loadKeypairs();
+
           return response;
         } else {
           throw new Error(getResponseError(response, 'login'));
@@ -569,7 +656,7 @@ async function login() {
       }
     );
   } catch (error) {
-    console.error('Login error:', error);
+    handleError(error, 'Create keyspace');
   }
 }
 
@@ -578,7 +665,7 @@ async function lockSession() {
     await sendMessage('lockSession');
     currentKeyspace = null;
     selectedKeypairId = null;
-    setStatus('Locked', false);
+    setStatus('', false);
     showSection('authSection');
 
     // Clear all form inputs
@@ -601,47 +688,35 @@ async function addKeypair() {
     return;
   }
 
-  try {
-    await executeOperation(
-      async () => {
-        const metadata = JSON.stringify({ name: keyName });
-        const response = await sendMessage('addKeypair', { keyType, metadata });
+  await executeOperation(
+    async () => {
+      const metadata = JSON.stringify({ name: keyName });
+      const response = await sendMessage('addKeypair', { keyType, metadata });
 
-        if (response?.success) {
-          hideAddKeypairForm();
-          await loadKeypairs();
-          return response;
-        } else {
-          throw new Error(getResponseError(response, 'add keypair'));
-        }
-      },
-      {
-        loadingElement: elements.addKeypairBtn,
-        successMessage: 'Keypair added successfully!'
+      if (response?.success) {
+        hideAddKeypairForm();
+        await loadKeypairs();
+        return response;
+      } else {
+        throw new Error(getResponseError(response, 'add keypair'));
       }
-    );
-  } catch (error) {
-    // Error already handled by executeOperation
-  }
+    },
+    {
+      loadingElement: elements.addKeypairBtn,
+      successMessage: 'Keypair added successfully!'
+    }
+  );
 }
 
 async function loadKeypairs() {
-  try {
-    const response = await sendMessage('listKeypairs');
+  const response = await sendMessage('listKeypairs');
 
-    if (response && response.success) {
-      renderKeypairs(response.keypairs);
-    } else {
-      const errorMsg = getResponseError(response, 'load keypairs');
-      const container = elements.keypairsList;
-      container.innerHTML = '<div class="empty-state">Failed to load keypairs. Try refreshing.</div>';
-      showToast(errorMsg, 'error');
-    }
-  } catch (error) {
-    const errorMsg = getErrorMessage(error, 'Failed to load keypairs');
-    console.error('Error loading keypairs:', error);
+  if (response && response.success) {
+    renderKeypairs(response.keypairs);
+  } else {
+    const errorMsg = getResponseError(response, 'load keypairs');
     const container = elements.keypairsList;
-    container.innerHTML = '<div class="empty-state">Error loading keypairs. Try refreshing.</div>';
+    container.innerHTML = '<div class="empty-state">Failed to load keypairs. Try refreshing.</div>';
     showToast(errorMsg, 'error');
   }
 }
@@ -724,7 +799,6 @@ async function selectKeypair(keyId) {
     }
   } catch (error) {
     const errorMsg = getErrorMessage(error, 'Failed to select keypair');
-    console.error('Error selecting keypair:', error);
     // Revert visual state if there was an error
     updateKeypairSelection(null);
     showToast(errorMsg, 'error');
@@ -747,183 +821,114 @@ function updateKeypairSelection(selectedId) {
   }
 }
 
-async function signMessage() {
-  const messageText = elements.messageInput.value.trim();
-  if (!messageText || !selectedKeypairId) {
-    showToast('Please enter a message and select a keypair', 'error');
+// Shared templates
+const copyIcon = `<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+  <rect x="9" y="9" width="13" height="13" rx="2" ry="2"></rect>
+  <path d="M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1"></path>
+</svg>`;
+
+const createResultContainer = (label, value, btnId) => `
+  <label>${label}:</label>
+  <div class="signature-container">
+    <code id="${value}Value">${value}</code>
+    <button id="${btnId}" class="btn-copy" title="Copy">${copyIcon}</button>
+  </div>
+`;
+
+// Unified crypto operation handler
+async function performCryptoOperation(config) {
+  const { input, validation, action, resultElement, button, successMsg, resultProcessor } = config;
+
+  if (!validation()) {
+    showToast(config.errorMsg, 'error');
     return;
   }
 
-  try {
-    await executeOperation(
-      async () => {
-        const messageBytes = stringToUint8Array(messageText);
-        const response = await sendMessage('sign', { message: messageBytes });
+  await executeOperation(
+    async () => {
+      const response = await sendMessage(action, input());
+      if (response?.success) {
+        resultElement.classList.remove('hidden');
+        resultElement.innerHTML = resultProcessor(response);
 
-        if (response?.success) {
-          elements.signatureResult.classList.remove('hidden');
-          elements.signatureResult.innerHTML = `
-            <label>Signature:</label>
-            <div class="signature-container">
-              <code id="signatureValue">${response.signature}</code>
-              <button id="copySignatureBtn" class="btn-copy" title="Copy">
-                <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-                  <rect x="9" y="9" width="13" height="13" rx="2" ry="2"></rect>
-                  <path d="M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1"></path>
-                </svg>
-              </button>
-            </div>
-          `;
-
-          document.getElementById('copySignatureBtn').addEventListener('click', () => {
-            copyToClipboard(response.signature);
-          });
-
-          return response;
-        } else {
-          throw new Error(getResponseError(response, 'sign message'));
+        // Add copy button listener if result has copy button
+        const copyBtn = resultElement.querySelector('.btn-copy');
+        if (copyBtn && config.copyValue) {
+          copyBtn.addEventListener('click', () => copyToClipboard(config.copyValue(response)));
         }
-      },
-      {
-        loadingElement: elements.signBtn,
-        successMessage: 'Message signed successfully!'
+
+        return response;
+      } else {
+        throw new Error(getResponseError(response, action));
       }
-    );
-  } catch (error) {
-    elements.signatureResult.classList.add('hidden');
-  }
+    },
+    { loadingElement: button, successMessage: successMsg }
+  );
 }
 
-async function encryptMessage() {
-  const messageText = elements.encryptMessageInput.value.trim();
-  if (!messageText || !currentKeyspace) {
-    showToast('Please enter a message and ensure you are connected to a keyspace', 'error');
-    return;
-  }
+// Crypto operation functions using shared templates
+const signMessage = () => performCryptoOperation({
+  validation: () => elements.messageInput.value.trim() && selectedKeypairId,
+  errorMsg: 'Please enter a message and select a keypair',
+  action: 'sign',
+  input: () => ({ message: stringToUint8Array(elements.messageInput.value.trim()) }),
+  resultElement: elements.signatureResult,
+  button: elements.signBtn,
+  successMsg: 'Message signed successfully!',
+  copyValue: (response) => response.signature,
+  resultProcessor: (response) => createResultContainer('Signature', response.signature, 'copySignatureBtn')
+});
 
-  try {
-    await executeOperation(
-      async () => {
-        const response = await sendMessage('encrypt', { message: messageText });
+const encryptMessage = () => performCryptoOperation({
+  validation: () => elements.encryptMessageInput.value.trim() && currentKeyspace,
+  errorMsg: 'Please enter a message and ensure you are connected to a keyspace',
+  action: 'encrypt',
+  input: () => ({ message: elements.encryptMessageInput.value.trim() }),
+  resultElement: elements.encryptResult,
+  button: elements.encryptBtn,
+  successMsg: 'Message encrypted successfully!',
+  copyValue: (response) => response.encryptedMessage,
+  resultProcessor: (response) => createResultContainer('Encrypted Message', response.encryptedMessage, 'copyEncryptedBtn')
+});
 
-        if (response?.success) {
-          elements.encryptResult.classList.remove('hidden');
-          elements.encryptResult.innerHTML = `
-            <label>Encrypted Message:</label>
-            <div class="signature-container">
-              <code id="encryptedValue">${response.encryptedMessage}</code>
-              <button id="copyEncryptedBtn" class="btn-copy" title="Copy">
-                <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-                  <rect x="9" y="9" width="13" height="13" rx="2" ry="2"></rect>
-                  <path d="M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1"></path>
-                </svg>
-              </button>
-            </div>
-          `;
+const decryptMessage = () => performCryptoOperation({
+  validation: () => elements.encryptedMessageInput.value.trim() && currentKeyspace,
+  errorMsg: 'Please enter encrypted message and ensure you are connected to a keyspace',
+  action: 'decrypt',
+  input: () => ({ encryptedMessage: elements.encryptedMessageInput.value.trim() }),
+  resultElement: elements.decryptResult,
+  button: elements.decryptBtn,
+  successMsg: 'Message decrypted successfully!',
+  copyValue: (response) => response.decryptedMessage,
+  resultProcessor: (response) => createResultContainer('Decrypted Message', response.decryptedMessage, 'copyDecryptedBtn')
+});
 
-          document.getElementById('copyEncryptedBtn').addEventListener('click', () => {
-            copyToClipboard(response.encryptedMessage);
-          });
-
-          return response;
-        } else {
-          throw new Error(getResponseError(response, 'encrypt message'));
-        }
-      },
-      {
-        loadingElement: elements.encryptBtn,
-        successMessage: 'Message encrypted successfully!'
-      }
-    );
-  } catch (error) {
-    elements.encryptResult.classList.add('hidden');
-  }
-}
-
-async function decryptMessage() {
-  const encryptedText = elements.encryptedMessageInput.value.trim();
-  if (!encryptedText || !currentKeyspace) {
-    showToast('Please enter encrypted message and ensure you are connected to a keyspace', 'error');
-    return;
-  }
-
-  try {
-    await executeOperation(
-      async () => {
-        const response = await sendMessage('decrypt', { encryptedMessage: encryptedText });
-
-        if (response?.success) {
-          elements.decryptResult.classList.remove('hidden');
-          elements.decryptResult.innerHTML = `
-            <label>Decrypted Message:</label>
-            <div class="signature-container">
-              <code id="decryptedValue">${response.decryptedMessage}</code>
-              <button id="copyDecryptedBtn" class="btn-copy" title="Copy">
-                <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-                  <rect x="9" y="9" width="13" height="13" rx="2" ry="2"></rect>
-                  <path d="M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1"></path>
-                </svg>
-              </button>
-            </div>
-          `;
-
-          document.getElementById('copyDecryptedBtn').addEventListener('click', () => {
-            copyToClipboard(response.decryptedMessage);
-          });
-
-          return response;
-        } else {
-          throw new Error(getResponseError(response, 'decrypt message'));
-        }
-      },
-      {
-        loadingElement: elements.decryptBtn,
-        successMessage: 'Message decrypted successfully!'
-      }
-    );
-  } catch (error) {
-    elements.decryptResult.classList.add('hidden');
-  }
-}
-
-async function verifySignature() {
-  const messageText = elements.verifyMessageInput.value.trim();
-  const signature = elements.signatureToVerifyInput.value.trim();
-  if (!messageText || !signature || !selectedKeypairId) {
-    showToast('Please enter message, signature, and select a keypair', 'error');
-    return;
-  }
-
-  try {
-    await executeOperation(
-      async () => {
-        const messageBytes = stringToUint8Array(messageText);
-        const response = await sendMessage('verify', { message: messageBytes, signature });
-
-        if (response?.success) {
-          const isValid = response.isValid;
-          const icon = isValid ? '✅' : '❌';
-          const text = isValid ? 'Signature is valid' : 'Signature is invalid';
-
-          elements.verifyResult.classList.remove('hidden');
-          elements.verifyResult.innerHTML = `
-            <div class="verification-status ${isValid ? 'valid' : 'invalid'}">
-              <span>${icon}</span>
+const verifySignature = () => performCryptoOperation({
+  validation: () => elements.verifyMessageInput.value.trim() && elements.signatureToVerifyInput.value.trim() && selectedKeypairId,
+  errorMsg: 'Please enter message, signature, and select a keypair',
+  action: 'verify',
+  input: () => ({
+    message: stringToUint8Array(elements.verifyMessageInput.value.trim()),
+    signature: elements.signatureToVerifyInput.value.trim()
+  }),
+  resultElement: elements.verifyResult,
+  button: elements.verifyBtn,
+  successMsg: null,
+  resultProcessor: (response) => {
+    const isValid = response.isValid;
+    const icon = isValid
+      ? `<svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+           <polyline points="20,6 9,17 4,12"></polyline>
+         </svg>`
+      : `<svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+           <circle cx="12" cy="12" r="10"></circle>
+           <line x1="15" y1="9" x2="9" y2="15"></line>
+           <line x1="9" y1="9" x2="15" y2="15"></line>
+         </svg>`;
+    const text = isValid ? 'Signature is valid' : 'Signature is invalid';
+    return `<div class="verification-status ${isValid ? 'valid' : 'invalid'}">
+              <span class="verification-icon">${icon}</span>
               <span>${text}</span>
-            </div>
-          `;
-
-          return response;
-        } else {
-          throw new Error(getResponseError(response, 'verify signature'));
-        }
-      },
-      {
-        loadingElement: elements.verifyBtn,
-        successMessage: null // No success message for verification
-      }
-    );
-  } catch (error) {
-    elements.verifyResult.classList.add('hidden');
+            </div>`;
   }
-}
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/crypto_vault_extension/styles/popup.css b/crypto_vault_extension/styles/popup.css
index 64b4057..5581b1d 100644
--- a/crypto_vault_extension/styles/popup.css
+++ b/crypto_vault_extension/styles/popup.css
@@ -34,7 +34,7 @@
   --accent-success: hsl(var(--accent-hue), 65%, 45%);
   --accent-error: hsl(0, 70%, 55%);
   --accent-warning: hsl(35, 85%, 55%);
-  --accent-info: hsl(var(--secondary-hue), 70%, 55%);
+  --accent-info: hsl(var(--primary-hue), 35%, 60%);
 
   /* Spacing system */
   --spacing-xs: 4px;
@@ -75,66 +75,63 @@
   --accent-success: hsl(var(--accent-hue), 60%, 55%);
   --accent-error: hsl(0, 65%, 60%);
   --accent-warning: hsl(35, 80%, 60%);
-  --accent-info: hsl(var(--secondary-hue), 65%, 60%);
+  --accent-info: hsl(var(--primary-hue), 30%, 70%);
 }
 
-/* Harmonious button styling system */
-.btn-primary {
-  background: var(--bg-button-primary);
-  color: var(--text-button-primary);
+/* Consolidated button styling system */
+.btn-primary, .btn-secondary, .btn-ghost {
   border: none;
-  font-weight: 600;
-  box-shadow: var(--shadow-button);
+  font-weight: 500;
   transition: all 0.2s cubic-bezier(0.4, 0, 0.2, 1);
 }
 
-.btn-primary:hover {
-  background: hsl(var(--primary-hue), var(--primary-saturation), 50%);
-  box-shadow: var(--shadow-button-hover);
-  transform: translateY(-1px);
-}
-
-.btn-primary:active {
-  transform: translateY(0);
+.btn-primary {
+  background: var(--bg-button-primary);
+  color: var(--text-button-primary);
+  font-weight: 600;
   box-shadow: var(--shadow-button);
 }
 
-/* Dark theme primary button adjustments */
-[data-theme="dark"] .btn-primary:hover {
-  background: hsl(var(--primary-hue), var(--primary-saturation), 65%);
-}
-
 .btn-secondary {
   background: var(--bg-button-secondary);
   color: var(--text-button-secondary);
   border: 1px solid var(--border-color);
-  font-weight: 500;
-  transition: all 0.2s cubic-bezier(0.4, 0, 0.2, 1);
-}
-
-.btn-secondary:hover {
-  background: var(--bg-input);
-  border-color: var(--border-focus);
-  color: var(--text-primary);
-  transform: translateY(-1px);
-}
-
-.btn-secondary:active {
-  transform: translateY(0);
 }
 
 .btn-ghost {
   background: var(--bg-button-ghost);
   color: var(--border-focus);
   border: 1px solid transparent;
-  font-weight: 500;
-  transition: all 0.2s cubic-bezier(0.4, 0, 0.2, 1);
+}
+
+.btn-primary:hover, .btn-secondary:hover, .btn-ghost:hover {
+  transform: translateY(-1px);
+}
+
+.btn-primary:active, .btn-secondary:active, .btn-ghost:active {
+  transform: translateY(0);
+}
+
+.btn-primary:hover {
+  background: hsl(var(--primary-hue), var(--primary-saturation), 50%);
+  box-shadow: var(--shadow-button-hover);
+}
+
+.btn-secondary:hover, .btn-ghost:hover {
+  background: var(--bg-input);
+  color: var(--text-primary);
+}
+
+.btn-secondary:hover {
+  border-color: var(--border-focus);
 }
 
 .btn-ghost:hover {
-  background: var(--bg-input);
   border-color: var(--border-color);
-  color: var(--text-primary);
+}
+
+[data-theme="dark"] .btn-primary:hover {
+  background: hsl(var(--primary-hue), var(--primary-saturation), 65%);
 }
 
 * {
@@ -197,6 +194,73 @@ body {
   gap: var(--spacing-md);
 }
 
+.settings-container {
+  position: relative;
+}
+
+.settings-dropdown {
+  position: absolute;
+  top: 100%;
+  right: 0;
+  margin-top: var(--spacing-sm);
+  background: var(--bg-card);
+  border: 1px solid var(--border-color);
+  border-radius: 12px;
+  padding: var(--spacing-lg);
+  box-shadow: var(--shadow-card);
+  backdrop-filter: blur(20px);
+  min-width: 200px;
+  z-index: 1000;
+}
+
+.settings-dropdown.hidden {
+  display: none;
+}
+
+.settings-item {
+  margin-bottom: var(--spacing-md);
+}
+
+.settings-item:last-child {
+  margin-bottom: 0;
+}
+
+.settings-item label {
+  display: block;
+  font-size: 14px;
+  font-weight: 500;
+  color: var(--text-secondary);
+  margin-bottom: var(--spacing-xs);
+}
+
+.timeout-input-group {
+  display: flex;
+  align-items: center;
+  gap: var(--spacing-sm);
+}
+
+.timeout-input-group input {
+  width: 60px;
+  padding: var(--spacing-xs) var(--spacing-sm);
+  font-size: 14px;
+  border: 1px solid var(--border-color);
+  border-radius: 8px;
+  background: var(--bg-input);
+  color: var(--text-primary);
+  text-align: center;
+}
+
+.timeout-input-group input:focus {
+  outline: none;
+  border-color: var(--border-focus);
+  box-shadow: 0 0 0 2px hsla(var(--primary-hue), var(--primary-saturation), 55%, 0.15);
+}
+
+.timeout-input-group span {
+  font-size: 14px;
+  color: var(--text-muted);
+}
+
 .btn-icon-only {
   background: var(--bg-button-ghost);
   border: none;
@@ -224,39 +288,15 @@ body {
   gap: var(--spacing-md);
 }
 
-.status-indicator .status-content {
-  display: flex;
-  align-items: center;
-  gap: var(--spacing-sm);
-}
 
-.status-dot {
-  width: 10px;
-  height: 10px;
-  border-radius: 50%;
-  background: var(--accent-warning);
-  box-shadow: 0 0 0 2px rgba(245, 158, 11, 0.2);
-}
-
-.status-indicator.connected .status-dot {
-  background: var(--accent-success);
-  box-shadow: 0 0 0 2px rgba(16, 185, 129, 0.2);
-}
 
 #statusText {
-  font-size: 14px;
-  font-weight: 500;
+  font-size: 22px;
+  font-weight: 700;
   color: var(--text-primary);
 }
 
-/* Vault status specific styling */
-.vault-status .status-indicator {
-  color: var(--text-primary);
-}
 
-.vault-status #statusText {
-  color: var(--text-primary);
-}
 
 /* Enhanced lock button styling */
 #lockBtn {
@@ -515,7 +555,7 @@ input::placeholder, textarea::placeholder {
 
 .vault-header h2 {
   color: var(--text-primary);
-  font-size: 20px;
+  font-size: 18px;
   font-weight: 600;
 }
 
@@ -749,31 +789,6 @@ input::placeholder, textarea::placeholder {
   color: var(--text-primary);
 }
 
-/* Signature Result */
-.signature-result {
-  margin-top: 16px;
-  padding: 16px;
-  background: hsla(var(--accent-hue), 60%, 95%, 0.8);
-  border-radius: 12px;
-  border: 1px solid hsla(var(--accent-hue), 50%, 70%, 0.3);
-}
-
-[data-theme="dark"] .signature-result {
-  background: hsla(var(--accent-hue), 40%, 15%, 0.6);
-  border-color: hsla(var(--accent-hue), 50%, 40%, 0.4);
-}
-
-
-
-.signature-result label {
-  color: var(--accent-success);
-  font-weight: 500;
-  margin-bottom: 8px;
-  display: block;
-}
-
-
-
 /* Enhanced Toast Notifications */
 .toast-notification {
   position: fixed;
@@ -828,31 +843,7 @@ input::placeholder, textarea::placeholder {
   word-wrap: break-word;
 }
 
-.toast-close {
-  background: none;
-  border: none;
-  color: inherit;
-  cursor: pointer;
-  font-size: 18px;
-  font-weight: bold;
-  line-height: 1;
-  opacity: 0.7;
-  padding: 0;
-  width: 20px;
-  height: 20px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  border-radius: 4px;
-  transition: all 0.2s ease;
-  flex-shrink: 0;
-  margin-top: 2px;
-}
 
-.toast-close:hover {
-  opacity: 1;
-  background: rgba(255, 255, 255, 0.1);
-}
 
 /* Success Toast */
 .toast-success {
@@ -880,9 +871,9 @@ input::placeholder, textarea::placeholder {
 
 /* Info Toast */
 .toast-info {
-  background: linear-gradient(135deg, rgba(59, 130, 246, 0.95) 0%, rgba(37, 99, 235, 0.95) 100%);
+  background: var(--accent-info);
   color: white;
-  border-color: rgba(59, 130, 246, 0.3);
+  border-color: hsla(var(--primary-hue), 35%, 60%, 0.3);
 }
 
 .toast-info .toast-icon {
@@ -981,10 +972,7 @@ input::placeholder, textarea::placeholder {
   color: var(--text-primary);
 }
 
-[data-theme="dark"] .tab-btn:hover {
-  color: var(--border-focus);
-}
-
+[data-theme="dark"] .tab-btn:hover,
 [data-theme="dark"] .tab-btn.active {
   color: var(--border-focus);
 }
@@ -997,8 +985,8 @@ input::placeholder, textarea::placeholder {
   display: block;
 }
 
-/* Result Styling */
-.encrypt-result, .decrypt-result, .verify-result {
+/* Consolidated result styling */
+.encrypt-result, .decrypt-result, .verify-result, .signature-result {
   margin-top: 16px;
   padding: 16px;
   border-radius: 12px;
@@ -1006,55 +994,55 @@ input::placeholder, textarea::placeholder {
   transition: all 0.2s cubic-bezier(0.4, 0, 0.2, 1);
 }
 
-.encrypt-result {
+.encrypt-result, .signature-result {
   background: hsla(var(--accent-hue), 60%, 95%, 0.8);
   border-color: hsla(var(--accent-hue), 50%, 70%, 0.3);
   box-shadow: 0 2px 12px hsla(var(--accent-hue), 50%, 50%, 0.1);
 }
 
-[data-theme="dark"] .encrypt-result {
-  background: hsla(var(--accent-hue), 40%, 15%, 0.6);
-  border-color: hsla(var(--accent-hue), 50%, 40%, 0.4);
-}
-
-.encrypt-result label {
-  color: var(--accent-success);
-  font-weight: 600;
-  margin-bottom: 12px;
-  display: block;
-  font-size: 14px;
-}
-
 .decrypt-result {
   background: hsla(var(--secondary-hue), 60%, 95%, 0.8);
   border-color: hsla(var(--secondary-hue), 50%, 70%, 0.3);
   box-shadow: 0 2px 12px hsla(var(--secondary-hue), 50%, 50%, 0.1);
 }
 
-[data-theme="dark"] .decrypt-result {
-  background: hsla(var(--secondary-hue), 40%, 15%, 0.6);
-  border-color: hsla(var(--secondary-hue), 50%, 40%, 0.4);
-}
-
-.decrypt-result label {
-  color: var(--accent-info);
-  font-weight: 600;
-  margin-bottom: 12px;
-  display: block;
-  font-size: 14px;
-}
-
 .verify-result {
   background: hsla(var(--primary-hue), 30%, 95%, 0.8);
   border-color: hsla(var(--primary-hue), 40%, 70%, 0.3);
   box-shadow: 0 2px 12px hsla(var(--primary-hue), 40%, 50%, 0.1);
 }
 
+[data-theme="dark"] .encrypt-result,
+[data-theme="dark"] .signature-result {
+  background: hsla(var(--accent-hue), 40%, 15%, 0.6);
+  border-color: hsla(var(--accent-hue), 50%, 40%, 0.4);
+}
+
+[data-theme="dark"] .decrypt-result {
+  background: hsla(var(--secondary-hue), 40%, 15%, 0.6);
+  border-color: hsla(var(--secondary-hue), 50%, 40%, 0.4);
+}
+
 [data-theme="dark"] .verify-result {
   background: hsla(var(--primary-hue), 20%, 15%, 0.6);
   border-color: hsla(var(--primary-hue), 30%, 40%, 0.4);
 }
 
+.encrypt-result label, .decrypt-result label, .signature-result label {
+  font-weight: 600;
+  margin-bottom: 12px;
+  display: block;
+  font-size: 14px;
+}
+
+.encrypt-result label, .signature-result label {
+  color: var(--accent-success);
+}
+
+.decrypt-result label {
+  color: var(--accent-info);
+}
+
 .verification-status {
   display: flex;
   align-items: center;
@@ -1071,19 +1059,14 @@ input::placeholder, textarea::placeholder {
   color: var(--accent-error);
 }
 
+.verification-icon {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-shrink: 0;
+}
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+.verification-icon svg {
+  width: 20px;
+  height: 20px;
+}
\ No newline at end of file