diff --git a/.gitignore b/.gitignore
index d52439158b..38d41211d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,11 +23,11 @@ _NCrunch_*/
 umbraco.config
 *.vs10x
 App_Data/TEMP/*
-umbraco/presentation/umbraco/plugins/*
-umbraco/presentation/usercontrols/*
-umbraco/presentation/scripts/*
-umbraco/presentation/fonts/*
-umbraco/presentation/css/*
+[Uu]mbraco/[Pp]resentation/[Uu]mbraco/[Pp]lugins/*
+[Uu]mbraco/[Pp]resentation/[Uu]ser[Cc]ontrols/*
+[Uu]mbraco/[Pp]resentation/[Ss]cripts/*
+[Uu]mbraco/[Pp]resentation/[Ff]onts/*
+[Uu]mbraco/[Pp]resentation/[Cc]ss/*
 
 src/Umbraco.Web.UI/[Cc]ss/*
 src/Umbraco.Web.UI/App_Code/*
@@ -44,7 +44,6 @@ src/Umbraco.Web.UI/Web.*.config.transformed
 umbraco/presentation/umbraco/plugins/uComponents/uComponentsInstaller.ascx
 umbraco/presentation/packages/uComponents/MultiNodePicker/CustomTreeService.asmx
 _BuildOutput/*
-*.ncrunchsolution
 build/UmbracoCms.AllBinaries*zip
 build/UmbracoCms.WebPI*zip
 build/UmbracoCms*zip
@@ -54,30 +53,28 @@ src/Umbraco.Tests/config/trees.config
 src/Umbraco.Web.UI/web.config
 *.orig
 src/Umbraco.Tests/config/404handlers.config
-src/Umbraco.Web.UI/Views/*.cshtml
-src/Umbraco.Web.UI/Views/*.vbhtml
-src/Umbraco.Tests/config/umbracoSettings.config
-src/Umbraco.Web.UI/App_Plugins/*
-src/Umbraco.Web.UI/Views/*
+src/Umbraco.Web.UI/[Vv]iews/*.cshtml
+src/Umbraco.Web.UI/[Vv]iews/*.vbhtml
+src/Umbraco.Tests/[Cc]onfig/umbracoSettings.config
+src/Umbraco.Web.UI/[Vv]iews/*
 src/packages/
 src/packages/repositories.config
 
-src/Umbraco.Web.UI/[W]eb.config
+src/Umbraco.Web.UI/[Ww]eb.config
 *.transformed
 webpihash.txt
 
 node_modules
-src/Umbraco.Web.UI/umbraco/lib/*
-src/Umbraco.Web.UI/umbraco/js/umbraco.*
-src/Umbraco.Web.UI/umbraco/js/routes.js
-src/Umbraco.Web.UI/umbraco/js/main.js
-src/Umbraco.Web.UI/umbraco/js/app.js
-src/Umbraco.Web.UI/umbraco/Views/**/*.js
-src/Umbraco.Web.UI/umbraco/Views/**/*.css
-src/Umbraco.Web.UI/umbraco/Views/**/*.html
-src/Umbraco.Web.UI/umbraco/assets/*
-src/Umbraco.Web.UI.Client/build/*
-src/Umbraco.Web.UI.Client/build/*
-src/Umbraco.Web.UI.Client/build/belle/
-src/Umbraco.Web.UI/UserControls/
+src/Umbraco.Web.UI/[Uu]mbraco/[Ll]ib/*
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/umbraco.*
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/routes.js
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/main.js
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/app.js
+src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.js
+src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.css
+src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.html
+src/Umbraco.Web.UI/[Uu]mbraco/[Aa]ssets/*
+src/Umbraco.Web.UI.Client/[Bb]uild/*
+src/Umbraco.Web.UI.Client/[Bb]uild/[Bb]elle/
+src/Umbraco.Web.UI/[Uu]ser[Cc]ontrols/
 build/_BuildOutput/