Fixed merge

src/lib/styles/cyberpunk.css

@@ -1,52 +1,48 @@
-/* Cyberpunk Theme */
-:global{
-  body:has(.theme-cyberpunk){
-    background: #0a0e27;
-  }
-  .theme-cyberpunk {
+.theme-cyberpunk {
   font-family: 'Courier New', monospace;
   background: #0a0e27;
   color: #00ffff;
-    .dice-display {
-      background: rgba(0, 255, 255, 0.05);
-      border: 1px solid #00ffff;
-    }
-    .window{
+}
+
+.theme-cyberpunk .window {
   background: rgba(10, 14, 39, 0.95);
   border: 2px solid #00ffff;
   box-shadow: 0 0 20px #ff00ff;
-    }
-    .title-bar {
+}
+
+.theme-cyberpunk .title-bar {
   background: linear-gradient(90deg, #ff00ff, #00ffff);
   color: #000;
   padding: 12px;
   font-weight: bold;
   text-transform: uppercase;
-    }
-    fieldset {
-      border: 1px solid #ff00ff;
-    }
+}
 
-    legend {
+.theme-cyberpunk fieldset {
+  border: 1px solid #ff00ff;
+}
+
+.theme-cyberpunk legend {
   color: #ff00ff;
   text-transform: uppercase;
-    }
+}
 
-    button {
+.theme-cyberpunk button {
   background: transparent;
   border: 2px solid #ff00ff;
   color: #ff00ff;
   font-family: 'Courier New', monospace;
   text-transform: uppercase;
   padding: 10px 25px;
-      &:hover {
+}
+
+.theme-cyberpunk button:hover {
   background: #ff00ff;
   color: #000;
-      }
-    }
-    .chart-display {
+}
+
+.theme-cyberpunk .chart-display,
+.theme-cyberpunk .dice-display {
   background: rgba(0, 255, 255, 0.05);
   border: 1px solid #00ffff;
-    }
-  }
 }

src/lib/styles/vaporwave.css

@@ -1,18 +1,17 @@
-/* Vaporwave Theme */
-:global(.theme-vaporwave) {
+.theme-vaporwave {
   font-family: 'Arial', sans-serif;
   background: linear-gradient(180deg, #ff6ad5 0%, #c774e8 50%, #ad8cff 100%);
   color: #fff;
 }
 
-:global(.theme-vaporwave .window) {
+.theme-vaporwave .window {
   background: rgba(255, 106, 213, 0.3);
   backdrop-filter: blur(10px);
   border: 3px solid #00f0ff;
   box-shadow: 0 8px 32px rgba(0, 240, 255, 0.4);
 }
 
-:global(.theme-vaporwave .title-bar) {
+.theme-vaporwave .title-bar {
   background: linear-gradient(90deg, #ff6ad5, #00f0ff);
   color: #fff;
   padding: 15px;
@@ -22,31 +21,26 @@
   text-shadow: 2px 2px 4px rgba(0, 0, 0, 0.5);
 }
 
-:global(.theme-vaporwave fieldset) {
+.theme-vaporwave fieldset {
   border: 2px solid #00f0ff;
   background: rgba(255, 255, 255, 0.1);
 }
 
-:global(.theme-vaporwave legend) {
+.theme-vaporwave legend {
   color: #00f0ff;
   text-transform: uppercase;
 }
 
-:global(.theme-vaporwave button) {
+.theme-vaporwave button {
   background: linear-gradient(135deg, #ff6ad5, #c774e8);
   border: 2px solid #00f0ff;
   color: #fff;
   text-transform: uppercase;
   padding: 12px 30px;
 }
-	:global(.theme-vaporwave .chart-display ){
-		background: rgba(255, 255, 255, 0.15);
-		border: 2px solid #ff6ad5;
-	}
-:global{
-  .theme-vaporwave .dice-display {
-    background: rgba(255, 255, 255, 0.15);
-    border: 2px solid #ff6ad5;
-  }
-}
 
+.theme-vaporwave .chart-display,
+.theme-vaporwave .dice-display {
+  background: rgba(255, 255, 255, 0.15);
+  border: 2px solid #ff6ad5;
+}