diff --git a/Installer/MietRechner.iss b/Installer/MietRechner.iss
index 1f5ce51..1bbfee4 100644
--- a/Installer/MietRechner.iss
+++ b/Installer/MietRechner.iss
@@ -1,16 +1,17 @@
 [Setup]
 AppName=MietRechner
-AppVersion=2.2
+AppVersion=2.3
 WizardStyle=modern
 DefaultDirName={autopf}\MietRechner
 DefaultGroupName=MietRechner
-UninstallDisplayIcon={app}\ucalc.exe
+UninstallDisplayIcon={app}\MietRechner.exe
 Compression=lzma2
 SolidCompression=yes
 OutputDir=.
 OutputBaseFilename=MietRechner Setup
 ArchitecturesAllowed=x64
 ArchitecturesInstallIn64BitMode=x64
+ChangesAssociations = yes
 
 [Languages]
 Name: "de"; MessagesFile: "compiler:Languages\German.isl"
@@ -22,5 +23,12 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{
 Source: "setup/**"; DestDir: "{app}"; Flags: recursesubdirs
 
 [Icons]
-Name: "{group}\MietRechner"; Filename: "{app}\ucalc.exe"
-Name: "{commondesktop}\MietRechner"; Filename: "{app}\ucalc.exe"; IconFilename: "{app}\ucalc.exe"; Tasks: desktopicon
+Name: "{group}\MietRechner"; Filename: "{app}\MietRechner.exe"
+Name: "{commondesktop}\MietRechner"; Filename: "{app}\MietRechner.exe"; IconFilename: "{app}\MietRechner.exe"; Tasks: desktopicon
+
+[Registry]
+Root: HKA; Subkey: "Software\Classes\.mr\OpenWithProgids"; ValueType: string; ValueName: "MietRechner.mr"; ValueData: ""; Flags: uninsdeletevalue
+Root: HKA; Subkey: "Software\Classes\MietRechner.mr"; ValueType: string; ValueName: ""; ValueData: "MietRechner"; Flags: uninsdeletekey
+Root: HKA; Subkey: "Software\Classes\MietRechner.mr\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\MietRechner.exe,0"
+Root: HKA; Subkey: "Software\Classes\MietRechner.mr\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\MietRechner.exe"" ""%1"""
+Root: HKA; Subkey: "Software\Classes\Applications\MietRechner.exe\SupportedTypes"; ValueType: string; ValueName: ".mr"; ValueData: ""
diff --git a/ucalc.sln b/ucalc.sln
index b0bdd94..7605648 100644
--- a/ucalc.sln
+++ b/ucalc.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.30128.74
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ucalc", "ucalc\ucalc.csproj", "{E565705A-BAF4-4653-99A1-199C314A21EC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MietRechner", "ucalc\ucalc.csproj", "{E565705A-BAF4-4653-99A1-199C314A21EC}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/ucalc/ucalc.csproj b/ucalc/ucalc.csproj
index 8ad9ec9..2b20c87 100644
--- a/ucalc/ucalc.csproj
+++ b/ucalc/ucalc.csproj
@@ -6,8 +6,11 @@
         <UseWPF>true</UseWPF>
         <ApplicationIcon>logo.ico</ApplicationIcon>
         <Platforms>AnyCPU;x64</Platforms>
-    </PropertyGroup>
 
+        <AssemblyTitle>MietRechner</AssemblyTitle>
+        <AssemblyName>MietRechner</AssemblyName>
+    </PropertyGroup>
+    
     <ItemGroup>
         <Page Update="BillingWindow.xaml">
             <Generator></Generator>