diff --git a/includes/tweaks/theme/dark.styles b/includes/tweaks/theme/dark.styles
index 99ae4ef..1c17a38 100644
--- a/includes/tweaks/theme/dark.styles
+++ b/includes/tweaks/theme/dark.styles
@@ -120,5 +120,8 @@
 		color__listPanelBackground			=		grey900
 
 		color__materialButtonWhiteBackground	=	grey800
+		color__screenshotBackground = color__background
+		color__appDownloadPanelActive = color__background
+		color__playButtonTextDownloadPage = color__playButtonText
 	}
 }
\ No newline at end of file
diff --git a/includes/tweaks/theme/light.styles b/includes/tweaks/theme/light.styles
index e5af945..9f7238f 100644
--- a/includes/tweaks/theme/light.styles
+++ b/includes/tweaks/theme/light.styles
@@ -120,5 +120,8 @@
 		color__listPanelBackground			=		white
 
 		color__materialButtonWhiteBackground	=	white
+		color__screenshotBackground = white
+		color__appDownloadPanelActive = white
+		color__playButtonTextDownloadPage = lightgreen900
 	}
 }
\ No newline at end of file
diff --git a/resource/layout/appdownloadpanel.layout b/resource/layout/appdownloadpanel.layout
index 0146251..6f15207 100644
--- a/resource/layout/appdownloadpanel.layout
+++ b/resource/layout/appdownloadpanel.layout
@@ -12,7 +12,7 @@
 		}
 		
 		panelStyleHighlight {
-			bgcolor=white
+			bgcolor=color__appDownloadPanelActive
 
 			render_bg {}			
 		}
@@ -29,16 +29,15 @@
 			inset="0 0 0 0"
 			
 			render_bg {}
-		}	
+		}
 
 		DetailsLaunchButton {
 			bgcolor=none
-			textcolor="lightgreen900"
+			textcolor=color__playButtonTextDownloadPage
 			font-family=font__mediumfont
 			font-size = 20
-font-size = 16 [$LINUX]
-font-size = 21 [$OSX]
-			
+			font-size = 16 [$LINUX]
+			font-size = 21 [$OSX]
 			font-weight=600
 			font-style=uppercase
 			inset="65 0 0 0"
@@ -47,24 +46,45 @@ font-size = 21 [$OSX]
 			
 			render {}
 			render_bg {
-				0="fill(x0,y0,x1,y1, limeA400__26opacity)"
-				1="fill(x0,y0,x0+3,y1, limeA400)"
-				2="fill(x0,y0,x1,y0+3, limeA400)"
-				3="fill(x1-3,y0,x1,y1, limeA400)"
-				4="fill(x0,y1-3,x1,y1, limeA400)"
+				0="fill(x0,y0,x1,y1, color__playButtonBackground)"
+				1="fill(x0,y0,x0+3,y1, color__playButtonBorder)"
+				2="fill(x0,y0,x1,y0+3, color__playButtonBorder)"
+				3="fill(x1-3,y0,x1,y1, color__playButtonBorder)"
+				4="fill(x0,y1-3,x1,y1, color__playButtonBorder)"
 			}
 		}
-	
-			DetailsLaunchButton:Hover {   
+		
+			DetailsLaunchButton:Hover {
+				render_bg {
+					0="fill(x0,y0,x1,y1, color__playButtonBackground__hover)"
+					1="fill(x0,y0,x0+3,y1, color__playButtonBorder__hover)"
+					2="fill(x0,y0,x1,y0+3, color__playButtonBorder__hover)"
+					3="fill(x1-3,y0,x1,y1, color__playButtonBorder__hover)"
+					4="fill(x0,y1-3,x1,y1, color__playButtonBorder__hover)"
+				}
+			}
+			
+			DetailsLaunchButton:Selected {
 				render_bg {
-					0="fill(x0,y0,x1,y1, limeA400__50opacity)"
-					1="fill(x0,y0,x0+3,y1, limeA400)"
-					2="fill(x0,y0,x1,y0+3, limeA400)"
-					3="fill(x1-3,y0,x1,y1, limeA400)"
-					4="fill(x0,y1-3,x1,y1, limeA400)"
-				}	
+					0="fill(x0,y0,x1,y1, color__playButtonBackground__selected)"
+					1="fill(x0,y0,x0+3,y1, color__playButtonBorder__selected)"
+					2="fill(x0,y0,x1,y0+3, color__playButtonBorder__selected)"
+					3="fill(x1-3,y0,x1,y1, color__playButtonBorder__selected)"
+					4="fill(x0,y1-3,x1,y1, color__playButtonBorder__selected)"
+				}
+			}
+		
+			DetailsLaunchButton:Active {
+				render_bg {
+					0="fill(x0,y0,x1,y1, color__playButtonBackground__selected)"
+					1="fill(x0,y0,x0+3,y1, color__playButtonBorder__selected)"
+					2="fill(x0,y0,x1,y0+3, color__playButtonBorder__selected)"
+					3="fill(x1-3,y0,x1,y1, color__playButtonBorder__selected)"
+					4="fill(x0,y1-3,x1,y1, color__playButtonBorder__selected)"
+				}
 			}
 
+
 		ModuleHeading {
 			textcolor=color__text
 			font-size=24
@@ -75,9 +95,8 @@ font-size = 21 [$OSX]
 		label {
 			textcolor=color__secondaryText
 			font-size = 18
-font-size = 16 [$LINUX]
-font-size = 19 [$OSX]
-			
+			font-size = 16 [$LINUX]
+			font-size = 19 [$OSX]
 		}
 
 		label2 {
diff --git a/resource/layout/downloadspage.layout b/resource/layout/downloadspage.layout
index 0c5c7f7..a8e720c 100644
--- a/resource/layout/downloadspage.layout
+++ b/resource/layout/downloadspage.layout
@@ -18,9 +18,8 @@
 			shadowtextcolor=color__disabled	
 			font-family=font__basefont
 			font-size = 14
-font-size = 12 [$LINUX]
-font-size = 15 [$OSX]
-			
+			font-size = 12 [$LINUX]
+			font-size = 15 [$OSX]
 			font-weight=400
 			
 			render {
@@ -76,7 +75,7 @@ font-size = 15 [$OSX]
 		}
 
 		SectionHeaderStyleLabel {
-			bgcolor=white
+			bgcolor=none
 			textcolor=color__listPanelSectionHeaderText
 			font-weight=600
 			font-style=uppercase
diff --git a/resource/layout/gamespage_details_subheader.layout b/resource/layout/gamespage_details_subheader.layout
index 28728d0..b1a6edb 100644
--- a/resource/layout/gamespage_details_subheader.layout
+++ b/resource/layout/gamespage_details_subheader.layout
@@ -109,9 +109,8 @@ font-size = 29 [$OSX]
 			textcolor=color__playButtonText
 			font-family=font__mediumfont
 			font-size = 28
-font-size = 23 [$LINUX]
-font-size = 29 [$OSX]
-			
+			font-size = 23 [$LINUX]
+			font-size = 29 [$OSX]
 			font-weight=600
 			font-style=uppercase
 			padding-left=60
diff --git a/resource/layout/screenshotmanager.layout b/resource/layout/screenshotmanager.layout
index a3e1634..3f12b31 100644
--- a/resource/layout/screenshotmanager.layout
+++ b/resource/layout/screenshotmanager.layout
@@ -18,7 +18,7 @@
 		} 
 
 		WrapPanel {			
-			bgcolor=white
+			bgcolor=color__screenshotBackground
 			padding-left=4
 			padding-top=4
 			padding-right=4