diff --git a/Base/res/icons/themes/Chillychilly/16x16/window-maximize.png b/Base/res/icons/themes/Chillychilly/16x16/window-maximize.png
index 3dec07f3e4..0628695ce0 100644
Binary files a/Base/res/icons/themes/Chillychilly/16x16/window-maximize.png and b/Base/res/icons/themes/Chillychilly/16x16/window-maximize.png differ
diff --git a/Base/res/icons/themes/Chillychilly/16x16/window-minimize.png b/Base/res/icons/themes/Chillychilly/16x16/window-minimize.png
index 03b27a2524..aa77102f4f 100644
Binary files a/Base/res/icons/themes/Chillychilly/16x16/window-minimize.png and b/Base/res/icons/themes/Chillychilly/16x16/window-minimize.png differ
diff --git a/Base/res/icons/themes/Chillychilly/16x16/window-restore.png b/Base/res/icons/themes/Chillychilly/16x16/window-restore.png
index 85278cc1a4..45ef428cf5 100644
Binary files a/Base/res/icons/themes/Chillychilly/16x16/window-restore.png and b/Base/res/icons/themes/Chillychilly/16x16/window-restore.png differ
diff --git a/Base/res/icons/themes/Chillychilly/frame-shadow-light.png b/Base/res/icons/themes/Chillychilly/frame-shadow-light.png
index 29da33354d..f46d1cabce 100644
Binary files a/Base/res/icons/themes/Chillychilly/frame-shadow-light.png and b/Base/res/icons/themes/Chillychilly/frame-shadow-light.png differ
diff --git a/Base/res/icons/themes/Chillychilly/menu-shadow.png b/Base/res/icons/themes/Chillychilly/menu-shadow.png
new file mode 100644
index 0000000000..1a6d2c0020
Binary files /dev/null and b/Base/res/icons/themes/Chillychilly/menu-shadow.png differ
diff --git a/Base/res/themes/Chillychilly.ini b/Base/res/themes/Chillychilly.ini
index a79d6c489b..fe5ec8a831 100644
--- a/Base/res/themes/Chillychilly.ini
+++ b/Base/res/themes/Chillychilly.ini
@@ -1,21 +1,21 @@
 [Colors]
-DesktopBackground=#888a85
-Accent=#284b63
-ActiveWindowBorder1=#284b63
-ActiveWindowBorder2=#3c6e71
+DesktopBackground=#a4ada8ff
+Accent=#509296ff
+ActiveWindowBorder1=#3c6e71ff
+ActiveWindowBorder2=#509296ff
 ActiveWindowTitle=white
-ActiveWindowTitleShadow=black
-ActiveWindowTitleStripes=#3c6e71
-InactiveWindowBorder1=#8c8c8c
-InactiveWindowBorder2=#8c8c8c
-InactiveWindowTitle=#fafafa
-InactiveWindowTitleShadow=#8c8c8c
-InactiveWindowTitleStripes=#a0a0a0
-MovingWindowBorder1=#284b63
-MovingWindowBorder2=#284b63
+ActiveWindowTitleShadow=#3c6e71ff
+ActiveWindowTitleStripes=#509296ff
+InactiveWindowBorder1=#8c8c8cff
+InactiveWindowBorder2=#3c6e71ff
+InactiveWindowTitle=#f6f6f6ff
+InactiveWindowTitleShadow=#8c8c8cff
+InactiveWindowTitleStripes=#8c8c8cff
+MovingWindowBorder1=#3c6e71ff
+MovingWindowBorder2=#3c6e71ff
 MovingWindowTitle=white
 MovingWindowTitleShadow=#1a4231
-MovingWindowTitleStripes=#284b63
+MovingWindowTitleStripes=#3c6e71ff
 HighlightWindowBorder1=#284b63
 HighlightWindowBorder2=#284b63
 HighlightWindowTitle=white
@@ -25,9 +25,9 @@ HighlightSearching=#ffff00
 HighlightSearchingText=black
 MenuBase=#cfdbd5
 MenuBaseText=#0a0a0a
-MenuStripe=#3c6e71
-MenuSelection=#3c6e71
-MenuSelectionText=#fdfdff
+MenuStripe=#cad6d0ff
+MenuSelection=#e2ecefff
+MenuSelectionText=#0c0c0cff
 Window=#cfdbd5
 WindowText=#353535
 Button=#cfdbd5
@@ -87,16 +87,16 @@ TitleAlignment=Left
 IsDark=false
 
 [Metrics]
-BorderThickness=4
+BorderThickness=3
 BorderRadius=0
-TitleHeight=19
-TitleButtonWidth=15
-TitleButtonHeight=15
+TitleHeight=22
+TitleButtonWidth=20
+TitleButtonHeight=18
 
 [Paths]
-ActiveWindowShadow=/res/icons/themes/Chillychilly/frame-shadow-dark.png
+ActiveWindowShadow=/res/icons/themes/Chillychilly/frame-shadow-light.png
 InactiveWindowShadow=/res/icons/themes/Chillychilly/frame-shadow-light.png
-MenuShadow=/res/icons/themes/Chillychilly/frame-shadow-light.png
+MenuShadow=/res/icons/themes/Chillychilly/menu-shadow.png
 TaskBarShadow=/res/icons/themes/Chillychilly/frame-shadow-light.png
 TooltipShadow=/res/icons/themes/Chillychilly/frame-shadow-light.png
 TitleButtonIcons=/res/icons/themes/Chillychilly/16x16/