diff --git a/G940LEDControl/Forms/MainFrm.dfm b/G940LEDControl/Forms/MainFrm.dfm
index c2798a3..d27b513 100644
--- a/G940LEDControl/Forms/MainFrm.dfm
+++ b/G940LEDControl/Forms/MainFrm.dfm
@@ -34,6 +34,10 @@ object MainForm: TMainForm
     TabOrder = 0
     object tsButtons: TTabSheet
       Caption = ' Button assignment '
+      ExplicitLeft = 0
+      ExplicitTop = 0
+      ExplicitWidth = 0
+      ExplicitHeight = 0
       DesignSize = (
         442
         452)
@@ -418,6 +422,10 @@ object MainForm: TMainForm
     object tsAbout: TTabSheet
       Caption = 'About'
       ImageIndex = 1
+      ExplicitLeft = 0
+      ExplicitTop = 0
+      ExplicitWidth = 0
+      ExplicitHeight = 0
       object lblVersionCaption: TLabel
         Left = 16
         Top = 67
diff --git a/G940LEDControl/Forms/MainFrm.pas b/G940LEDControl/Forms/MainFrm.pas
index 92b669b..e213103 100644
--- a/G940LEDControl/Forms/MainFrm.pas
+++ b/G940LEDControl/Forms/MainFrm.pas
@@ -222,8 +222,9 @@ const
   DefaultProfileName = 'Default';
   ProfilePostfixModified = ' (modified)';
 
-  FilenameProfiles = 'G940LEDControl\Profiles.xml';
-  FilenameSettings = 'G940LEDControl\Settings.xml';
+  UserDataPath = 'G940LEDControl\';
+  FilenameProfiles = UserDataPath + 'Profiles.xml';
+  FilenameSettings = UserDataPath + 'Settings.xml';
 
   TextStateSearching = 'Searching...';
   TextStateNotFound = 'Not found';
@@ -291,6 +292,8 @@ begin
 
   FindLEDControls;
 
+  ForceDirectories(App.UserPath + UserDataPath);
+
   FProfilesFilename := App.UserPath + FilenameProfiles;
   LoadProfiles;
 
diff --git a/G940LEDControl/G940LEDControl.dproj b/G940LEDControl/G940LEDControl.dproj
index e0f847e..5bcedf3 100644
--- a/G940LEDControl/G940LEDControl.dproj
+++ b/G940LEDControl/G940LEDControl.dproj
@@ -82,10 +82,11 @@
 			<DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
 		</PropertyGroup>
 		<PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
+			<VerInfo_Build>1</VerInfo_Build>
 			<VerInfo_Release>6</VerInfo_Release>
 			<VerInfo_MajorVer>1</VerInfo_MajorVer>
 			<VerInfo_MinorVer>0</VerInfo_MinorVer>
-			<VerInfo_Keys>CompanyName=X²Software;FileDescription=G940 LED Control;FileVersion=1.0.6.0;InternalName=;LegalCopyright=© 2011 X²Software;LegalTrademarks=;OriginalFilename=G940LEDControl.exe;ProductName=G940 LED Control;ProductVersion=1.0;Comments=</VerInfo_Keys>
+			<VerInfo_Keys>CompanyName=X²Software;FileDescription=G940 LED Control;FileVersion=1.0.6.1;InternalName=;LegalCopyright=© 2011 X²Software;LegalTrademarks=;OriginalFilename=G940LEDControl.exe;ProductName=G940 LED Control;ProductVersion=1.0;Comments=</VerInfo_Keys>
 			<VerInfo_Locale>1033</VerInfo_Locale>
 			<Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
 		</PropertyGroup>
diff --git a/G940LEDControl/G940LEDControl.res b/G940LEDControl/G940LEDControl.res
index 2a54137..bc71e1a 100644
Binary files a/G940LEDControl/G940LEDControl.res and b/G940LEDControl/G940LEDControl.res differ
diff --git a/Setup/G940LEDControl.iss b/Setup/G940LEDControl.iss
new file mode 100644
index 0000000..5512b93
--- /dev/null
+++ b/Setup/G940LEDControl.iss
@@ -0,0 +1,41 @@
+#define AppName "G940 LED Control"
+#define AppExeName "G940LEDControl.exe"
+#define AppVersion GetFileVersion("..\G940LEDControl\Bin\" + AppExeName)
+#define AppPublisher "X²Software"
+#define AppURL "http://g940.x2software.net/r"
+
+[Setup]
+AppId={{704baf93-d22e-471b-bdcf-d21d82d73398}
+AppName={#AppName}
+AppVersion={#AppVersion}
+AppPublisher={#AppPublisher}
+AppPublisherURL={#AppURL}
+AppSupportURL={#AppURL}
+AppUpdatesURL={#AppURL}
+DefaultDirName={pf}\{#AppName}
+DefaultGroupName={#AppName}
+AllowNoIcons=yes
+;LicenseFile=..\license.txt
+OutputDir=output
+OutputBaseFilename=G940LEDControlSetup-{#AppVersion}
+Compression=lzma
+SolidCompression=yes
+
+[Languages]
+Name: "english"; MessagesFile: "compiler:Default.isl"
+
+[Tasks]
+Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
+
+[Files]
+Source: "..\G940LEDControl\Bin\{#AppExeName}"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\G940LEDControl\Bin\LogiJoystickDLL.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\G940LEDControl\Bin\SimConnect.dll"; DestDir: "{app}"; Flags: ignoreversion
+
+[Icons]
+Name: "{group}\{#AppName}"; Filename: "{app}\{#AppExeName}"
+Name: "{commondesktop}\{#AppName}"; Filename: "{app}\{#AppExeName}"; Tasks: desktopicon
+
+[Run]
+Filename: "{app}\{#AppExeName}"; Description: "{cm:LaunchProgram,{#AppName}}"; Flags: nowait postinstall skipifsilent
+