diff --git a/webui/src/App.vue b/webui/src/App.vue
index 0e8961ff..f8e4cb38 100644
--- a/webui/src/App.vue
+++ b/webui/src/App.vue
@@ -6,7 +6,7 @@
         <UpdateNotification :latest-release="latestRelease" :current-release="currentRelease" />
 
         <div class="shadow-md rounded-lg bg-white dark:bg-neutral-700 overflow-hidden">
-          <div class="flex flex-row flex-auto items-center p-3 px-5 border-b-2 border-gray-100 dark:border-neutral-600">
+          <div class="flex flex-row flex-auto items-center p-3 px-5 border-b-2 border-neutral-200 dark:border-neutral-600">
             <div class="flex-grow">
               <p class="text-2xl font-medium dark:text-neutral-200">{{ $t('clients') }}</p>
             </div>
@@ -20,7 +20,7 @@
             <div
               v-for="client in clients"
               :key="client.id"
-              class="relative overflow-hidden border-b last:border-b-0 border-gray-100 dark:border-neutral-600 border-solid"
+              class="relative overflow-hidden border-b last:border-b-0 border-neutral-200 dark:border-neutral-600 border-solid"
             >
               <Client :client="client" />
             </div>
diff --git a/webui/src/assets/style.css b/webui/src/assets/style.css
index b5c61c95..0e5da320 100644
--- a/webui/src/assets/style.css
+++ b/webui/src/assets/style.css
@@ -1,3 +1,13 @@
 @tailwind base;
 @tailwind components;
 @tailwind utilities;
+
+@layer utilities {
+  html * {
+    @apply transition-colors ease-linear duration-200;
+  }
+}
+
+html.dark .vue-apexcharts {
+  filter: invert(1);
+}
\ No newline at end of file
diff --git a/webui/src/components/Auth.vue b/webui/src/components/Auth.vue
index fbeb5ef6..eb901b2c 100644
--- a/webui/src/components/Auth.vue
+++ b/webui/src/components/Auth.vue
@@ -28,7 +28,7 @@
       <input
         v-if="!authenticating && password"
         type="submit"
-        class="bg-red-800 dark:bg-red-800 w-full rounded shadow py-2 text-sm text-white dark:text-white hover:bg-red-700 dark:hover:bg-red-700 transition cursor-pointer"
+        class="bg-red-800 dark:bg-red-800 w-full rounded shadow py-2 text-sm text-white dark:text-white hover:bg-red-700 dark:hover:bg-red-700 cursor-pointer"
         value="Sign In"
       />
       <input
diff --git a/webui/src/components/ClientAvatar.vue b/webui/src/components/ClientAvatar.vue
index 88f4f539..ffcdac30 100644
--- a/webui/src/components/ClientAvatar.vue
+++ b/webui/src/components/ClientAvatar.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="h-10 w-10 rounded-full bg-gray-50 relative">
+  <div class="h-10 w-10 rounded-full bg-gray-50 dark:bg-neutral-500 relative">
     <IconAvatarDefault class="w-6 m-2 text-gray-300" />
     <img v-if="props.client.avatar" :src="props.client.avatar" class="w-10 rounded-full absolute top-0 left-0" />
 
diff --git a/webui/src/components/ClientCharts.vue b/webui/src/components/ClientCharts.vue
index f8e11002..7d1fba61 100644
--- a/webui/src/components/ClientCharts.vue
+++ b/webui/src/components/ClientCharts.vue
@@ -36,9 +36,9 @@ const UI_CHART_TYPES = [
 ];
 
 const CHART_COLORS = {
-  rx: { light: 'rgba(128,128,128,0.3)', dark: 'rgba(255,255,255,0.3)' },
-  tx: { light: 'rgba(128,128,128,0.4)', dark: 'rgba(255,255,255,0.3)' },
-  gradient: { light: ['rgba(0,0,0,0.1)', 'rgba(0,0,0,1.0)'], dark: ['rgba(128,128,128,0)', 'rgba(128,128,128,0)'] },
+  rx: 'rgba(0,0,0,0.2)' ,
+  tx: 'rgba(0,0,0,0.3)' ,
+  gradient: ['rgba(0,0,0,0.1)', 'rgba(0,0,0,1.0)'] ,
 };
 
 defineProps({
@@ -48,31 +48,24 @@ defineProps({
 const store = useStore();
 const { uiChartType, uiTheme, prefersDarkScheme, updateCharts } = storeToRefs(store);
 
-const darkOrLight = computed(() => {
-  if (uiTheme.value === 'auto') {
-    return prefersDarkScheme.value.matches ? 'dark' : 'light';
-  }
-  return uiTheme.value;
-});
-
 const chartOptionsTX = computed(() => {
   const opts = {
     ...chartOptions,
-    colors: [CHART_COLORS.tx[darkOrLight.value]],
+    colors: [CHART_COLORS.tx],
   };
   opts.chart.type = UI_CHART_TYPES[uiChartType.value].type || false;
   opts.stroke.width = UI_CHART_TYPES[uiChartType.value].strokeWidth;
-  opts.fill.gradient.gradientToColors = CHART_COLORS.gradient[darkOrLight.value];
+  opts.fill.gradient.gradientToColors = CHART_COLORS.gradient;
   return opts;
 });
 const chartOptionsRX = computed(() => {
   const opts = {
     ...chartOptions,
-    colors: [CHART_COLORS.rx[darkOrLight.value]],
+    colors: [CHART_COLORS.rx],
   };
   opts.chart.type = UI_CHART_TYPES[uiChartType.value].type || false;
   opts.stroke.width = UI_CHART_TYPES[uiChartType.value].strokeWidth;
-  opts.fill.gradient.gradientToColors = CHART_COLORS.gradient[darkOrLight.value];
+  opts.fill.gradient.gradientToColors = CHART_COLORS.gradient;
   return opts;
 });
 </script>
diff --git a/webui/src/components/ClientControls.vue b/webui/src/components/ClientControls.vue
index 88949453..78f407aa 100644
--- a/webui/src/components/ClientControls.vue
+++ b/webui/src/components/ClientControls.vue
@@ -4,7 +4,7 @@
     <div
       v-if="client.enabled === true"
       :title="$t('disableClient')"
-      class="inline-block align-middle rounded-full w-10 h-6 mr-1 bg-red-800 cursor-pointer hover:bg-red-700 transition-all"
+      class="inline-block align-middle rounded-full w-10 h-6 mr-1 bg-red-800 cursor-pointer hover:bg-red-700"
       @click="disableClient"
     >
       <div class="rounded-full w-4 h-4 m-1 ml-5 bg-white"></div>
@@ -13,7 +13,7 @@
     <div
       v-if="client.enabled === false"
       :title="$t('enableClient')"
-      class="inline-block align-middle rounded-full w-10 h-6 mr-1 bg-gray-200 dark:bg-neutral-400 cursor-pointer hover:bg-gray-300 dark:hover:bg-neutral-500 transition-all"
+      class="inline-block align-middle rounded-full w-10 h-6 mr-1 bg-gray-200 dark:bg-neutral-400 cursor-pointer hover:bg-gray-300 dark:hover:bg-neutral-500"
       @click="enableClient"
     >
       <div class="rounded-full w-4 h-4 m-1 bg-white"></div>
@@ -23,7 +23,7 @@
 
     <button
       :disabled="!client.downloadableConfig"
-      class="align-middle bg-gray-100 dark:bg-neutral-600 dark:text-neutral-300 p-2 rounded transition"
+      class="align-middle bg-gray-100 dark:bg-neutral-600 dark:text-neutral-300 p-2 rounded"
       :class="{
         'hover:bg-red-800 dark:hover:bg-red-800 hover:text-white dark:hover:text-white': client.downloadableConfig,
         'is-disabled': !client.downloadableConfig,
@@ -39,7 +39,7 @@
       :disabled="!client.downloadableConfig"
       :href="'./api/wireguard/client/' + client.id + '/configuration'"
       :download="client.downloadableConfig ? 'configuration' : null"
-      class="align-middle inline-block bg-gray-100 dark:bg-neutral-600 dark:text-neutral-300 p-2 rounded transition"
+      class="align-middle inline-block bg-gray-100 dark:bg-neutral-600 dark:text-neutral-300 p-2 rounded"
       :class="{
         'hover:bg-red-800 dark:hover:bg-red-800 hover:text-white dark:hover:text-white': client.downloadableConfig,
         'is-disabled': !client.downloadableConfig,
@@ -57,7 +57,7 @@
     <!-- Delete -->
 
     <button
-      class="align-middle bg-gray-100 dark:bg-neutral-600 dark:text-neutral-300 hover:bg-red-800 dark:hover:bg-red-800 hover:text-white dark:hover:text-white p-2 rounded transition"
+      class="align-middle bg-gray-100 dark:bg-neutral-600 dark:text-neutral-300 hover:bg-red-800 dark:hover:bg-red-800 hover:text-white dark:hover:text-white p-2 rounded"
       :title="$t('deleteClient')"
       @click="handleDeleteClick"
     >
diff --git a/webui/src/components/ClientNewButton.vue b/webui/src/components/ClientNewButton.vue
index 4212348e..d72120e1 100644
--- a/webui/src/components/ClientNewButton.vue
+++ b/webui/src/components/ClientNewButton.vue
@@ -2,7 +2,7 @@
 <template>
   <div>
     <button
-      class="hover:bg-red-800 hover:border-red-800 hover:text-white text-gray-700 dark:text-neutral-200 border-2 border-gray-100 dark:border-neutral-600 py-2 px-4 rounded inline-flex items-center transition"
+      class="hover:bg-red-800 hover:border-red-800 hover:text-white text-gray-700 dark:text-neutral-200 border-2 border-gray-100 dark:border-neutral-600 py-2 px-4 rounded inline-flex items-center"
       @click="handleNewClient()"
     >
       <IconNew class="w-4 mr-2" />
diff --git a/webui/src/components/Header.vue b/webui/src/components/Header.vue
index d10ac1e2..a916e236 100644
--- a/webui/src/components/Header.vue
+++ b/webui/src/components/Header.vue
@@ -8,7 +8,7 @@
     <div class="flex items-center grow-0 gap-3 items-end self-end xxs:self-center">
       <!-- Dark / light theme -->
       <button
-        class="flex items-center justify-center w-8 h-8 rounded-full bg-gray-200 hover:bg-gray-300 dark:bg-neutral-700 dark:hover:bg-neutral-600 transition"
+        class="flex items-center justify-center w-8 h-8 rounded-full bg-gray-200 hover:bg-gray-300 dark:bg-neutral-700 dark:hover:bg-neutral-600"
         :title="$t(`theme.${uiTheme}`)"
         @click="toggleTheme"
       >
@@ -17,7 +17,7 @@
       <!-- Show / hide charts -->
       <label
         v-if="uiChartType > 0"
-        class="inline-flex items-center justify-center cursor-pointer w-8 h-8 rounded-full bg-gray-200 hover:bg-gray-300 dark:bg-neutral-700 dark:hover:bg-neutral-600 whitespace-nowrap transition group"
+        class="inline-flex items-center justify-center cursor-pointer w-8 h-8 rounded-full bg-gray-200 hover:bg-gray-300 dark:bg-neutral-700 dark:hover:bg-neutral-600 whitespace-nowrap group"
         :title="$t('toggleCharts')"
       >
         <input v-model="uiShowCharts" type="checkbox" value="" class="sr-only peer" @change="toggleCharts" />
diff --git a/webui/src/components/ModalCreateClient.vue b/webui/src/components/ModalCreateClient.vue
index ad236e71..60a3c0ed 100644
--- a/webui/src/components/ModalCreateClient.vue
+++ b/webui/src/components/ModalCreateClient.vue
@@ -28,7 +28,7 @@
     -->
 
     <div
-      class="inline-block align-bottom bg-white dark:bg-neutral-700 rounded-lg text-left overflow-hidden shadow-xl transform transition-all sm:my-8 sm:align-middle sm:max-w-lg w-full"
+      class="inline-block align-bottom bg-white dark:bg-neutral-700 rounded-lg text-left overflow-hidden shadow-xl transform sm:my-8 sm:align-middle sm:max-w-lg w-full"
       role="dialog"
       aria-modal="true"
       aria-labelledby="modal-headline"
diff --git a/webui/src/components/ModalDeleteClient.vue b/webui/src/components/ModalDeleteClient.vue
index 6852fc36..f6648edf 100644
--- a/webui/src/components/ModalDeleteClient.vue
+++ b/webui/src/components/ModalDeleteClient.vue
@@ -29,7 +29,7 @@
     -->
 
     <div
-      class="inline-block align-bottom bg-white dark:bg-neutral-700 rounded-lg text-left overflow-hidden shadow-xl transform transition-all sm:my-8 sm:align-middle sm:max-w-lg w-full"
+      class="inline-block align-bottom bg-white dark:bg-neutral-700 rounded-lg text-left overflow-hidden shadow-xl transform sm:my-8 sm:align-middle sm:max-w-lg w-full"
       role="dialog"
       aria-modal="true"
       aria-labelledby="modal-headline"
diff --git a/webui/src/components/UpdateNotification.vue b/webui/src/components/UpdateNotification.vue
index a774de08..8af80be4 100644
--- a/webui/src/components/UpdateNotification.vue
+++ b/webui/src/components/UpdateNotification.vue
@@ -13,7 +13,7 @@
       <a
         href="https://github.com/wg-easy/wg-easy#updating"
         target="_blank"
-        class="p-3 rounded-md bg-white dark:bg-red-100 float-right font-sm font-semibold text-red-800 dark:text-red-600 flex-shrink-0 border-2 border-red-800 dark:border-red-600 hover:border-white dark:hover:border-red-600 hover:text-white dark:hover:text-red-100 hover:bg-red-800 dark:hover:bg-red-600 transition-all"
+        class="p-3 rounded-md bg-white dark:bg-red-100 float-right font-sm font-semibold text-red-800 dark:text-red-600 flex-shrink-0 border-2 border-red-800 dark:border-red-600 hover:border-white dark:hover:border-red-600 hover:text-white dark:hover:text-red-100 hover:bg-red-800 dark:hover:bg-red-600"
       >
         {{ $t('update') }} →
       </a>
diff --git a/webui/src/components/icons/IconChart.vue b/webui/src/components/icons/IconChart.vue
index 81404eac..bd22b99a 100644
--- a/webui/src/components/icons/IconChart.vue
+++ b/webui/src/components/icons/IconChart.vue
@@ -4,7 +4,7 @@
     viewBox="0 0 24 24"
     stroke-width="1.5"
     fill="currentColor"
-    class="w-5 h-5 peer fill-gray-400 peer-checked:fill-gray-600 dark:fill-neutral-600 peer-checked:dark:fill-neutral-400 group-hover:dark:fill-neutral-500 transition"
+    class="w-5 h-5 peer fill-gray-400 peer-checked:fill-gray-600 dark:fill-neutral-600 peer-checked:dark:fill-neutral-400 group-hover:dark:fill-neutral-500"
   >
     <path
       d="M18.375 2.25c-1.035 0-1.875.84-1.875 1.875v15.75c0 1.035.84 1.875 1.875 1.875h.75c1.035 0 1.875-.84 1.875-1.875V4.125c0-1.036-.84-1.875-1.875-1.875h-.75ZM9.75 8.625c0-1.036.84-1.875 1.875-1.875h.75c1.036 0 1.875.84 1.875 1.875v11.25c0 1.035-.84 1.875-1.875 1.875h-.75a1.875 1.875 0 0 1-1.875-1.875V8.625ZM3 13.125c0-1.036.84-1.875 1.875-1.875h.75c1.036 0 1.875.84 1.875 1.875v6.75c0 1.035-.84 1.875-1.875 1.875h-.75A1.875 1.875 0 0 1 3 19.875v-6.75Z"
diff --git a/webui/src/store/store.js b/webui/src/store/store.js
index 84058506..a4723dec 100644
--- a/webui/src/store/store.js
+++ b/webui/src/store/store.js
@@ -27,6 +27,8 @@ export const useStore = defineStore('store', () => {
   const uiShowCharts = ref(localStorage.getItem('uiShowCharts') === '1');
   const uiTrafficStats = ref(false);
 
+  const pauseCharts = ref(false);
+
   const updateCharts = computed(() => {
     return uiChartType.value > 0 && uiShowCharts.value;
   });
@@ -116,7 +118,7 @@ export const useStore = defineStore('store', () => {
           client.latestHandshakeAt = new Date('2024-03-20');
         }
 
-        if (updateCharts.value) {
+        if (updateCharts.value && !pauseCharts.value) {
           clientsPersist[client.id].transferRxHistory.push(clientsPersist[client.id].transferRxCurrent);
           clientsPersist[client.id].transferRxHistory.shift();
 
@@ -147,12 +149,18 @@ export const useStore = defineStore('store', () => {
   }
 
   function toggleTheme() {
+    pauseCharts.value = true;
+
     const themes = ['light', 'dark', 'auto'];
     const currentIndex = themes.indexOf(uiTheme.value);
     const newIndex = (currentIndex + 1) % themes.length;
     uiTheme.value = themes[newIndex];
     localStorage.theme = uiTheme.value;
     setTheme(uiTheme.value);
+    
+    setTimeout(() => {
+      pauseCharts.value = false;
+    }, 300);
   }
   function setTheme(theme) {
     const { classList } = document.documentElement;