diff --git a/build/RevertToCleanInstall.bat b/build/RevertToCleanInstall.bat
index 893b7216ee..6c391386cd 100644
--- a/build/RevertToCleanInstall.bat
+++ b/build/RevertToCleanInstall.bat
@@ -21,29 +21,44 @@ echo ^<?xml version="1.0" encoding="utf-8"?^>^<packages^>^</packages^> >..\src\U
 echo Removing plugin cache files
 del ..\src\Umbraco.Web.UI\App_Data\TEMP\PluginCache\*.*
 
+echo Removing cache files and examine index
+del ..\src\Umbraco.Web.UI\App_Data\TEMP\*.*
+
 echo Removing log files
 del ..\src\Umbraco.Web.UI\App_Data\Logs\*.*
 
+echo Removing packages
+del ..\src\Umbraco.Web.UI\App_Data\packages\*.*
+
+echo Removing previews
+del ..\src\Umbraco.Web.UI\App_Data\preview\*.*
+
+echo Removing app code files (typically added by starterkits)
+del ..\src\Umbraco.Web.UI\App_Code\*.*
+
 echo Removing xslt files
-del ..\src\Umbraco.Web.UI\Xslt\*.*
+del ..\src\Umbraco.Web.UI\xslt\*.*
 
 echo Removing user control files
 del ..\src\Umbraco.Web.UI\UserControls\*.*
 
+echo Removing masterpage files
+del ..\src\Umbraco.Web.UI\masterpages\*.*
+
 echo Removing view files
 del ..\src\Umbraco.Web.UI\Views\*.*
 
 echo Removing razor files
-del ..\src\Umbraco.Web.UI\MacroScripts\*.*
+del ..\src\Umbraco.Web.UI\macroScripts\*.*
 
 echo Removing media files
-del ..\src\Umbraco.Web.UI\Media\*.*
+del ..\src\Umbraco.Web.UI\media\*.*
 
 echo Removing script files
-del ..\src\Umbraco.Web.UI\Scripts\*.*
+del ..\src\Umbraco.Web.UI\scripts\*.*
 
 echo Removing css files
-del ..\src\Umbraco.Web.UI\Css\*.*
+del ..\src\Umbraco.Web.UI\css\*.*
 
 echo "Umbraco install reverted to clean install"
 pause 
@@ -64,29 +79,44 @@ echo ^<?xml version="1.0" encoding="utf-8"?^>^<packages^>^</packages^> >..\src\U
 echo Removing plugin cache files
 FOR %%A IN (..\src\Umbraco.Web.UI\App_Data\TEMP\PluginCache\*.*) DO DEL %%A
 
+echo Removing cache files and examine index
+FOR %%A IN (..\src\Umbraco.Web.UI\App_Data\TEMP\*.*) DO DEL %%A
+
 echo Removing log files
 FOR %%A IN (..\src\Umbraco.Web.UI\App_Data\Logs\*.*) DO DEL %%A
 
+echo Removing packages
+FOR %%A IN (..\src\Umbraco.Web.UI\App_Data\packages\*.*) DO DEL %%A
+
+echo Removing previews
+FOR %%A IN (..\src\Umbraco.Web.UI\App_Data\preview\*.*) DO DEL %%A
+
+echo Removing app code files (typically added by starterkits)
+FOR %%A IN (..\src\Umbraco.Web.UI\App_Code\*.*) DO DEL %%A
+
 echo Removing xslt files
-FOR %%A IN (..\src\Umbraco.Web.UI\Xslt\*.*) DO DEL %%A
+FOR %%A IN (..\src\Umbraco.Web.UI\xslt\*.*) DO DEL %%A
+
+echo Removing masterpage files
+FOR %%A IN (..\src\Umbraco.Web.UI\masterpages\*.*) DO DEL %%A
 
 echo Removing user control files
-FOR %%A IN (..\src\Umbraco.Web.UI\UserControls\*.*) DO DEL %%A
+FOR %%A IN (..\src\Umbraco.Web.UI\usercontrols\*.*) DO DEL %%A
 
 echo Removing view files
 FOR %%A IN (..\src\Umbraco.Web.UI\Views\*.*) DO DEL %%A
 
 echo Removing razor files
-FOR %%A IN (..\src\Umbraco.Web.UI\MacroScripts\*.*) DO DEL %%A
+FOR %%A IN (..\src\Umbraco.Web.UI\macroScripts\*.*) DO DEL %%A
 
 echo Removing media files
-FOR %%A IN (..\src\Umbraco.Web.UI\Media\*.*) DO DEL %%A
+FOR %%A IN (..\src\Umbraco.Web.UI\media\*.*) DO DEL %%A
 
 echo Removing script files
-FOR %%A IN (..\src\Umbraco.Web.UI\Scripts\*.*) DO DEL %%A
+FOR %%A IN (..\src\Umbraco.Web.UI\scripts\*.*) DO DEL %%A
 
 echo Removing css files
-FOR %%A IN (..\src\Umbraco.Web.UI\Css\*.*) DO DEL %%A
+FOR %%A IN (..\src\Umbraco.Web.UI\css\*.*) DO DEL %%A
 
 echo "Umbraco install reverted to clean install"
 pause