diff --git a/Application/Application.vcproj b/Application/Application.vcproj
index 632f2bf5..d11e0873 100644
--- a/Application/Application.vcproj
+++ b/Application/Application.vcproj
@@ -290,7 +290,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="if not exist ..\testbench\x32\debug\skins (mkdir ..\testbench\x32\debug\skins)&#x0D;&#x0A;if not exist ..\testbench\x32\debug\themes (mkdir ..\testbench\x32\debug\themes)&#x0D;&#x0A;echo &quot;Copying the skins...&quot;&#x0D;&#x0A;xcopy /Q /S /Y ..\Install\Skins ..\testbench\x32\debug\skins&#x0D;&#x0A;xcopy /Q /S /Y ..\Install\Themes ..\testbench\x32\debug\themes&#x0D;&#x0A;xcopy /Q /S /Y ..\Install\Default.ini ..\testbench\x32\debug\"
+				CommandLine="if not exist ..\testbench\x32\debug\skins (mkdir ..\testbench\x32\debug\skins)&#x0D;&#x0A;if not exist ..\testbench\x32\debug\themes (mkdir ..\testbench\x32\debug\themes)&#x0D;&#x0A;echo &quot;Copying the skins...&quot;&#x0D;&#x0A;xcopy /Q /S /Y ..\Install\Skins ..\testbench\x32\debug\skins&#x0D;&#x0A;xcopy /Q /S /Y ..\Install\Themes ..\testbench\x32\debug\themes&#x0D;&#x0A;xcopy /Q /S /Y ..\Install\Default.ini ..\testbench\x32\debug\&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@@ -476,7 +476,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="if not exist ..\testbench\x32\release\skins (mkdir ..\testbench\x32\release\skins)&#x0D;&#x0A;if not exist ..\testbench\x32\release\themes (mkdir ..\testbench\x32\release\themes)&#x0D;&#x0A;echo &quot;Copying the skins...&quot;&#x0D;&#x0A;xcopy /Q /S /Y ..\Install\Skins ..\testbench\x32\release\skins&#x0D;&#x0A;xcopy /Q /S /Y ..\Install\Themes ..\testbench\x32\release\themes&#x0D;&#x0A;xcopy /Q /S /Y ..\Install\Default.ini ..\testbench\x32release\"
+				CommandLine="if not exist ..\testbench\x32\release\skins (mkdir ..\testbench\x32\release\skins)&#x0D;&#x0A;if not exist ..\testbench\x32\release\themes (mkdir ..\testbench\x32\release\themes)&#x0D;&#x0A;echo &quot;Copying the skins...&quot;&#x0D;&#x0A;xcopy /Q /S /Y ..\Install\Skins ..\testbench\x32\release\skins&#x0D;&#x0A;xcopy /Q /S /Y ..\Install\Themes ..\testbench\x32\release\themes&#x0D;&#x0A;xcopy /Q /S /Y ..\Install\Default.ini ..\testbench\x32\release\&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
diff --git a/Library/TrayWindow.cpp b/Library/TrayWindow.cpp
index 72f4fae5..55898f1a 100644
--- a/Library/TrayWindow.cpp
+++ b/Library/TrayWindow.cpp
@@ -471,8 +471,8 @@ LRESULT CALLBACK CTrayWindow::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
 			}
 			else if(wParam == ID_CONTEXT_MANAGETHEMES)
 			{
-				std::wstring command = Rainmeter->GetPath();
-				command += L"\\Addons\\RainThemes\\RainThemes.exe";
+				std::wstring command = L"\"" + Rainmeter->GetPath();
+				command += L"\\Addons\\RainThemes\\RainThemes.exe\"";
 				LSExecute(tray->GetWindow(), command.c_str(), SW_SHOWNORMAL);
 			}
 			else if(wParam == ID_CONTEXT_QUIT)
@@ -495,8 +495,8 @@ LRESULT CALLBACK CTrayWindow::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
 				const std::vector<std::wstring>& themes = Rainmeter->GetAllThemes();
 				if (pos >= 0 && pos < themes.size())
 				{
-					std::wstring command = Rainmeter->GetPath();
-					command += L"\\Addons\\RainThemes\\RainThemes.exe /load \"";
+					std::wstring command = L"\"" + Rainmeter->GetPath();
+					command += L"\\Addons\\RainThemes\\RainThemes.exe\" /load \"";
 					command += themes[pos];
 					command += L"\"";
 					LSExecute(tray->GetWindow(), command.c_str(), SW_SHOWNORMAL);
diff --git a/revision-number.h b/revision-number.h
index f03afe06..2e541cfb 100644
--- a/revision-number.h
+++ b/revision-number.h
@@ -1,2 +1,2 @@
 #pragma once
-const int revision_number = 178;
\ No newline at end of file
+const int revision_number = 180;
\ No newline at end of file