diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 6fa092e..30a3917 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,18 +2,22 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="56e91349-2444-4553-bc78-90c2bab49e9c" name="Default" comment="">
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/contenters/CXZ.py" afterPath="$PROJECT_DIR$/resources/contenters/CXZ.py" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/resources/skins/DialogXml.py" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/resources/skins/__init__.py" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/resources/skins/Default/720p/movieinfo.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Content.py" afterPath="$PROJECT_DIR$/Content.py" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Core.py" afterPath="$PROJECT_DIR$/Core.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/contenters/EZTV.py" afterPath="$PROJECT_DIR$/resources/contenters/EZTV.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/contenters/FastTorrent.py" afterPath="$PROJECT_DIR$/resources/contenters/FastTorrent.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/contenters/IMDB.py" afterPath="$PROJECT_DIR$/resources/contenters/IMDB.py" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/contenters/KickAssSo.py" afterPath="$PROJECT_DIR$/resources/contenters/KickAssSo.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/contenters/KinoPoisk.py" afterPath="$PROJECT_DIR$/resources/contenters/KinoPoisk.py" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/searchers/KickAssSo.py" afterPath="$PROJECT_DIR$/resources/searchers/KickAssSo.py" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Localization.py" afterPath="$PROJECT_DIR$/Localization.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/contenters/RiperAM.py" afterPath="$PROJECT_DIR$/resources/contenters/RiperAM.py" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/addon.xml" afterPath="$PROJECT_DIR$/addon.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/scrapers/cache.py" afterPath="$PROJECT_DIR$/resources/scrapers/cache.py" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cal.py" afterPath="$PROJECT_DIR$/cal.py" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/changelog.txt" afterPath="$PROJECT_DIR$/changelog.txt" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/functions.py" afterPath="$PROJECT_DIR$/functions.py" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/settings.xml" afterPath="$PROJECT_DIR$/resources/settings.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/language/English/strings.xml" afterPath="$PROJECT_DIR$/resources/language/English/strings.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/language/Russian/strings.xml" afterPath="$PROJECT_DIR$/resources/language/Russian/strings.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="plugin.video.torrenter.iws" />
@@ -48,56 +52,83 @@
           <file leaf-file-name="Core.py" pinned="false" current="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/Core.py">
               <provider selected="true" editor-type-id="text-editor">
-                <state vertical-scroll-proportion="-15.428572" vertical-offset="1064" max-vertical-offset="4658">
-                  <caret line="665" column="11" selection-start-line="665" selection-start-column="11" selection-end-line="665" selection-end-column="23" />
+                <state vertical-scroll-proportion="-29.321428" vertical-offset="9498" max-vertical-offset="11067">
+                  <caret line="1492" column="0" selection-start-line="1492" selection-start-column="0" selection-end-line="1492" selection-end-column="0" />
                   <folding>
                     <element signature="e#24#781#1" expanded="false" />
-                    <element signature="e#2318#2615#0" expanded="false" />
-                    <element signature="e#2652#7286#0" expanded="false" />
-                    <element signature="e#7325#19290#0" expanded="false" />
-                    <element signature="e#19331#20097#0" expanded="false" />
-                    <element signature="e#20148#27163#0" expanded="false" />
-                    <element signature="e#27207#30636#0" expanded="false" />
-                    <element signature="e#30677#31904#0" expanded="false" />
-                    <element signature="e#32004#36358#0" expanded="false" />
-                    <element signature="e#36406#38470#0" expanded="false" />
-                    <element signature="e#45082#51439#0" expanded="false" />
-                    <element signature="e#53607#55566#0" expanded="false" />
-                    <element signature="e#55723#56975#0" expanded="false" />
-                    <element signature="e#57031#57448#0" expanded="false" />
-                    <element signature="e#57490#57599#0" expanded="false" />
-                    <element signature="e#57642#57762#0" expanded="false" />
-                    <element signature="e#57812#57963#0" expanded="false" />
-                    <element signature="e#58016#65770#0" expanded="false" />
-                    <element signature="e#65819#65858#0" expanded="false" />
-                    <element signature="e#65907#66697#0" expanded="false" />
-                    <element signature="e#66747#69547#0" expanded="false" />
-                    <element signature="e#69592#70341#0" expanded="false" />
-                    <element signature="e#70389#71885#0" expanded="false" />
-                    <element signature="e#71930#72803#0" expanded="false" />
-                    <element signature="e#72851#78920#0" expanded="false" />
-                    <element signature="e#78968#80752#0" expanded="false" />
-                    <element signature="e#80802#80898#0" expanded="false" />
-                    <element signature="e#80961#81488#0" expanded="false" />
-                    <element signature="e#81549#86761#0" expanded="false" />
-                    <element signature="e#86805#86862#0" expanded="false" />
-                    <element signature="e#86916#90265#0" expanded="false" />
-                    <element signature="e#90320#92251#0" expanded="false" />
-                    <element signature="e#92317#92937#0" expanded="false" />
-                    <element signature="e#92980#93651#0" expanded="false" />
-                    <element signature="e#93687#94476#0" expanded="false" />
-                    <element signature="e#94518#94613#0" expanded="false" />
-                    <element signature="e#94663#94811#0" expanded="false" />
+                    <element signature="e#2316#2613#0" expanded="false" />
+                    <element signature="e#2650#7284#0" expanded="false" />
+                    <element signature="e#7323#19288#0" expanded="false" />
+                    <element signature="e#19329#20095#0" expanded="false" />
+                    <element signature="e#20146#27161#0" expanded="false" />
+                    <element signature="e#27205#30634#0" expanded="false" />
+                    <element signature="e#30675#31902#0" expanded="false" />
+                    <element signature="e#32002#36356#0" expanded="false" />
+                    <element signature="e#36404#38468#0" expanded="false" />
+                    <element signature="e#38510#40305#0" expanded="false" />
+                    <element signature="e#40355#44978#0" expanded="false" />
+                    <element signature="e#53882#54693#0" expanded="false" />
+                    <element signature="e#54742#56701#0" expanded="false" />
+                    <element signature="e#56858#58110#0" expanded="false" />
+                    <element signature="e#58166#58583#0" expanded="false" />
+                    <element signature="e#58625#58734#0" expanded="false" />
+                    <element signature="e#58777#58897#0" expanded="false" />
+                    <element signature="e#58947#59098#0" expanded="false" />
+                    <element signature="e#66954#66993#0" expanded="false" />
+                    <element signature="e#67042#67832#0" expanded="false" />
+                    <element signature="e#70727#71476#0" expanded="false" />
+                    <element signature="e#71524#73020#0" expanded="false" />
+                    <element signature="e#73065#73938#0" expanded="false" />
+                    <element signature="e#81864#81960#0" expanded="false" />
+                    <element signature="e#82023#82550#0" expanded="false" />
+                    <element signature="e#82611#87823#0" expanded="false" />
+                    <element signature="e#87867#87924#0" expanded="false" />
+                    <element signature="e#87978#91327#0" expanded="false" />
+                    <element signature="e#91382#93313#0" expanded="false" />
+                    <element signature="e#93379#93999#0" expanded="false" />
+                    <element signature="e#94749#95538#0" expanded="false" />
+                    <element signature="e#95580#95675#0" expanded="false" />
+                    <element signature="e#95725#95873#0" expanded="false" />
                   </folding>
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="Content.py" pinned="false" current="true" current-in-tab="true">
+          <file leaf-file-name="ExtraTorrent.py" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/resources/searchers/ExtraTorrent.py">
+              <provider selected="true" editor-type-id="text-editor">
+                <state vertical-scroll-proportion="0.0" vertical-offset="861" max-vertical-offset="1802">
+                  <caret line="75" column="22" selection-start-line="75" selection-start-column="22" selection-end-line="75" selection-end-column="22" />
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="KickAssSo.py" pinned="false" current="false" current-in-tab="true">
+            <entry file="file://$PROJECT_DIR$/resources/searchers/KickAssSo.py">
+              <provider selected="true" editor-type-id="text-editor">
+                <state vertical-scroll-proportion="0.079617836" vertical-offset="1004" max-vertical-offset="1632">
+                  <caret line="66" column="33" selection-start-line="66" selection-start-column="33" selection-end-line="66" selection-end-column="33" />
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="Content.py" pinned="false" current="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/Content.py">
               <provider selected="true" editor-type-id="text-editor">
-                <state vertical-scroll-proportion="0.34931508" vertical-offset="1751" max-vertical-offset="4335">
-                  <caret line="124" column="0" selection-start-line="124" selection-start-column="0" selection-end-line="124" selection-end-column="0" />
+                <state vertical-scroll-proportion="0.0" vertical-offset="714" max-vertical-offset="4335">
+                  <caret line="51" column="18" selection-start-line="51" selection-start-column="8" selection-end-line="51" selection-end-column="18" />
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="addon.xml" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/addon.xml">
+              <provider selected="true" editor-type-id="text-editor">
+                <state vertical-scroll-proportion="0.0" vertical-offset="170" max-vertical-offset="510">
+                  <caret line="10" column="35" selection-start-line="10" selection-start-column="35" selection-end-line="10" selection-end-column="35" />
                   <folding />
                 </state>
               </provider>
@@ -106,8 +137,8 @@
           <file leaf-file-name="KickAssSo.py" pinned="false" current="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/resources/contenters/KickAssSo.py">
               <provider selected="true" editor-type-id="text-editor">
-                <state vertical-scroll-proportion="-2.877193" vertical-offset="1077" max-vertical-offset="1921">
-                  <caret line="73" column="0" selection-start-line="73" selection-start-column="0" selection-end-line="73" selection-end-column="0" />
+                <state vertical-scroll-proportion="-17.178572" vertical-offset="2341" max-vertical-offset="3043">
+                  <caret line="166" column="25" selection-start-line="166" selection-start-column="25" selection-end-line="166" selection-end-column="25" />
                   <folding>
                     <element signature="e#782#791#0" expanded="true" />
                   </folding>
@@ -115,11 +146,21 @@
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="Localization.py" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/Localization.py">
+          <file leaf-file-name="cal.py" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/cal.py">
               <provider selected="true" editor-type-id="text-editor">
-                <state vertical-scroll-proportion="-9.928572" vertical-offset="3581" max-vertical-offset="4148">
-                  <caret line="227" column="13" selection-start-line="227" selection-start-column="9" selection-end-line="227" selection-end-column="13" />
+                <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="306">
+                  <caret line="11" column="117" selection-start-line="11" selection-start-column="117" selection-end-line="11" selection-end-column="117" />
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="changelog.txt" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/changelog.txt">
+              <provider selected="true" editor-type-id="text-editor">
+                <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1360">
+                  <caret line="2" column="64" selection-start-line="2" selection-start-column="64" selection-end-line="2" selection-end-column="64" />
                   <folding />
                 </state>
               </provider>
@@ -129,138 +170,62 @@
       </split-first>
       <split-second>
         <leaf>
-          <file leaf-file-name="SearcherABC.py" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/SearcherABC.py">
-              <provider selected="true" editor-type-id="text-editor">
-                <state vertical-scroll-proportion="0.0" vertical-offset="1581" max-vertical-offset="3757">
-                  <caret line="93" column="52" selection-start-line="93" selection-start-column="52" selection-end-line="93" selection-end-column="52" />
-                  <folding />
-                </state>
-              </provider>
-            </entry>
-          </file>
           <file leaf-file-name="Libtorrent.py" pinned="false" current="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/Libtorrent.py">
               <provider selected="true" editor-type-id="text-editor">
-                <state vertical-scroll-proportion="0.0" vertical-offset="4471" max-vertical-offset="6732">
-                  <caret line="277" column="12" selection-start-line="277" selection-start-column="12" selection-end-line="277" selection-end-column="12" />
+                <state vertical-scroll-proportion="0.0" vertical-offset="4981" max-vertical-offset="6970">
+                  <caret line="293" column="48" selection-start-line="293" selection-start-column="48" selection-end-line="293" selection-end-column="48" />
                   <folding />
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="functions.py" pinned="false" current="false" current-in-tab="false">
+          <file leaf-file-name="DialogXml.py" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/resources/skins/DialogXml.py">
+              <provider selected="true" editor-type-id="text-editor">
+                <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1411">
+                  <caret line="9" column="44" selection-start-line="9" selection-start-column="44" selection-end-line="9" selection-end-column="44" />
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="movieinfo.xml" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/resources/skins/Default/720p/movieinfo.xml">
+              <provider selected="true" editor-type-id="text-editor">
+                <state vertical-scroll-proportion="0.0" vertical-offset="2543" max-vertical-offset="3808">
+                  <caret line="167" column="46" selection-start-line="167" selection-start-column="43" selection-end-line="167" selection-end-column="46" />
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="functions.py" pinned="false" current="true" current-in-tab="true">
             <entry file="file://$PROJECT_DIR$/functions.py">
               <provider selected="true" editor-type-id="text-editor">
-                <state vertical-scroll-proportion="0.0" vertical-offset="25825" max-vertical-offset="26503">
-                  <caret line="1548" column="0" selection-start-line="1548" selection-start-column="0" selection-end-line="1548" selection-end-column="0" />
+                <state vertical-scroll-proportion="0.3455414" vertical-offset="15695" max-vertical-offset="26588">
+                  <caret line="953" column="23" selection-start-line="953" selection-start-column="23" selection-end-line="953" selection-end-column="23" />
                   <folding />
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="net.py" pinned="false" current="false" current-in-tab="true">
+          <file leaf-file-name="settings.xml" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/resources/settings.xml">
+              <provider selected="true" editor-type-id="text-editor">
+                <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2941">
+                  <caret line="24" column="29" selection-start-line="24" selection-start-column="29" selection-end-line="24" selection-end-column="29" />
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="net.py" pinned="false" current="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/resources/utorrent/net.py">
               <provider selected="true" editor-type-id="text-editor">
-                <state vertical-scroll-proportion="1.0112" vertical-offset="116" max-vertical-offset="969">
+                <state vertical-scroll-proportion="0.0" vertical-offset="14501" max-vertical-offset="22848">
                   <caret line="853" column="13" selection-start-line="853" selection-start-column="13" selection-end-line="853" selection-end-column="13" />
-                  <folding>
-                    <element signature="e#1035#8981#0" expanded="false" />
-                    <element signature="e#1063#1400#0" expanded="false" />
-                    <element signature="e#1451#2546#0" expanded="false" />
-                    <element signature="e#2581#3672#0" expanded="false" />
-                    <element signature="e#3705#5438#0" expanded="false" />
-                    <element signature="e#5474#6446#0" expanded="false" />
-                    <element signature="e#6496#7776#0" expanded="false" />
-                    <element signature="e#7816#8114#0" expanded="false" />
-                    <element signature="e#8168#8506#0" expanded="false" />
-                    <element signature="e#8544#8981#0" expanded="false" />
-                    <element signature="e#9007#10161#0" expanded="false" />
-                    <element signature="e#9351#10026#0" expanded="false" />
-                    <element signature="e#10060#10161#0" expanded="false" />
-                    <element signature="e#10188#10687#0" expanded="false" />
-                    <element signature="e#10225#10410#0" expanded="false" />
-                    <element signature="e#10444#10687#0" expanded="false" />
-                    <element signature="e#10710#18412#0" expanded="false" />
-                    <element signature="e#10775#11132#0" expanded="false" />
-                    <element signature="e#11166#11736#0" expanded="false" />
-                    <element signature="e#11766#12548#0" expanded="false" />
-                    <element signature="e#12587#13184#0" expanded="false" />
-                    <element signature="e#13224#13571#0" expanded="false" />
-                    <element signature="e#13618#13922#0" expanded="false" />
-                    <element signature="e#13973#14140#0" expanded="false" />
-                    <element signature="e#14182#14503#0" expanded="false" />
-                    <element signature="e#14558#14727#0" expanded="false" />
-                    <element signature="e#14779#14860#0" expanded="false" />
-                    <element signature="e#14896#14900#0" expanded="false" />
-                    <element signature="e#14950#15522#0" expanded="false" />
-                    <element signature="e#15573#15663#0" expanded="false" />
-                    <element signature="e#15698#16224#0" expanded="false" />
-                    <element signature="e#16278#16860#0" expanded="false" />
-                    <element signature="e#16918#18412#0" expanded="false" />
-                    <element signature="e#16918#17225#1" expanded="false" />
-                    <element signature="e#18439#28666#0" expanded="false" />
-                    <element signature="e#18499#18828#0" expanded="false" />
-                    <element signature="e#18858#21531#0" expanded="false" />
-                    <element signature="e#21565#21797#0" expanded="false" />
-                    <element signature="e#21836#23117#0" expanded="false" />
-                    <element signature="e#23164#23361#0" expanded="false" />
-                    <element signature="e#23412#23567#0" expanded="false" />
-                    <element signature="e#23603#23607#0" expanded="false" />
-                    <element signature="e#23649#24386#0" expanded="false" />
-                    <element signature="e#24441#24935#0" expanded="false" />
-                    <element signature="e#24987#25522#0" expanded="false" />
-                    <element signature="e#25563#27337#0" expanded="false" />
-                    <element signature="e#27388#27914#0" expanded="false" />
-                    <element signature="e#27948#28178#0" expanded="false" />
-                    <element signature="e#28220#28368#0" expanded="false" />
-                    <element signature="e#28410#28666#0" expanded="false" />
-                    <element signature="e#28687#36366#0" expanded="false" />
-                    <element signature="e#28747#28943#0" expanded="false" />
-                    <element signature="e#28977#29093#0" expanded="false" />
-                    <element signature="e#29123#30370#0" expanded="false" />
-                    <element signature="e#30404#30655#0" expanded="false" />
-                    <element signature="e#30694#31685#0" expanded="false" />
-                    <element signature="e#31723#31872#0" expanded="false" />
-                    <element signature="e#31919#32220#0" expanded="false" />
-                    <element signature="e#32271#32671#0" expanded="false" />
-                    <element signature="e#32707#32711#0" expanded="false" />
-                    <element signature="e#32753#33139#0" expanded="false" />
-                    <element signature="e#33194#33566#0" expanded="false" />
-                    <element signature="e#33618#34013#0" expanded="false" />
-                    <element signature="e#34054#34785#0" expanded="false" />
-                    <element signature="e#34836#35261#0" expanded="false" />
-                    <element signature="e#35295#36022#0" expanded="false" />
-                    <element signature="e#36064#36366#0" expanded="false" />
-                    <element signature="e#36385#41888#0" expanded="false" />
-                    <element signature="e#36445#36813#0" expanded="false" />
-                    <element signature="e#36844#38407#0" expanded="false" />
-                    <element signature="e#38441#38473#0" expanded="false" />
-                    <element signature="e#38512#39399#0" expanded="false" />
-                    <element signature="e#39446#39630#0" expanded="false" />
-                    <element signature="e#39682#39781#0" expanded="false" />
-                    <element signature="e#39817#39821#0" expanded="false" />
-                    <element signature="e#39863#40299#0" expanded="false" />
-                    <element signature="e#40354#40608#0" expanded="false" />
-                    <element signature="e#40684#41073#0" expanded="false" />
-                    <element signature="e#41125#41206#0" expanded="false" />
-                    <element signature="e#41257#41629#0" expanded="false" />
-                    <element signature="e#41673#41888#0" expanded="false" />
-                    <element signature="e#41913#45363#0" expanded="false" />
-                    <element signature="e#41941#41954#0" expanded="false" />
-                    <element signature="e#41986#42550#0" expanded="false" />
-                    <element signature="e#42594#44487#0" expanded="false" />
-                    <element signature="e#44534#44574#0" expanded="false" />
-                    <element signature="e#44625#44669#0" expanded="false" />
-                    <element signature="e#44699#44724#0" expanded="false" />
-                    <element signature="e#44758#44787#0" expanded="false" />
-                    <element signature="e#44826#44858#0" expanded="false" />
-                    <element signature="e#44894#44923#0" expanded="false" />
-                    <element signature="e#44965#45000#0" expanded="false" />
-                    <element signature="e#45055#45161#0" expanded="false" />
-                    <element signature="e#45218#45268#0" expanded="false" />
-                    <element signature="e#45319#45363#0" expanded="false" />
-                  </folding>
+                  <folding />
                 </state>
               </provider>
             </entry>
@@ -268,8 +233,18 @@
           <file leaf-file-name="strings.xml" pinned="false" current="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/resources/language/English/strings.xml">
               <provider selected="true" editor-type-id="text-editor">
-                <state vertical-scroll-proportion="0.0" vertical-offset="239" max-vertical-offset="1088">
-                  <caret line="37" column="53" selection-start-line="37" selection-start-column="53" selection-end-line="37" selection-end-column="53" />
+                <state vertical-scroll-proportion="0.0" vertical-offset="345" max-vertical-offset="1105">
+                  <caret line="38" column="4" selection-start-line="38" selection-start-column="4" selection-end-line="38" selection-end-column="60" />
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="strings.xml" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/resources/language/Russian/strings.xml">
+              <provider selected="true" editor-type-id="text-editor">
+                <state vertical-scroll-proportion="0.0" vertical-offset="256" max-vertical-offset="1122">
+                  <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
                   <folding />
                 </state>
               </provider>
@@ -295,30 +270,35 @@
         <option value="$PROJECT_DIR$/controlcenter.py" />
         <option value="$PROJECT_DIR$/resources/searchers/NNMClubRu.py" />
         <option value="$PROJECT_DIR$/Downloader.py" />
-        <option value="$PROJECT_DIR$/resources/searchers/KickAssSo.py" />
-        <option value="$PROJECT_DIR$/resources/language/Russian/strings.xml" />
-        <option value="$PROJECT_DIR$/resources/language/English/strings.xml" />
-        <option value="$PROJECT_DIR$/resources/settings.xml" />
         <option value="$PROJECT_DIR$/resources/searchers/T411FR.py" />
         <option value="$PROJECT_DIR$/resources/searchers/EZTV.py" />
-        <option value="$PROJECT_DIR$/cal.py" />
         <option value="$PROJECT_DIR$/AceStream.py" />
-        <option value="$PROJECT_DIR$/addon.xml" />
         <option value="$PROJECT_DIR$/resources/utorrent/net.py" />
         <option value="$PROJECT_DIR$/Libtorrent.py" />
         <option value="$PROJECT_DIR$/Player.py" />
-        <option value="$PROJECT_DIR$/changelog.txt" />
-        <option value="$PROJECT_DIR$/functions.py" />
-        <option value="$PROJECT_DIR$/Localization.py" />
         <option value="$PROJECT_DIR$/resources/contenters/CXZ.py" />
-        <option value="$PROJECT_DIR$/resources/contenters/KickAssSo.py" />
         <option value="$PROJECT_DIR$/resources/contenters/IMDB.py" />
         <option value="$PROJECT_DIR$/resources/contenters/FastTorrent.py" />
         <option value="$PROJECT_DIR$/resources/contenters/EZTV.py" />
         <option value="$PROJECT_DIR$/resources/contenters/KinoPoisk.py" />
         <option value="$PROJECT_DIR$/resources/contenters/RiperAM.py" />
-        <option value="$PROJECT_DIR$/Core.py" />
+        <option value="$PROJECT_DIR$/addon.xml" />
         <option value="$PROJECT_DIR$/Content.py" />
+        <option value="$PROJECT_DIR$/resources/skins/DialogReviews.py" />
+        <option value="$PROJECT_DIR$/cal.py" />
+        <option value="$PROJECT_DIR$/resources/skins/Default/720p/movieinfo.xml" />
+        <option value="$PROJECT_DIR$/Localization.py" />
+        <option value="$PROJECT_DIR$/changelog.txt" />
+        <option value="$PROJECT_DIR$/functions.py" />
+        <option value="$PROJECT_DIR$/resources/language/English/strings.xml" />
+        <option value="$PROJECT_DIR$/resources/language/Russian/strings.xml" />
+        <option value="$PROJECT_DIR$/resources/scrapers/cache.py" />
+        <option value="$PROJECT_DIR$/resources/searchers/KickAssSo.py" />
+        <option value="$PROJECT_DIR$/resources/searchers/Nyaa.py" />
+        <option value="$PROJECT_DIR$/resources/contenters/KickAssSo.py" />
+        <option value="$PROJECT_DIR$/resources/skins/DialogXml.py" />
+        <option value="$PROJECT_DIR$/resources/settings.xml" />
+        <option value="$PROJECT_DIR$/Core.py" />
       </list>
     </option>
   </component>
@@ -354,6 +334,7 @@
       <sortByType />
     </navigator>
     <panes>
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -372,9 +353,76 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="plugin.video.torrenter" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="plugin.video.torrenter" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="resources" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="plugin.video.torrenter" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="plugin.video.torrenter" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="resources" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="searchers" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="plugin.video.torrenter" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="plugin.video.torrenter" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="resources" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="scrapers" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="plugin.video.torrenter" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="plugin.video.torrenter" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="resources" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="language" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
         </subPane>
       </pane>
-      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -687,7 +735,11 @@
       <created>1422468152950</created>
       <updated>1422468152950</updated>
     </task>
-    <option name="localTasksCounter" value="34" />
+    <task id="LOCAL-00034" summary="sort">
+      <created>1422474825684</created>
+      <updated>1422474825684</updated>
+    </task>
+    <option name="localTasksCounter" value="35" />
     <servers />
   </component>
   <component name="TodoView" selected-index="0">
@@ -714,23 +766,23 @@
     <frame x="1" y="1" width="1918" height="1038" extended-state="0" />
     <editor active="true" />
     <layout>
-      <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2587968" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2585034" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3288889" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3291714" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32925472" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32925472" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.13240042" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2497309" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.21366595" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.1319149" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2154195" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32925472" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32539684" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2497309" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
@@ -749,7 +801,6 @@
     <option name="myTodoPanelSettings">
       <TodoPanelSettings />
     </option>
-    <MESSAGE value="extratorrent fix" />
     <MESSAGE value="save path keyboard" />
     <MESSAGE value="return russian trackers" />
     <MESSAGE value="moveout some minor functions from Core" />
@@ -774,7 +825,8 @@
     <MESSAGE value="deluge net fix" />
     <MESSAGE value="false positive fix" />
     <MESSAGE value="myshows fix" />
-    <option name="LAST_COMMIT_MESSAGE" value="myshows fix" />
+    <MESSAGE value="sort" />
+    <option name="LAST_COMMIT_MESSAGE" value="sort" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -782,149 +834,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/Localization.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="2779" max-vertical-offset="3638">
-          <caret line="198" column="41" selection-start-line="198" selection-start-column="41" selection-end-line="198" selection-end-column="41" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Core.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="27387">
-          <caret line="1071" column="32" selection-start-line="1071" selection-start-column="32" selection-end-line="1071" selection-end-column="32" />
-          <folding>
-            <element signature="e#24#781#1" expanded="false" />
-            <element signature="e#2318#2615#0" expanded="false" />
-            <element signature="e#2652#7286#0" expanded="false" />
-            <element signature="e#7325#19290#0" expanded="false" />
-            <element signature="e#19331#20097#0" expanded="false" />
-            <element signature="e#20148#27163#0" expanded="false" />
-            <element signature="e#27207#30636#0" expanded="false" />
-            <element signature="e#30677#31904#0" expanded="false" />
-            <element signature="e#32004#36358#0" expanded="false" />
-            <element signature="e#36406#38470#0" expanded="false" />
-            <element signature="e#45082#51439#0" expanded="false" />
-            <element signature="e#53607#55566#0" expanded="false" />
-            <element signature="e#55723#56975#0" expanded="false" />
-            <element signature="e#57031#57448#0" expanded="false" />
-            <element signature="e#57490#57599#0" expanded="false" />
-            <element signature="e#57642#57762#0" expanded="false" />
-            <element signature="e#57812#57963#0" expanded="false" />
-            <element signature="e#58016#65770#0" expanded="false" />
-            <element signature="e#65819#65858#0" expanded="false" />
-            <element signature="e#65907#66697#0" expanded="false" />
-            <element signature="e#66747#69547#0" expanded="false" />
-            <element signature="e#69592#70341#0" expanded="false" />
-            <element signature="e#70389#71885#0" expanded="false" />
-            <element signature="e#71930#72803#0" expanded="false" />
-            <element signature="e#72851#78920#0" expanded="false" />
-            <element signature="e#78968#80752#0" expanded="false" />
-            <element signature="e#80802#80898#0" expanded="false" />
-            <element signature="e#80961#81488#0" expanded="false" />
-            <element signature="e#81549#86761#0" expanded="false" />
-            <element signature="e#86805#86862#0" expanded="false" />
-            <element signature="e#86916#90265#0" expanded="false" />
-            <element signature="e#90320#92251#0" expanded="false" />
-            <element signature="e#92317#92937#0" expanded="false" />
-            <element signature="e#92980#93651#0" expanded="false" />
-            <element signature="e#93687#94476#0" expanded="false" />
-            <element signature="e#94518#94613#0" expanded="false" />
-            <element signature="e#94663#94811#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Player.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="1458" max-vertical-offset="6154">
-          <caret line="128" column="38" selection-start-line="128" selection-start-column="38" selection-end-line="128" selection-end-column="38" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/cal.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="187" max-vertical-offset="289">
-          <caret line="11" column="93" selection-start-line="11" selection-start-column="93" selection-end-line="11" selection-end-column="93" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/addon.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="17" max-vertical-offset="510">
-          <caret line="1" column="66" selection-start-line="1" selection-start-column="66" selection-end-line="1" selection-end-column="66" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/changelog.txt">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="204" max-vertical-offset="833">
-          <caret line="12" column="12" selection-start-line="12" selection-start-column="12" selection-end-line="12" selection-end-column="12" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Localization.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="3366" max-vertical-offset="3638">
-          <caret line="198" column="41" selection-start-line="198" selection-start-column="41" selection-end-line="198" selection-end-column="41" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Core.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="25024" max-vertical-offset="26979">
-          <caret line="1472" column="26" selection-start-line="1472" selection-start-column="26" selection-end-line="1472" selection-end-column="26" />
-          <folding>
-            <element signature="e#24#781#1" expanded="false" />
-            <element signature="e#2318#2615#0" expanded="false" />
-            <element signature="e#2652#7286#0" expanded="false" />
-            <element signature="e#7325#19290#0" expanded="false" />
-            <element signature="e#19331#20097#0" expanded="false" />
-            <element signature="e#20148#27163#0" expanded="false" />
-            <element signature="e#27207#30636#0" expanded="false" />
-            <element signature="e#30677#31904#0" expanded="false" />
-            <element signature="e#32004#36358#0" expanded="false" />
-            <element signature="e#36406#38470#0" expanded="false" />
-            <element signature="e#45082#51439#0" expanded="false" />
-            <element signature="e#53607#55566#0" expanded="false" />
-            <element signature="e#55723#56975#0" expanded="false" />
-            <element signature="e#57031#57448#0" expanded="false" />
-            <element signature="e#57490#57599#0" expanded="false" />
-            <element signature="e#57642#57762#0" expanded="false" />
-            <element signature="e#57812#57963#0" expanded="false" />
-            <element signature="e#58016#65770#0" expanded="false" />
-            <element signature="e#65819#65858#0" expanded="false" />
-            <element signature="e#65907#66697#0" expanded="false" />
-            <element signature="e#66747#69547#0" expanded="false" />
-            <element signature="e#69592#70341#0" expanded="false" />
-            <element signature="e#70389#71885#0" expanded="false" />
-            <element signature="e#71930#72803#0" expanded="false" />
-            <element signature="e#72851#78920#0" expanded="false" />
-            <element signature="e#78968#80752#0" expanded="false" />
-            <element signature="e#80802#80898#0" expanded="false" />
-            <element signature="e#80961#81488#0" expanded="false" />
-            <element signature="e#81549#86761#0" expanded="false" />
-            <element signature="e#86805#86862#0" expanded="false" />
-            <element signature="e#86916#90265#0" expanded="false" />
-            <element signature="e#90320#92251#0" expanded="false" />
-            <element signature="e#92317#92937#0" expanded="false" />
-            <element signature="e#92980#93651#0" expanded="false" />
-            <element signature="e#93687#94476#0" expanded="false" />
-            <element signature="e#94518#94613#0" expanded="false" />
-            <element signature="e#94663#94811#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/resources/searchers/ExtraTorrent.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="1377" max-vertical-offset="1836">
-          <caret line="81" column="27" selection-start-line="81" selection-start-column="27" selection-end-line="81" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/cal.py">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="187" max-vertical-offset="289">
@@ -975,20 +884,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/resources/searchers/ExtraTorrent.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.4695946" vertical-offset="861" max-vertical-offset="1802">
-          <caret line="69" column="18" selection-start-line="69" selection-start-column="18" selection-end-line="69" selection-end-column="56" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/resources/searchers/KickAssSo.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="802" max-vertical-offset="1700">
-          <caret line="62" column="0" selection-start-line="62" selection-start-column="0" selection-end-line="62" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$USER_HOME$/.PyCharm30/system/python_stubs/1494736245/__builtin__.py">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.33277312" vertical-offset="329" max-vertical-offset="86666">
@@ -996,14 +891,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/resources/language/English/strings.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="239" max-vertical-offset="1088">
-          <caret line="37" column="53" selection-start-line="37" selection-start-column="53" selection-end-line="37" selection-end-column="53" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/resources/searchers/TFileME.py">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.45095694" vertical-offset="1238" max-vertical-offset="2176">
@@ -1011,13 +898,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/resources/settings.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0645933" vertical-offset="1697" max-vertical-offset="2839">
-          <caret line="103" column="16" selection-start-line="103" selection-start-column="16" selection-end-line="103" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/resources/searchers/NNMClubRu.py">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.61350405" vertical-offset="1632" max-vertical-offset="2618">
@@ -1060,13 +940,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/cal.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="459" max-vertical-offset="561">
-          <caret line="27" column="40" selection-start-line="27" selection-start-column="40" selection-end-line="27" selection-end-column="61" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/../script.module.torrent.ts/ASCore.py">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="3443" max-vertical-offset="11322">
@@ -1081,14 +954,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/resources/language/Russian/strings.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="256" max-vertical-offset="1105">
-          <caret line="37" column="48" selection-start-line="37" selection-start-column="48" selection-end-line="37" selection-end-column="48" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/Downloader.py">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="187" max-vertical-offset="2278">
@@ -1096,14 +961,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/SearcherABC.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="102" max-vertical-offset="1547">
-          <caret line="93" column="52" selection-start-line="93" selection-start-column="52" selection-end-line="93" selection-end-column="52" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/AceStream.py">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.5012225" vertical-offset="1409" max-vertical-offset="2448">
@@ -1111,155 +968,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Player.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="5610" max-vertical-offset="6885">
-          <caret line="385" column="0" selection-start-line="385" selection-start-column="0" selection-end-line="385" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Libtorrent.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="4471" max-vertical-offset="6732">
-          <caret line="277" column="12" selection-start-line="277" selection-start-column="12" selection-end-line="277" selection-end-column="12" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/addon.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="510">
-          <caret line="10" column="43" selection-start-line="10" selection-start-column="43" selection-end-line="10" selection-end-column="43" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/changelog.txt">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1292">
-          <caret line="1" column="28" selection-start-line="1" selection-start-column="28" selection-end-line="1" selection-end-column="28" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/functions.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="25825" max-vertical-offset="26503">
-          <caret line="1548" column="0" selection-start-line="1548" selection-start-column="0" selection-end-line="1548" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/resources/utorrent/net.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.0112" vertical-offset="116" max-vertical-offset="969">
-          <caret line="853" column="13" selection-start-line="853" selection-start-column="13" selection-end-line="853" selection-end-column="13" />
-          <folding>
-            <element signature="e#1035#8981#0" expanded="false" />
-            <element signature="e#1063#1400#0" expanded="false" />
-            <element signature="e#1451#2546#0" expanded="false" />
-            <element signature="e#2581#3672#0" expanded="false" />
-            <element signature="e#3705#5438#0" expanded="false" />
-            <element signature="e#5474#6446#0" expanded="false" />
-            <element signature="e#6496#7776#0" expanded="false" />
-            <element signature="e#7816#8114#0" expanded="false" />
-            <element signature="e#8168#8506#0" expanded="false" />
-            <element signature="e#8544#8981#0" expanded="false" />
-            <element signature="e#9007#10161#0" expanded="false" />
-            <element signature="e#9351#10026#0" expanded="false" />
-            <element signature="e#10060#10161#0" expanded="false" />
-            <element signature="e#10188#10687#0" expanded="false" />
-            <element signature="e#10225#10410#0" expanded="false" />
-            <element signature="e#10444#10687#0" expanded="false" />
-            <element signature="e#10710#18412#0" expanded="false" />
-            <element signature="e#10775#11132#0" expanded="false" />
-            <element signature="e#11166#11736#0" expanded="false" />
-            <element signature="e#11766#12548#0" expanded="false" />
-            <element signature="e#12587#13184#0" expanded="false" />
-            <element signature="e#13224#13571#0" expanded="false" />
-            <element signature="e#13618#13922#0" expanded="false" />
-            <element signature="e#13973#14140#0" expanded="false" />
-            <element signature="e#14182#14503#0" expanded="false" />
-            <element signature="e#14558#14727#0" expanded="false" />
-            <element signature="e#14779#14860#0" expanded="false" />
-            <element signature="e#14896#14900#0" expanded="false" />
-            <element signature="e#14950#15522#0" expanded="false" />
-            <element signature="e#15573#15663#0" expanded="false" />
-            <element signature="e#15698#16224#0" expanded="false" />
-            <element signature="e#16278#16860#0" expanded="false" />
-            <element signature="e#16918#18412#0" expanded="false" />
-            <element signature="e#16918#17225#1" expanded="false" />
-            <element signature="e#18439#28666#0" expanded="false" />
-            <element signature="e#18499#18828#0" expanded="false" />
-            <element signature="e#18858#21531#0" expanded="false" />
-            <element signature="e#21565#21797#0" expanded="false" />
-            <element signature="e#21836#23117#0" expanded="false" />
-            <element signature="e#23164#23361#0" expanded="false" />
-            <element signature="e#23412#23567#0" expanded="false" />
-            <element signature="e#23603#23607#0" expanded="false" />
-            <element signature="e#23649#24386#0" expanded="false" />
-            <element signature="e#24441#24935#0" expanded="false" />
-            <element signature="e#24987#25522#0" expanded="false" />
-            <element signature="e#25563#27337#0" expanded="false" />
-            <element signature="e#27388#27914#0" expanded="false" />
-            <element signature="e#27948#28178#0" expanded="false" />
-            <element signature="e#28220#28368#0" expanded="false" />
-            <element signature="e#28410#28666#0" expanded="false" />
-            <element signature="e#28687#36366#0" expanded="false" />
-            <element signature="e#28747#28943#0" expanded="false" />
-            <element signature="e#28977#29093#0" expanded="false" />
-            <element signature="e#29123#30370#0" expanded="false" />
-            <element signature="e#30404#30655#0" expanded="false" />
-            <element signature="e#30694#31685#0" expanded="false" />
-            <element signature="e#31723#31872#0" expanded="false" />
-            <element signature="e#31919#32220#0" expanded="false" />
-            <element signature="e#32271#32671#0" expanded="false" />
-            <element signature="e#32707#32711#0" expanded="false" />
-            <element signature="e#32753#33139#0" expanded="false" />
-            <element signature="e#33194#33566#0" expanded="false" />
-            <element signature="e#33618#34013#0" expanded="false" />
-            <element signature="e#34054#34785#0" expanded="false" />
-            <element signature="e#34836#35261#0" expanded="false" />
-            <element signature="e#35295#36022#0" expanded="false" />
-            <element signature="e#36064#36366#0" expanded="false" />
-            <element signature="e#36385#41888#0" expanded="false" />
-            <element signature="e#36445#36813#0" expanded="false" />
-            <element signature="e#36844#38407#0" expanded="false" />
-            <element signature="e#38441#38473#0" expanded="false" />
-            <element signature="e#38512#39399#0" expanded="false" />
-            <element signature="e#39446#39630#0" expanded="false" />
-            <element signature="e#39682#39781#0" expanded="false" />
-            <element signature="e#39817#39821#0" expanded="false" />
-            <element signature="e#39863#40299#0" expanded="false" />
-            <element signature="e#40354#40608#0" expanded="false" />
-            <element signature="e#40684#41073#0" expanded="false" />
-            <element signature="e#41125#41206#0" expanded="false" />
-            <element signature="e#41257#41629#0" expanded="false" />
-            <element signature="e#41673#41888#0" expanded="false" />
-            <element signature="e#41913#45363#0" expanded="false" />
-            <element signature="e#41941#41954#0" expanded="false" />
-            <element signature="e#41986#42550#0" expanded="false" />
-            <element signature="e#42594#44487#0" expanded="false" />
-            <element signature="e#44534#44574#0" expanded="false" />
-            <element signature="e#44625#44669#0" expanded="false" />
-            <element signature="e#44699#44724#0" expanded="false" />
-            <element signature="e#44758#44787#0" expanded="false" />
-            <element signature="e#44826#44858#0" expanded="false" />
-            <element signature="e#44894#44923#0" expanded="false" />
-            <element signature="e#44965#45000#0" expanded="false" />
-            <element signature="e#45055#45161#0" expanded="false" />
-            <element signature="e#45218#45268#0" expanded="false" />
-            <element signature="e#45319#45363#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/resources/contenters/CXZ.py">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="1619" max-vertical-offset="3281">
           <caret line="114" column="63" selection-start-line="114" selection-start-column="63" selection-end-line="114" selection-end-column="63" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1267,31 +979,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="1270" max-vertical-offset="4233">
           <caret line="97" column="63" selection-start-line="97" selection-start-column="63" selection-end-line="97" selection-end-column="63" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/resources/contenters/FastTorrent.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="862" max-vertical-offset="2346">
-          <caret line="70" column="63" selection-start-line="70" selection-start-column="63" selection-end-line="70" selection-end-column="63" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Localization.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-9.928572" vertical-offset="3581" max-vertical-offset="4148">
-          <caret line="227" column="13" selection-start-line="227" selection-start-column="9" selection-end-line="227" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/resources/contenters/EZTV.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="641" max-vertical-offset="1649">
-          <caret line="56" column="63" selection-start-line="56" selection-start-column="63" selection-end-line="56" selection-end-column="63" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1299,22 +986,207 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="1372" max-vertical-offset="5287">
           <caret line="104" column="63" selection-start-line="104" selection-start-column="63" selection-end-line="104" selection-end-column="63" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/addon.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="510">
+          <caret line="10" column="35" selection-start-line="10" selection-start-column="35" selection-end-line="10" selection-end-column="35" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/resources/utorrent/net.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="14229" max-vertical-offset="22576">
+          <caret line="853" column="13" selection-start-line="853" selection-start-column="13" selection-end-line="853" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/SearcherABC.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="102" max-vertical-offset="1547">
+          <caret line="93" column="52" selection-start-line="93" selection-start-column="52" selection-end-line="93" selection-end-column="52" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/resources/contenters/EZTV.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.38825756" vertical-offset="560" max-vertical-offset="1649">
+          <caret line="45" column="8" selection-start-line="45" selection-start-column="8" selection-end-line="45" selection-end-column="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/resources/contenters/FastTorrent.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="827" max-vertical-offset="2346">
+          <caret line="62" column="8" selection-start-line="62" selection-start-column="8" selection-end-line="62" selection-end-column="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Libtorrent.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="4471" max-vertical-offset="6732">
+          <caret line="293" column="48" selection-start-line="293" selection-start-column="48" selection-end-line="293" selection-end-column="48" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../../plugin.video.watch.is.dev/resources/skins/DialogXml.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.05762712" vertical-offset="0" max-vertical-offset="1615">
+          <caret line="2" column="0" selection-start-line="2" selection-start-column="0" selection-end-line="3" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../../plugin.video.watch.is.dev/addon.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33274022" vertical-offset="5355" max-vertical-offset="8245">
+          <caret line="329" column="69" selection-start-line="329" selection-start-column="65" selection-end-line="329" selection-end-column="69" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/resources/contenters/RiperAM.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="828" max-vertical-offset="1955">
-          <caret line="64" column="63" selection-start-line="64" selection-start-column="63" selection-end-line="64" selection-end-column="63" />
+        <state vertical-scroll-proportion="0.0" vertical-offset="1167" max-vertical-offset="1955">
+          <caret line="77" column="8" selection-start-line="77" selection-start-column="8" selection-end-line="78" selection-end-column="66" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/cal.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="306">
+          <caret line="11" column="117" selection-start-line="11" selection-start-column="117" selection-end-line="11" selection-end-column="117" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../../plugin.video.watch.is.dev/resources/skins/Default/720p/movieinfo.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.32857144" vertical-offset="2360" max-vertical-offset="3825">
+          <caret line="151" column="0" selection-start-line="151" selection-start-column="0" selection-end-line="197" selection-end-column="26" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/resources/skins/Default/720p/movieinfo.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="2543" max-vertical-offset="3808">
+          <caret line="167" column="46" selection-start-line="167" selection-start-column="43" selection-end-line="167" selection-end-column="46" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Localization.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.38870433" vertical-offset="1279" max-vertical-offset="4250">
+          <caret line="89" column="29" selection-start-line="89" selection-start-column="29" selection-end-line="89" selection-end-column="29" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../../plugin.video.watch.is.dev/addon.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.10575428" vertical-offset="0" max-vertical-offset="643">
+          <caret line="4" column="42" selection-start-line="4" selection-start-column="42" selection-end-line="4" selection-end-column="51" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Player.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.2904762" vertical-offset="6192" max-vertical-offset="6885">
+          <caret line="387" column="24" selection-start-line="387" selection-start-column="24" selection-end-line="392" selection-end-column="37" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Content.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="255" max-vertical-offset="4335">
+          <caret line="51" column="18" selection-start-line="51" selection-start-column="8" selection-end-line="51" selection-end-column="18" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/.PyCharm30/system/python_stubs/1494736245/_sqlite3.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33280253" vertical-offset="2307" max-vertical-offset="9078">
+          <caret line="148" column="8" selection-start-line="148" selection-start-column="8" selection-end-line="148" selection-end-column="8" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/changelog.txt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1360">
+          <caret line="2" column="64" selection-start-line="2" selection-start-column="64" selection-end-line="2" selection-end-column="64" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/resources/language/English/strings.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="345" max-vertical-offset="1105">
+          <caret line="38" column="4" selection-start-line="38" selection-start-column="4" selection-end-line="38" selection-end-column="60" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/resources/scrapers/cache.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.43152866" vertical-offset="2075" max-vertical-offset="2703">
+          <caret line="148" column="66" selection-start-line="148" selection-start-column="66" selection-end-line="148" selection-end-column="66" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/resources/language/Russian/strings.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="256" max-vertical-offset="1122">
+          <caret line="38" column="64" selection-start-line="38" selection-start-column="64" selection-end-line="38" selection-end-column="64" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/resources/searchers/Nyaa.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.48726115" vertical-offset="714" max-vertical-offset="1513">
+          <caret line="65" column="22" selection-start-line="65" selection-start-column="22" selection-end-line="65" selection-end-column="22" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/resources/searchers/ExtraTorrent.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="861" max-vertical-offset="1802">
+          <caret line="75" column="22" selection-start-line="75" selection-start-column="22" selection-end-line="75" selection-end-column="22" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/resources/skins/DialogXml.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1411">
+          <caret line="9" column="44" selection-start-line="9" selection-start-column="44" selection-end-line="9" selection-end-column="44" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/resources/settings.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2941">
+          <caret line="24" column="29" selection-start-line="24" selection-start-column="29" selection-end-line="24" selection-end-column="29" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/resources/contenters/KickAssSo.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-2.877193" vertical-offset="1077" max-vertical-offset="1921">
-          <caret line="73" column="0" selection-start-line="73" selection-start-column="0" selection-end-line="73" selection-end-column="0" />
+        <state vertical-scroll-proportion="-17.178572" vertical-offset="2341" max-vertical-offset="3043">
+          <caret line="166" column="25" selection-start-line="166" selection-start-column="25" selection-end-line="166" selection-end-column="25" />
           <folding>
             <element signature="e#782#791#0" expanded="true" />
           </folding>
@@ -1323,54 +1195,59 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/Core.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-15.428572" vertical-offset="1064" max-vertical-offset="4658">
-          <caret line="665" column="11" selection-start-line="665" selection-start-column="11" selection-end-line="665" selection-end-column="23" />
+        <state vertical-scroll-proportion="-29.321428" vertical-offset="9498" max-vertical-offset="11067">
+          <caret line="1492" column="0" selection-start-line="1492" selection-start-column="0" selection-end-line="1492" selection-end-column="0" />
           <folding>
             <element signature="e#24#781#1" expanded="false" />
-            <element signature="e#2318#2615#0" expanded="false" />
-            <element signature="e#2652#7286#0" expanded="false" />
-            <element signature="e#7325#19290#0" expanded="false" />
-            <element signature="e#19331#20097#0" expanded="false" />
-            <element signature="e#20148#27163#0" expanded="false" />
-            <element signature="e#27207#30636#0" expanded="false" />
-            <element signature="e#30677#31904#0" expanded="false" />
-            <element signature="e#32004#36358#0" expanded="false" />
-            <element signature="e#36406#38470#0" expanded="false" />
-            <element signature="e#45082#51439#0" expanded="false" />
-            <element signature="e#53607#55566#0" expanded="false" />
-            <element signature="e#55723#56975#0" expanded="false" />
-            <element signature="e#57031#57448#0" expanded="false" />
-            <element signature="e#57490#57599#0" expanded="false" />
-            <element signature="e#57642#57762#0" expanded="false" />
-            <element signature="e#57812#57963#0" expanded="false" />
-            <element signature="e#58016#65770#0" expanded="false" />
-            <element signature="e#65819#65858#0" expanded="false" />
-            <element signature="e#65907#66697#0" expanded="false" />
-            <element signature="e#66747#69547#0" expanded="false" />
-            <element signature="e#69592#70341#0" expanded="false" />
-            <element signature="e#70389#71885#0" expanded="false" />
-            <element signature="e#71930#72803#0" expanded="false" />
-            <element signature="e#72851#78920#0" expanded="false" />
-            <element signature="e#78968#80752#0" expanded="false" />
-            <element signature="e#80802#80898#0" expanded="false" />
-            <element signature="e#80961#81488#0" expanded="false" />
-            <element signature="e#81549#86761#0" expanded="false" />
-            <element signature="e#86805#86862#0" expanded="false" />
-            <element signature="e#86916#90265#0" expanded="false" />
-            <element signature="e#90320#92251#0" expanded="false" />
-            <element signature="e#92317#92937#0" expanded="false" />
-            <element signature="e#92980#93651#0" expanded="false" />
-            <element signature="e#93687#94476#0" expanded="false" />
-            <element signature="e#94518#94613#0" expanded="false" />
-            <element signature="e#94663#94811#0" expanded="false" />
+            <element signature="e#2316#2613#0" expanded="false" />
+            <element signature="e#2650#7284#0" expanded="false" />
+            <element signature="e#7323#19288#0" expanded="false" />
+            <element signature="e#19329#20095#0" expanded="false" />
+            <element signature="e#20146#27161#0" expanded="false" />
+            <element signature="e#27205#30634#0" expanded="false" />
+            <element signature="e#30675#31902#0" expanded="false" />
+            <element signature="e#32002#36356#0" expanded="false" />
+            <element signature="e#36404#38468#0" expanded="false" />
+            <element signature="e#38510#40305#0" expanded="false" />
+            <element signature="e#40355#44978#0" expanded="false" />
+            <element signature="e#53882#54693#0" expanded="false" />
+            <element signature="e#54742#56701#0" expanded="false" />
+            <element signature="e#56858#58110#0" expanded="false" />
+            <element signature="e#58166#58583#0" expanded="false" />
+            <element signature="e#58625#58734#0" expanded="false" />
+            <element signature="e#58777#58897#0" expanded="false" />
+            <element signature="e#58947#59098#0" expanded="false" />
+            <element signature="e#66954#66993#0" expanded="false" />
+            <element signature="e#67042#67832#0" expanded="false" />
+            <element signature="e#70727#71476#0" expanded="false" />
+            <element signature="e#71524#73020#0" expanded="false" />
+            <element signature="e#73065#73938#0" expanded="false" />
+            <element signature="e#81864#81960#0" expanded="false" />
+            <element signature="e#82023#82550#0" expanded="false" />
+            <element signature="e#82611#87823#0" expanded="false" />
+            <element signature="e#87867#87924#0" expanded="false" />
+            <element signature="e#87978#91327#0" expanded="false" />
+            <element signature="e#91382#93313#0" expanded="false" />
+            <element signature="e#93379#93999#0" expanded="false" />
+            <element signature="e#94749#95538#0" expanded="false" />
+            <element signature="e#95580#95675#0" expanded="false" />
+            <element signature="e#95725#95873#0" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Content.py">
+    <entry file="file://$PROJECT_DIR$/resources/searchers/KickAssSo.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.34931508" vertical-offset="1751" max-vertical-offset="4335">
-          <caret line="124" column="0" selection-start-line="124" selection-start-column="0" selection-end-line="124" selection-end-column="0" />
+        <state vertical-scroll-proportion="0.079617836" vertical-offset="1004" max-vertical-offset="1632">
+          <caret line="66" column="33" selection-start-line="66" selection-start-column="33" selection-end-line="66" selection-end-column="33" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/functions.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.3455414" vertical-offset="15695" max-vertical-offset="26588">
+          <caret line="953" column="23" selection-start-line="953" selection-start-column="23" selection-end-line="953" selection-end-column="23" />
           <folding />
         </state>
       </provider>
diff --git a/Content.py b/Content.py
index a6d6e8f..3cc0403 100644
--- a/Content.py
+++ b/Content.py
@@ -81,7 +81,7 @@ class Content:
     for y in range(2015, 1970, -1):
         category_dict['year'][str(y)] = (str(y), '/top/y/%s/' % str(y))
 
-    def get_contentList(self, category, subcategory=None, property=None):
+    def get_contentList(self, category, subcategory=None, apps_property=None):
         '''
         Retrieve keyword from the input and return a list of tuples:
         filesList.append((
diff --git a/Core.py b/Core.py
index 977a360..f865651 100644
--- a/Core.py
+++ b/Core.py
@@ -18,8 +18,6 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 '''
 
-from StringIO import StringIO
-import gzip
 import tempfile
 
 import Downloader
@@ -33,6 +31,7 @@ from Player import TorrentPlayer
 from functions import *
 from resources.utorrent.net import *
 from resources.scrapers.scrapers import Scrapers
+from resources.skins.DialogXml import *
 
 
 class Core:
@@ -651,8 +650,7 @@ class Core:
                 apps['sort'] = int(sort) + 1
             else:
                 apps['sort'] = 0
-            print str(apps['sort'])
-            self.drawItem('[COLOR FFFFFFFF][B]%s: %s[/B][/COLOR]' % (self.localize('Sort'), self.localize(property['sort'][apps['sort']]['name'])), 'openContent',
+            self.drawItem('[COLOR FFFFFFFF][B]%s %s[/B][/COLOR]' % (self.localize('Sort'), self.localize(property['sort'][apps['sort']]['name'])), 'openContent',
                           json.dumps(apps), isFolder=True)
 
         if mode == 'tracker':
@@ -898,6 +896,11 @@ class Core:
                      sys.argv[0], 'downloadLibtorrent', urllib.quote_plus('%s::%s' % (provider, info.get('link')))))
                 ]
 
+            if isinstance(info, dict) and info.get('infolink'):
+                contextMenu.append((self.localize('Information'),
+                    'XBMC.RunPlugin(%s)' % ('%s?action=%s&provider=%s&url=%s&link=%s') % (
+                    sys.argv[0], 'ActionInfo', provider, info.get('infolink'), link['url'])))
+
             if self.open_option==0:
                 self.drawItem(title, 'openTorrent', link, image=img, info=info, contextMenu=contextMenu, replaceMenu=False)
             elif self.open_option==1:
@@ -908,6 +911,27 @@ class Core:
                 self.drawItem(title, 'downloadLibtorrent', link, image=img, info=info, contextMenu=contextMenu, replaceMenu=False)
             #self.drawItem(title, 'openTorrent', link, img, info=info, contextMenu=contextMenu, replaceMenu=False)
 
+    def ActionInfo(self, params={}):
+        get = params.get
+        contenter=get('provider')
+        infolink=get('url')
+        link=get('link')
+        if ROOT + os.sep + 'resources' + os.sep + 'contenters' not in sys.path:
+            sys.path.insert(0, ROOT + os.sep + 'resources' + os.sep + 'contenters')
+        try:
+            self.Content = getattr(__import__(contenter), contenter)()
+        except Exception, e:
+            print 'Unable to use contenter: ' + contenter + ' at ' + ' ActionInfo(). Exception: ' + str(e)
+
+        movieInfo=self.Content.get_info(infolink)
+        if movieInfo:
+            w = DialogXml("movieinfo.xml", ROOT, "Default")
+            w.doModal(movieInfo, link)
+            del w
+            del movieInfo
+        else:
+            showMessage(self.localize('Information'),self.localize('Information not found!'))
+
     def searchOption(self, params={}):
         try:
             apps = json.loads(urllib.unquote_plus(params.get("url")))
@@ -1378,10 +1402,8 @@ class Core:
                             x=x+1
                             fileTitle=myshows_sizes[str(i)]+myshows_cut[x]
                             myshows_items.append(fileTitle)
-                    myshows_items.append(self.localize('Return to MyShows.ru'))
-                    myshows_files.append('')
                 dialog = xbmcgui.Dialog()
-                if len(myshows_items) == 2:
+                if len(myshows_items) == 1:
                     ret = 0
                 else:
                     ret = dialog.select(self.localize('Search results:'), myshows_items)
@@ -1429,7 +1451,7 @@ class Core:
         get = params.get
         url = urllib.unquote_plus(get("url"))
         addtime=get("addtime")
-        if not addtime and self.__settings__.getSetting('history')=='true':
+        if self.__settings__.getSetting('history')=='true':
             HistoryDB().add(url)
         try:
             external = urllib.unquote_plus(get("external"))
@@ -1465,7 +1487,8 @@ class Core:
         if None == get('isApi'):
             progressBar.update(0)
             progressBar.close()
-        filesList = sorted(filesList, key=lambda x: x[0], reverse=True)
+        if self.__settings__.getSetting('sort_search')=='true':
+            filesList = sorted(filesList, key=lambda x: x[0], reverse=True)
         self.showFilesList(filesList, params)
 
     def controlCenter(self, params={}):
diff --git a/Localization.py b/Localization.py
index 3b373d8..8a2beb9 100644
--- a/Localization.py
+++ b/Localization.py
@@ -87,6 +87,7 @@ dictionary = {
         'Skip All Files': 'Пропустить Все Файлы',
         'Start': 'Пуск',
         'Stop': 'Стоп',
+        'Play':'Воспроизвести',
         'High Priority': 'Высокий Приоритет',
         'Skip File': 'Пропустить Файл',
         'Remove': 'Удалить',
@@ -226,6 +227,11 @@ dictionary = {
         'by Seeders':'по Сидам',
         'by Date':'по Дате',
         'Sort':'Сортировка',
+        'Close':'Закрыть окно',
+        'Views:':'Просм.:',
+        'Rating:':'Рейтинг:',
+        'Information not found!':'Информация не найдена!'
+
 
     }
 }
diff --git a/addon.xml b/addon.xml
index b9b2b17..885bff0 100644
--- a/addon.xml
+++ b/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.torrenter" name="Torrenter" version="2.1.5" provider-name="vadim.skorba, DiMartino">
+<addon id="plugin.video.torrenter" name="Torrenter" version="2.1.6" provider-name="vadim.skorba, DiMartino">
     <requires>
         <import addon="xbmc.python" version="2.1.0"/>
         <import addon="script.module.libtorrent"/>
diff --git a/cal.py b/cal.py
index 589bced..740b7e9 100644
--- a/cal.py
+++ b/cal.py
@@ -4,25 +4,10 @@ import os, json
 
 ROOT = os.path.dirname(sys.modules["__main__"].sys.argv[0])
 searcherObject = {}
-searcher = 'IMDB'
+searcher = 'KickAssSo'
 if ROOT + os.sep + 'resources' + os.sep + 'contenters' not in sys.path:
     sys.path.insert(0, ROOT + os.sep + 'resources' + os.sep + 'contenters')
 searcherObject[searcher] = getattr(__import__(searcher), searcher)()
 
-#print str(searcherObject[searcher].get_contentList(category='search', subcategory='Hobbit'))
+print str(searcherObject[searcher].get_info('http://kickass.so/greys-anatomy-s11e09-hdtv-x264-lol-ettv-t10144556.html'))
 
-title='No Game No Life\\Subs.[GMC]\\No Game No Life - 06.ass'
-path='D:\\torrents\\Torrenter\\No Game No Life\\No Game No Life - 06.mkv'
-#path='/sdasda/asdasd/asdasd/No Game No Life - 06.mkv'
-
-folder=title.split('\\')[0]
-print folder
-temp=os.path.basename(title)
-print temp
-addition=os.path.dirname(title).lstrip(folder+'\\').replace('\\','.').replace(' ','_').strip()
-print addition
-ext=temp.split('.')[-1]
-temp = temp[:len(temp) - len(ext) - 1]+'.'+addition+'.'+ext
-print temp
-newFileName=os.path.join(os.path.dirname(path),temp.replace('\\',os.sep))
-print str((os.path.join(os.path.dirname(os.path.dirname(path)),title.replace('\\',os.sep)),newFileName))
\ No newline at end of file
diff --git a/changelog.txt b/changelog.txt
index f0234e7..2afc220 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,5 +1,9 @@
-[B]Version 2.1.4[/B]
-[+] Списки Медиа: Сортировка
+[B]Version 2.1.6[/B]
+[+] Списки Медиа: Окно информации (пока только KickAssSo). Спасибо evgen_dev
+[+] История Поиска: Перенос в начало списка при повторном поиске
+
+[B]Version 2.1.5[/B]
+[+] Списки Медиа: Сортировка (пока только KickAssSo)
 
 [B]Version 2.1.4[/B]
 [+] Ace Stream: баг-фиксы
diff --git a/functions.py b/functions.py
index dc682a1..365696f 100644
--- a/functions.py
+++ b/functions.py
@@ -948,12 +948,17 @@ class HistoryDB:
             self._close()
 
     def add(self, url):
-        if not self.get(url):
-            self._connect()
+        self._connect()
+        self.cur.execute('select fav from history where string="' + url + '"')
+        x = self.cur.fetchone()
+        if x: x=int(x[0])
+        fav=True if x else False
+        if not fav:
+            self.cur.execute('delete from history where string="' +  decode(url) + '"')
             self.cur.execute('insert into history(addtime,string,fav,providers)'
-                             ' values(?,?,?,?)', (int(time.time()), decode(url), 0, ""))
-            self.db.commit()
-            self._close()
+                                 ' values(?,?,?,?)', (int(time.time()), decode(url), 0, ""))
+        self.db.commit()
+        self._close()
 
     def update(self, addtime, fav):
         self._connect()
diff --git a/resources/contenters/KickAssSo.py b/resources/contenters/KickAssSo.py
index dce736f..b3610df 100644
--- a/resources/contenters/KickAssSo.py
+++ b/resources/contenters/KickAssSo.py
@@ -19,6 +19,7 @@
 '''
 import re
 import Content
+from BeautifulSoup import BeautifulSoup
 
 class KickAssSo(Content.Content):
     category_dict = {
@@ -85,9 +86,9 @@ class KickAssSo(Content.Content):
         num = 51
         good_forums=['TV','Anime','Movies']
         result = re.compile(
-                r'''<a title="Download torrent file" href="(.+?)\?.+?" class=".+?"><i.+?<a.+?<a.+?<a href=".+?html" class=".+?">(.+?)</a>.+? in <span.+?"><strong>.+?">(.+?)</a>''',
+                r'''<a title="Download torrent file" href="(.+?)\?.+?" class=".+?"><i.+?<a.+?<a.+?<a href="(.+?html)" class=".+?">(.+?)</a>.+? in <span.+?"><strong>.+?">(.+?)</a>''',
                 re.DOTALL).findall(response)
-        for link,title,forum in result:
+        for link,infolink,title,forum in result:
             #main
             if forum in good_forums:
                 info = {}
@@ -99,9 +100,75 @@ class KickAssSo(Content.Content):
 
                 info['label'] = info['title'] = self.unescape(title)
                 info['link'] = link
+                info['infolink']=self.baseurl+infolink
 
                 contentList.append((
                     int(int(self.sourceWeight) * (int(num))),
                     original_title, title, int(year), img, info,
                 ))
         return contentList
+
+    def get_info(self, url):
+        movieInfo={}
+        color='[COLOR blue]%s:[/COLOR] %s\r\n'
+        response = self.makeRequest(url, headers=self.headers)
+
+        if None != response and 0 < len(response):
+            Soup = BeautifulSoup(response)
+            result = Soup.find('div', 'torrentMediaInfo')
+            if not result:
+                return None
+            li=result.findAll('li')
+            info,movieInfo={'Cast':''},{'desc':'','poster':'','title':'','views':'0','rating':'50','kinopoisk':''}
+            try:
+                img=result.find('a',{'class':'movieCover'}).find('img').get('src')
+                movieInfo['poster']='http:'+img
+            except:
+                pass
+            try:
+                movie=re.compile('View all <strong>(.+?)</strong> episodes</a>').match(str(result))
+                if movie:
+                    info['Movie']=movie.group(1)
+            except:
+                pass
+            for i in li:
+                name=i.find('strong').text
+                if name:
+                    info[name.rstrip(':')]=i.text.replace(name,'',1)
+            plot=result.find('div',{'id':'summary'})
+            if plot:
+                cut=plot.find('strong').text
+                info['plot']=plot.text.replace(cut,'',1).replace('report summary','')
+            #print str(result)
+            cast=re.compile('<a href="/movies/actor/.+?">(.+?)</a>').findall(str(result))
+            if cast:
+                for actor in cast:
+                    info['Cast']+=actor+", "
+            if 'Genres' in info:
+                info['Genres']=info['Genres'].replace(', ',',').replace(',',', ')
+            for key in info.keys():
+                if not 'Movie' in info and info[key]=='addto bookmarks':
+                    movieInfo['title']=self.unescape(key)
+                    info['TV Show']=self.unescape(key)
+                if not 'plot' in info and 'Summary' in key:
+                    info['plot']=info[key]
+
+            for i in ['Movie','TV Show','Release date','Original run','Episode','Air date','Genres','Language','Director','Writers','Cast','Original run','IMDb rating','AniDB rating']:
+                if info.get(i) and info.get(i) not in ['']:
+                    movieInfo['desc']+=color %(i,info.get(i))
+                    if i=='Movie':
+                        movieInfo['title']=info.get(i)
+
+            for i in ['plot','IMDb link','RottenTomatoes']:
+                if info.get(i) and info.get(i) not in ['']:
+                    if i=='plot':
+                        movieInfo['desc']+='\r\n[COLOR blue]Plot:[/COLOR]\r\n'+info.get(i)
+                    if i=='RottenTomatoes':
+                        movieInfo['rating']=str(info.get(i).split('%')[0])
+                    if i=='IMDb link':
+                        movieInfo['kinopoisk']='http://imdb.snick.ru/ratefor/02/tt%s.png' % info.get(i)
+
+
+            #print str(info)
+
+        return movieInfo
\ No newline at end of file
diff --git a/resources/language/English/strings.xml b/resources/language/English/strings.xml
index a06ad45..773b348 100644
--- a/resources/language/English/strings.xml
+++ b/resources/language/English/strings.xml
@@ -36,6 +36,7 @@
     <string id="30036">Open Context Menu</string>
     <string id="30037">Download via Torrent-client</string>
     <string id="30038">Download via Python-Libtorrent</string>
+    <string id="30039">Sort search results by seeds</string>
     <string id="30101">Interface</string>
     <string id="30102">P2P Network</string>
     <string id="30103">Advanced</string>
diff --git a/resources/language/Russian/strings.xml b/resources/language/Russian/strings.xml
index 6533e1b..023ba85 100644
--- a/resources/language/Russian/strings.xml
+++ b/resources/language/Russian/strings.xml
@@ -36,6 +36,7 @@
     <string id="30036">Открыть Контекстное меню</string>
     <string id="30037">Скачать Торрент-клиентом</string>
     <string id="30038">Скачать Python-Libtorrent</string>
+    <string id="30039">Сортировать поиск по количеству раздающих</string>
     <string id="30101">Интерфейс</string>
     <string id="30102">P2P Сеть</string>
     <string id="30103">Дополнительные</string>
diff --git a/resources/scrapers/cache.py b/resources/scrapers/cache.py
index 70d1311..cca4ca2 100644
--- a/resources/scrapers/cache.py
+++ b/resources/scrapers/cache.py
@@ -146,7 +146,7 @@ class Cache:
 
     def download(self):
         dirname = os.path.dirname(self.filename)
-        zipname = os.path.basename(self.filename).rstrip('.db') + '.zip'
+        zipname = os.path.basename(self.filename).replace('.db','') + '.zip'
         url = 'http://www.tat-store.ru/torrenter/' + zipname
         self.http = HTTP()
         response = self.http.fetch(url, download=os.path.join(dirname, zipname), progress=True)
diff --git a/resources/searchers/KickAssSo.py b/resources/searchers/KickAssSo.py
index 7ebf051..5d6597e 100644
--- a/resources/searchers/KickAssSo.py
+++ b/resources/searchers/KickAssSo.py
@@ -63,7 +63,7 @@ class KickAssSo(SearcherABC.SearcherABC):
 
     def search(self, keyword):
         filesList = []
-        url = "http://kickass.so/usearch/%s/?field=seeders&sorder=desc" % urllib.quote_plus(keyword)
+        url = "http://kickass.so/usearch/%s/?field=time_add&sorder=desc" % urllib.quote_plus(keyword)
         headers = [('User-Agent',
             'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/37.0.2062.124 YaBrowser/14.10.2062.12061 Safari/537.36'),
            ('Referer', 'http://kickass.so/'), ('Accept-encoding', 'gzip'), ]
diff --git a/resources/settings.xml b/resources/settings.xml
index b36368f..86a74b2 100644
--- a/resources/settings.xml
+++ b/resources/settings.xml
@@ -19,6 +19,12 @@
                 label="30020"
                 default="true"
                 />
+        <setting
+                id="sort_search"
+                type="bool"
+                label="30039"
+                default="true"
+                />
         <setting
                 id="skin_optimization"
                 type="enum"
diff --git a/resources/skins/Default/720p/movieinfo.xml b/resources/skins/Default/720p/movieinfo.xml
new file mode 100644
index 0000000..952e7f7
--- /dev/null
+++ b/resources/skins/Default/720p/movieinfo.xml
@@ -0,0 +1,218 @@
+<window>
+    <coordinates>
+        <system>1</system>
+        <posx>240</posx>
+        <posy>20</posy>
+    </coordinates>
+    <include>dialogeffect</include>
+    <controls>
+        <control type="group">
+            <animation effect="fade" time="250">WindowOpen</animation>
+            <animation effect="fade" time="250">WindowClose</animation> 
+            <control type="image">
+                <description>background image</description>
+                <posx>0</posx>
+                <posy>0</posy>
+                <width>800</width>
+                <height>680</height>
+                <texture border="40">DialogBack.png</texture>
+            </control>
+            <control type="image">
+                <description>Dialog Header image</description>
+                <posx>40</posx>
+                <posy>16</posy>
+                <width>720</width>
+                <height>40</height>
+                <texture>dialogheader.png</texture>
+            </control>
+            <control type="label" id="1">
+                <description>header label</description>
+                <posx>40</posx>
+                <posy>20</posy>
+                <width>720</width>
+                <height>30</height>
+                <font>font13_title</font>
+                <label>Информация о фильме</label>
+                <align>center</align>
+                <aligny>center</aligny>
+                <textcolor>selected</textcolor>
+                <shadowcolor>black</shadowcolor>
+            </control>
+            
+			<control type="button" id="2">
+                <description>Close Window button</description>
+                <posx>710</posx>
+                <posy>15</posy>
+                <width>64</width>
+                <height>32</height>
+                <label>-</label>
+                <font>-</font>
+                <onclick>PreviousMenu</onclick>
+                <texturefocus>DialogCloseButton-focus.png</texturefocus>
+                <texturenofocus>DialogCloseButton.png</texturenofocus>
+                <onleft>10</onleft>
+                <onright>10</onright>
+                <onup>10</onup>
+                <ondown>10</ondown>
+                <visible>system.getbool(input.enablemouse)</visible>
+            </control>
+            
+            <control type="scrollbar" id="60">
+                <posx>760</posx>
+                <posy>100</posy>
+                <width>25</width>
+                <height>495</height>
+                <texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
+                <texturesliderbar border="0,14,0,14">ScrollBarV_bar.png</texturesliderbar>
+                <texturesliderbarfocus border="0,14,0,14">ScrollBarV_bar_focus.png</texturesliderbarfocus>
+                <textureslidernib>ScrollBarNib.png</textureslidernib>
+                <textureslidernibfocus>ScrollBarNib.png</textureslidernibfocus>
+                <onleft>30</onleft>
+                <onright>131</onright>
+                <showonepage>true</showonepage>
+				<visible>IntegerGreaterThan(Container(32).NumPages,1)</visible>
+                <orientation>vertical</orientation>
+            </control>
+            
+			<control type="image" id="31">
+                <description>Dialog Header image</description>
+                <posx>33</posx>
+                <posy>85</posy>
+                <width>104</width>
+                <height>149</height>
+                <texture></texture>
+            </control>
+			
+			<control type="label" id="34">
+				<description>rating</description>
+				<posx>34</posx>
+                <posy>240</posy>
+				<width>102</width>
+				<height>20</height>
+				<visible>true</visible>
+				<align>left</align>
+				<aligny>center</aligny>
+				<scroll>false</scroll>
+				<label></label>
+				<haspath>false</haspath>
+				<font>font10</font>
+				<textcolor>white</textcolor>
+				<shadowcolor>black</shadowcolor>
+				<wrapmultiline>false</wrapmultiline>
+			</control>
+			
+			<control type="label" id="35">
+				<description>rating</description>
+				<posx>34</posx>
+                <posy>260</posy>
+				<width>102</width>
+				<height>20</height>
+				<visible>true</visible>
+				<align>left</align>
+				<aligny>center</aligny>
+				<scroll>false</scroll>
+				<label>[COLOR blue]Рейтинг:[/COLOR] [COLOR red]-200[/COLOR]</label>
+				<haspath>false</haspath>
+				<font>font10</font>
+				<textcolor>white</textcolor>
+				<shadowcolor>black</shadowcolor>
+				<wrapmultiline>false</wrapmultiline>
+			</control>
+			
+			<control type="image" id="36">
+                <description>kinopoisk</description>
+                <posx>34</posx>
+                <posy>292</posy>
+                <width>102</width>
+                <height>38</height>
+                <texture></texture>
+            </control>
+			
+			<control type="textbox" id="32">
+				<description>filepath</description>
+				<posx>180</posx>
+				<posy>70</posy>
+				<width>550</width>
+				<pagecontrol>60</pagecontrol>
+				<height max="470">470</height>
+				<align>left</align>
+				<aligny>top</aligny>
+				<font>font18</font>
+				<text>Нет описания</text>
+				<align>center</align>
+				<aligny>center</aligny>
+				<textcolor>white</textcolor>
+				<shadowcolor>black</shadowcolor>
+				<wrapmultiline>true</wrapmultiline>
+			</control>
+			<control type="group" id="9001">
+                <posy>615</posy>
+                <posx>50</posx>
+				
+				<control type="button" id="22">
+                    <description>close</description>
+                    <posx>350</posx>
+                    <posy>0</posy>
+                    <width>320</width>
+                    <height>40</height>
+                    <align>center</align>
+                    <aligny>center</aligny>
+                    <font>font12_title</font>
+                    <label></label>
+                    <onleft>33</onleft>
+                    <onright>60</onright>
+                    <onup>30</onup>
+                    <ondown>30</ondown>
+                </control>
+
+				<control type="button" id="131">
+                    <description>play</description>
+                    <posx>20</posx>
+                    <posy>-50</posy>
+                    <width>320</width>
+                    <height>40</height>
+                    <align>center</align>
+                    <aligny>center</aligny>
+                    <font>font12_title</font>
+                    <label></label>
+                    <onleft>60</onleft>
+                    <onright>30</onright>
+                    <onup>33</onup>
+                    <ondown>33</ondown>
+                </control>
+
+				<control type="button" id="30">
+                    <description>libtorrent</description>
+                    <posx>350</posx>
+                    <posy>-50</posy>
+                    <width>320</width>
+                    <height>40</height>
+                    <align>center</align>
+                    <aligny>center</aligny>
+                    <font>font12_title</font>
+                    <label></label>
+                    <onleft>131</onleft>
+                    <onright>60</onright>
+                    <onup>22</onup>
+                    <ondown>22</ondown>
+                </control>
+
+				<control type="button" id="33">
+                    <description>tclient</description>
+                    <posx>20</posx>
+                    <posy>0</posy>
+                    <width>320</width>
+                    <height>40</height>
+                    <align>center</align>
+                    <aligny>center</aligny>
+                    <font>font12_title</font>
+                    <label>T-client</label>
+                    <onleft>22</onleft>
+                    <onright>22</onright>
+                    <onup>131</onup>
+                    <ondown>131</ondown>
+                </control>
+            </control>
+        </control>
+    </controls>
+</window>
diff --git a/resources/skins/DialogXml.py b/resources/skins/DialogXml.py
new file mode 100644
index 0000000..dc1b127
--- /dev/null
+++ b/resources/skins/DialogXml.py
@@ -0,0 +1,78 @@
+# -*- coding: utf-8 -*-
+import xbmcgui, Localization, sys, xbmc
+
+KEY_BUTTON_BACK = 275
+KEY_KEYBOARD_ESC = 61467
+ACTION_PREVIOUS_MENU = 10
+ACTION_NAV_BACK = 92
+class DialogXml(xbmcgui.WindowXMLDialog):
+    def onInit(self):
+        print "onInit(): Window Initialized"
+        localize=Localization.localize
+        color='[COLOR %s]%s[/COLOR]'
+        self.movie_label = self.getControl(32)
+        self.movie_label.setText(self.movieInfo['desc'])
+
+        if self.movieInfo.get('views'):
+            self.view_label = self.getControl(34)
+            self.view_label.setLabel(color % ('blue', localize('Views:'))+self.movieInfo['views'])
+
+        self.view_label = self.getControl(35)
+        self.ratingcolor = 'green'
+        self.ratingint = int(self.movieInfo['rating'])
+        if(self.ratingint < 70):
+            self.ratingcolor = 'red'
+        self.view_label.setLabel(color % ('blue', localize('Rating:'))+color % (self.ratingcolor, self.movieInfo['rating']))
+
+        self.movie_label = self.getControl(1)
+        self.movie_label.setLabel(self.movieInfo['title'])
+
+        self.movie_label = self.getControl(32)
+        self.movie_label.setText(self.movieInfo['desc'])
+
+        self.poster = self.getControl(31)
+        self.poster.setImage(self.movieInfo['poster'])
+
+        self.poster = self.getControl(36)
+        self.poster.setImage(self.movieInfo['kinopoisk'])
+        self.getControl(22).setLabel(localize('Close'))
+        self.getControl(33).setLabel(localize('Download via T-client'))
+        self.getControl(30).setLabel(localize('Download via Libtorrent'))
+        self.getControl(131).setLabel(localize('Play'))
+
+        self.setFocus(self.getControl(22))
+
+    def onAction(self, action):
+        buttonCode =  action.getButtonCode()
+        if (action == ACTION_NAV_BACK or action == ACTION_PREVIOUS_MENU):
+            self.close()
+        if (buttonCode == KEY_BUTTON_BACK or buttonCode == KEY_KEYBOARD_ESC):
+            self.close()
+
+    def onClick(self, controlID):
+        if (controlID == 2 or controlID == 22):
+            self.close()
+        if (controlID == 30):
+            self.RunPlugin('downloadLibtorrent')
+        if (controlID == 33):
+            self.RunPlugin('downloadFilesList')
+        if (controlID == 131):
+            self.RunPlugin('openTorrent&external=1')
+
+    def RunPlugin(self, action):
+        if self.link:
+            exec_str='XBMC.RunPlugin(%s)' % \
+                         ('%s?action=%s&url=%s') % \
+                         (sys.argv[0], action, self.link)
+            xbmc.executebuiltin(exec_str)
+
+
+    def onFocus(self, controlID):
+        #print "onFocus(): control %i" % controlID
+        pass
+
+
+    def doModal(self, movieInfo, url):
+        self.movieInfo = movieInfo
+        self.link=url
+        xbmcgui.WindowXMLDialog.doModal(self)
\ No newline at end of file
diff --git a/resources/skins/__init__.py b/resources/skins/__init__.py
new file mode 100644
index 0000000..e69de29