diff --git a/Elwig/App.xaml.cs b/Elwig/App.xaml.cs
index 19f7a7a..77b5f07 100644
--- a/Elwig/App.xaml.cs
+++ b/Elwig/App.xaml.cs
@@ -29,6 +29,9 @@ namespace Elwig {
         public static readonly string MailsPath = Path.Combine(DataPath, "mails");
         public static readonly string ConfigPath = Path.Combine(DataPath, "config.ini");
         public static readonly string ExePath = @"C:\Program Files\Elwig\";
+        public static readonly string DocumentsPath = (Assembly.GetEntryAssembly()?.Location.Contains(@"\bin\") ?? false) ?
+            Path.Combine(Assembly.GetEntryAssembly()!.Location.Split(@"\bin\")[0], "../Elwig/Documents") :
+            Path.Combine(ExePath, "resources/Documents");
         public static readonly string TempPath = Path.Combine(Path.GetTempPath(), "Elwig");
 
         public static Config Config { get; private set; } = new(ConfigPath);
diff --git a/Elwig/Documents/BusinessDocument.cshtml b/Elwig/Documents/BusinessDocument.cshtml
index 1d843e4..9f17087 100644
--- a/Elwig/Documents/BusinessDocument.cshtml
+++ b/Elwig/Documents/BusinessDocument.cshtml
@@ -2,7 +2,7 @@
 @inherits TemplatePage<Elwig.Documents.BusinessDocument>
 @model Elwig.Documents.BusinessDocument
 @{ Layout = "Document"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\BusinessDocument.css"/>
+<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\BusinessDocument.css"/>
 <div class="info-wrapper">
     <div class="address-wrapper">
         <div class="sender">
diff --git a/Elwig/Documents/CreditNote.cshtml b/Elwig/Documents/CreditNote.cshtml
index f933faf..8e098fd 100644
--- a/Elwig/Documents/CreditNote.cshtml
+++ b/Elwig/Documents/CreditNote.cshtml
@@ -3,7 +3,7 @@
 @inherits TemplatePage<Elwig.Documents.CreditNote>
 @model Elwig.Documents.CreditNote
 @{ Layout = "BusinessDocument"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\CreditNote.css"/>
+<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\CreditNote.css" />
 <main>
     <h1>@Model.Title</h1>
     <table class="credit">
diff --git a/Elwig/Documents/DeliveryAncmtList.cshtml b/Elwig/Documents/DeliveryAncmtList.cshtml
index 55f8f0e..b53272c 100644
--- a/Elwig/Documents/DeliveryAncmtList.cshtml
+++ b/Elwig/Documents/DeliveryAncmtList.cshtml
@@ -2,7 +2,7 @@
 @inherits TemplatePage<Elwig.Documents.DeliveryAncmtList>
 @model Elwig.Documents.DeliveryAncmtList
 @{ Layout = "Document"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\DeliveryAncmtList.css" />
+<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\DeliveryAncmtList.css" />
 <main>
     <h1>Anmeldeliste</h1>
     <h2>@Model.Filter</h2>
diff --git a/Elwig/Documents/DeliveryConfirmation.cshtml b/Elwig/Documents/DeliveryConfirmation.cshtml
index c2f579a..67a0671 100644
--- a/Elwig/Documents/DeliveryConfirmation.cshtml
+++ b/Elwig/Documents/DeliveryConfirmation.cshtml
@@ -3,7 +3,7 @@
 @inherits TemplatePage<Elwig.Documents.DeliveryConfirmation>
 @model Elwig.Documents.DeliveryConfirmation
 @{ Layout = "BusinessDocument"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\DeliveryConfirmation.css"/>
+<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\DeliveryConfirmation.css" />
 <main>
     <h1>@Model.Title</h1>
     <table class="delivery-confirmation">
diff --git a/Elwig/Documents/DeliveryDepreciationList.cshtml b/Elwig/Documents/DeliveryDepreciationList.cshtml
index ad33660..0b56548 100644
--- a/Elwig/Documents/DeliveryDepreciationList.cshtml
+++ b/Elwig/Documents/DeliveryDepreciationList.cshtml
@@ -2,7 +2,7 @@
 @inherits TemplatePage<Elwig.Documents.DeliveryDepreciationList>
 @model Elwig.Documents.DeliveryDepreciationList
 @{ Layout = "Document"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\DeliveryDepreciationList.css" />
+<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\DeliveryDepreciationList.css" />
 <main>
     <h1>Abwertungsliste</h1>
     <h2>@Model.Filter</h2>
diff --git a/Elwig/Documents/DeliveryJournal.cshtml b/Elwig/Documents/DeliveryJournal.cshtml
index ac87568..0f979d9 100644
--- a/Elwig/Documents/DeliveryJournal.cshtml
+++ b/Elwig/Documents/DeliveryJournal.cshtml
@@ -2,7 +2,7 @@
 @inherits TemplatePage<Elwig.Documents.DeliveryJournal>
 @model Elwig.Documents.DeliveryJournal
 @{ Layout = "Document"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\DeliveryJournal.css"/>
+<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\DeliveryJournal.css"/>
 <main>
     <h1>Lieferjournal</h1>
     <h2>@Model.Filter</h2>
diff --git a/Elwig/Documents/DeliveryNote.cshtml b/Elwig/Documents/DeliveryNote.cshtml
index 2d4c613..85b2fea 100644
--- a/Elwig/Documents/DeliveryNote.cshtml
+++ b/Elwig/Documents/DeliveryNote.cshtml
@@ -2,7 +2,7 @@
 @inherits TemplatePage<Elwig.Documents.DeliveryNote>
 @model Elwig.Documents.DeliveryNote
 @{ Layout = "BusinessDocument"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\DeliveryNote.css" />
+<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\DeliveryNote.css" />
 <main>
 <h1>@Model.Title</h1>
 <table class="delivery large">
diff --git a/Elwig/Documents/Document.cs b/Elwig/Documents/Document.cs
index 348083a..755286e 100644
--- a/Elwig/Documents/Document.cs
+++ b/Elwig/Documents/Document.cs
@@ -23,7 +23,7 @@ namespace Elwig.Documents {
         public bool ShowFoldMarks = App.Config.Debug;
         public bool DoublePaged = false;
 
-        public string DataPath;
+        public string DocumentsPath;
         public int CurrentNextSeason;
         public string? DocumentId;
         public string Title;
@@ -34,7 +34,7 @@ namespace Elwig.Documents {
 
         public Document(string title) {
             var c = App.Client;
-            DataPath = App.DataPath;
+            DocumentsPath = App.DocumentsPath;
             CurrentNextSeason = Utils.CurrentNextSeason;
             Title = title;
             Author = c.NameFull;
diff --git a/Elwig/Documents/Document.cshtml b/Elwig/Documents/Document.cshtml
index 731188a..0f77c08 100644
--- a/Elwig/Documents/Document.cshtml
+++ b/Elwig/Documents/Document.cshtml
@@ -7,9 +7,9 @@
     <title>@Model.Title</title>
     <meta name="author" value="@Model.Author"/>
     <meta charset="UTF-8"/>
-    <link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\Document.css"/>
-    <link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\Document.Page.css"/>
-    <link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\Document.Table.css"/>
+    <link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\Document.css" />
+    <link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\Document.Page.css" />
+    <link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\Document.Table.css" />
     @if (Model.DoublePaged) {
         <style>
             @@page :left {
diff --git a/Elwig/Documents/MemberDataSheet.cshtml b/Elwig/Documents/MemberDataSheet.cshtml
index 61be083..3a35e82 100644
--- a/Elwig/Documents/MemberDataSheet.cshtml
+++ b/Elwig/Documents/MemberDataSheet.cshtml
@@ -3,7 +3,7 @@
 @inherits TemplatePage<Elwig.Documents.MemberDataSheet>
 @model Elwig.Documents.MemberDataSheet
 @{ Layout = "BusinessDocument"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\MemberDataSheet.css" />
+<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\MemberDataSheet.css" />
 <main>
     <h1>@Model.Title</h1>
     <table class="member border">
diff --git a/Elwig/Documents/MemberList.cshtml b/Elwig/Documents/MemberList.cshtml
index 2782089..2405c3b 100644
--- a/Elwig/Documents/MemberList.cshtml
+++ b/Elwig/Documents/MemberList.cshtml
@@ -2,7 +2,7 @@
 @inherits TemplatePage<Elwig.Documents.MemberList>
 @model Elwig.Documents.MemberList
 @{ Layout = "Document"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\MemberList.css"/>
+<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\MemberList.css" />
 <main>
     <h1>Mitgliederliste</h1>
     <h2>@Model.Filter</h2>
diff --git a/Elwig/Documents/PaymentVariantSummary.cshtml b/Elwig/Documents/PaymentVariantSummary.cshtml
index 3846ff7..a91962c 100644
--- a/Elwig/Documents/PaymentVariantSummary.cshtml
+++ b/Elwig/Documents/PaymentVariantSummary.cshtml
@@ -3,7 +3,7 @@
 @inherits TemplatePage<Elwig.Documents.PaymentVariantSummary>
 @model Elwig.Documents.PaymentVariantSummary
 @{ Layout = "Document"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\PaymentVariantSummary.css" />
+<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\PaymentVariantSummary.css" />
 <main>
     <h1>Auszahlungsvariante Lese @Model.Variant.Year</h1>
     <h2>@Model.Variant.Name</h2>
diff --git a/Elwig/Documents/WineQualityStatistics.cshtml b/Elwig/Documents/WineQualityStatistics.cshtml
index b9d69de..76279f4 100644
--- a/Elwig/Documents/WineQualityStatistics.cshtml
+++ b/Elwig/Documents/WineQualityStatistics.cshtml
@@ -3,7 +3,7 @@
 @inherits TemplatePage<Elwig.Documents.WineQualityStatistics>
 @model Elwig.Documents.WineQualityStatistics
 @{ Layout = "Document"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\WineQualityStatistics.css"/>
+<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\WineQualityStatistics.css" />
 <main>
     <h1>Qualitätsstatistik</h1>
     <h2>@Model.Filter</h2>
diff --git a/Elwig/Elwig.csproj b/Elwig/Elwig.csproj
index 7cb5ca8..53f4023 100644
--- a/Elwig/Elwig.csproj
+++ b/Elwig/Elwig.csproj
@@ -20,10 +20,6 @@
     <EmbeddedResource Include="Resources\Sql\*" />
   </ItemGroup>
 
-  <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
-    <Exec Command="call fetch-resources.bat" />
-  </Target>
-
   <ItemGroup>
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
     <PackageReference Include="LinqKit" Version="1.3.8" />
diff --git a/Elwig/Helpers/Printing/Html.cs b/Elwig/Helpers/Printing/Html.cs
index 779b8ff..201f786 100644
--- a/Elwig/Helpers/Printing/Html.cs
+++ b/Elwig/Helpers/Printing/Html.cs
@@ -10,7 +10,7 @@ namespace Elwig.Helpers.Printing {
 
         public static async Task Init(Action? evtHandler = null) {
             var e = new RazorLightEngineBuilder()
-                .UseFileSystemProject(App.DataPath + "resources")
+                .UseFileSystemProject(App.DocumentsPath)
                 .UseMemoryCachingProvider()
                 .Build();
 
diff --git a/Elwig/fetch-resources.bat b/Elwig/fetch-resources.bat
deleted file mode 100644
index 7f3f340..0000000
--- a/Elwig/fetch-resources.bat
+++ /dev/null
@@ -1,5 +0,0 @@
-::mkdir "C:\Program Files\Elwig"
-mkdir "C:\ProgramData\Elwig\resources"
-copy /b /y Documents\*.css "C:\ProgramData\Elwig\resources"
-copy /b /y Documents\*.cshtml "C:\ProgramData\Elwig\resources"
-::copy /b /y ..\Installer\Files\*.exe "C:\Program Files\Elwig\"
diff --git a/Installer/Folders.wxs b/Installer/Folders.wxs
index 7fbd526..bce790b 100644
--- a/Installer/Folders.wxs
+++ b/Installer/Folders.wxs
@@ -1,23 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <Fragment>
-	<!-- C:\Program Files (x86)\Elwig oder C:\Program Files\Elwig -->
+    <!-- C:\Program Files (x86)\Elwig oder C:\Program Files\Elwig -->
     <StandardDirectory Id="ProgramFiles64Folder">
-		<Directory Id="InstallFolder" Name="!(bind.Property.ProductName)" />
+      <Directory Id="InstallFolder" Name="!(bind.Property.ProductName)">
+        <Directory Id="InstallFolderResources" Name="resources">
+          <Directory Id="InstallFolderDocuments" Name="Documents" />
+        </Directory>
+      </Directory>
     </StandardDirectory>
-	
-	<!-- C:\ProgramData\Elwig -->
-	<StandardDirectory Id="CommonAppDataFolder">
-		<Directory Id="ConfigFolder" Name="!(bind.Property.ProductName)">
-			<Directory Id="ConfigFolderResources" Name="resources" />
-		</Directory>
-	</StandardDirectory>
-	  
-	<!-- C:\ProgramData\Microsoft\Windows\Start Menu\Programs -->
-	<StandardDirectory Id="ProgramMenuFolder">
-		<Directory Id="StartMenuProgramsFolder" Name="!(bind.Property.ProductName)" />
-	</StandardDirectory>
-	  
-	<!-- C:\Users{USERNAME}\Desktop -->
-	<StandardDirectory Id="DesktopFolder" />
+
+    <!-- C:\ProgramData\Elwig -->
+    <StandardDirectory Id="CommonAppDataFolder">
+      <Directory Id="ConfigFolder" Name="!(bind.Property.ProductName)" />
+    </StandardDirectory>
+
+    <!-- C:\ProgramData\Microsoft\Windows\Start Menu\Programs -->
+    <StandardDirectory Id="ProgramMenuFolder">
+      <Directory Id="StartMenuProgramsFolder" Name="!(bind.Property.ProductName)" />
+    </StandardDirectory>
+
+    <!-- C:\Users\{USERNAME}\Desktop -->
+    <StandardDirectory Id="DesktopFolder" />
   </Fragment>
 </Wix>
diff --git a/Installer/HeatComponents.wxs b/Installer/HeatComponents.wxs
index 9c37027..bb40eff 100644
--- a/Installer/HeatComponents.wxs
+++ b/Installer/HeatComponents.wxs
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <Fragment>
-	  <ComponentGroup Id="HeatComponents">
-		  <Files Directory="InstallFolder" Include="..\Elwig\bin\Publish\**">
-			  <Exclude Files="..\Elwig\bin\Publish\**.exe" />
-			  <Exclude Files="..\Elwig\bin\Publish\**.pdb" />
-		  </Files>
-		  <Files Directory="ConfigFolderResources" Include="..\Elwig\Documents\**">
-			  <Exclude Files="..\Elwig\Documents\**.cs" />
-		  </Files>
-	  </ComponentGroup>
+    <ComponentGroup Id="HeatComponents">
+      <Files Directory="InstallFolder" Include="..\Elwig\bin\Publish\**">
+        <Exclude Files="..\Elwig\bin\Publish\**.exe" />
+        <Exclude Files="..\Elwig\bin\Publish\**.pdb" />
+      </Files>
+      <Files Directory="InstallFolderDocuments" Include="..\Elwig\Documents\**">
+        <Exclude Files="..\Elwig\Documents\**.cs" />
+      </Files>
+    </ComponentGroup>
   </Fragment>
 </Wix>