diff --git a/.gitignore b/.gitignore
index 21985710e..b2dc20145 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ coverage
 .settings/
 local/cache/*
 composer.lock
+web/assets/*
diff --git a/core/lib/Thelia/Admin/Templating/Template.class.php b/core/lib/Thelia/Admin/Templating/Template.php
similarity index 99%
rename from core/lib/Thelia/Admin/Templating/Template.class.php
rename to core/lib/Thelia/Admin/Templating/Template.php
index 526ed2cdd..99387367a 100644
--- a/core/lib/Thelia/Admin/Templating/Template.class.php
+++ b/core/lib/Thelia/Admin/Templating/Template.php
@@ -41,6 +41,7 @@ class Template extends Smarty
         if (! is_dir($cache_dir)) @mkdir($cache_dir, 0777, true);
 
         $web_root  = THELIA_WEB_DIR;
+
         $asset_dir_from_web_root = 'assets/admin/default'; // FIXME
 
         $this->asset_manager = new AssetsManager($web_root, $asset_dir_from_web_root);
diff --git a/web/.htaccess b/web/.htaccess
old mode 100644
new mode 100755
index a7acb85e6..4336ad269
--- a/web/.htaccess
+++ b/web/.htaccess
@@ -5,6 +5,8 @@ AddDefaultCharset UTF-8
 <IfModule mod_rewrite.c>
 	RewriteEngine on
 
-	RewriteBase /thelia2
+    RewriteCond %{REQUEST_FILENAME} !-f
+    RewriteCond %{REQUEST_FILENAME} !-d
+
 	RewriteRule ^admin(/.*)?$ index_dev.php/admin/$1 [L,QSA]
 </IfModule>
\ No newline at end of file