diff --git a/Blocks3D.vcproj b/Blocks3D.vcproj
index fbe4a2c..24c36f3 100644
--- a/Blocks3D.vcproj
+++ b/Blocks3D.vcproj
@@ -75,7 +75,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="Advapi32.lib UxTheme.lib Comctl32.lib Comdlg32.lib Shell32.lib"
+				AdditionalDependencies="Advapi32.lib Comctl32.lib Comdlg32.lib Shell32.lib"
 				OutputFile="./Blocks3D.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
diff --git a/Installer/install_script.iss b/Installer/install_script.iss
new file mode 100644
index 0000000..2ed2351
--- /dev/null
+++ b/Installer/install_script.iss
@@ -0,0 +1,37 @@
+;InnoSetupVersion=5.5.7
+
+[Setup]
+AppName=Blocks3D
+AppId={{4C5DF268-0208-4CDE-A7F0-65F7E2CB5067}
+AppVersion=v0_0_104_3
+AppPublisherURL=http://blocks3d.com/
+AppSupportURL=http://blocks3d.com/
+AppUpdatesURL=http://blocks3d.com/
+DefaultDirName={%localappdata}\Blocks3D
+OutputBaseFilename=Blocks3D_Setup_{#SetupSetting("AppVersion")}
+Compression=lzma2
+PrivilegesRequired=lowest
+WizardImageFile=setup.bmp
+
+
+[UninstallDelete]
+Type: filesandordirs; Name: "{app}"
+
+[Files]
+Source: "Redist\vcredist_x86.exe"; DestDir: "{tmp}"; Flags: ignoreversion 
+Source: "Redist\vcredist_x64.exe"; DestDir: "{tmp}"; Check: "IsWin64"; Flags: ignoreversion 
+Source: "..\content\*"; DestDir: "{app}\content"; Flags: ignoreversion recursesubdirs
+Source: "..\SDL.DLL"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs
+Source: "..\Blocks3D.exe"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs
+
+[Registry]
+
+
+[Run]
+Filename: "{tmp}\vcredist_x86.exe"; Parameters: "/q"; Tasks: instvc; 
+Filename: "{tmp}\vcredist_x64.exe"; Parameters: "/q"; Tasks: instvc; Check: "IsWin64";
+Filename: "iexplore.exe"; Parameters: "http://www.blocks3d.com/FirstInstall"; Description: Start playing Blocks3D; Flags: shellexec postinstall nowait skipifsilent
+
+[Tasks]
+Name: "instvc"; Description: "Install Visual C++ Redistributable 2005 SP1 (Requires elevated permissions)";
+
diff --git a/Installer/setup.bmp b/Installer/setup.bmp
new file mode 100644
index 0000000..58e12c6
Binary files /dev/null and b/Installer/setup.bmp differ
diff --git a/src/source/propertyGrid.cpp b/src/source/propertyGrid.cpp
index 591214b..51ee92a 100644
--- a/src/source/propertyGrid.cpp
+++ b/src/source/propertyGrid.cpp
@@ -959,7 +959,7 @@ static HWND CreateEdit(HINSTANCE hInstance, HWND hwndParent, INT id)
         return NULL;
 
     //DWM 1.4: Added Disable visual styles for this control.
-    SetWindowTheme(hwnd, L" ", L" ");
+   // SetWindowTheme(hwnd, L" ", L" ");
 
     SendMessage(hwnd, WM_SETFONT, (WPARAM)GetStockObject(DEFAULT_GUI_FONT), 0L);
 
@@ -1268,7 +1268,7 @@ static HWND CreateButton(HINSTANCE hInstance, HWND hwndParent, INT id)
         return NULL;
 
     //DWM 1.4: Added Disable visual styles for this control.
-    SetWindowTheme(hwnd, L" ", L" ");
+    //SetWindowTheme(hwnd, L" ", L" ");
 
     SendMessage(hwnd, WM_SETFONT, (WPARAM)GetStockObject(DEFAULT_GUI_FONT), 0L);
 
@@ -1505,7 +1505,7 @@ static HWND CreateDatePicker(HINSTANCE hInstance, HWND hwndParent, INT id, BOOL
         return NULL;
 
     //DWM 1.4: Added Disable visual styles for this control.
-    SetWindowTheme(hwnd, L" ", L" ");
+    //SetWindowTheme(hwnd, L" ", L" ");
 
     SendMessage(hwnd, WM_SETFONT, (WPARAM)GetStockObject(DEFAULT_GUI_FONT), 0L);
 
@@ -1697,7 +1697,7 @@ static HWND CreateCombo(HINSTANCE hInstance, HWND hwndParent, INT id, BOOL fEdit
 
     //DWM 1.4: Disable visual styles for the time being since the combo looks bad
     // in this grid when drawn using the Vista and later styles.
-    SetWindowTheme(hwnd, L" ", L" ");
+    //SetWindowTheme(hwnd, L" ", L" ");
 
     SendMessage(hwnd, WM_SETFONT, (WPARAM)GetStockObject(DEFAULT_GUI_FONT), 0L);