diff --git a/.htaccess b/.htaccess
index 8e16ebe..d37f705 100644
--- a/.htaccess
+++ b/.htaccess
@@ -8,39 +8,27 @@
 
     SetEnv TZ Europe/Kiev
 
-<IfModule mod_rewrite.c>
-
     RewriteEngine On
 
-    RewriteBase /
-    
-    # deal with admin first
-    RewriteRule ^storage/(.*)?$ /storage/$1 [L,PT]
-
-    RewriteCond %{REQUEST_URI} ^/(admin)
-
-    RewriteRule ^admin/assets/(.*)$ backend/web/assets/$1 [L]
-    RewriteRule ^admin/css/(.*)$ backend/web/css/$1 [L]
-    RewriteRule ^admin/js/(.*)$ backend/web/js/$1 [L]
-    RewriteRule ^admin/images/(.*)$ backend/web/images/$1 [L]
-    RewriteRule ^admin/fonts/(.*)$ backend/web/fonts/$1 [L]
-
-    RewriteCond %{REQUEST_URI} !^/backend/web/(assets|css|js|images|fonts)/
-    RewriteCond %{REQUEST_URI} ^/(admin)
-    RewriteRule ^.*$ backend/web/index.php [L]
-
-    RewriteCond %{REQUEST_URI} ^/(assets|css)
-    RewriteRule ^assets/(.*)$ frontend/web/assets/$1 [L]
-    RewriteRule ^css/(.*)$ frontend/web/css/$1 [L]
-    RewriteRule ^js/(.*)$ frontend/web/js/$1 [L]
-    RewriteRule ^images/(.*)$ frontend/web/images/$1 [L]
-    RewriteRule ^fonts/(.*)$ frontend/web/fonts/$1 [L]
+<IfModule mod_rewrite.c>
 
+    RewriteEngine On
 
-    RewriteCond %{REQUEST_URI} !^/(frontend|backend)/web/(assets|css|js|images|fonts)/
-    RewriteCond %{REQUEST_URI} !index.php
-    RewriteCond %{REQUEST_FILENAME} !-f [OR]
+    # the main rewrite rule for the frontend application
+    RewriteCond %{REQUEST_URI} !^/(backend/web|admin)
+    RewriteRule !^frontend/web /frontend/web%{REQUEST_URI} [L]
+  
+    RewriteCond %{REQUEST_URI} ^/frontend/web
+    RewriteCond %{REQUEST_FILENAME} !-f
     RewriteCond %{REQUEST_FILENAME} !-d
-    RewriteRule ^.*$ frontend/web/index.php
+    RewriteRule . /frontend/web/index.php [L]
+ 
+    RewriteCond %{REQUEST_URI} ^/backend/web
+    RewriteCond %{REQUEST_FILENAME} !-f
+    RewriteCond %{REQUEST_FILENAME} !-d
+    RewriteRule . /backend/web/index.php [L]
 
+    RewriteCond %{REQUEST_URI} \.(htaccess|htpasswd|svn|git)
+    RewriteRule \.(htaccess|htpasswd|svn|git) - [F]
+    
 </IfModule>
\ No newline at end of file
--
libgit2 0.21.4