diff --git a/src/lib/DevBanner.svelte b/src/lib/DevBanner.svelte
index fe677a9..1ea8ca9 100644
--- a/src/lib/DevBanner.svelte
+++ b/src/lib/DevBanner.svelte
@@ -15,6 +15,6 @@
     -webkit-transform: rotate(45deg);
     transform: rotate(45deg);
     z-index: 100;
-    box-shadow: 2px 2px 30px rgba(0,0,0,0.19);
+    box-shadow: 5px 5px 30px rgba(0, 0, 0, 0.451);
   }
 </style>
diff --git a/src/lib/islands/input-island-form.svelte b/src/lib/islands/input-island-form.svelte
index a3afc07..223ec7e 100644
--- a/src/lib/islands/input-island-form.svelte
+++ b/src/lib/islands/input-island-form.svelte
@@ -28,6 +28,7 @@
     font-family: urwgothic, 'Lucida Sans', 'Lucida Sans Regular', 'Lucida Grande', 'Lucida Sans Unicode', Geneva, Verdana, sans-serif;
     text-transform: uppercase;
     font-size: 15px;
+    box-shadow: var(--box-shadow);
   }
   button {
     width: 50%;
@@ -41,5 +42,6 @@
     font-weight: 400;
     background-color: var(--island-button-color);
     color: var(--island-link-color);
+    box-shadow: var(--box-shadow);
   }
 </style>
diff --git a/src/lib/islands/island.svelte b/src/lib/islands/island.svelte
index b00ad4e..0ca276d 100644
--- a/src/lib/islands/island.svelte
+++ b/src/lib/islands/island.svelte
@@ -24,6 +24,6 @@
     padding: 10px;
     background-color: var(--island-bg-color);
     border-radius: 10px;
-    box-shadow: 2px 2px 30px rgba(0,0,0,0.19);
+    box-shadow: 5px 5px 30px rgba(0,0,0,0.29);
   }
 </style>
diff --git a/src/lib/islands/overlay-island.svelte b/src/lib/islands/overlay-island.svelte
index f87dc2c..5abb88c 100644
--- a/src/lib/islands/overlay-island.svelte
+++ b/src/lib/islands/overlay-island.svelte
@@ -29,7 +29,7 @@
     margin: auto;
     margin-top: 25px;
     padding: 10px;
-    background-color: var(--overlay-island-bg-color);
+    background-color: var(--island-bg-solid);
     border-radius: 10px;
     z-index: 1000;
   }
diff --git a/src/lib/islands/quick-link-island.svelte b/src/lib/islands/quick-link-island.svelte
index 707458d..5507074 100644
--- a/src/lib/islands/quick-link-island.svelte
+++ b/src/lib/islands/quick-link-island.svelte
@@ -49,5 +49,6 @@
     text-decoration: none;
     background-color: var(--island-button-color);
     color: var(--island-link-color);
+    box-shadow: var(--box-shadow);
   }
 </style>
diff --git a/src/lib/islands/quick-link-set-island.svelte b/src/lib/islands/quick-link-set-island.svelte
index 43b7ca4..c5d945a 100644
--- a/src/lib/islands/quick-link-set-island.svelte
+++ b/src/lib/islands/quick-link-set-island.svelte
@@ -98,6 +98,7 @@
     text-decoration: none;
     text-align: center;
     text-transform: uppercase;
+    box-shadow: var(--box-shadow);
   }
   button {
     width: 30%;
@@ -111,5 +112,6 @@
     font-weight: 400;
     background-color: var(--island-button-color);
     color: var(--island-link-color);
+    box-shadow: var(--box-shadow);
   }
 </style>
diff --git a/src/lib/navigation/LogoutButton.svelte b/src/lib/navigation/LogoutButton.svelte
index 4d32d4c..90c7a9f 100644
--- a/src/lib/navigation/LogoutButton.svelte
+++ b/src/lib/navigation/LogoutButton.svelte
@@ -20,5 +20,6 @@
     min-width: 90px;
     margin: 30px;
     height: 48px;
+    box-shadow: var(--box-shadow);
   }
 </style>
diff --git a/src/lib/navigation/done.svelte b/src/lib/navigation/done.svelte
index 37162b1..3372b14 100644
--- a/src/lib/navigation/done.svelte
+++ b/src/lib/navigation/done.svelte
@@ -21,6 +21,7 @@
     padding-bottom: 1px;
     min-width: 90px;
     max-width: 90px;
+    box-shadow: var(--box-shadow);
   }
   p {
     padding-top: 0px;
diff --git a/src/lib/navigation/header.svelte b/src/lib/navigation/header.svelte
index f0d4a21..0c639da 100644
--- a/src/lib/navigation/header.svelte
+++ b/src/lib/navigation/header.svelte
@@ -18,7 +18,7 @@
 <style>
   .headerBar {
     background: var(--island-bg-solid);
-    color: var(--island-header-color);
+    color: var(--main-header-color);
     position: fixed;
     top: 0;
     left: 0;
diff --git a/src/lib/navigation/loading.svelte b/src/lib/navigation/loading.svelte
index 0ffbf2f..bd18803 100644
--- a/src/lib/navigation/loading.svelte
+++ b/src/lib/navigation/loading.svelte
@@ -43,6 +43,7 @@
     padding-bottom: 1px;
     min-width: 90px;
     max-width: 90px;
+    box-shadow: var(--box-shadow);
   }
   p {
     padding-top: 50px;
diff --git a/src/lib/navigation/nav.svelte b/src/lib/navigation/nav.svelte
index 0d4a9dc..ea94fbf 100644
--- a/src/lib/navigation/nav.svelte
+++ b/src/lib/navigation/nav.svelte
@@ -52,6 +52,7 @@
     border-bottom: none;
     border-color: var(--box-shadow-color);
     text-decoration: double;
+    color: var(--main-text-color);
     font-weight: 600;
   }
 
diff --git a/src/lib/overlays/welcome.svelte b/src/lib/overlays/welcome.svelte
index b5421c6..678ae5e 100644
--- a/src/lib/overlays/welcome.svelte
+++ b/src/lib/overlays/welcome.svelte
@@ -58,17 +58,17 @@
     margin: auto;
     margin-top: 25px;
     padding: 10px;
-    background-color: var(--overlay-island-color);
+    background-color: var(--island-bg-solid);
     border-radius: 10px;
     z-index: 2500;
-    box-shadow: 1px 1px 3px var(--box-shadow-color);
-  }
+    box-shadow: 5px 5px 10px var(--box-shadow-color);
+  } 
 
   .navButton {
     border-radius: 50px;
     border: none;
     color: var(--island-link-color);
-    background-color: var(--overlay-island-bg-color);
+    background-color: var(--island-button-color);
     width: 50px;
     height: 50px;
     font-size: 20px;
diff --git a/src/lib/themes.css b/src/lib/themes.css
index a2bc3f7..f51742f 100644
--- a/src/lib/themes.css
+++ b/src/lib/themes.css
@@ -1,7 +1,7 @@
-/* OLD THEME */
+/* OLD THEME
 :root {
     --main-bg-color: #404c55;
-    --second-bg-color: #2b343c; /* Use as first arg in radial gradient */
+    --second-bg-color: #2b343c;
     --accent-color: #007979;
     --overlay-color: #3c6f79de;
     --overlay-color-solid: #3c6f79;
@@ -12,32 +12,45 @@
     --box-border-color: rgba(0,0,0,0.19);
     --link-visited-color: azure;
     --main-alert-color: #ed6d00;
-    --second-alert-color: #e77f00; /* Use as second arg in radial gradient */
+    --second-alert-color: #e77f00;
     --main-warning-color: orange;
     --board-name-color: #fcfc09;
-}
+}*/
 
-/* Main Theme
+/* Main Theme */
 :root {
     --main-bg-color: #404c55;
     --second-bg-color: #2b343c;
-    --main-header-color: ;
-    --main-text-color: ;
-    --main-link-color: ;
-    --island-bg-color: ;
-    --island-bg-solid: ;
-    --island-button-color: ;
-    --island-link-color: ;
-    --island-header-color: ;
-    --island-text-color: ;
-    --overlay-island-bg-color: ;
+    --main-header-color: #dff3f3;
+    --main-text-color: #cce9e9;
+    --main-link-color: #00b7b7;
+    --island-bg-color: #3c6f79de;
+    --island-bg-solid: #3c6f79;
+    --island-button-color: #404c55;
+    --island-link-color: #cce9e9;
+    --island-header-color: #4fd1d1;
+    --island-text-color: #cce9e9;
+    --overlay-island-bg-color: #3c6f79;
     --box-shadow-color: rgba(0,0,0,0.19);
-    --box-shadow: (2px 2px 6px var(--box-shadow-color);
+    --box-shadow: 2px 2px 4px rgba(0,0,0,0.19);
 }
-*/
-/*
-Christmas Theme
-{
 
+
+/* Christmas Theme 
+:root {
+    --main-bg-color: #404c55;
+    --second-bg-color: #2b343c;
+    --main-header-color: #00ff00;
+    --main-text-color: #ff0000;
+    --main-link-color: #2bc500;
+    --island-bg-color: #9900ffde;
+    --island-bg-solid: #3c6f79;
+    --island-button-color: #404c55;
+    --island-link-color: #cce9e9;
+    --island-header-color: #4fd1d1;
+    --island-text-color: #cce9e9;
+    --overlay-island-bg-color: #3c6f79;
+    --box-shadow-color: rgba(0,0,0,0.19);
+    --box-shadow: 2px 2px 4px rgba(0,0,0,0.19);
 }
 */
\ No newline at end of file
diff --git a/src/lib/train/train-detail.svelte b/src/lib/train/train-detail.svelte
index ff63fb6..dcf0cf9 100644
--- a/src/lib/train/train-detail.svelte
+++ b/src/lib/train/train-detail.svelte
@@ -104,10 +104,11 @@
     width: 95%;
     max-width: 600px;
     height: auto;
-    background-color: var(--overlay-island-bg-color);
+    background-color: var(--island-bg-solid);
     border-radius: 10px;
     overflow: hidden;
     transition: height 500ms ease-in-out;
+    box-shadow: 5px 5px 30px var(--box-shadow-color);
   }
   .container-header {
     text-align: left;
diff --git a/src/routes/more/corpus/+page.svelte b/src/routes/more/corpus/+page.svelte
index b738557..c91dbcc 100644
--- a/src/routes/more/corpus/+page.svelte
+++ b/src/routes/more/corpus/+page.svelte
@@ -114,11 +114,12 @@
     height: 30px;
     margin-bottom: 10px;
     text-transform: uppercase;
+    box-shadow: var(--box-shadow);
   }
   button {
     border-radius: 50px;
     font-family: urwgothic, sans-serif;
-    background-color: var(--overlay-color);
+    background-color: var(--island-bg-color);
     border: none;
     color: white;
     height: 30px;
@@ -126,6 +127,7 @@
     max-width: 100px;
     min-width: 75px;
     font-size: 18px;
+    box-shadow: var(--box-shadow);
   }
   .desc {
     color: white;
diff --git a/src/routes/more/reasons/+page.svelte b/src/routes/more/reasons/+page.svelte
index 32d173d..34cb1f3 100644
--- a/src/routes/more/reasons/+page.svelte
+++ b/src/routes/more/reasons/+page.svelte
@@ -101,6 +101,7 @@
     font-family: urwgothic, 'Lucida Sans', 'Lucida Sans Regular', 'Lucida Grande', 'Lucida Sans Unicode', Geneva, Verdana, sans-serif;
     text-transform: uppercase;
     font-size: 15px;
+    box-shadow: var(--box-shadow);
   }
   button {
     width: 15%;
@@ -113,7 +114,8 @@
     font-family: urwgothic, 'Lucida Sans', 'Lucida Sans Regular', 'Lucida Grande', 'Lucida Sans Unicode', Geneva, Verdana, sans-serif;
     font-size: 16px;
     font-weight: 400;
-    background-color: var(--overlay-color);
-    color: var(--link-color);
+    background-color: var(--island-bg-color);
+    color: var(--main-text-color);
+    box-shadow: var(--box-shadow);
   }
 </style>
diff --git a/src/routes/more/reg/+page.svelte b/src/routes/more/reg/+page.svelte
index b2cb60f..2328daf 100644
--- a/src/routes/more/reg/+page.svelte
+++ b/src/routes/more/reg/+page.svelte
@@ -126,8 +126,8 @@
   }
   button {
     border: none;
-    background-color: var(--overlay-color);
-    color: white;
+    background-color: var(--island-bg-color);
+    color: var(--main-text-color);
     width: 35%;
     height: 30px;
     border-radius: 50px;
diff --git a/src/routes/pis/+page.svelte b/src/routes/pis/+page.svelte
index b3880ed..387233a 100644
--- a/src/routes/pis/+page.svelte
+++ b/src/routes/pis/+page.svelte
@@ -134,6 +134,7 @@
     height: 30px;
     font-size: 16px;
     margin-bottom: 15px;
+    box-shadow: var(--box-shadow);
   }
   button {
     border: none;
@@ -145,9 +146,10 @@
     margin-left: 10px;
     margin-right: 10px;
     height: 30px;
-    background-color: var(--overlay-color);
+    background-color: var(--island-bg-color);
     color: white;
     font-size: 16px;
+    box-shadow: var(--box-shadow);
   }
   table {
     width: 100%;