diff --git a/VDownload.Core/VDownload.Core.Strings/StringResourcesManager.cs b/VDownload.Core/VDownload.Core.Strings/StringResourcesManager.cs
index 3bcdad2..96c880a 100644
--- a/VDownload.Core/VDownload.Core.Strings/StringResourcesManager.cs
+++ b/VDownload.Core/VDownload.Core.Strings/StringResourcesManager.cs
@@ -36,17 +36,13 @@ namespace VDownload.Core.Strings
 
         private static StringResource BuildResource(string resourceName)
         {
-            File.AppendAllText("C:\\Users\\mateusz\\Desktop\\test.txt", $"teststring {resourceName}\n");
             ResourceLoader loader;
             try
             {
-                loader = new ResourceLoader($"VDownload.Core.Strings/{resourceName}");
-                File.AppendAllText("C:\\Users\\mateusz\\Desktop\\test.txt", $"afterteststring {resourceName}\n");
+                loader = new ResourceLoader($"{resourceName}");
             }
             catch (Exception e)
             {
-
-                File.AppendAllText("C:\\Users\\mateusz\\Desktop\\test.txt", $"teststringerror {e.Message}\n");
                 throw;
             }
             return new StringResource(loader);
diff --git a/VDownload.Core/VDownload.Core.Strings/VDownload.Core.Strings.csproj b/VDownload.Core/VDownload.Core.Strings/VDownload.Core.Strings.csproj
index 146088e..e3ba69a 100644
--- a/VDownload.Core/VDownload.Core.Strings/VDownload.Core.Strings.csproj
+++ b/VDownload.Core/VDownload.Core.Strings/VDownload.Core.Strings.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
+    <TargetFramework>net8.0-windows10.0.26100.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
     <RootNamespace>VDownload.Core.Strings</RootNamespace>
     <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
@@ -13,50 +13,4 @@
       <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240227000" />
       <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.3233" />
   </ItemGroup>
-
-  <ItemGroup>
-    <PRIResource Update="Strings\en-US\AboutViewResources.resw">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </PRIResource>
-    <PRIResource Update="Strings\en-US\AuthenticationViewResources.resw">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </PRIResource>
-    <PRIResource Update="Strings\en-US\BaseViewResources.resw">
-      <Generator></Generator>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </PRIResource>
-    <PRIResource Update="Strings\en-US\CommonResources.resw">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </PRIResource>
-    <PRIResource Update="Strings\en-US\DialogButtonsResources.resw">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </PRIResource>
-    <PRIResource Update="Strings\en-US\FilenameTemplateResources.resw">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </PRIResource>
-    <PRIResource Update="Strings\en-US\HomeDownloadsViewResources.resw">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </PRIResource>
-    <PRIResource Update="Strings\en-US\HomeVideoCollectionViewResources.resw">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </PRIResource>
-    <PRIResource Update="Strings\en-US\HomeVideoViewResources.resw">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </PRIResource>
-    <PRIResource Update="Strings\en-US\HomeViewResources.resw">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </PRIResource>
-    <PRIResource Update="Strings\en-US\NotificationsResources.resw">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </PRIResource>
-    <PRIResource Update="Strings\en-US\SearchResources.resw">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </PRIResource>
-    <PRIResource Update="Strings\en-US\SettingsViewResources.resw">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </PRIResource>
-    <PRIResource Update="Strings\en-US\SubscriptionsViewResources.resw">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </PRIResource>
-  </ItemGroup>
 </Project>
diff --git a/VDownload.Core/VDownload.Core.Tasks/VDownload.Core.Tasks.csproj b/VDownload.Core/VDownload.Core.Tasks/VDownload.Core.Tasks.csproj
index ae5c5fc..6f348b5 100644
--- a/VDownload.Core/VDownload.Core.Tasks/VDownload.Core.Tasks.csproj
+++ b/VDownload.Core/VDownload.Core.Tasks/VDownload.Core.Tasks.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-	  <TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
+	  <TargetFramework>net8.0-windows10.0.26100.0</TargetFramework>
 	  <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
 	  <RootNamespace>VDownload.Core.Tasks</RootNamespace>
 	  <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
diff --git a/VDownload.Core/VDownload.Core.ViewModels/VDownload.Core.ViewModels.csproj b/VDownload.Core/VDownload.Core.ViewModels/VDownload.Core.ViewModels.csproj
index bf03ae7..c04e453 100644
--- a/VDownload.Core/VDownload.Core.ViewModels/VDownload.Core.ViewModels.csproj
+++ b/VDownload.Core/VDownload.Core.ViewModels/VDownload.Core.ViewModels.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
+		<TargetFramework>net8.0-windows10.0.26100.0</TargetFramework>
 		<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
 		<RootNamespace>VDownload.Core.ViewModels</RootNamespace>
 		<RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
diff --git a/VDownload.Core/VDownload.Core.Views/About/AboutView.xaml b/VDownload.Core/VDownload.Core.Views/About/AboutView.xaml
index 67ed693..12a1228 100644
--- a/VDownload.Core/VDownload.Core.Views/About/AboutView.xaml
+++ b/VDownload.Core/VDownload.Core.Views/About/AboutView.xaml
@@ -33,7 +33,7 @@
             </StackPanel>
             <StackPanel HorizontalAlignment="Center" 
                     Spacing="2">
-                <TextBlock x:Uid="/VDownload.Core.Strings/AboutViewResources/Developers"
+                <TextBlock x:Uid="/AboutViewResources/Developers"
                        HorizontalAlignment="Center"
                        FontSize="17"
                        FontWeight="SemiBold"/>
@@ -52,7 +52,7 @@
             </StackPanel>
             <StackPanel HorizontalAlignment="Center"
                         Spacing="2">
-                <TextBlock x:Uid="/VDownload.Core.Strings/AboutViewResources/Translation"
+                <TextBlock x:Uid="/AboutViewResources/Translation"
                        HorizontalAlignment="Center"
                        FontSize="17"
                        FontWeight="SemiBold"/>
@@ -71,19 +71,19 @@
             </StackPanel>
             <StackPanel HorizontalAlignment="Center"
                         Spacing="2">
-                <TextBlock x:Uid="/VDownload.Core.Strings/AboutViewResources/More"
+                <TextBlock x:Uid="/AboutViewResources/More"
                        HorizontalAlignment="Center"
                        FontSize="17"
                        FontWeight="SemiBold"/>
                 <StackPanel Orientation="Horizontal">
                     <HyperlinkButton HorizontalAlignment="Center"
                                  NavigateUri="{Binding RepositoryUrl}">
-                        <TextBlock x:Uid="/VDownload.Core.Strings/AboutViewResources/Repository"
+                        <TextBlock x:Uid="/AboutViewResources/Repository"
                                FontSize="12"/>
                     </HyperlinkButton>
                     <HyperlinkButton HorizontalAlignment="Center"
                                  NavigateUri="{Binding DonationUrl}">
-                        <TextBlock x:Uid="/VDownload.Core.Strings/AboutViewResources/Donation"
+                        <TextBlock x:Uid="/AboutViewResources/Donation"
                                FontSize="12"/>
                     </HyperlinkButton>
                 </StackPanel>
diff --git a/VDownload.Core/VDownload.Core.Views/Authentication/AuthenticationView.xaml b/VDownload.Core/VDownload.Core.Views/Authentication/AuthenticationView.xaml
index c1d6420..86e3fd9 100644
--- a/VDownload.Core/VDownload.Core.Views/Authentication/AuthenticationView.xaml
+++ b/VDownload.Core/VDownload.Core.Views/Authentication/AuthenticationView.xaml
@@ -24,7 +24,7 @@
             <RowDefinition Height="Auto"/>
             <RowDefinition/>
         </Grid.RowDefinitions>
-        <TextBlock x:Uid="/VDownload.Core.Strings/AuthenticationViewResources/Header"
+        <TextBlock x:Uid="/AuthenticationViewResources/Header"
                    Grid.Row="0"
                    FontSize="28"
                    FontWeight="SemiBold"/>
@@ -44,10 +44,10 @@
                                     <Button.Content>
                                         <ctuc:SwitchPresenter Value="{Binding TwitchButtonState, Converter={StaticResource ObjectToStringConverter}}">
                                             <ctuc:Case Value="SignIn">
-                                                <TextBlock x:Uid="/VDownload.Core.Strings/AuthenticationViewResources/AuthenticationButtonSignIn"/>
+                                                <TextBlock x:Uid="/AuthenticationViewResources/AuthenticationButtonSignIn"/>
                                             </ctuc:Case>
                                             <ctuc:Case Value="SignOut">
-                                                <TextBlock x:Uid="/VDownload.Core.Strings/AuthenticationViewResources/AuthenticationButtonSignOut"/>
+                                                <TextBlock x:Uid="/AuthenticationViewResources/AuthenticationButtonSignOut"/>
                                             </ctuc:Case>
                                         </ctuc:SwitchPresenter>
                                     </Button.Content>
@@ -58,7 +58,7 @@
                     <ic:DataTriggerBehavior Binding="{Binding TwitchButtonState, Converter={StaticResource ObjectToStringConverter}}"
                                             ComparisonCondition="Equal"
                                             Value="Loading">
-                        <ic:ChangePropertyAction x:Uid="/VDownload.Core.Strings/AuthenticationViewResources/AuthenticationDescriptionLoading"
+                        <ic:ChangePropertyAction x:Uid="/AuthenticationViewResources/AuthenticationDescriptionLoading"
                                                  PropertyName="Description"/>
                         <ic:ChangePropertyAction PropertyName="Content">
                             <ic:ChangePropertyAction.Value>
diff --git a/VDownload.Core/VDownload.Core.Views/Home/HomeDownloadsView.xaml b/VDownload.Core/VDownload.Core.Views/Home/HomeDownloadsView.xaml
index b2a9a6d..bdec29b 100644
--- a/VDownload.Core/VDownload.Core.Views/Home/HomeDownloadsView.xaml
+++ b/VDownload.Core/VDownload.Core.Views/Home/HomeDownloadsView.xaml
@@ -98,15 +98,15 @@
                                                         Orientation="Horizontal">
                                                 <ctuc:SwitchPresenter Value="{Binding DownloadOptions.MediaType, Converter={StaticResource ObjectToStringConverter}}">
                                                     <ctuc:Case Value="Original">
-                                                        <TextBlock x:Uid="/VDownload.Core.Strings/CommonResources/MediaTypeOriginal"
+                                                        <TextBlock x:Uid="/CommonResources/MediaTypeOriginal"
                                                                    FontSize="{StaticResource TextSize}"/>
                                                     </ctuc:Case>
                                                     <ctuc:Case Value="OnlyVideo">
-                                                        <TextBlock x:Uid="/VDownload.Core.Strings/CommonResources/MediaTypeOnlyVideo"
+                                                        <TextBlock x:Uid="/CommonResources/MediaTypeOnlyVideo"
                                                                    FontSize="{StaticResource TextSize}"/>
                                                     </ctuc:Case>
                                                     <ctuc:Case Value="OnlyAudio">
-                                                        <TextBlock x:Uid="/VDownload.Core.Strings/CommonResources/MediaTypeOnlyAudio"
+                                                        <TextBlock x:Uid="/CommonResources/MediaTypeOnlyAudio"
                                                                    FontSize="{StaticResource TextSize}"/>
                                                     </ctuc:Case>
                                                 </ctuc:SwitchPresenter>
@@ -205,7 +205,7 @@
                                                                             Value="Idle">
                                                         <ic:ChangePropertyAction PropertyName="Child">
                                                             <ic:ChangePropertyAction.Value>
-                                                                <TextBlock x:Uid="/VDownload.Core.Strings/HomeDownloadsViewResources/StatusIdle" 
+                                                                <TextBlock x:Uid="/HomeDownloadsViewResources/StatusIdle" 
                                                                            FontSize="{StaticResource TextSize}"/>
                                                             </ic:ChangePropertyAction.Value>
                                                         </ic:ChangePropertyAction>
@@ -215,7 +215,7 @@
                                                                             Value="Queued">
                                                         <ic:ChangePropertyAction PropertyName="Child">
                                                             <ic:ChangePropertyAction.Value>
-                                                                <TextBlock x:Uid="/VDownload.Core.Strings/HomeDownloadsViewResources/StatusQueued" 
+                                                                <TextBlock x:Uid="/HomeDownloadsViewResources/StatusQueued" 
                                                                            FontSize="{StaticResource TextSize}"/>
                                                             </ic:ChangePropertyAction.Value>
                                                         </ic:ChangePropertyAction>
@@ -225,7 +225,7 @@
                                                                             Value="Initializing">
                                                         <ic:ChangePropertyAction PropertyName="Child">
                                                             <ic:ChangePropertyAction.Value>
-                                                                <TextBlock x:Uid="/VDownload.Core.Strings/HomeDownloadsViewResources/StatusInitializing" 
+                                                                <TextBlock x:Uid="/HomeDownloadsViewResources/StatusInitializing" 
                                                                            FontSize="{StaticResource TextSize}"/>
                                                             </ic:ChangePropertyAction.Value>
                                                         </ic:ChangePropertyAction>
@@ -236,7 +236,7 @@
                                                         <ic:ChangePropertyAction PropertyName="Child">
                                                             <ic:ChangePropertyAction.Value>
                                                                 <StackPanel Orientation="Horizontal">
-                                                                    <TextBlock x:Uid="/VDownload.Core.Strings/HomeDownloadsViewResources/StatusDownloading"
+                                                                    <TextBlock x:Uid="/HomeDownloadsViewResources/StatusDownloading"
                                                                                FontSize="{StaticResource TextSize}"/>
                                                                     <TextBlock Text="{Binding Progress, Converter={StaticResource StringFormatConverter}, ConverterParameter='{} ({0:0.##}%)'}"
                                                                                FontSize="{StaticResource TextSize}"/>
@@ -250,7 +250,7 @@
                                                         <ic:ChangePropertyAction PropertyName="Child">
                                                             <ic:ChangePropertyAction.Value>
                                                                 <TextBlock FontSize="{StaticResource TextSize}">
-                                                                    <Run x:Uid="/VDownload.Core.Strings/HomeDownloadsViewResources/StatusProcessing"/><Run Text=" ("/><Run Text="{Binding Progress, Converter={StaticResource StringFormatConverter}, ConverterParameter='{}{0:0.##}'}"/>%)
+                                                                    <Run x:Uid="/HomeDownloadsViewResources/StatusProcessing"/><Run Text=" ("/><Run Text="{Binding Progress, Converter={StaticResource StringFormatConverter}, ConverterParameter='{}{0:0.##}'}"/>%)
                                                                 </TextBlock>
                                                             </ic:ChangePropertyAction.Value>
                                                         </ic:ChangePropertyAction>
@@ -260,7 +260,7 @@
                                                                             Value="Finalizing">
                                                         <ic:ChangePropertyAction PropertyName="Child">
                                                             <ic:ChangePropertyAction.Value>
-                                                                <TextBlock x:Uid="/VDownload.Core.Strings/HomeDownloadsViewResources/StatusFinalizing"
+                                                                <TextBlock x:Uid="/HomeDownloadsViewResources/StatusFinalizing"
                                                                            FontSize="{StaticResource TextSize}"/>
                                                             </ic:ChangePropertyAction.Value>
                                                         </ic:ChangePropertyAction>
@@ -271,7 +271,7 @@
                                                         <ic:ChangePropertyAction PropertyName="Child">
                                                             <ic:ChangePropertyAction.Value>
                                                                 <TextBlock FontSize="{StaticResource TextSize}">
-                                                                    <Run x:Uid="/VDownload.Core.Strings/HomeDownloadsViewResources/StatusError"/><Run Text=" ("/><Run Text="{Binding Error}"/>)
+                                                                    <Run x:Uid="/HomeDownloadsViewResources/StatusError"/><Run Text=" ("/><Run Text="{Binding Error}"/>)
                                                                 </TextBlock>
                                                             </ic:ChangePropertyAction.Value>
                                                         </ic:ChangePropertyAction>
@@ -281,7 +281,7 @@
                                                                             Value="EndedSuccessfully">
                                                         <ic:ChangePropertyAction PropertyName="Child">
                                                             <ic:ChangePropertyAction.Value>
-                                                                <TextBlock x:Uid="/VDownload.Core.Strings/HomeDownloadsViewResources/StatusDone"
+                                                                <TextBlock x:Uid="/HomeDownloadsViewResources/StatusDone"
                                                                            FontSize="{StaticResource TextSize}"/>
                                                             </ic:ChangePropertyAction.Value>
                                                         </ic:ChangePropertyAction>
@@ -291,7 +291,7 @@
                                                                             Value="EndedCancelled">
                                                         <ic:ChangePropertyAction PropertyName="Child">
                                                             <ic:ChangePropertyAction.Value>
-                                                                <TextBlock x:Uid="/VDownload.Core.Strings/HomeDownloadsViewResources/StatusCancelled"
+                                                                <TextBlock x:Uid="/HomeDownloadsViewResources/StatusCancelled"
                                                                            FontSize="{StaticResource TextSize}"/>
                                                             </ic:ChangePropertyAction.Value>
                                                         </ic:ChangePropertyAction>
diff --git a/VDownload.Core/VDownload.Core.Views/Home/HomeVideoCollectionView.xaml b/VDownload.Core/VDownload.Core.Views/Home/HomeVideoCollectionView.xaml
index 6c5d31f..1a23e19 100644
--- a/VDownload.Core/VDownload.Core.Views/Home/HomeVideoCollectionView.xaml
+++ b/VDownload.Core/VDownload.Core.Views/Home/HomeVideoCollectionView.xaml
@@ -41,7 +41,7 @@
                         Spacing="10">
                 <TextBlock VerticalAlignment="Center"
                            Visibility="{Binding IsSomethingHidden, Converter={StaticResource BoolToVisibilityConverter}}">
-                    <Run x:Uid="/VDownload.Core.Strings/HomeVideoCollectionViewResources/HiddenTextBlock"/><Run Text="{Binding HiddenCount}"/>
+                    <Run x:Uid="/HomeVideoCollectionViewResources/HiddenTextBlock"/><Run Text="{Binding HiddenCount}"/>
                 </TextBlock>
                 <AppBarToggleButton x:Name="FilterButton"
                                     Icon="Filter" 
@@ -49,7 +49,7 @@
                                     Height="48">
                     <AppBarToggleButton.Resources>
                         <TeachingTip x:Name="FilterWindow"
-                                     x:Uid="/VDownload.Core.Strings/HomeVideoCollectionViewResources/FilterWindow"
+                                     x:Uid="/HomeVideoCollectionViewResources/FilterWindow"
                                      Target="{Binding ElementName=FilterButton}"
                                      PreferredPlacement="BottomLeft"
                                      IsOpen="{Binding ElementName=FilterButton, Path=IsChecked, Mode=TwoWay}">
@@ -69,23 +69,23 @@
                                     <RowDefinition Height="Auto"/>
                                     <RowDefinition Height="Auto"/>
                                 </Grid.RowDefinitions>
-                                <TextBlock x:Uid="/VDownload.Core.Strings/HomeVideoCollectionViewResources/FilterTitleTextBlock"
+                                <TextBlock x:Uid="/HomeVideoCollectionViewResources/FilterTitleTextBlock"
                                            Grid.Row="0"
                                            Grid.Column="0"
                                            VerticalAlignment="Center"/>
-                                <TextBox x:Uid="/VDownload.Core.Strings/HomeVideoCollectionViewResources/FilterTitleTextBox"
+                                <TextBox x:Uid="/HomeVideoCollectionViewResources/FilterTitleTextBox"
                                          Grid.Row="0"
                                          Grid.Column="1"
                                          Text="{Binding TitleFilter, Mode=TwoWay}"/>
-                                <TextBlock x:Uid="/VDownload.Core.Strings/HomeVideoCollectionViewResources/FilterAuthorTextBlock"
+                                <TextBlock x:Uid="/HomeVideoCollectionViewResources/FilterAuthorTextBlock"
                                            Grid.Row="1"
                                            Grid.Column="0"
                                            VerticalAlignment="Center"/>
-                                <TextBox x:Uid="/VDownload.Core.Strings/HomeVideoCollectionViewResources/FilterAuthorTextBox"
+                                <TextBox x:Uid="/HomeVideoCollectionViewResources/FilterAuthorTextBox"
                                          Grid.Row="1"
                                          Grid.Column="1"
                                          Text="{Binding AuthorFilter, Mode=TwoWay}"/>
-                                <TextBlock x:Uid="/VDownload.Core.Strings/HomeVideoCollectionViewResources/FilterViewsTextBlock"
+                                <TextBlock x:Uid="/HomeVideoCollectionViewResources/FilterViewsTextBlock"
                                            Grid.Row="2"
                                            Grid.Column="0"
                                            VerticalAlignment="Center"/>
@@ -115,7 +115,7 @@
                                                SmallChange="1" 
                                                LargeChange="10"/>
                                 </Grid>
-                                <TextBlock x:Uid="/VDownload.Core.Strings/HomeVideoCollectionViewResources/FilterDateTextBlock"
+                                <TextBlock x:Uid="/HomeVideoCollectionViewResources/FilterDateTextBlock"
                                            Grid.Row="3"
                                            Grid.Column="0"
                                            VerticalAlignment="Center"/>
@@ -139,7 +139,7 @@
                                                         Date="{Binding MaxDateFilter, Mode=TwoWay}"
                                                         MaxDate="{Binding MaxDate}"/>
                                 </Grid>
-                                <TextBlock x:Uid="/VDownload.Core.Strings/HomeVideoCollectionViewResources/FilterDurationTextBlock"
+                                <TextBlock x:Uid="/HomeVideoCollectionViewResources/FilterDurationTextBlock"
                                            Grid.Row="4"
                                            Grid.Column="0"
                                            VerticalAlignment="Center"/>
@@ -159,7 +159,7 @@
                                                        Value="{Binding MaxDurationFilter, Mode=TwoWay}"
                                                        Maximum="{Binding MaxDuration}"/>
                                 </Grid>
-                                <TextBlock x:Uid="/VDownload.Core.Strings/HomeVideoCollectionViewResources/FilterRemovedTextBlock"
+                                <TextBlock x:Uid="/HomeVideoCollectionViewResources/FilterRemovedTextBlock"
                                            Grid.Row="5"
                                            Grid.Column="0"
                                            VerticalAlignment="Center"/>
@@ -172,7 +172,7 @@
                                     <TextBlock Grid.Column="0"
                                                VerticalAlignment="Center"
                                                Text="{Binding RemovedCount}"/>
-                                    <Button x:Uid="/VDownload.Core.Strings/HomeVideoCollectionViewResources/FilterRemovedButton"
+                                    <Button x:Uid="/HomeVideoCollectionViewResources/FilterRemovedButton"
                                             Grid.Column="1"
                                             Command="{Binding RestoreRemovedVideosCommand}"/>
                                 </Grid>
@@ -180,7 +180,7 @@
                         </TeachingTip>
                     </AppBarToggleButton.Resources>
                 </AppBarToggleButton>
-                <AppBarButton x:Uid="/VDownload.Core.Strings/HomeVideoCollectionViewResources/ApplyDirectoryButton"
+                <AppBarButton x:Uid="/HomeVideoCollectionViewResources/ApplyDirectoryButton"
                               Icon="Folder"
                               Width="40"
                               Height="48"
@@ -289,10 +289,10 @@
                             <Expander.Content>
                                 <StackPanel Spacing="20">
                                     <StackPanel Spacing="5">
-                                        <TextBlock x:Uid="/VDownload.Core.Strings/HomeVideoCollectionViewResources/MediaOptionsHeader"
+                                        <TextBlock x:Uid="/HomeVideoCollectionViewResources/MediaOptionsHeader"
                                                    FontWeight="Bold"
                                                    FontSize="15"/>
-                                        <ctc:SettingsCard x:Uid="/VDownload.Core.Strings/HomeVideoCollectionViewResources/QualitySettingsCard">
+                                        <ctc:SettingsCard x:Uid="/HomeVideoCollectionViewResources/QualitySettingsCard">
                                             <ctc:SettingsCard.HeaderIcon>
                                                 <BitmapIcon ShowAsMonochrome="False"
                                                             UriSource="{ThemeResource ImageHomeVideoCollectionViewMedia}"/>
@@ -300,7 +300,7 @@
                                             <ComboBox ItemsSource="{Binding Key.Streams}"
                                                       SelectedItem="{Binding Key.SelectedStream, Mode=TwoWay}"/>
                                         </ctc:SettingsCard>
-                                        <ctc:SettingsCard x:Uid="/VDownload.Core.Strings/HomeVideoCollectionViewResources/MediaTypeSettingsCard">
+                                        <ctc:SettingsCard x:Uid="/HomeVideoCollectionViewResources/MediaTypeSettingsCard">
                                             <ctc:SettingsCard.HeaderIcon>
                                                 <BitmapIcon ShowAsMonochrome="False" 
                                                             UriSource="{ThemeResource ImageHomeVideoCollectionViewMedia}"/>
@@ -311,30 +311,30 @@
                                                     <DataTemplate>
                                                         <ctuc:SwitchPresenter Value="{Binding Converter={StaticResource ObjectToStringConverter}}">
                                                             <ctuc:Case Value="Original">
-                                                                <TextBlock x:Uid="/VDownload.Core.Strings/CommonResources/MediaTypeOriginal"/>
+                                                                <TextBlock x:Uid="/CommonResources/MediaTypeOriginal"/>
                                                             </ctuc:Case>
                                                             <ctuc:Case Value="OnlyVideo">
-                                                                <TextBlock x:Uid="/VDownload.Core.Strings/CommonResources/MediaTypeOnlyVideo"/>
+                                                                <TextBlock x:Uid="/CommonResources/MediaTypeOnlyVideo"/>
                                                             </ctuc:Case>
                                                             <ctuc:Case Value="OnlyAudio">
-                                                                <TextBlock x:Uid="/VDownload.Core.Strings/CommonResources/MediaTypeOnlyAudio"/>
+                                                                <TextBlock x:Uid="/CommonResources/MediaTypeOnlyAudio"/>
                                                             </ctuc:Case>
                                                         </ctuc:SwitchPresenter>
                                                     </DataTemplate>
                                                 </ComboBox.ItemTemplate>
                                             </ComboBox>
                                         </ctc:SettingsCard>
-                                        <ctc:SettingsExpander x:Uid="/VDownload.Core.Strings/HomeVideoCollectionViewResources/TrimSettingsGroup">
+                                        <ctc:SettingsExpander x:Uid="/HomeVideoCollectionViewResources/TrimSettingsGroup">
                                             <ctc:SettingsExpander.HeaderIcon>
                                                 <BitmapIcon ShowAsMonochrome="False" 
                                                             UriSource="{ThemeResource ImageHomeVideoCollectionViewTrim}"/>
                                             </ctc:SettingsExpander.HeaderIcon>
                                             <ctc:SettingsExpander.Items>
-                                                <ctc:SettingsCard x:Uid="/VDownload.Core.Strings/HomeVideoCollectionViewResources/TrimStartSettingsCard">
+                                                <ctc:SettingsCard x:Uid="/HomeVideoCollectionViewResources/TrimStartSettingsCard">
                                                     <c:TimeSpanControl Value="{Binding Key.TrimStart, Mode=TwoWay}" 
                                                                        Maximum="{Binding Key.TrimEnd, Mode=OneWay}"/>
                                                 </ctc:SettingsCard>
-                                                <ctc:SettingsCard x:Uid="/VDownload.Core.Strings/HomeVideoCollectionViewResources/TrimEndSettingsCard">
+                                                <ctc:SettingsCard x:Uid="/HomeVideoCollectionViewResources/TrimEndSettingsCard">
                                                     <c:TimeSpanControl Minimum="{Binding Key.TrimStart, Mode=OneWay}" 
                                                                        Value="{Binding Key.TrimEnd, Mode=TwoWay}" 
                                                                        Maximum="{Binding Key.Duration, Mode=OneWay}"/>
@@ -343,26 +343,26 @@
                                         </ctc:SettingsExpander>
                                     </StackPanel>
                                     <StackPanel Spacing="5">
-                                        <TextBlock x:Uid="/VDownload.Core.Strings/HomeVideoCollectionViewResources/FileOptionsHeader"
+                                        <TextBlock x:Uid="/HomeVideoCollectionViewResources/FileOptionsHeader"
                                                    FontWeight="Bold"
                                                    FontSize="15"/>
-                                        <ctc:SettingsCard x:Uid="/VDownload.Core.Strings/HomeVideoCollectionViewResources/DirectorySettingsCard"
+                                        <ctc:SettingsCard x:Uid="/HomeVideoCollectionViewResources/DirectorySettingsCard"
                                                           Description="{Binding Key.DirectoryPath}">
                                             <ctc:SettingsCard.HeaderIcon>
                                                 <BitmapIcon ShowAsMonochrome="False" 
                                                             UriSource="{ThemeResource ImageHomeVideoCollectionViewDirectory}"/>
                                             </ctc:SettingsCard.HeaderIcon>
-                                            <Button x:Uid="/VDownload.Core.Strings/HomeVideoCollectionViewResources/DirectorySettingsCardButton"
+                                            <Button x:Uid="/HomeVideoCollectionViewResources/DirectorySettingsCardButton"
                                                     Command="{Binding Key.BrowseCommand}"/>
                                         </ctc:SettingsCard>
-                                        <ctc:SettingsCard x:Uid="/VDownload.Core.Strings/HomeVideoCollectionViewResources/FilenameSettingsCard">
+                                        <ctc:SettingsCard x:Uid="/HomeVideoCollectionViewResources/FilenameSettingsCard">
                                             <ctc:SettingsCard.HeaderIcon>
                                                 <BitmapIcon ShowAsMonochrome="False" 
                                                             UriSource="{ThemeResource ImageHomeVideoCollectionViewFilename}"/>
                                             </ctc:SettingsCard.HeaderIcon>
                                             <TextBox Text="{Binding Key.Filename, Mode=TwoWay}"/>
                                         </ctc:SettingsCard>
-                                        <ctc:SettingsCard x:Uid="/VDownload.Core.Strings/HomeVideoCollectionViewResources/FileTypeSettingsCard">
+                                        <ctc:SettingsCard x:Uid="/HomeVideoCollectionViewResources/FileTypeSettingsCard">
                                             <ctc:SettingsCard.HeaderIcon>
                                                 <BitmapIcon ShowAsMonochrome="False" 
                                                             UriSource="{ThemeResource ImageHomeVideoCollectionViewExtension}"/>
@@ -414,9 +414,9 @@
                     HorizontalAlignment="Right"
                     Orientation="Horizontal"
                     Spacing="10">
-            <Button x:Uid="/VDownload.Core.Strings/HomeVideoCollectionViewResources/CreateAndStartButton"
+            <Button x:Uid="/HomeVideoCollectionViewResources/CreateAndStartButton"
                     Command="{Binding CreateTasksAndDownloadCommand}"/>
-            <Button x:Uid="/VDownload.Core.Strings/HomeVideoCollectionViewResources/CreateButton"
+            <Button x:Uid="/HomeVideoCollectionViewResources/CreateButton"
                     Style="{StaticResource AccentButtonStyle}" 
                     Command="{Binding CreateTasksCommand}"/>
         </StackPanel>
diff --git a/VDownload.Core/VDownload.Core.Views/Home/HomeVideoView.xaml b/VDownload.Core/VDownload.Core.Views/Home/HomeVideoView.xaml
index aff7cb3..aa19d58 100644
--- a/VDownload.Core/VDownload.Core.Views/Home/HomeVideoView.xaml
+++ b/VDownload.Core/VDownload.Core.Views/Home/HomeVideoView.xaml
@@ -89,10 +89,10 @@
         <ScrollViewer Grid.Row="1">
             <StackPanel Spacing="20">
                 <StackPanel Spacing="5">
-                    <TextBlock x:Uid="/VDownload.Core.Strings/HomeVideoViewResources/MediaOptionsHeader"
+                    <TextBlock x:Uid="/HomeVideoViewResources/MediaOptionsHeader"
                                FontWeight="Bold"
                                FontSize="15"/>
-                    <ctc:SettingsCard x:Uid="/VDownload.Core.Strings/HomeVideoViewResources/QualitySettingsCard">
+                    <ctc:SettingsCard x:Uid="/HomeVideoViewResources/QualitySettingsCard">
                         <ctc:SettingsCard.HeaderIcon>
                             <BitmapIcon ShowAsMonochrome="False" 
                                         UriSource="{ThemeResource ImageHomeVideoViewQuality}"/>
@@ -100,7 +100,7 @@
                         <ComboBox ItemsSource="{Binding Streams}"
                                   SelectedItem="{Binding SelectedStream, Mode=TwoWay}"/>
                     </ctc:SettingsCard>
-                    <ctc:SettingsCard x:Uid="/VDownload.Core.Strings/HomeVideoViewResources/MediaTypeSettingsCard">
+                    <ctc:SettingsCard x:Uid="/HomeVideoViewResources/MediaTypeSettingsCard">
                         <ctc:SettingsCard.HeaderIcon>
                             <BitmapIcon ShowAsMonochrome="False" 
                                         UriSource="{ThemeResource ImageHomeVideoViewMedia}"/>
@@ -111,30 +111,30 @@
                                 <DataTemplate>
                                     <ctuc:SwitchPresenter Value="{Binding Converter={StaticResource ObjectToStringConverter}}">
                                         <ctuc:Case Value="Original">
-                                            <TextBlock x:Uid="/VDownload.Core.Strings/CommonResources/MediaTypeOriginal"/>
+                                            <TextBlock x:Uid="/CommonResources/MediaTypeOriginal"/>
                                         </ctuc:Case>
                                         <ctuc:Case Value="OnlyVideo">
-                                            <TextBlock x:Uid="/VDownload.Core.Strings/CommonResources/MediaTypeOnlyVideo"/>
+                                            <TextBlock x:Uid="/CommonResources/MediaTypeOnlyVideo"/>
                                         </ctuc:Case>
                                         <ctuc:Case Value="OnlyAudio">
-                                            <TextBlock x:Uid="/VDownload.Core.Strings/CommonResources/MediaTypeOnlyAudio"/>
+                                            <TextBlock x:Uid="/CommonResources/MediaTypeOnlyAudio"/>
                                         </ctuc:Case>
                                     </ctuc:SwitchPresenter>
                                 </DataTemplate>
                             </ComboBox.ItemTemplate>
                         </ComboBox>
                     </ctc:SettingsCard>
-                    <ctc:SettingsExpander x:Uid="/VDownload.Core.Strings/HomeVideoViewResources/TrimSettingsGroup">
+                    <ctc:SettingsExpander x:Uid="/HomeVideoViewResources/TrimSettingsGroup">
                         <ctc:SettingsExpander.HeaderIcon>
                             <BitmapIcon ShowAsMonochrome="False" 
                                         UriSource="{ThemeResource ImageHomeVideoViewTrim}"/>
                         </ctc:SettingsExpander.HeaderIcon>
                         <ctc:SettingsExpander.Items>
-                            <ctc:SettingsCard x:Uid="/VDownload.Core.Strings/HomeVideoViewResources/TrimStartSettingsCard">
+                            <ctc:SettingsCard x:Uid="/HomeVideoViewResources/TrimStartSettingsCard">
                                 <c:TimeSpanControl Value="{Binding TrimStart, Mode=TwoWay}" 
                                                     Maximum="{Binding TrimEnd, Mode=OneWay}"/>
                             </ctc:SettingsCard>
-                            <ctc:SettingsCard x:Uid="/VDownload.Core.Strings/HomeVideoViewResources/TrimEndSettingsCard">
+                            <ctc:SettingsCard x:Uid="/HomeVideoViewResources/TrimEndSettingsCard">
                                 <c:TimeSpanControl Minimum="{Binding TrimStart, Mode=OneWay}" 
                                                     Value="{Binding TrimEnd, Mode=TwoWay}" 
                                                     Maximum="{Binding Duration, Mode=OneWay}"/>
@@ -143,26 +143,26 @@
                     </ctc:SettingsExpander>
                 </StackPanel>
                 <StackPanel Spacing="5">
-                    <TextBlock x:Uid="/VDownload.Core.Strings/HomeVideoViewResources/FileOptionsHeader"
+                    <TextBlock x:Uid="/HomeVideoViewResources/FileOptionsHeader"
                                FontWeight="Bold"
                                FontSize="15"/>
-                    <ctc:SettingsCard x:Uid="/VDownload.Core.Strings/HomeVideoViewResources/DirectorySettingsCard"
+                    <ctc:SettingsCard x:Uid="/HomeVideoViewResources/DirectorySettingsCard"
                                       Description="{Binding DirectoryPath}">
                         <ctc:SettingsCard.HeaderIcon>
                             <BitmapIcon ShowAsMonochrome="False" 
                                         UriSource="{ThemeResource ImageHomeVideoViewDirectory}"/>
                         </ctc:SettingsCard.HeaderIcon>
-                        <Button x:Uid="/VDownload.Core.Strings/HomeVideoViewResources/DirectorySettingsCardButton"
+                        <Button x:Uid="/HomeVideoViewResources/DirectorySettingsCardButton"
                                 Command="{Binding BrowseCommand}"/>
                     </ctc:SettingsCard>
-                    <ctc:SettingsCard x:Uid="/VDownload.Core.Strings/HomeVideoViewResources/FilenameSettingsCard">
+                    <ctc:SettingsCard x:Uid="/HomeVideoViewResources/FilenameSettingsCard">
                         <ctc:SettingsCard.HeaderIcon>
                             <BitmapIcon ShowAsMonochrome="False" 
                                         UriSource="{ThemeResource ImageHomeVideoViewFilename}"/>
                         </ctc:SettingsCard.HeaderIcon>
                         <TextBox Text="{Binding Filename, Mode=TwoWay}"/>
                     </ctc:SettingsCard>
-                    <ctc:SettingsCard x:Uid="/VDownload.Core.Strings/HomeVideoViewResources/FileTypeSettingsCard">
+                    <ctc:SettingsCard x:Uid="/HomeVideoViewResources/FileTypeSettingsCard">
                         <ctc:SettingsCard.HeaderIcon>
                             <BitmapIcon ShowAsMonochrome="False" 
                                         UriSource="{ThemeResource ImageHomeVideoViewExtension}"/>
@@ -209,9 +209,9 @@
                     HorizontalAlignment="Right"
                     Orientation="Horizontal"
                     Spacing="10">
-            <Button x:Uid="/VDownload.Core.Strings/HomeVideoViewResources/CreateAndStartButton"
+            <Button x:Uid="/HomeVideoViewResources/CreateAndStartButton"
                     Command="{Binding CreateTaskAndDownloadCommand}"/>
-            <Button x:Uid="/VDownload.Core.Strings/HomeVideoViewResources/CreateButton"
+            <Button x:Uid="/HomeVideoViewResources/CreateButton"
                     Style="{StaticResource AccentButtonStyle}" 
                     Command="{Binding CreateTaskCommand}"/>
         </StackPanel>
diff --git a/VDownload.Core/VDownload.Core.Views/Home/HomeView.xaml b/VDownload.Core/VDownload.Core.Views/Home/HomeView.xaml
index 263bcdc..5959627 100644
--- a/VDownload.Core/VDownload.Core.Views/Home/HomeView.xaml
+++ b/VDownload.Core/VDownload.Core.Views/Home/HomeView.xaml
@@ -70,11 +70,11 @@
                                         <ColumnDefinition/>
                                         <ColumnDefinition Width="Auto"/>
                                     </Grid.ColumnDefinitions>
-                                    <TextBox x:Uid="/VDownload.Core.Strings/HomeViewResources/OptionBarVideoSearchContentTextBox"
+                                    <TextBox x:Uid="/HomeViewResources/OptionBarVideoSearchContentTextBox"
                                              Grid.Column="0"
                                              VerticalAlignment="Center"
                                              Text="{Binding OptionBarVideoSearchTBValue, Mode=TwoWay}"/>
-                                    <Button x:Uid="/VDownload.Core.Strings/HomeViewResources/OptionBarSearchButton"
+                                    <Button x:Uid="/HomeViewResources/OptionBarSearchButton"
                                             Grid.Column="1"
                                             IsEnabled="{Binding OptionBarSearchNotPending}"
                                             Command="{Binding VideoSearchStartCommand}"/>
@@ -87,11 +87,11 @@
                                         <ColumnDefinition Width="Auto"/>
                                         <ColumnDefinition Width="Auto"/>
                                     </Grid.ColumnDefinitions>
-                                    <TextBox x:Uid="/VDownload.Core.Strings/HomeViewResources/OptionBarPlaylistSearchContentTextBox"
+                                    <TextBox x:Uid="/HomeViewResources/OptionBarPlaylistSearchContentTextBox"
                                              Grid.Column="0" 
                                              VerticalAlignment="Center"
                                              Text="{Binding OptionBarPlaylistSearchTBValue, Mode=TwoWay}"/>
-                                    <NumberBox x:Uid="/VDownload.Core.Strings/HomeViewResources/OptionBarPlaylistSearchContentNumberBox"
+                                    <NumberBox x:Uid="/HomeViewResources/OptionBarPlaylistSearchContentNumberBox"
                                                Grid.Column="1" 
                                                VerticalAlignment="Center"
                                                SpinButtonPlacementMode="Compact" 
@@ -99,7 +99,7 @@
                                                LargeChange="10" 
                                                Value="{Binding OptionBarPlaylistSearchNBValue, Mode=TwoWay}"
                                                Minimum="0"/>
-                                    <Button x:Uid="/VDownload.Core.Strings/HomeViewResources/OptionBarSearchButton"
+                                    <Button x:Uid="/HomeViewResources/OptionBarSearchButton"
                                             Grid.Column="2"
                                             IsEnabled="{Binding OptionBarSearchNotPending}"
                                             Command="{Binding PlaylistSearchStartCommand}"/>
@@ -118,33 +118,33 @@
                     <StackPanel Grid.Column="2" 
                                 Orientation="Horizontal"
                                 Margin="0,0,4,0">
-                        <AppBarToggleButton x:Uid="/VDownload.Core.Strings/HomeViewResources/OptionBarLoadSubscription"
+                        <AppBarToggleButton x:Uid="/HomeViewResources/OptionBarLoadSubscription"
                                             Icon="Favorite"
                                             IsEnabled="{Binding OptionBarSearchNotPending}"
                                             IsChecked="{Binding OptionBarLoadSubscriptionButtonChecked, Mode=TwoWay}"
                                             Command="{Binding LoadFromSubscriptionCommand}"/>
-                        <AppBarToggleButton x:Uid="/VDownload.Core.Strings/HomeViewResources/OptionBarVideoSearch"
+                        <AppBarToggleButton x:Uid="/HomeViewResources/OptionBarVideoSearch"
                                             Icon="Video"
                                             IsEnabled="{Binding OptionBarSearchNotPending}"
                                             IsChecked="{Binding OptionBarVideoSearchButtonChecked, Mode=TwoWay}"
                                             Command="{Binding VideoSearchShowCommand}"/>
-                        <AppBarToggleButton x:Uid="/VDownload.Core.Strings/HomeViewResources/OptionBarPlaylistSearch"
+                        <AppBarToggleButton x:Uid="/HomeViewResources/OptionBarPlaylistSearch"
                                             Icon="List"
                                             IsEnabled="{Binding OptionBarSearchNotPending}"
                                             IsChecked="{Binding OptionBarPlaylistSearchButtonChecked, Mode=TwoWay}"
                                             Command="{Binding PlaylistSearchShowCommand}"/>
                         <AppBarSeparator/>
-                        <AppBarButton x:Uid="/VDownload.Core.Strings/HomeViewResources/OptionBarCancelAll"
+                        <AppBarButton x:Uid="/HomeViewResources/OptionBarCancelAll"
                                       Icon="Cancel"
                                       Command="{Binding CancelCommand}"/>
-                        <AppBarButton x:Uid="/VDownload.Core.Strings/HomeViewResources/OptionBarDownloadAll"
+                        <AppBarButton x:Uid="/HomeViewResources/OptionBarDownloadAll"
                                       Icon="Download"
                                       Command="{Binding DownloadCommand}"/>
                     </StackPanel>
                 </Grid>
             </ctuc:Case>
             <ctuc:Case Value="True">
-                <InfoBar x:Uid="/VDownload.Core.Strings/HomeViewResources/ErrorInfoBar"
+                <InfoBar x:Uid="/HomeViewResources/ErrorInfoBar"
                          Severity="Error"
                          IsOpen="{Binding OptionBarIsErrorOpened, Mode=TwoWay}"
                          Message="{Binding OptionBarError}"
diff --git a/VDownload.Core/VDownload.Core.Views/Settings/SettingsView.xaml b/VDownload.Core/VDownload.Core.Views/Settings/SettingsView.xaml
index 96e06c9..7deaa69 100644
--- a/VDownload.Core/VDownload.Core.Views/Settings/SettingsView.xaml
+++ b/VDownload.Core/VDownload.Core.Views/Settings/SettingsView.xaml
@@ -21,7 +21,7 @@
             <RowDefinition Height="Auto"/>
             <RowDefinition/>
         </Grid.RowDefinitions>
-        <TextBlock x:Uid="/VDownload.Core.Strings/SettingsViewResources/Header"
+        <TextBlock x:Uid="/SettingsViewResources/Header"
                    Grid.Row="0"
                    FontSize="28"
                    FontWeight="SemiBold"/>
@@ -29,10 +29,10 @@
             <StackPanel Spacing="20">
                 <!-- Searching -->
                 <StackPanel Spacing="5">
-                    <TextBlock x:Uid="/VDownload.Core.Strings/SettingsViewResources/SearchingHeader"
+                    <TextBlock x:Uid="/SettingsViewResources/SearchingHeader"
                                FontWeight="Bold"
                                FontSize="15"/>
-                    <ctc:SettingsCard x:Uid="/VDownload.Core.Strings/SettingsViewResources/SearchingPlaylistCount">
+                    <ctc:SettingsCard x:Uid="/SettingsViewResources/SearchingPlaylistCount">
                         <ctc:SettingsCard.HeaderIcon>
                             <BitmapIcon ShowAsMonochrome="False" 
                                         UriSource="{ThemeResource ImageSettingsViewSearchingPlaylistCount}"/>
@@ -47,10 +47,10 @@
 
                 <!-- Tasks -->
                 <StackPanel Spacing="5">
-                    <TextBlock x:Uid="/VDownload.Core.Strings/SettingsViewResources/TasksHeader"
+                    <TextBlock x:Uid="/SettingsViewResources/TasksHeader"
                                FontWeight="Bold"
                                FontSize="15"/>
-                    <ctc:SettingsCard x:Uid="/VDownload.Core.Strings/SettingsViewResources/TasksRunningTasks">
+                    <ctc:SettingsCard x:Uid="/SettingsViewResources/TasksRunningTasks">
                         <ctc:SettingsCard.HeaderIcon>
                             <BitmapIcon ShowAsMonochrome="False" 
                                         UriSource="{ThemeResource ImageSettingsViewTasksRunningTasks}"/>
@@ -61,43 +61,43 @@
                                    LargeChange="10"
                                    SpinButtonPlacementMode="Compact"/>
                     </ctc:SettingsCard>
-                    <ctc:SettingsExpander x:Uid="/VDownload.Core.Strings/SettingsViewResources/TasksDefaultMediaOptions">
+                    <ctc:SettingsExpander x:Uid="/SettingsViewResources/TasksDefaultMediaOptions">
                         <ctc:SettingsExpander.HeaderIcon>
                             <BitmapIcon ShowAsMonochrome="False" 
                                         UriSource="{ThemeResource ImageSettingsViewTasksDefaultMediaOptions}"/>
                         </ctc:SettingsExpander.HeaderIcon>
                         <ctc:SettingsExpander.Items>
-                            <ctc:SettingsCard x:Uid="/VDownload.Core.Strings/SettingsViewResources/TasksMediaType">
+                            <ctc:SettingsCard x:Uid="/SettingsViewResources/TasksMediaType">
                                 <ComboBox ItemsSource="{ct:EnumValues Type=m:MediaType}"
                                           SelectedItem="{Binding TasksMediaType, Mode=TwoWay}">
                                     <ComboBox.ItemTemplate>
                                         <DataTemplate>
                                             <ctuc:SwitchPresenter Value="{Binding Converter={StaticResource ObjectToStringConverter}}">
                                                 <ctuc:Case Value="Original">
-                                                    <TextBlock x:Uid="/VDownload.Core.Strings/CommonResources/MediaTypeOriginal"/>
+                                                    <TextBlock x:Uid="/CommonResources/MediaTypeOriginal"/>
                                                 </ctuc:Case>
                                                 <ctuc:Case Value="OnlyVideo">
-                                                    <TextBlock x:Uid="/VDownload.Core.Strings/CommonResources/MediaTypeOnlyVideo"/>
+                                                    <TextBlock x:Uid="/CommonResources/MediaTypeOnlyVideo"/>
                                                 </ctuc:Case>
                                                 <ctuc:Case Value="OnlyAudio">
-                                                    <TextBlock x:Uid="/VDownload.Core.Strings/CommonResources/MediaTypeOnlyAudio"/>
+                                                    <TextBlock x:Uid="/CommonResources/MediaTypeOnlyAudio"/>
                                                 </ctuc:Case>
                                             </ctuc:SwitchPresenter>
                                         </DataTemplate>
                                     </ComboBox.ItemTemplate>
                                 </ComboBox>
                             </ctc:SettingsCard>
-                            <ctc:SettingsCard x:Uid="/VDownload.Core.Strings/SettingsViewResources/TasksVideoExtension">
+                            <ctc:SettingsCard x:Uid="/SettingsViewResources/TasksVideoExtension">
                                 <ComboBox ItemsSource="{ct:EnumValues Type=m:VideoExtension}"
                                           SelectedItem="{Binding TasksVideoExtension, Mode=TwoWay}"/>
                             </ctc:SettingsCard>
-                            <ctc:SettingsCard x:Uid="/VDownload.Core.Strings/SettingsViewResources/TasksAudioExtension">
+                            <ctc:SettingsCard x:Uid="/SettingsViewResources/TasksAudioExtension">
                                 <ComboBox ItemsSource="{ct:EnumValues Type=m:AudioExtension}"
                                           SelectedItem="{Binding TasksAudioExtension, Mode=TwoWay}"/>
                             </ctc:SettingsCard>
                         </ctc:SettingsExpander.Items>
                     </ctc:SettingsExpander>
-                    <ctc:SettingsCard x:Uid="/VDownload.Core.Strings/SettingsViewResources/TasksFilenameTemplate">
+                    <ctc:SettingsCard x:Uid="/SettingsViewResources/TasksFilenameTemplate">
                         <ctc:SettingsCard.HeaderIcon>
                             <BitmapIcon ShowAsMonochrome="False" 
                                         UriSource="{ThemeResource ImageSettingsViewTasksFilenameTemplate}"/>
@@ -105,29 +105,29 @@
                         <TextBox Text="{Binding TasksFilenameTemplate, Mode=TwoWay}"
                                  ToolTipService.ToolTip="{Binding TasksFilenameTemplateTooltip}"/>
                     </ctc:SettingsCard>
-                    <ctc:SettingsCard x:Uid="/VDownload.Core.Strings/SettingsViewResources/TasksMeteredConnectionWarning">
+                    <ctc:SettingsCard x:Uid="/SettingsViewResources/TasksMeteredConnectionWarning">
                         <ctc:SettingsCard.HeaderIcon>
                             <BitmapIcon ShowAsMonochrome="False" 
                                         UriSource="{ThemeResource ImageSettingsViewTasksMeteredConnectionWarning}"/>
                         </ctc:SettingsCard.HeaderIcon>
                         <ToggleSwitch IsOn="{Binding TasksMeteredConnectionWarning, Mode=TwoWay}"/>
                     </ctc:SettingsCard>
-                    <ctc:SettingsExpander x:Uid="/VDownload.Core.Strings/SettingsViewResources/TasksSaveLastOutputDirectory">
+                    <ctc:SettingsExpander x:Uid="/SettingsViewResources/TasksSaveLastOutputDirectory">
                         <ctc:SettingsExpander.HeaderIcon>
                             <BitmapIcon ShowAsMonochrome="False" 
                                         UriSource="{ThemeResource ImageSettingsViewTasksOutputDirectory}"/>
                         </ctc:SettingsExpander.HeaderIcon>
                         <ToggleSwitch IsOn="{Binding TasksSaveLastOutputDirectory, Mode=TwoWay}"/>
                         <ctc:SettingsExpander.Items>
-                            <ctc:SettingsCard x:Uid="/VDownload.Core.Strings/SettingsViewResources/TasksDefaultOutputDirectory"
+                            <ctc:SettingsCard x:Uid="/SettingsViewResources/TasksDefaultOutputDirectory"
                                               IsEnabled="{Binding TasksSaveLastOutputDirectory, Converter={StaticResource BoolNegationConverter}}"
                                               Description="{Binding TasksDefaultOutputDirectory}">
-                                <Button x:Uid="/VDownload.Core.Strings/SettingsViewResources/TasksDefaultOutputDirectoryButton"
+                                <Button x:Uid="/SettingsViewResources/TasksDefaultOutputDirectoryButton"
                                         Command="{Binding BrowseTasksDefaultOutputDirectoryCommand}"/>
                             </ctc:SettingsCard>
                         </ctc:SettingsExpander.Items>
                     </ctc:SettingsExpander>
-                    <ctc:SettingsCard x:Uid="/VDownload.Core.Strings/SettingsViewResources/TasksReplaceOutputFile">
+                    <ctc:SettingsCard x:Uid="/SettingsViewResources/TasksReplaceOutputFile">
                         <ctc:SettingsCard.HeaderIcon>
                             <BitmapIcon ShowAsMonochrome="False" 
                                         UriSource="{ThemeResource ImageSettingsViewTasksReplaceOutputFile}"/>
@@ -138,33 +138,33 @@
                 
                 <!-- Processing -->
                 <StackPanel Spacing="5">
-                    <TextBlock x:Uid="/VDownload.Core.Strings/SettingsViewResources/ProcessingHeader"
+                    <TextBlock x:Uid="/SettingsViewResources/ProcessingHeader"
                                FontWeight="Bold"
                                FontSize="15"/>
-                    <ctc:SettingsCard x:Uid="/VDownload.Core.Strings/SettingsViewResources/ProcessingFFmpegLocation"
+                    <ctc:SettingsCard x:Uid="/SettingsViewResources/ProcessingFFmpegLocation"
                                       Description="{Binding ProcessingFFmpegLocation}">
                         <ctc:SettingsCard.HeaderIcon>
                             <BitmapIcon ShowAsMonochrome="False" 
                                         UriSource="{ThemeResource ImageSettingsViewProcessingFFmpegLocation}"/>
                         </ctc:SettingsCard.HeaderIcon>
-                        <Button x:Uid="/VDownload.Core.Strings/SettingsViewResources/ProcessingFFmpegLocationButton"
+                        <Button x:Uid="/SettingsViewResources/ProcessingFFmpegLocationButton"
                                 Command="{Binding BrowseProcessingFFmpegLocationCommand}"/>
                     </ctc:SettingsCard>
-                    <ctc:SettingsCard x:Uid="/VDownload.Core.Strings/SettingsViewResources/ProcessingUseMultithreading">
+                    <ctc:SettingsCard x:Uid="/SettingsViewResources/ProcessingUseMultithreading">
                         <ctc:SettingsCard.HeaderIcon>
                             <BitmapIcon ShowAsMonochrome="False" 
                                         UriSource="{ThemeResource ImageSettingsViewProcessingUseMultithreading}"/>
                         </ctc:SettingsCard.HeaderIcon>
                         <ToggleSwitch IsOn="{Binding ProcessingUseMultithreading, Mode=TwoWay}"/>
                     </ctc:SettingsCard>
-                    <ctc:SettingsCard x:Uid="/VDownload.Core.Strings/SettingsViewResources/ProcessingUseHardwareAcceleration">
+                    <ctc:SettingsCard x:Uid="/SettingsViewResources/ProcessingUseHardwareAcceleration">
                         <ctc:SettingsCard.HeaderIcon>
                             <BitmapIcon ShowAsMonochrome="False" 
                                         UriSource="{ThemeResource ImageSettingsViewProcessingUseHardwareAcceleration}"/>
                         </ctc:SettingsCard.HeaderIcon>
                         <ToggleSwitch IsOn="{Binding ProcessingUseHardwareAcceleration, Mode=TwoWay}"/>
                     </ctc:SettingsCard>
-                    <ctc:SettingsCard x:Uid="/VDownload.Core.Strings/SettingsViewResources/ProcessingSpeed">
+                    <ctc:SettingsCard x:Uid="/SettingsViewResources/ProcessingSpeed">
                         <ctc:SettingsCard.HeaderIcon>
                             <BitmapIcon ShowAsMonochrome="False" 
                                         UriSource="{ThemeResource ImageSettingsViewProcessingSpeed}"/>
@@ -175,31 +175,31 @@
                                 <DataTemplate>
                                     <ctuc:SwitchPresenter Value="{Binding Converter={StaticResource ObjectToStringConverter}}">
                                         <ctuc:Case Value="VerySlow">
-                                            <TextBlock x:Uid="/VDownload.Core.Strings/CommonResources/ProcessingSpeedVerySlow"/>
+                                            <TextBlock x:Uid="/CommonResources/ProcessingSpeedVerySlow"/>
                                         </ctuc:Case>
                                         <ctuc:Case Value="Slower">
-                                            <TextBlock x:Uid="/VDownload.Core.Strings/CommonResources/ProcessingSpeedSlower"/>
+                                            <TextBlock x:Uid="/CommonResources/ProcessingSpeedSlower"/>
                                         </ctuc:Case>
                                         <ctuc:Case Value="Slow">
-                                            <TextBlock x:Uid="/VDownload.Core.Strings/CommonResources/ProcessingSpeedSlow"/>
+                                            <TextBlock x:Uid="/CommonResources/ProcessingSpeedSlow"/>
                                         </ctuc:Case>
                                         <ctuc:Case Value="Medium">
-                                            <TextBlock x:Uid="/VDownload.Core.Strings/CommonResources/ProcessingSpeedMedium"/>
+                                            <TextBlock x:Uid="/CommonResources/ProcessingSpeedMedium"/>
                                         </ctuc:Case>
                                         <ctuc:Case Value="Fast">
-                                            <TextBlock x:Uid="/VDownload.Core.Strings/CommonResources/ProcessingSpeedFast"/>
+                                            <TextBlock x:Uid="/CommonResources/ProcessingSpeedFast"/>
                                         </ctuc:Case>
                                         <ctuc:Case Value="Faster">
-                                            <TextBlock x:Uid="/VDownload.Core.Strings/CommonResources/ProcessingSpeedFaster"/>
+                                            <TextBlock x:Uid="/CommonResources/ProcessingSpeedFaster"/>
                                         </ctuc:Case>
                                         <ctuc:Case Value="VeryFast">
-                                            <TextBlock x:Uid="/VDownload.Core.Strings/CommonResources/ProcessingSpeedVeryFast"/>
+                                            <TextBlock x:Uid="/CommonResources/ProcessingSpeedVeryFast"/>
                                         </ctuc:Case>
                                         <ctuc:Case Value="SuperFast">
-                                            <TextBlock x:Uid="/VDownload.Core.Strings/CommonResources/ProcessingSpeedSuperFast"/>
+                                            <TextBlock x:Uid="/CommonResources/ProcessingSpeedSuperFast"/>
                                         </ctuc:Case>
                                         <ctuc:Case Value="UltraFast">
-                                            <TextBlock x:Uid="/VDownload.Core.Strings/CommonResources/ProcessingSpeedUltraFast"/>
+                                            <TextBlock x:Uid="/CommonResources/ProcessingSpeedUltraFast"/>
                                         </ctuc:Case>
                                     </ctuc:SwitchPresenter>
                                 </DataTemplate>
@@ -210,17 +210,17 @@
                 
                 <!-- Notifications -->
                 <StackPanel Spacing="5">
-                    <TextBlock x:Uid="/VDownload.Core.Strings/SettingsViewResources/NotificationsHeader"
+                    <TextBlock x:Uid="/SettingsViewResources/NotificationsHeader"
                                FontWeight="Bold"
                                FontSize="15"/>
-                    <ctc:SettingsCard x:Uid="/VDownload.Core.Strings/SettingsViewResources/NotificationsOnSuccessful">
+                    <ctc:SettingsCard x:Uid="/SettingsViewResources/NotificationsOnSuccessful">
                         <ctc:SettingsCard.HeaderIcon>
                             <BitmapIcon ShowAsMonochrome="False" 
                                         UriSource="{ThemeResource ImageSettingsViewNotificationOnSuccessful}"/>
                         </ctc:SettingsCard.HeaderIcon>
                         <ToggleSwitch IsOn="{Binding NotificationsOnSuccessful, Mode=TwoWay}"/>
                     </ctc:SettingsCard>
-                    <ctc:SettingsCard x:Uid="/VDownload.Core.Strings/SettingsViewResources/NotificationsOnUnsuccessful">
+                    <ctc:SettingsCard x:Uid="/SettingsViewResources/NotificationsOnUnsuccessful">
                         <ctc:SettingsCard.HeaderIcon>
                             <BitmapIcon ShowAsMonochrome="False" 
                                         UriSource="{ThemeResource ImageSettingsViewNotificationOnUnsuccessful}"/>
@@ -231,19 +231,19 @@
                 
                 <!-- Temporary files -->
                 <StackPanel Spacing="5">
-                    <TextBlock x:Uid="/VDownload.Core.Strings/SettingsViewResources/TempHeader"
+                    <TextBlock x:Uid="/SettingsViewResources/TempHeader"
                                FontWeight="Bold"
                                FontSize="15"/>
-                    <ctc:SettingsCard x:Uid="/VDownload.Core.Strings/SettingsViewResources/TempDirectory"
+                    <ctc:SettingsCard x:Uid="/SettingsViewResources/TempDirectory"
                                       Description="{Binding TempDirectory}">
                         <ctc:SettingsCard.HeaderIcon>
                             <BitmapIcon ShowAsMonochrome="False" 
                                         UriSource="{ThemeResource ImageSettingsViewTempDirectory}"/>
                         </ctc:SettingsCard.HeaderIcon>
-                        <Button x:Uid="/VDownload.Core.Strings/SettingsViewResources/TempDirectoryButton"
+                        <Button x:Uid="/SettingsViewResources/TempDirectoryButton"
                                 Command="{Binding BrowseTempDirectoryCommand}"/>
                     </ctc:SettingsCard>
-                    <ctc:SettingsCard x:Uid="/VDownload.Core.Strings/SettingsViewResources/TempDeleteOnFail">
+                    <ctc:SettingsCard x:Uid="/SettingsViewResources/TempDeleteOnFail">
                         <ctc:SettingsCard.HeaderIcon>
                             <BitmapIcon ShowAsMonochrome="False" 
                                         UriSource="{ThemeResource ImageSettingsViewTempDeleteOnFail}"/>
@@ -254,17 +254,17 @@
                 
                 <!-- Twitch -->
                 <StackPanel Spacing="5">
-                    <TextBlock x:Uid="/VDownload.Core.Strings/SettingsViewResources/TwitchHeader"
+                    <TextBlock x:Uid="/SettingsViewResources/TwitchHeader"
                                FontWeight="Bold"
                                FontSize="15"/>
-                    <ctc:SettingsCard x:Uid="/VDownload.Core.Strings/SettingsViewResources/TwitchVodPassiveTrimming">
+                    <ctc:SettingsCard x:Uid="/SettingsViewResources/TwitchVodPassiveTrimming">
                         <ctc:SettingsCard.HeaderIcon>
                             <BitmapIcon ShowAsMonochrome="False" 
                                         UriSource="{StaticResource ImageSourcesTwitch}"/>
                         </ctc:SettingsCard.HeaderIcon>
                         <ToggleSwitch IsOn="{Binding TwitchVodPassiveTrimming, Mode=TwoWay}"/>
                     </ctc:SettingsCard>
-                    <ctc:SettingsCard x:Uid="/VDownload.Core.Strings/SettingsViewResources/TwitchVodParallelDownloads">
+                    <ctc:SettingsCard x:Uid="/SettingsViewResources/TwitchVodParallelDownloads">
                         <ctc:SettingsCard.HeaderIcon>
                             <BitmapIcon ShowAsMonochrome="False" 
                                         UriSource="{StaticResource ImageSourcesTwitch}"/>
@@ -275,14 +275,14 @@
                                    LargeChange="10"
                                    SpinButtonPlacementMode="Compact"/>
                     </ctc:SettingsCard>
-                    <ctc:SettingsExpander x:Uid="/VDownload.Core.Strings/SettingsViewResources/TwitchVodChunkDownloadingErrorRetry">
+                    <ctc:SettingsExpander x:Uid="/SettingsViewResources/TwitchVodChunkDownloadingErrorRetry">
                         <ctc:SettingsExpander.HeaderIcon>
                             <BitmapIcon ShowAsMonochrome="False" 
                                         UriSource="{StaticResource ImageSourcesTwitch}"/>
                         </ctc:SettingsExpander.HeaderIcon>
                         <ToggleSwitch IsOn="{Binding TwitchVodChunkDownloadingErrorRetry, Mode=TwoWay}"/>
                         <ctc:SettingsExpander.Items>
-                            <ctc:SettingsCard x:Uid="/VDownload.Core.Strings/SettingsViewResources/TwitchVodChunkDownloadingErrorRetryCount"
+                            <ctc:SettingsCard x:Uid="/SettingsViewResources/TwitchVodChunkDownloadingErrorRetryCount"
                                               IsEnabled="{Binding TwitchVodChunkDownloadingErrorRetry}">
                                 <NumberBox Value="{Binding TwitchVodChunkDownloadingErrorRetryCount, Mode=TwoWay}"
                                            Minimum="1"
@@ -290,7 +290,7 @@
                                            LargeChange="10"
                                            SpinButtonPlacementMode="Compact"/>
                             </ctc:SettingsCard>
-                            <ctc:SettingsCard x:Uid="/VDownload.Core.Strings/SettingsViewResources/TwitchVodChunkDownloadingErrorRetryDelay"
+                            <ctc:SettingsCard x:Uid="/SettingsViewResources/TwitchVodChunkDownloadingErrorRetryDelay"
                                               IsEnabled="{Binding TwitchVodChunkDownloadingErrorRetry}">
                                 <NumberBox Value="{Binding TwitchVodChunkDownloadingErrorRetryDelay, Mode=TwoWay}"
                                            Minimum="0"
@@ -303,7 +303,7 @@
                 </StackPanel>
 
                 <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
-                    <Button x:Uid="/VDownload.Core.Strings/SettingsViewResources/RestoreToDefaultButton"
+                    <Button x:Uid="/SettingsViewResources/RestoreToDefaultButton"
                             Command="{Binding RestoreToDefaultCommand}"/>
                 </StackPanel>
             </StackPanel>
diff --git a/VDownload.Core/VDownload.Core.Views/Subscriptions/SubscriptionsView.xaml b/VDownload.Core/VDownload.Core.Views/Subscriptions/SubscriptionsView.xaml
index feb9aca..5893146 100644
--- a/VDownload.Core/VDownload.Core.Views/Subscriptions/SubscriptionsView.xaml
+++ b/VDownload.Core/VDownload.Core.Views/Subscriptions/SubscriptionsView.xaml
@@ -27,7 +27,7 @@
             <RowDefinition/>
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
-        <TextBlock x:Uid="/VDownload.Core.Strings/SubscriptionsViewResources/Header"
+        <TextBlock x:Uid="/SubscriptionsViewResources/Header"
                    Grid.Row="0"
                    FontSize="28"
                    FontWeight="SemiBold"/>
@@ -64,7 +64,7 @@
                                        Text="{Binding Name}"
                                        HorizontalAlignment="Center"
                                        TextTrimming="CharacterEllipsis"/>
-                            <HyperlinkButton x:Uid="/VDownload.Core.Strings/SubscriptionsViewResources/RemovePlaylistButton"
+                            <HyperlinkButton x:Uid="/SubscriptionsViewResources/RemovePlaylistButton"
                                              Grid.Row="2"
                                              Content="Remove"
                                              HorizontalAlignment="Center"
@@ -86,7 +86,7 @@
                         <ColumnDefinition/>
                         <ColumnDefinition Width="Auto"/>
                     </Grid.ColumnDefinitions>
-                    <TextBox x:Uid="/VDownload.Core.Strings/SubscriptionsViewResources/PlaylistUrlTextBox"
+                    <TextBox x:Uid="/SubscriptionsViewResources/PlaylistUrlTextBox"
                              Grid.Column="0"
                              Text="{Binding Url, Mode=TwoWay}"
                              IsEnabled="{Binding Loading, Converter={StaticResource BoolNegationConverter}}"/>
@@ -98,14 +98,14 @@
                                           Height="20"/>
                         </ctuc:Case>
                         <ctuc:Case Value="False">
-                            <Button x:Uid="/VDownload.Core.Strings/SubscriptionsViewResources/PlaylistSearchButton"
+                            <Button x:Uid="/SubscriptionsViewResources/PlaylistSearchButton"
                                     Command="{Binding AddCommand}"/>
                         </ctuc:Case>
                     </ctuc:SwitchPresenter>
                 </Grid>
             </ctuc:Case>
             <ctuc:Case Value="True">
-                <InfoBar x:Uid="/VDownload.Core.Strings/SubscriptionsViewResources/ErrorInfoBar"
+                <InfoBar x:Uid="/SubscriptionsViewResources/ErrorInfoBar"
                          Severity="Error"
                          IsOpen="{Binding IsErrorOpened, Mode=TwoWay}"
                          Message="{Binding Error}"
diff --git a/VDownload.Core/VDownload.Core.Views/VDownload.Core.Views.csproj b/VDownload.Core/VDownload.Core.Views/VDownload.Core.Views.csproj
index 7f6d8a0..509ac9f 100644
--- a/VDownload.Core/VDownload.Core.Views/VDownload.Core.Views.csproj
+++ b/VDownload.Core/VDownload.Core.Views/VDownload.Core.Views.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
+    <TargetFramework>net8.0-windows10.0.26100.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
     <RootNamespace>VDownload.Core.Views</RootNamespace>
     <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
diff --git a/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.Dialogs/VDownload.Services.UI.Dialogs.csproj b/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.Dialogs/VDownload.Services.UI.Dialogs.csproj
index 6167d47..687e937 100644
--- a/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.Dialogs/VDownload.Services.UI.Dialogs.csproj
+++ b/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.Dialogs/VDownload.Services.UI.Dialogs.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
+    <TargetFramework>net8.0-windows10.0.26100.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
     <RootNamespace>VDownload.Services.UI.Dialogs</RootNamespace>
     <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
diff --git a/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.DictionaryResources/VDownload.Services.UI.DictionaryResources.csproj b/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.DictionaryResources/VDownload.Services.UI.DictionaryResources.csproj
index 54b8411..8bb655c 100644
--- a/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.DictionaryResources/VDownload.Services.UI.DictionaryResources.csproj
+++ b/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.DictionaryResources/VDownload.Services.UI.DictionaryResources.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
+    <TargetFramework>net8.0-windows10.0.26100.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
     <RootNamespace>VDownload.Services.UI.DictionaryResources</RootNamespace>
     <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
diff --git a/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.Notifications/VDownload.Services.UI.Notifications.csproj b/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.Notifications/VDownload.Services.UI.Notifications.csproj
index e6fa01d..8c542e1 100644
--- a/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.Notifications/VDownload.Services.UI.Notifications.csproj
+++ b/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.Notifications/VDownload.Services.UI.Notifications.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
+    <TargetFramework>net8.0-windows10.0.26100.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
     <RootNamespace>VDownload.Services.UI.Notifications</RootNamespace>
     <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
diff --git a/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.StoragePicker/VDownload.Services.UI.StoragePicker.csproj b/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.StoragePicker/VDownload.Services.UI.StoragePicker.csproj
index 8407c20..13f4949 100644
--- a/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.StoragePicker/VDownload.Services.UI.StoragePicker.csproj
+++ b/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.StoragePicker/VDownload.Services.UI.StoragePicker.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
+    <TargetFramework>net8.0-windows10.0.26100.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
     <RootNamespace>VDownload.Services.UI.StoragePicker</RootNamespace>
     <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
diff --git a/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.WebView/VDownload.Services.UI.WebView.csproj b/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.WebView/VDownload.Services.UI.WebView.csproj
index aa294dd..ddf1e78 100644
--- a/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.WebView/VDownload.Services.UI.WebView.csproj
+++ b/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.WebView/VDownload.Services.UI.WebView.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
+    <TargetFramework>net8.0-windows10.0.26100.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
     <RootNamespace>VDownload.Services.UI.WebView</RootNamespace>
     <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
diff --git a/VDownload/Activation/ActivationService.cs b/VDownload/Activation/ActivationService.cs
index 1cb9125..a335fa5 100644
--- a/VDownload/Activation/ActivationService.cs
+++ b/VDownload/Activation/ActivationService.cs
@@ -74,19 +74,14 @@ namespace VDownload.Activation
 
         public async Task ActivateAsync(object activationArgs)
         {
-            File.AppendAllText("C:\\Users\\mateusz\\Desktop\\test.txt", "testactivate\n");
             await InitializeAsync();
             ViewModelToViewConverter.Initialize((App.Current as App)!.Host.Services);
-            File.AppendAllText("C:\\Users\\mateusz\\Desktop\\test.txt", "test1\n");
 
             await HandleActivationAsync(activationArgs);
 
-            File.AppendAllText("C:\\Users\\mateusz\\Desktop\\test.txt", "test2\n");
             _window = App.GetService<BaseWindow>();
-            File.AppendAllText("C:\\Users\\mateusz\\Desktop\\test.txt", "test3\n");
             _window.RootLoaded += Window_RootLoaded;
             _window.Activate();
-            File.AppendAllText("C:\\Users\\mateusz\\Desktop\\test.txt", "test4\n");
 
             await StartupAsync();
         }
diff --git a/VDownload/App.xaml.cs b/VDownload/App.xaml.cs
index 22ce65d..5a9ad1b 100644
--- a/VDownload/App.xaml.cs
+++ b/VDownload/App.xaml.cs
@@ -122,14 +122,11 @@ namespace VDownload
         {
             base.OnLaunched(args);
 
-            File.AppendAllText("C:\\Users\\mateusz\\Desktop\\test.txt", "testlaunched\n");
-
             await GetService<IActivationService>().ActivateAsync(args);
         }
 
         protected void UnhandledExceptionCatched(object sender, Microsoft.UI.Xaml.UnhandledExceptionEventArgs e)
         {
-            File.AppendAllText("C:\\Users\\mateusz\\Desktop\\test.txt", $"test {e.Message} {e.Exception.StackTrace}\n");
             Environment.Exit(0);
         }
 
diff --git a/VDownload.Core/VDownload.Core.Strings/Strings/en-US/AboutViewResources.resw b/VDownload/Resources/en-US/AboutViewResources.resw
similarity index 100%
rename from VDownload.Core/VDownload.Core.Strings/Strings/en-US/AboutViewResources.resw
rename to VDownload/Resources/en-US/AboutViewResources.resw
diff --git a/VDownload.Core/VDownload.Core.Strings/Strings/en-US/AuthenticationViewResources.resw b/VDownload/Resources/en-US/AuthenticationViewResources.resw
similarity index 100%
rename from VDownload.Core/VDownload.Core.Strings/Strings/en-US/AuthenticationViewResources.resw
rename to VDownload/Resources/en-US/AuthenticationViewResources.resw
diff --git a/VDownload.Core/VDownload.Core.Strings/Strings/en-US/BaseViewResources.resw b/VDownload/Resources/en-US/BaseViewResources.resw
similarity index 100%
rename from VDownload.Core/VDownload.Core.Strings/Strings/en-US/BaseViewResources.resw
rename to VDownload/Resources/en-US/BaseViewResources.resw
diff --git a/VDownload.Core/VDownload.Core.Strings/Strings/en-US/CommonResources.resw b/VDownload/Resources/en-US/CommonResources.resw
similarity index 100%
rename from VDownload.Core/VDownload.Core.Strings/Strings/en-US/CommonResources.resw
rename to VDownload/Resources/en-US/CommonResources.resw
diff --git a/VDownload.Core/VDownload.Core.Strings/Strings/en-US/DialogButtonsResources.resw b/VDownload/Resources/en-US/DialogButtonsResources.resw
similarity index 100%
rename from VDownload.Core/VDownload.Core.Strings/Strings/en-US/DialogButtonsResources.resw
rename to VDownload/Resources/en-US/DialogButtonsResources.resw
diff --git a/VDownload.Core/VDownload.Core.Strings/Strings/en-US/FilenameTemplateResources.resw b/VDownload/Resources/en-US/FilenameTemplateResources.resw
similarity index 100%
rename from VDownload.Core/VDownload.Core.Strings/Strings/en-US/FilenameTemplateResources.resw
rename to VDownload/Resources/en-US/FilenameTemplateResources.resw
diff --git a/VDownload.Core/VDownload.Core.Strings/Strings/en-US/HomeDownloadsViewResources.resw b/VDownload/Resources/en-US/HomeDownloadsViewResources.resw
similarity index 100%
rename from VDownload.Core/VDownload.Core.Strings/Strings/en-US/HomeDownloadsViewResources.resw
rename to VDownload/Resources/en-US/HomeDownloadsViewResources.resw
diff --git a/VDownload.Core/VDownload.Core.Strings/Strings/en-US/HomeVideoCollectionViewResources.resw b/VDownload/Resources/en-US/HomeVideoCollectionViewResources.resw
similarity index 100%
rename from VDownload.Core/VDownload.Core.Strings/Strings/en-US/HomeVideoCollectionViewResources.resw
rename to VDownload/Resources/en-US/HomeVideoCollectionViewResources.resw
diff --git a/VDownload.Core/VDownload.Core.Strings/Strings/en-US/HomeVideoViewResources.resw b/VDownload/Resources/en-US/HomeVideoViewResources.resw
similarity index 100%
rename from VDownload.Core/VDownload.Core.Strings/Strings/en-US/HomeVideoViewResources.resw
rename to VDownload/Resources/en-US/HomeVideoViewResources.resw
diff --git a/VDownload.Core/VDownload.Core.Strings/Strings/en-US/HomeViewResources.resw b/VDownload/Resources/en-US/HomeViewResources.resw
similarity index 100%
rename from VDownload.Core/VDownload.Core.Strings/Strings/en-US/HomeViewResources.resw
rename to VDownload/Resources/en-US/HomeViewResources.resw
diff --git a/VDownload.Core/VDownload.Core.Strings/Strings/en-US/NotificationsResources.resw b/VDownload/Resources/en-US/NotificationsResources.resw
similarity index 100%
rename from VDownload.Core/VDownload.Core.Strings/Strings/en-US/NotificationsResources.resw
rename to VDownload/Resources/en-US/NotificationsResources.resw
diff --git a/VDownload.Core/VDownload.Core.Strings/Strings/en-US/SearchResources.resw b/VDownload/Resources/en-US/SearchResources.resw
similarity index 100%
rename from VDownload.Core/VDownload.Core.Strings/Strings/en-US/SearchResources.resw
rename to VDownload/Resources/en-US/SearchResources.resw
diff --git a/VDownload.Core/VDownload.Core.Strings/Strings/en-US/SettingsViewResources.resw b/VDownload/Resources/en-US/SettingsViewResources.resw
similarity index 100%
rename from VDownload.Core/VDownload.Core.Strings/Strings/en-US/SettingsViewResources.resw
rename to VDownload/Resources/en-US/SettingsViewResources.resw
diff --git a/VDownload.Core/VDownload.Core.Strings/Strings/en-US/SubscriptionsViewResources.resw b/VDownload/Resources/en-US/SubscriptionsViewResources.resw
similarity index 100%
rename from VDownload.Core/VDownload.Core.Strings/Strings/en-US/SubscriptionsViewResources.resw
rename to VDownload/Resources/en-US/SubscriptionsViewResources.resw
diff --git a/VDownload/VDownload.csproj b/VDownload/VDownload.csproj
index eefb73b..1977287 100644
--- a/VDownload/VDownload.csproj
+++ b/VDownload/VDownload.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>WinExe</OutputType>
-	<TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
+	<TargetFramework>net8.0-windows10.0.26100.0</TargetFramework>
 	<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
 	<RootNamespace>VDownload</RootNamespace>
 	<ApplicationManifest>app.manifest</ApplicationManifest>
@@ -19,6 +19,7 @@
     <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
 	<WindowsPackageType>None</WindowsPackageType>
 	<EnableMsixTooling>true</EnableMsixTooling>
+	<StartupObject></StartupObject>
     </PropertyGroup>
     <ItemGroup>
         <Content Remove="Assets\BaseView\AuthenticationDark.png" />
@@ -598,4 +599,89 @@
   <PropertyGroup Condition="'$(DisableHasPackageAndPublishMenuAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
     <HasPackageAndPublishMenu>true</HasPackageAndPublishMenu>
   </PropertyGroup>
+
+  <ItemGroup>
+    <PRIResource Update="Resources\en-US\AboutViewResources.resw">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </PRIResource>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PRIResource Update="Resources\en-US\AuthenticationViewResources.resw">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </PRIResource>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PRIResource Update="Resources\en-US\BaseViewResources.resw">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <Generator></Generator>
+    </PRIResource>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PRIResource Update="Resources\en-US\CommonResources.resw">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </PRIResource>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PRIResource Update="Resources\en-US\DialogButtonsResources.resw">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </PRIResource>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PRIResource Update="Resources\en-US\FilenameTemplateResources.resw">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </PRIResource>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PRIResource Update="Resources\en-US\HomeDownloadsViewResources.resw">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </PRIResource>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PRIResource Update="Resources\en-US\HomeVideoCollectionViewResources.resw">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </PRIResource>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PRIResource Update="Resources\en-US\HomeVideoViewResources.resw">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </PRIResource>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PRIResource Update="Resources\en-US\HomeViewResources.resw">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </PRIResource>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PRIResource Update="Resources\en-US\NotificationsResources.resw">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </PRIResource>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PRIResource Update="Resources\en-US\SearchResources.resw">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </PRIResource>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PRIResource Update="Resources\en-US\SettingsViewResources.resw">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </PRIResource>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PRIResource Update="Resources\en-US\SubscriptionsViewResources.resw">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </PRIResource>
+  </ItemGroup>
 </Project>