diff --git a/ep_gui/resources/lang/ep_gui.en-US.rc b/ep_gui/resources/lang/ep_gui.en-US.rc
index e2beade..8b5e678 100644
--- a/ep_gui/resources/lang/ep_gui.en-US.rc
+++ b/ep_gui/resources/lang/ep_gui.en-US.rc
@@ -392,13 +392,13 @@ BEGIN
     IDS_ADV_LEARN               "Learn more"
     IDS_ADV_CONSOLE             "Enable console"
     IDS_ADV_MEMCHECK            "Dump memory leaks"
-    IDS_ADV_AUTOHIDE            "Double click taskbar to toggle auto-hide (only works when the taskbar is locked)"
+    IDS_ADV_AUTOHIDE            "Double click taskbar to toggle auto-hide (only works when locked)"
     IDS_ADV_PAINTDESKTOPVERSION "Show Windows build info on the desktop"
     IDS_ADV_CLASSICTHEME        "Enable advanced mitigations for correct rendering using classic theme"
     IDS_ADV_SYSLISTVIEW32       "Enable SysListView32 for Explorer views"
     IDS_ADV_NOPROPERTIES        "Do not change the taskbar context menu (e.g. do not display the ""Properties"" item)"
     IDS_ADV_SYMBOLS             "Enable symbols download"
-    IDS_ADV_PINNEDITEMS         "Pinned items act as quick launch (don't group pinned items with active apps)"
+    IDS_ADV_PINNEDITEMS         "Pinned items act as quick launch (don't group with active apps)"
     IDS_ADV_REMOVEEXTRAGAP      "When the taskbar shows button labels, remove the extra gap around pinned items"
     IDS_ADV_DELAY               "Supplementary delay at logon"
     IDS_ADV_DELAY_0             "None (default)"
diff --git a/ep_setup/ep_setup.c b/ep_setup/ep_setup.c
index 65bdfee..a926610 100644
--- a/ep_setup/ep_setup.c
+++ b/ep_setup/ep_setup.c
@@ -5,7 +5,7 @@ processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'\"")
 #include <stdio.h>
 #include <Shlwapi.h>
 #pragma comment(lib, "Shlwapi.lib")
-#include "resource.h"
+#include "resources/resource.h"
 #include "../ExplorerPatcher/utility.h"
 
 BOOL ShouldDownloadOrDelete(BOOL bInstall, HINSTANCE hInstance, LPCWSTR wszPath, LPCSTR chash)
diff --git a/ep_setup/ep_setup.vcxproj b/ep_setup/ep_setup.vcxproj
index 85237a6..74755a5 100644
--- a/ep_setup/ep_setup.vcxproj
+++ b/ep_setup/ep_setup.vcxproj
@@ -156,7 +156,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\ExplorerPatcher\utility.h" />
-    <ClInclude Include="resource.h" />
+    <ClInclude Include="resources\resource.h" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="resources\ep_setup.rc">
diff --git a/ep_setup/resources/ep_setup.en-US.rc b/ep_setup/resources/lang/ep_setup.en-US.rc
similarity index 93%
rename from ep_setup/resources/ep_setup.en-US.rc
rename to ep_setup/resources/lang/ep_setup.en-US.rc
index 8a585f1..b56cc6b 100644
--- a/ep_setup/resources/ep_setup.en-US.rc
+++ b/ep_setup/resources/lang/ep_setup.en-US.rc
@@ -1,4 +1,4 @@
-#include "resource.h"
+#include "resources/resource.h"
 #include "winres.h"
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
@@ -10,5 +10,5 @@ BEGIN
     IDS_SETUP_UNINSTALL_LOGOFF  "To complete the uninstallation, you will be automatically signed out of Windows.\n\nDo you want to continue?"
     IDS_SETUP_UNINSTALL_RESTART "Please reboot the PC to complete the uninstall.\n\nDo you want to reboot now?"
     IDS_SETUP_UNINSTALL_FINISH  "Uninstall completed. Thank you for using ExplorerPatcher."
-    IDS_SETUP_FAILED            "An error has occurred while servicing ExplorerPatcher.\nThis is most likely caused by one or more of the backup files from a previous update still being in use. Unlocking the files should fix this issue.\n\nTroubleshooting steps:\n• Close and reopen the ""Properties"" dialog if it is currently open.\n• Kill and restart all ""explorer.exe"" processes.\n• If you have registered ExplorerPatcher as a shell extension, then restarting the PC will probably fix this.\n• Lastly, reboot the PC and try again.",
+    IDS_SETUP_FAILED            "An error has occurred while servicing ExplorerPatcher.\nThis is most likely caused by one or more of the backup files from a previous update still being in use. Unlocking the files should fix this issue.\n\nTroubleshooting steps:\n• Close and reopen the ""Properties"" dialog if it is currently open.\n• Kill and restart all ""explorer.exe"" processes.\n• If you have registered ExplorerPatcher as a shell extension, then restarting the PC will probably fix this.\n• Lastly, reboot the PC and try again."
 END
diff --git a/ep_setup/resource.h b/ep_setup/resources/resource.h
similarity index 100%
rename from ep_setup/resource.h
rename to ep_setup/resources/resource.h