diff --git a/source/Constants.xaml b/source/Constants.xaml
index 69a11ad..f6b5c55 100644
--- a/source/Constants.xaml
+++ b/source/Constants.xaml
@@ -86,6 +86,9 @@
 	<HorizontalAlignment x:Key="GridGameDetailsValueHorizontalAlignment">Left</HorizontalAlignment> <!-- Values: Left Center Right  -->
 	<sys:Double x:Key="GridLeftColumnMinWidth">100</sys:Double>
 	
+	<!-- HowLongToBeat Settings -->
+	<sys:Boolean x:Key="HLTBButtonVisibility">False</sys:Boolean> <!-- Values: True False  -->
+	
 	<!-- LibraryManagement Settings -->
 	<sys:Boolean x:Key="FeaturesTopPanelVideoPlaying">True</sys:Boolean> <!-- Values: True False  -->
 	<sys:Boolean x:Key="DetailThFeaturesAtTop">True</sys:Boolean> <!-- Values: True False  -->
diff --git a/source/DerivedStyles/GridViewItemTemplate.xaml b/source/DerivedStyles/GridViewItemTemplate.xaml
index 369075c..73c6bf3 100644
--- a/source/DerivedStyles/GridViewItemTemplate.xaml
+++ b/source/DerivedStyles/GridViewItemTemplate.xaml
@@ -137,7 +137,7 @@
 										</Image>
 									</Grid>
 									<Grid Visibility="{Binding ElementName=GridListUseItmIconBannersCheck, Path=IsChecked, Converter={StaticResource BooleanToVisibilityConverter}}">
-										<Image Margin="4,4,4,4" Height="Auto" 
+										<Image Margin="6,6,6,6" Height="Auto" 
 											HorizontalAlignment="Right" VerticalAlignment="Center"
 											Source="{Binding Platforms[0].Icon, Converter={StaticResource ImageStringToImageConverter}}"
 											Visibility="{Binding ElementName=GridListUseItmStoreBannersCheck, Path=IsChecked, Converter={StaticResource InvertedBooleanToVisibilityConverter}}">
@@ -220,7 +220,7 @@
 											</Image>
 										</Grid>
 										<Grid Visibility="{Binding ElementName=GridListUseItmIconBannersCheck, Path=IsChecked, Converter={StaticResource BooleanToVisibilityConverter}}">
-											<Image Margin="4,4,4,4" Height="Auto" 
+											<Image Margin="6,6,6,6" Height="Auto" 
 												HorizontalAlignment="Center" VerticalAlignment="Top"
 												Source="{Binding Platforms[0].Icon, Converter={StaticResource ImageStringToImageConverter}}"
 												Visibility="{Binding ElementName=GridListUseItmStoreBannersCheck, Path=IsChecked, Converter={StaticResource InvertedBooleanToVisibilityConverter}}">
diff --git a/source/Images/banners/Stores/Riot Launcher.png b/source/Images/Banners/Stores/Riot Games.png
similarity index 100%
rename from source/Images/banners/Stores/Riot Launcher.png
rename to source/Images/Banners/Stores/Riot Games.png
diff --git a/source/Images/banners/Amazon Games.png b/source/Images/banners/Amazon Games.png
deleted file mode 100644
index a599055..0000000
Binary files a/source/Images/banners/Amazon Games.png and /dev/null differ
diff --git a/source/Images/banners/Battle.net.png b/source/Images/banners/Battle.net.png
deleted file mode 100644
index c48a87d..0000000
Binary files a/source/Images/banners/Battle.net.png and /dev/null differ
diff --git a/source/Images/banners/Bethesda.png b/source/Images/banners/Bethesda.png
deleted file mode 100644
index 4754ae3..0000000
Binary files a/source/Images/banners/Bethesda.png and /dev/null differ
diff --git a/source/Images/banners/Epic.png b/source/Images/banners/Epic.png
deleted file mode 100644
index 99e2c1a..0000000
Binary files a/source/Images/banners/Epic.png and /dev/null differ
diff --git a/source/Images/banners/GOG.png b/source/Images/banners/GOG.png
deleted file mode 100644
index afca3b5..0000000
Binary files a/source/Images/banners/GOG.png and /dev/null differ
diff --git a/source/Images/banners/Humble.png b/source/Images/banners/Humble.png
deleted file mode 100644
index 852ebe5..0000000
Binary files a/source/Images/banners/Humble.png and /dev/null differ
diff --git a/source/Images/banners/Indiegala.png b/source/Images/banners/Indiegala.png
deleted file mode 100644
index 6db9164..0000000
Binary files a/source/Images/banners/Indiegala.png and /dev/null differ
diff --git a/source/Images/banners/Itch.io.png b/source/Images/banners/Itch.io.png
deleted file mode 100644
index 5b976d1..0000000
Binary files a/source/Images/banners/Itch.io.png and /dev/null differ
diff --git a/source/Images/banners/Oculus.png b/source/Images/banners/Oculus.png
deleted file mode 100644
index bd899af..0000000
Binary files a/source/Images/banners/Oculus.png and /dev/null differ
diff --git a/source/Images/banners/Origin.png b/source/Images/banners/Origin.png
deleted file mode 100644
index f9bb3a9..0000000
Binary files a/source/Images/banners/Origin.png and /dev/null differ
diff --git a/source/Images/banners/PlayStation.png b/source/Images/banners/PlayStation.png
deleted file mode 100644
index d1beacf..0000000
Binary files a/source/Images/banners/PlayStation.png and /dev/null differ
diff --git a/source/Images/banners/Rockstar Games.png b/source/Images/banners/Rockstar Games.png
deleted file mode 100644
index 264ac90..0000000
Binary files a/source/Images/banners/Rockstar Games.png and /dev/null differ
diff --git a/source/Images/banners/Steam.png b/source/Images/banners/Steam.png
deleted file mode 100644
index 84c2973..0000000
Binary files a/source/Images/banners/Steam.png and /dev/null differ
diff --git a/source/Images/banners/Ubisoft Connect.png b/source/Images/banners/Ubisoft Connect.png
deleted file mode 100644
index 4ae520b..0000000
Binary files a/source/Images/banners/Ubisoft Connect.png and /dev/null differ
diff --git a/source/Images/banners/Xbox.png b/source/Images/banners/Xbox.png
deleted file mode 100644
index d4ae4d6..0000000
Binary files a/source/Images/banners/Xbox.png and /dev/null differ
diff --git a/source/Images/stores/Amazon Games.png b/source/Images/stores/Amazon Games.png
deleted file mode 100644
index cc123db..0000000
Binary files a/source/Images/stores/Amazon Games.png and /dev/null differ
diff --git a/source/Images/stores/Battle.net.png b/source/Images/stores/Battle.net.png
deleted file mode 100644
index d01e02b..0000000
Binary files a/source/Images/stores/Battle.net.png and /dev/null differ
diff --git a/source/Images/stores/Bethesda.png b/source/Images/stores/Bethesda.png
deleted file mode 100644
index 6063426..0000000
Binary files a/source/Images/stores/Bethesda.png and /dev/null differ
diff --git a/source/Images/stores/Epic.png b/source/Images/stores/Epic.png
deleted file mode 100644
index 3dbfcdc..0000000
Binary files a/source/Images/stores/Epic.png and /dev/null differ
diff --git a/source/Images/stores/GOG.png b/source/Images/stores/GOG.png
deleted file mode 100644
index 6c0b4cb..0000000
Binary files a/source/Images/stores/GOG.png and /dev/null differ
diff --git a/source/Images/stores/Humble.png b/source/Images/stores/Humble.png
deleted file mode 100644
index b4d6ac8..0000000
Binary files a/source/Images/stores/Humble.png and /dev/null differ
diff --git a/source/Images/stores/Indiegala.png b/source/Images/stores/Indiegala.png
deleted file mode 100644
index dd524f8..0000000
Binary files a/source/Images/stores/Indiegala.png and /dev/null differ
diff --git a/source/Images/stores/Itch.io.png b/source/Images/stores/Itch.io.png
deleted file mode 100644
index 639515a..0000000
Binary files a/source/Images/stores/Itch.io.png and /dev/null differ
diff --git a/source/Images/stores/Oculus.png b/source/Images/stores/Oculus.png
deleted file mode 100644
index bb4d437..0000000
Binary files a/source/Images/stores/Oculus.png and /dev/null differ
diff --git a/source/Images/stores/Origin.png b/source/Images/stores/Origin.png
deleted file mode 100644
index 00d1227..0000000
Binary files a/source/Images/stores/Origin.png and /dev/null differ
diff --git a/source/Images/stores/PlayStation.png b/source/Images/stores/PlayStation.png
deleted file mode 100644
index 25e06e0..0000000
Binary files a/source/Images/stores/PlayStation.png and /dev/null differ
diff --git a/source/Images/stores/Rockstar Games.png b/source/Images/stores/Rockstar Games.png
deleted file mode 100644
index 8ab8806..0000000
Binary files a/source/Images/stores/Rockstar Games.png and /dev/null differ
diff --git a/source/Images/stores/Steam.png b/source/Images/stores/Steam.png
deleted file mode 100644
index c768fd7..0000000
Binary files a/source/Images/stores/Steam.png and /dev/null differ
diff --git a/source/Images/stores/Ubisoft Connect.png b/source/Images/stores/Ubisoft Connect.png
deleted file mode 100644
index e5a8cb4..0000000
Binary files a/source/Images/stores/Ubisoft Connect.png and /dev/null differ
diff --git a/source/Images/stores/Xbox.png b/source/Images/stores/Xbox.png
deleted file mode 100644
index b5d48f0..0000000
Binary files a/source/Images/stores/Xbox.png and /dev/null differ
diff --git a/source/Views/DetailsViewGameOverview.xaml b/source/Views/DetailsViewGameOverview.xaml
index b9733a5..7304e08 100644
--- a/source/Views/DetailsViewGameOverview.xaml
+++ b/source/Views/DetailsViewGameOverview.xaml
@@ -616,7 +616,7 @@
 																	</Image>
 																</Grid>
 																<Grid Visibility="{Binding ElementName=DetailIconCheck, Path=IsChecked, Converter={StaticResource BooleanToVisibilityConverter}}">
-																	<Image Margin="4,4,4,4" Height="Auto"
+																	<Image Margin="6,6,6,6" Height="Auto"
 																		HorizontalAlignment="Right" VerticalAlignment="Center"
 																		Source="{Binding Game.Platforms[0].Icon, Converter={StaticResource ImageStringToImageConverter}}"
 																		Visibility="{Binding ElementName=DetailStoreCheck, Path=IsChecked, Converter={StaticResource InvertedBooleanToVisibilityConverter}}">
@@ -704,7 +704,7 @@
 																		</Image>
 																	</Grid>
 																	<Grid Visibility="{Binding ElementName=DetailIconCheck, Path=IsChecked, Converter={StaticResource BooleanToVisibilityConverter}}">
-																		<Image Margin="4,4,4,4" Height="Auto" 
+																		<Image Margin="6,6,6,6" Height="Auto" 
 																			HorizontalAlignment="Center" VerticalAlignment="Top"
 																			Source="{Binding Game.Platforms[0].Icon, Converter={StaticResource ImageStringToImageConverter}}"
 																			Visibility="{Binding ElementName=DetailStoreCheck, Path=IsChecked, Converter={StaticResource InvertedBooleanToVisibilityConverter}}">
@@ -837,28 +837,35 @@
 																Padding="0" Width="40" Height="40" Margin="0,0,0,0" Cursor="Hand"
 																ToolTip="{DynamicResource LOCGameActivityViewGameActivity}" />
 														</Grid>
-
+														<CheckBox Name="HLTBButtonVisibilityCheck" IsChecked="{DynamicResource HLTBButtonVisibility}" Visibility="Collapsed" />
 														<Grid Width="Auto" Height="Auto" Margin="0,0,10,5">
 															<Grid.Style>
 																<Style TargetType="{x:Type Grid}" BasedOn="{StaticResource {x:Type Grid}}">
-																	<Setter Property="Visibility" Value="Visible" />
+																	<Setter Property="Visibility" Value="Collapsed" />
 																	<Style.Triggers>
-																		<DataTrigger Binding="{PluginStatus Plugin=playnite-howlongtobeat-plugin, Status=Installed}" Value="False">
-																			<Setter Property="Visibility" Value="Collapsed" />
-																		</DataTrigger>
-																		<DataTrigger Binding="{PluginSettings Plugin=HowLongToBeat, Path=EnableIntegrationButton}" Value="False">
-																			<Setter Property="Visibility" Value="Collapsed" />
-																		</DataTrigger>
-																		<DataTrigger Binding="{PluginSettings Plugin=HowLongToBeat, Path=HasData}" Value="False">
-																			<Setter Property="Control.Visibility" Value="Collapsed" />
-																		</DataTrigger>
+																		<MultiDataTrigger>
+																			<MultiDataTrigger.Conditions>
+																				<Condition Binding="{PluginStatus Plugin=playnite-howlongtobeat-plugin, Status=Installed}" Value="True"/>
+																				<Condition Binding="{PluginSettings Plugin=HowLongToBeat, Path=EnableIntegrationButton}" Value="True"/>
+																				<Condition Binding="{PluginSettings Plugin=HowLongToBeat, Path=HasData}" Value="True"/>
+																			</MultiDataTrigger.Conditions>
+																			<Setter Property="Control.Visibility" Value="Visible" />
+																		</MultiDataTrigger>
+																		<MultiDataTrigger>
+																			<MultiDataTrigger.Conditions>
+																				<Condition Binding="{PluginStatus Plugin=playnite-howlongtobeat-plugin, Status=Installed}" Value="True"/>
+																				<Condition Binding="{PluginSettings Plugin=HowLongToBeat, Path=EnableIntegrationButton}" Value="True"/>
+																				<Condition Binding="{Binding ElementName=HLTBButtonVisibilityCheck, Path=IsChecked}" Value="True"/>
+																			</MultiDataTrigger.Conditions>
+																			<Setter Property="Control.Visibility" Value="Visible" />
+																		</MultiDataTrigger>
 																	</Style.Triggers>
 																</Style>
 															</Grid.Style>
 															<ContentControl x:Name="HowLongToBeat_PluginButton" FontSize="19" 
 															Padding="0" Width="40" Height="40" Margin="0,0,0,0" Cursor="Hand"
 															ToolTip="{DynamicResource LOCHowLongToBeatPluginView}" />
-														</Grid>																
+														</Grid>
 
 														<TextBlock Name="TtImageCount" Visibility="Collapsed"
 															Tag="{PluginSettings Plugin=ScreenshotsVisualizer, Path=ListScreenshots.Count}" >
@@ -1938,40 +1945,40 @@
 																		<DataTrigger Binding="{Binding Game.Source.Name}" Value="Steam">
 																			<Setter Property="Control.Visibility" Value="Visible"/>
 																		</DataTrigger>
-																		<DataTrigger Binding="{Binding Game.Links[0].Name}" Value="Steam store">
+																		<DataTrigger Binding="{Binding Game.Links[0].Name}" Value="Steam Store">
 																			<Setter Property="Control.Visibility" Value="Visible"/>
 																		</DataTrigger>
-																		<DataTrigger Binding="{Binding Game.Links[1].Name}" Value="Steam store">
+																		<DataTrigger Binding="{Binding Game.Links[1].Name}" Value="Steam Store">
 																			<Setter Property="Control.Visibility" Value="Visible"/>
 																		</DataTrigger>
-																		<DataTrigger Binding="{Binding Game.Links[2].Name}" Value="Steam store">
+																		<DataTrigger Binding="{Binding Game.Links[2].Name}" Value="Steam Store">
 																			<Setter Property="Control.Visibility" Value="Visible"/>
 																		</DataTrigger>
-																		<DataTrigger Binding="{Binding Game.Links[3].Name}" Value="Steam store">
+																		<DataTrigger Binding="{Binding Game.Links[3].Name}" Value="Steam Store">
 																			<Setter Property="Control.Visibility" Value="Visible"/>
 																		</DataTrigger>
-																		<DataTrigger Binding="{Binding Game.Links[4].Name}" Value="Steam store">
+																		<DataTrigger Binding="{Binding Game.Links[4].Name}" Value="Steam Store">
 																			<Setter Property="Control.Visibility" Value="Visible"/>
 																		</DataTrigger>
-																		<DataTrigger Binding="{Binding Game.Links[5].Name}" Value="Steam store">
+																		<DataTrigger Binding="{Binding Game.Links[5].Name}" Value="Steam Store">
 																			<Setter Property="Control.Visibility" Value="Visible"/>
 																		</DataTrigger>
-																		<DataTrigger Binding="{Binding Game.Links[6].Name}" Value="Steam store">
+																		<DataTrigger Binding="{Binding Game.Links[6].Name}" Value="Steam Store">
 																			<Setter Property="Control.Visibility" Value="Visible"/>
 																		</DataTrigger>
-																		<DataTrigger Binding="{Binding Game.Links[7].Name}" Value="Steam store">
+																		<DataTrigger Binding="{Binding Game.Links[7].Name}" Value="Steam Store">
 																			<Setter Property="Control.Visibility" Value="Visible"/>
 																		</DataTrigger>
-																		<DataTrigger Binding="{Binding Game.Links[8].Name}" Value="Steam store">
+																		<DataTrigger Binding="{Binding Game.Links[8].Name}" Value="Steam Store">
 																			<Setter Property="Control.Visibility" Value="Visible"/>
 																		</DataTrigger>
-																		<DataTrigger Binding="{Binding Game.Links[9].Name}" Value="Steam store">
+																		<DataTrigger Binding="{Binding Game.Links[9].Name}" Value="Steam Store">
 																			<Setter Property="Control.Visibility" Value="Visible"/>
 																		</DataTrigger>
-																		<DataTrigger Binding="{Binding Game.Links[10].Name}" Value="Steam store">
+																		<DataTrigger Binding="{Binding Game.Links[10].Name}" Value="Steam Store">
 																			<Setter Property="Control.Visibility" Value="Visible"/>
 																		</DataTrigger>
-																		<DataTrigger Binding="{Binding Game.Links[11].Name}" Value="Steam store">
+																		<DataTrigger Binding="{Binding Game.Links[11].Name}" Value="Steam Store">
 																			<Setter Property="Control.Visibility" Value="Visible"/>
 																		</DataTrigger>
 																		<DataTrigger Binding="{PluginStatus Plugin=Review_Viewer_ca24e37a-76d9-49bf-89ab-d3cba4a54bd1, Status=Installed}" Value="False">
@@ -2321,40 +2328,40 @@
 																					<DataTrigger Binding="{Binding Game.Source.Name}" Value="Steam">
 																						<Setter Property="Control.Visibility" Value="Visible"/>
 																					</DataTrigger>
-																					<DataTrigger Binding="{Binding Game.Links[0].Name}" Value="Steam store">
+																					<DataTrigger Binding="{Binding Game.Links[0].Name}" Value="Steam Store">
 																						<Setter Property="Control.Visibility" Value="Visible"/>
 																					</DataTrigger>
-																					<DataTrigger Binding="{Binding Game.Links[1].Name}" Value="Steam store">
+																					<DataTrigger Binding="{Binding Game.Links[1].Name}" Value="Steam Store">
 																						<Setter Property="Control.Visibility" Value="Visible"/>
 																					</DataTrigger>
-																					<DataTrigger Binding="{Binding Game.Links[2].Name}" Value="Steam store">
+																					<DataTrigger Binding="{Binding Game.Links[2].Name}" Value="Steam Store">
 																						<Setter Property="Control.Visibility" Value="Visible"/>
 																					</DataTrigger>
-																					<DataTrigger Binding="{Binding Game.Links[3].Name}" Value="Steam store">
+																					<DataTrigger Binding="{Binding Game.Links[3].Name}" Value="Steam Store">
 																						<Setter Property="Control.Visibility" Value="Visible"/>
 																					</DataTrigger>
-																					<DataTrigger Binding="{Binding Game.Links[4].Name}" Value="Steam store">
+																					<DataTrigger Binding="{Binding Game.Links[4].Name}" Value="Steam Store">
 																						<Setter Property="Control.Visibility" Value="Visible"/>
 																					</DataTrigger>
-																					<DataTrigger Binding="{Binding Game.Links[5].Name}" Value="Steam store">
+																					<DataTrigger Binding="{Binding Game.Links[5].Name}" Value="Steam Store">
 																						<Setter Property="Control.Visibility" Value="Visible"/>
 																					</DataTrigger>
-																					<DataTrigger Binding="{Binding Game.Links[6].Name}" Value="Steam store">
+																					<DataTrigger Binding="{Binding Game.Links[6].Name}" Value="Steam Store">
 																						<Setter Property="Control.Visibility" Value="Visible"/>
 																					</DataTrigger>
-																					<DataTrigger Binding="{Binding Game.Links[7].Name}" Value="Steam store">
+																					<DataTrigger Binding="{Binding Game.Links[7].Name}" Value="Steam Store">
 																						<Setter Property="Control.Visibility" Value="Visible"/>
 																					</DataTrigger>
-																					<DataTrigger Binding="{Binding Game.Links[8].Name}" Value="Steam store">
+																					<DataTrigger Binding="{Binding Game.Links[8].Name}" Value="Steam Store">
 																						<Setter Property="Control.Visibility" Value="Visible"/>
 																					</DataTrigger>
-																					<DataTrigger Binding="{Binding Game.Links[9].Name}" Value="Steam store">
+																					<DataTrigger Binding="{Binding Game.Links[9].Name}" Value="Steam Store">
 																						<Setter Property="Control.Visibility" Value="Visible"/>
 																					</DataTrigger>
-																					<DataTrigger Binding="{Binding Game.Links[10].Name}" Value="Steam store">
+																					<DataTrigger Binding="{Binding Game.Links[10].Name}" Value="Steam Store">
 																						<Setter Property="Control.Visibility" Value="Visible"/>
 																					</DataTrigger>
-																					<DataTrigger Binding="{Binding Game.Links[11].Name}" Value="Steam store">
+																					<DataTrigger Binding="{Binding Game.Links[11].Name}" Value="Steam Store">
 																						<Setter Property="Control.Visibility" Value="Visible"/>
 																					</DataTrigger>
 																					<DataTrigger Binding="{PluginStatus Plugin=Review_Viewer_ca24e37a-76d9-49bf-89ab-d3cba4a54bd1, Status=Installed}" Value="False">
diff --git a/source/Views/GridViewGameOverview.xaml b/source/Views/GridViewGameOverview.xaml
index c65c4e1..2b25830 100644
--- a/source/Views/GridViewGameOverview.xaml
+++ b/source/Views/GridViewGameOverview.xaml
@@ -668,7 +668,7 @@
 																				</Image>
 																			</Grid>
 																			<Grid Visibility="{Binding ElementName=GdIconCheck, Path=IsChecked, Converter={StaticResource BooleanToVisibilityConverter}}">
-																				<Image Margin="4,4,4,4" Height="Auto" 
+																				<Image Margin="6,6,6,6" Height="Auto" 
 																					HorizontalAlignment="Right" VerticalAlignment="Center"
 																					Source="{Binding Game.Platforms[0].Icon, Converter={StaticResource ImageStringToImageConverter}}"
 																					Visibility="{Binding ElementName=GdStoreCheck, Path=IsChecked, Converter={StaticResource InvertedBooleanToVisibilityConverter}}">
@@ -756,7 +756,7 @@
 																					</Image>
 																				</Grid>
 																				<Grid Visibility="{Binding ElementName=GdIconCheck, Path=IsChecked, Converter={StaticResource BooleanToVisibilityConverter}}">
-																					<Image Margin="4,4,4,4" Height="Auto" 
+																					<Image Margin="6,6,6,6" Height="Auto" 
 																						HorizontalAlignment="Center" VerticalAlignment="Top"
 																						Source="{Binding Game.Platforms[0].Icon, Converter={StaticResource ImageStringToImageConverter}}"
 																						Visibility="{Binding ElementName=GdStoreCheck, Path=IsChecked, Converter={StaticResource InvertedBooleanToVisibilityConverter}}">
@@ -889,27 +889,35 @@
 																			ToolTip="{DynamicResource LOCGameActivityViewGameActivity}" />
 																	</Grid>
 
+																	<CheckBox Name="HLTBButtonVisibilityCheck" IsChecked="{DynamicResource HLTBButtonVisibility}" Visibility="Collapsed" />
 																	<Grid Width="Auto" Height="Auto" Margin="0,0,10,5">
 																		<Grid.Style>
 																			<Style TargetType="{x:Type Grid}" BasedOn="{StaticResource {x:Type Grid}}">
-																				<Setter Property="Visibility" Value="Visible" />
+																				<Setter Property="Visibility" Value="Collapsed" />
 																				<Style.Triggers>
-																					<DataTrigger Binding="{PluginStatus Plugin=playnite-howlongtobeat-plugin, Status=Installed}" Value="False">
-																						<Setter Property="Visibility" Value="Collapsed" />
-																					</DataTrigger>
-																					<DataTrigger Binding="{PluginSettings Plugin=HowLongToBeat, Path=EnableIntegrationButton}" Value="False">
-																						<Setter Property="Visibility" Value="Collapsed" />
-																					</DataTrigger>
-																					<DataTrigger Binding="{PluginSettings Plugin=HowLongToBeat, Path=HasData}" Value="False">
-																						<Setter Property="Control.Visibility" Value="Collapsed" />
-																					</DataTrigger>
+																					<MultiDataTrigger>
+																						<MultiDataTrigger.Conditions>
+																							<Condition Binding="{PluginStatus Plugin=playnite-howlongtobeat-plugin, Status=Installed}" Value="True"/>
+																							<Condition Binding="{PluginSettings Plugin=HowLongToBeat, Path=EnableIntegrationButton}" Value="True"/>
+																							<Condition Binding="{PluginSettings Plugin=HowLongToBeat, Path=HasData}" Value="True"/>
+																						</MultiDataTrigger.Conditions>
+																						<Setter Property="Control.Visibility" Value="Visible" />
+																					</MultiDataTrigger>
+																					<MultiDataTrigger>
+																						<MultiDataTrigger.Conditions>
+																							<Condition Binding="{PluginStatus Plugin=playnite-howlongtobeat-plugin, Status=Installed}" Value="True"/>
+																							<Condition Binding="{PluginSettings Plugin=HowLongToBeat, Path=EnableIntegrationButton}" Value="True"/>
+																							<Condition Binding="{Binding ElementName=HLTBButtonVisibilityCheck, Path=IsChecked}" Value="True"/>
+																						</MultiDataTrigger.Conditions>
+																						<Setter Property="Control.Visibility" Value="Visible" />
+																					</MultiDataTrigger>
 																				</Style.Triggers>
 																			</Style>
 																		</Grid.Style>
 																		<ContentControl x:Name="HowLongToBeat_PluginButton" FontSize="19" 
 																		Padding="0" Width="40" Height="40" Margin="0,0,0,0" Cursor="Hand"
 																		ToolTip="{DynamicResource LOCHowLongToBeatPluginView}" />
-																	</Grid>																
+																	</Grid>
 
 																	<TextBlock Name="TtImageCount" Visibility="Collapsed"
 																		Tag="{PluginSettings Plugin=ScreenshotsVisualizer, Path=ListScreenshots.Count}" >
@@ -1985,40 +1993,40 @@
 																						<DataTrigger Binding="{Binding Game.Source.Name}" Value="Steam">
 																							<Setter Property="Control.Visibility" Value="Visible"/>
 																						</DataTrigger>
-																						<DataTrigger Binding="{Binding Game.Links[0].Name}" Value="Steam store">
+																						<DataTrigger Binding="{Binding Game.Links[0].Name}" Value="Steam Store">
 																							<Setter Property="Control.Visibility" Value="Visible"/>
 																						</DataTrigger>
-																						<DataTrigger Binding="{Binding Game.Links[1].Name}" Value="Steam store">
+																						<DataTrigger Binding="{Binding Game.Links[1].Name}" Value="Steam Store">
 																							<Setter Property="Control.Visibility" Value="Visible"/>
 																						</DataTrigger>
-																						<DataTrigger Binding="{Binding Game.Links[2].Name}" Value="Steam store">
+																						<DataTrigger Binding="{Binding Game.Links[2].Name}" Value="Steam Store">
 																							<Setter Property="Control.Visibility" Value="Visible"/>
 																						</DataTrigger>
-																						<DataTrigger Binding="{Binding Game.Links[3].Name}" Value="Steam store">
+																						<DataTrigger Binding="{Binding Game.Links[3].Name}" Value="Steam Store">
 																							<Setter Property="Control.Visibility" Value="Visible"/>
 																						</DataTrigger>
-																						<DataTrigger Binding="{Binding Game.Links[4].Name}" Value="Steam store">
+																						<DataTrigger Binding="{Binding Game.Links[4].Name}" Value="Steam Store">
 																							<Setter Property="Control.Visibility" Value="Visible"/>
 																						</DataTrigger>
-																						<DataTrigger Binding="{Binding Game.Links[5].Name}" Value="Steam store">
+																						<DataTrigger Binding="{Binding Game.Links[5].Name}" Value="Steam Store">
 																							<Setter Property="Control.Visibility" Value="Visible"/>
 																						</DataTrigger>
-																						<DataTrigger Binding="{Binding Game.Links[6].Name}" Value="Steam store">
+																						<DataTrigger Binding="{Binding Game.Links[6].Name}" Value="Steam Store">
 																							<Setter Property="Control.Visibility" Value="Visible"/>
 																						</DataTrigger>
-																						<DataTrigger Binding="{Binding Game.Links[7].Name}" Value="Steam store">
+																						<DataTrigger Binding="{Binding Game.Links[7].Name}" Value="Steam Store">
 																							<Setter Property="Control.Visibility" Value="Visible"/>
 																						</DataTrigger>
-																						<DataTrigger Binding="{Binding Game.Links[8].Name}" Value="Steam store">
+																						<DataTrigger Binding="{Binding Game.Links[8].Name}" Value="Steam Store">
 																							<Setter Property="Control.Visibility" Value="Visible"/>
 																						</DataTrigger>
-																						<DataTrigger Binding="{Binding Game.Links[9].Name}" Value="Steam store">
+																						<DataTrigger Binding="{Binding Game.Links[9].Name}" Value="Steam Store">
 																							<Setter Property="Control.Visibility" Value="Visible"/>
 																						</DataTrigger>
-																						<DataTrigger Binding="{Binding Game.Links[10].Name}" Value="Steam store">
+																						<DataTrigger Binding="{Binding Game.Links[10].Name}" Value="Steam Store">
 																							<Setter Property="Control.Visibility" Value="Visible"/>
 																						</DataTrigger>
-																						<DataTrigger Binding="{Binding Game.Links[11].Name}" Value="Steam store">
+																						<DataTrigger Binding="{Binding Game.Links[11].Name}" Value="Steam Store">
 																							<Setter Property="Control.Visibility" Value="Visible"/>
 																						</DataTrigger>
 																						<DataTrigger Binding="{PluginStatus Plugin=Review_Viewer_ca24e37a-76d9-49bf-89ab-d3cba4a54bd1, Status=Installed}" Value="False">
@@ -2368,40 +2376,40 @@
 																								<DataTrigger Binding="{Binding Game.Source.Name}" Value="Steam">
 																									<Setter Property="Control.Visibility" Value="Visible"/>
 																								</DataTrigger>
-																								<DataTrigger Binding="{Binding Game.Links[0].Name}" Value="Steam store">
+																								<DataTrigger Binding="{Binding Game.Links[0].Name}" Value="Steam Store">
 																									<Setter Property="Control.Visibility" Value="Visible"/>
 																								</DataTrigger>
-																								<DataTrigger Binding="{Binding Game.Links[1].Name}" Value="Steam store">
+																								<DataTrigger Binding="{Binding Game.Links[1].Name}" Value="Steam Store">
 																									<Setter Property="Control.Visibility" Value="Visible"/>
 																								</DataTrigger>
-																								<DataTrigger Binding="{Binding Game.Links[2].Name}" Value="Steam store">
+																								<DataTrigger Binding="{Binding Game.Links[2].Name}" Value="Steam Store">
 																									<Setter Property="Control.Visibility" Value="Visible"/>
 																								</DataTrigger>
-																								<DataTrigger Binding="{Binding Game.Links[3].Name}" Value="Steam store">
+																								<DataTrigger Binding="{Binding Game.Links[3].Name}" Value="Steam Store">
 																									<Setter Property="Control.Visibility" Value="Visible"/>
 																								</DataTrigger>
-																								<DataTrigger Binding="{Binding Game.Links[4].Name}" Value="Steam store">
+																								<DataTrigger Binding="{Binding Game.Links[4].Name}" Value="Steam Store">
 																									<Setter Property="Control.Visibility" Value="Visible"/>
 																								</DataTrigger>
-																								<DataTrigger Binding="{Binding Game.Links[5].Name}" Value="Steam store">
+																								<DataTrigger Binding="{Binding Game.Links[5].Name}" Value="Steam Store">
 																									<Setter Property="Control.Visibility" Value="Visible"/>
 																								</DataTrigger>
-																								<DataTrigger Binding="{Binding Game.Links[6].Name}" Value="Steam store">
+																								<DataTrigger Binding="{Binding Game.Links[6].Name}" Value="Steam Store">
 																									<Setter Property="Control.Visibility" Value="Visible"/>
 																								</DataTrigger>
-																								<DataTrigger Binding="{Binding Game.Links[7].Name}" Value="Steam store">
+																								<DataTrigger Binding="{Binding Game.Links[7].Name}" Value="Steam Store">
 																									<Setter Property="Control.Visibility" Value="Visible"/>
 																								</DataTrigger>
-																								<DataTrigger Binding="{Binding Game.Links[8].Name}" Value="Steam store">
+																								<DataTrigger Binding="{Binding Game.Links[8].Name}" Value="Steam Store">
 																									<Setter Property="Control.Visibility" Value="Visible"/>
 																								</DataTrigger>
-																								<DataTrigger Binding="{Binding Game.Links[9].Name}" Value="Steam store">
+																								<DataTrigger Binding="{Binding Game.Links[9].Name}" Value="Steam Store">
 																									<Setter Property="Control.Visibility" Value="Visible"/>
 																								</DataTrigger>
-																								<DataTrigger Binding="{Binding Game.Links[10].Name}" Value="Steam store">
+																								<DataTrigger Binding="{Binding Game.Links[10].Name}" Value="Steam Store">
 																									<Setter Property="Control.Visibility" Value="Visible"/>
 																								</DataTrigger>
-																								<DataTrigger Binding="{Binding Game.Links[11].Name}" Value="Steam store">
+																								<DataTrigger Binding="{Binding Game.Links[11].Name}" Value="Steam Store">
 																									<Setter Property="Control.Visibility" Value="Visible"/>
 																								</DataTrigger>
 																								<DataTrigger Binding="{PluginStatus Plugin=Review_Viewer_ca24e37a-76d9-49bf-89ab-d3cba4a54bd1, Status=Installed}" Value="False">
diff --git a/source/changelog.yaml b/source/changelog.yaml
index e388f5b..5ff2964 100644
--- a/source/changelog.yaml
+++ b/source/changelog.yaml
@@ -1,4 +1,11 @@
 ChangeLog: eMixedNiteMC
+Version: 3.1
+    - Added setting to force-on visibility of HLTB button when game as no data and plugin is installed (Asked by Jordyn11)
+    - Added margin around platform icon
+    - Fixed Riot Launcher banner name (Asked by xCeeTee)
+        - Changed "Riot Launcher.png" into "Riot Games.png"
+    - Fixed Review Viewer triggering visibility on the first 12 link (Asked by Mouse-conspiracy)
+        - The theme will now look for links named "Steam Store" instead of "Steam store"
 Version: 3.0
     - Game banners system as been reworked
         - Platform banners are now included in the theme (Asked by daephx)
diff --git a/source/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/source/obj/Debug/DesignTimeResolveAssemblyReferences.cache
deleted file mode 100644
index f5e894a..0000000
Binary files a/source/obj/Debug/DesignTimeResolveAssemblyReferences.cache and /dev/null differ
diff --git a/source/theme.yaml b/source/theme.yaml
index ee24626..3e3a446 100644
--- a/source/theme.yaml
+++ b/source/theme.yaml
@@ -2,7 +2,7 @@ ThemeApiVersion: 2.1.0
 Id: eMixedNiteMC_4333b3b2-0374-43a1-a9eb-d27f3ea89ef8
 Name: eMixedNiteMC
 Author: eminaguil & MCC321
-Version: 3.0
+Version: 3.1
 Links:
   - Name: Github
     Url: https://github.com/MCC321-QC/eMixedNiteMC
diff --git a/source/thememodifier.yaml b/source/thememodifier.yaml
index 32e9153..31e0fe1 100644
--- a/source/thememodifier.yaml
+++ b/source/thememodifier.yaml
@@ -96,4 +96,5 @@ Constants:
   - GridThFeaturesAtTop: Grid view LibraryManagement features panel at top
   - GridFeatureTopPanelOpacity(0.0,0.9): Grid view LM features top panel opacity
   - FeaturesTopPanelVideoPlaying: LM features top panel visibility when video is playing
+  - HLTBButtonVisibility: HLTB button visibility forced-on when there is no data
   - SvVerticalListHeight(165,550): ScreenshotVisualizer vertical list height
\ No newline at end of file