diff --git a/.htaccess b/.htaccess
index d37f705..effc303 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,34 +1,70 @@
-    AddDefaultCharset utf-8
-
-    Options -Indexes +FollowSymlinks -MultiViews
-    DirectoryIndex index.php
-
-    AddHandler server-parsed .html
-    AddOutputFilter INCLUDES .html 
+<IfModule mod_rewrite.c>
 
-    SetEnv TZ Europe/Kiev
+    Options +FollowSymlinks
 
     RewriteEngine On
 
+</IfModule>
+
 <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]
+
+
+    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 [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]
-    
+    RewriteRule ^.*$ frontend/web/index.php
+
+</IfModule>
+
+#для возможности загрузки файлов парсера
+<IfModule mod_php5.c>
+    php_value upload_max_filesize 20M
+    php_value post_max_size 30M
 </IfModule>
\ No newline at end of file
diff --git a/backend/config/main.php b/backend/config/main.php
index b2c4c06..40a62d5 100644
--- a/backend/config/main.php
+++ b/backend/config/main.php
@@ -40,6 +40,15 @@ return [
         'errorHandler' => [
             'errorAction' => 'site/error',
         ],
+        'request'=>[
+
+            'class' => 'common\components\Request',
+
+            'web'=> '/backend/web',
+
+            'adminUrl' => '/admin'
+
+        ],
     ],
     'params' => $params,
 ];
diff --git a/common/components/Request.php b/common/components/Request.php
new file mode 100755
index 0000000..f3a4f37
--- /dev/null
+++ b/common/components/Request.php
@@ -0,0 +1,40 @@
+<?php
+namespace common\components;
+
+class Request extends \yii\web\Request
+
+{
+
+    public $web;
+
+    public $adminUrl;
+
+
+
+    public function getBaseUrl()
+
+    {
+
+        return str_replace($this->web, "", parent::getBaseUrl()) . $this->adminUrl;
+
+    }
+
+
+
+    public function resolvePathInfo()
+
+    {
+
+        if ($this->getUrl() === $this->adminUrl) {
+
+            return "";
+
+        } else {
+
+            return parent::resolvePathInfo();
+
+        }
+
+    }
+
+}
\ No newline at end of file
diff --git a/common/config/main.php b/common/config/main.php
index 3e1b289..f47eb54 100644
--- a/common/config/main.php
+++ b/common/config/main.php
@@ -6,12 +6,10 @@ return [
             'class' => 'yii\caching\FileCache',
         ],
         'urlManager' => [
-            'enablePrettyUrl' => false,
+            'enablePrettyUrl' => true,
             'showScriptName' => false,
             'class'=> 'common\components\LangUrlManager',
             'rules'=>[
-                '/' => 'site/index',
-                '<controller:\w+>/<action:\w+>/*'=>'<controller>/<action>',
             ]
         ],
         'request' => [
diff --git a/frontend/config/main.php b/frontend/config/main.php
index 1f58b6a..096b756 100644
--- a/frontend/config/main.php
+++ b/frontend/config/main.php
@@ -17,6 +17,13 @@ return [
             'identityClass' => 'common\models\User',
             'enableAutoLogin' => true,
         ],
+        'request'=>[
+
+            'class' => 'common\components\Request',
+
+            'web'=> '/frontend/web'
+
+        ],
         'log' => [
             'traceLevel' => YII_DEBUG ? 3 : 0,
             'targets' => [
@@ -34,8 +41,7 @@ return [
             'enablePrettyUrl' => true,
             'showScriptName' => false, 
                 'rules' => [
-                    '' => 'site/index',
-                    '<controller>/<action>' => '<controller>/<action>', 
+
                 ]
         ],
     ],
--
libgit2 0.21.4