diff --git a/profiles/templates/3.3/6_ac_desktop_profile/2-user/www-client/chromium-41/.config/chromium/Default/Extensions/clcbojcafbggjenbeflknhfimpcikmlc/1.0.1_0/Cached Theme.pak b/profiles/templates/3.3/6_ac_desktop_profile/2-user/www-client/chromium-41/.config/chromium/Default/Extensions/clcbojcafbggjenbeflknhfimpcikmlc/1.0.1_0/Cached Theme.pak
deleted file mode 100644
index fbfd77b86..000000000
Binary files a/profiles/templates/3.3/6_ac_desktop_profile/2-user/www-client/chromium-41/.config/chromium/Default/Extensions/clcbojcafbggjenbeflknhfimpcikmlc/1.0.1_0/Cached Theme.pak and /dev/null differ
diff --git a/profiles/templates/3.3/6_ac_desktop_profile/2-user/www-client/chromium-41/.config/chromium/Default/Extensions/clcbojcafbggjenbeflknhfimpcikmlc/1.0.1_0/_metadata/verified_contents.json b/profiles/templates/3.3/6_ac_desktop_profile/2-user/www-client/chromium-41/.config/chromium/Default/Extensions/clcbojcafbggjenbeflknhfimpcikmlc/1.0.1_0/_metadata/verified_contents.json
deleted file mode 100644
index 283dc1dfc..000000000
--- a/profiles/templates/3.3/6_ac_desktop_profile/2-user/www-client/chromium-41/.config/chromium/Default/Extensions/clcbojcafbggjenbeflknhfimpcikmlc/1.0.1_0/_metadata/verified_contents.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"description":"treehash per file","signed_content":{"payload":"eyJjb250ZW50X2hhc2hlcyI6W3siYmxvY2tfc2l6ZSI6NDA5NiwiZGlnZXN0Ijoic2hhMjU2IiwiZmlsZXMiOlt7InBhdGgiOiJpbWFnZXMvdGhlbWVfZnJhbWUucG5nIiwicm9vdF9oYXNoIjoiTlNYLU10ZXNRVmxvVHU0RFB2YmRoMVp0NnYxX2l4UUtCdUpFU2pqV294QSJ9LHsicGF0aCI6ImltYWdlcy90aGVtZV90b29sYmFyLnBuZyIsInJvb3RfaGFzaCI6Imo1THV6bHNtdTdFTmpFWWFfUndMNFBIMlJqZ2p3WXZNVnVfVU9tai1SbEkifSx7InBhdGgiOiJtYW5pZmVzdC5qc29uIiwicm9vdF9oYXNoIjoiZlE4bmlxNUQ5b3NhZEMyZXU4Zk9NYUNTWVExMmF0RDk3T0ZWcTdxV1ZocyJ9XSwiZm9ybWF0IjoidHJlZWhhc2giLCJoYXNoX2Jsb2NrX3NpemUiOjQwOTZ9XSwiaXRlbV9pZCI6ImNsY2JvamNhZmJnZ2plbmJlZmxrbmhmaW1wY2lrbWxjIiwiaXRlbV92ZXJzaW9uIjoiMS4wLjEiLCJwcm90b2NvbF92ZXJzaW9uIjoxfQ","signatures":[{"header":{"kid":"publisher"},"protected":"eyJhbGciOiJSUzI1NiJ9","signature":"CrbPjy4rLpdek2PDfxbRarG-_CIpSRKAx6YBMTED7IgW3cF0ML00DZCG4EGBoE1wlFpgD79NdL34Gegn319KAAannuGkAYpSiUZJWGNefTbaBtof4qqLhUB9UkJ_AhuXpqeGvtpPB5EmRjKi-4oKJMiXmrjljVJBmy2flnosj_uxHtvzX8VRggkC5xMqg8EGFliZ-DQFA1WbYLvqetqF2Q-3kXrofGeinUrapPCN_-4-xuEG-YxJswi2LQs864UMmMFQVz-RV6GJ1L9O-ssDXDS6wK18OKNHv3RUMOpYJ5tac120N10XLpcsv6uylRCbS0lgP65wEBFQnjAsvRFZhg"},{"header":{"kid":"webstore"},"protected":"eyJhbGciOiJSUzI1NiJ9","signature":"LbGbnThM2f34R320SMykEy-CJ5i31OYv_SJa4g5HaJzbg2imlpK2Go3b-3H825KsNPE-0naJx_GKZH1yYslI31VVfK3OtqpaqxqIIWQMIWHFtim5LSH2on50Hl0ZS_Uzp1e33cntUiYUW1dSCtoHGvnoGqxsDvB_kxDjOQQhf0H74ArSW1m3X4Khlhmxf3RuiD6chLQNq-WnQTrnYcSbzpRb6pde9Y2vk_sLunNnIqp4CgxvhMtw0r8GAA4UKKf0vbg-SP4oeOBSUCF6NfLiKa44IJAMlDme37bVKjUGdBjq-BzvcwTps6OVA06GQ2hHAMW8spghzAg6gP5Z_7uIHw"}]}}]
\ No newline at end of file
diff --git a/profiles/templates/3.3/6_ac_desktop_profile/2-user/www-client/chromium-41/.config/chromium/Default/Extensions/clcbojcafbggjenbeflknhfimpcikmlc/1.0.1_0/images/theme_frame.png b/profiles/templates/3.3/6_ac_desktop_profile/2-user/www-client/chromium-41/.config/chromium/Default/Extensions/clcbojcafbggjenbeflknhfimpcikmlc/1.0.1_0/images/theme_frame.png
deleted file mode 100644
index 123ddf1b1..000000000
Binary files a/profiles/templates/3.3/6_ac_desktop_profile/2-user/www-client/chromium-41/.config/chromium/Default/Extensions/clcbojcafbggjenbeflknhfimpcikmlc/1.0.1_0/images/theme_frame.png and /dev/null differ
diff --git a/profiles/templates/3.3/6_ac_desktop_profile/2-user/www-client/chromium-41/.config/chromium/Default/Extensions/clcbojcafbggjenbeflknhfimpcikmlc/1.0.1_0/images/theme_toolbar.png b/profiles/templates/3.3/6_ac_desktop_profile/2-user/www-client/chromium-41/.config/chromium/Default/Extensions/clcbojcafbggjenbeflknhfimpcikmlc/1.0.1_0/images/theme_toolbar.png
deleted file mode 100644
index 3dc03724e..000000000
Binary files a/profiles/templates/3.3/6_ac_desktop_profile/2-user/www-client/chromium-41/.config/chromium/Default/Extensions/clcbojcafbggjenbeflknhfimpcikmlc/1.0.1_0/images/theme_toolbar.png and /dev/null differ
diff --git a/profiles/templates/3.3/6_ac_desktop_profile/2-user/www-client/chromium-41/.config/chromium/Default/Extensions/clcbojcafbggjenbeflknhfimpcikmlc/1.0.1_0/manifest.json b/profiles/templates/3.3/6_ac_desktop_profile/2-user/www-client/chromium-41/.config/chromium/Default/Extensions/clcbojcafbggjenbeflknhfimpcikmlc/1.0.1_0/manifest.json
deleted file mode 100644
index 031bf8844..000000000
--- a/profiles/templates/3.3/6_ac_desktop_profile/2-user/www-client/chromium-41/.config/chromium/Default/Extensions/clcbojcafbggjenbeflknhfimpcikmlc/1.0.1_0/manifest.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-   "description": "Simple minimalistic white theme for Google Chrome",
-   "key": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtRc/DyYLgLIaYngoUMUewveYlC4HJpd2U4mJ8HG1ArpT38lglujNtGZvoS4aGCs2PiFneksYNmFgGWbmeb75CNcKtrUlSEmJnGEOY/GKGbAG0d4uh6tXgoebNzCH9Ko8MuA7pV6h5kxbMcsXul8Hrm6G+rdveewGvDQ7l5UU5Zg71u0mdmD3doj6sRdDmrCs3X8vCxcrJvg66yCH+ssHibjVbc2ZUh8CbvtcizxbVVvFrn6m3Q7NC/+Px1/6l8OGlUVpv54nZ8af02Ti0CsQI9XF1HOMleEfB9oDgDWgCUfZ3iBhKm4WgWFX2R2e+jg63qmlzDa4sGQ5I9LwRbQqFQIDAQAB",
-   "manifest_version": 2,
-   "name": "Minimal White",
-   "theme": {
-      "colors": {
-         "bookmark_text": [ 59, 59, 59 ],
-         "button_background": [ 0, 0, 0, 0 ],
-         "frame": [ 255, 255, 255 ],
-         "ntp_background": [ 255, 255, 255 ],
-         "ntp_text": [ 59, 59, 59 ],
-         "tab_background_text": [ 96, 96, 96 ],
-         "tab_text": [ 59, 59, 59 ],
-         "toolbar": [ 239, 239, 239 ]
-      },
-      "images": {
-         "theme_frame": "images/theme_frame.png",
-         "theme_toolbar": "images/theme_toolbar.png"
-      },
-      "properties": {
-         "ntp_background_alignment": "bottom",
-         "ntp_background_repeat": "no-repeat"
-      },
-      "tints": {
-         "buttons": [ 0, 0, 0.65 ]
-      }
-   },
-   "update_url": "https://clients2.google.com/service/update2/crx",
-   "version": "1.0.1"
-}
diff --git a/profiles/templates/3.3/6_ac_desktop_profile/2-user/www-client/chromium-41/.config/chromium/Default/Extensions/ublock-install.sh b/profiles/templates/3.3/6_ac_desktop_profile/2-user/www-client/chromium-41/.config/chromium/Default/Extensions/ublock-install.sh
deleted file mode 100644
index 2f8619d5b..000000000
--- a/profiles/templates/3.3/6_ac_desktop_profile/2-user/www-client/chromium-41/.config/chromium/Default/Extensions/ublock-install.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate pkg(www-apps/chromium-ublock)!= exec=/bin/bash
-
-cp -r /usr/share/chromium-ublock/cjpalhdlnbpafiamejdnhcphjbkeiagm #-ur_home_path-#/.config/chromium/Default/Extensions/
-chown #-ur_login-#:#-ur_group-# -R #-ur_home_path-#/.config/chromium/Default/Extensions/cjpalhdlnbpafiamejdnhcphjbkeiagm &>/dev/null
-exit 0
diff --git a/profiles/templates/3.3/6_ac_desktop_profile/2-user/www-client/chromium-41/.config/chromium/Default/Local Storage/chrome-extension_gighmmpiobklfepjocnamgkkbiglidom_0.localstorage b/profiles/templates/3.3/6_ac_desktop_profile/2-user/www-client/chromium-41/.config/chromium/Default/Local Storage/chrome-extension_gighmmpiobklfepjocnamgkkbiglidom_0.localstorage
deleted file mode 100644
index 944f58f7f..000000000
Binary files a/profiles/templates/3.3/6_ac_desktop_profile/2-user/www-client/chromium-41/.config/chromium/Default/Local Storage/chrome-extension_gighmmpiobklfepjocnamgkkbiglidom_0.localstorage and /dev/null differ
diff --git a/profiles/templates/3.3/6_ac_desktop_profile/2-user/www-client/chromium-41/.config/chromium/First Run b/profiles/templates/3.3/6_ac_desktop_profile/2-user/www-client/chromium-41/.config/chromium/First Run
deleted file mode 100644
index 8d1c8b69c..000000000
--- a/profiles/templates/3.3/6_ac_desktop_profile/2-user/www-client/chromium-41/.config/chromium/First Run	
+++ /dev/null
@@ -1 +0,0 @@
- 
diff --git a/profiles/templates/3.3/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/.calculate_directory b/profiles/templates/3.3/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/.calculate_directory
new file mode 100644
index 000000000..28419f924
--- /dev/null
+++ b/profiles/templates/3.3/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/.calculate_directory
@@ -0,0 +1 @@
+# Calculate path=~/.config/chromium
diff --git a/profiles/templates/3.3/6_ac_desktop_profile/2-user/www-client/chromium-41/.config/chromium/Default/Bookmarks.en b/profiles/templates/3.3/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/Bookmarks.en
similarity index 86%
rename from profiles/templates/3.3/6_ac_desktop_profile/2-user/www-client/chromium-41/.config/chromium/Default/Bookmarks.en
rename to profiles/templates/3.3/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/Bookmarks.en
index ea21e90ad..8ecd17bdf 100644
--- a/profiles/templates/3.3/6_ac_desktop_profile/2-user/www-client/chromium-41/.config/chromium/Default/Bookmarks.en
+++ b/profiles/templates/3.3/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/Bookmarks.en
@@ -39,7 +39,7 @@
          {
             "name": "Calculate Linux | Facebook",
             "type": "url",
-            "url": "http://www.facebook.com/group.php?gid=97309000613"
+            "url": "https://www.facebook.com/CalculateLinux"
          },
          {
             "name": "Calculate - LinuxQuestions.org",
@@ -49,17 +49,12 @@
          {
             "name": "DistroWatch.com",
             "type": "url",
-            "url": "http://distrowatch.com/"
+            "url": "http://distrowatch.com/calculate"
          },
          {
             "name": "Gentoo Linux",
             "type": "url",
             "url": "http://www.gentoo.org/"
-         },
-         {
-            "name": "LinuxTracker",
-            "type": "url",
-            "url": "http://linuxtracker.org/"
          }],
          "type": "folder"
       }
diff --git a/profiles/templates/3.3/6_ac_desktop_profile/2-user/www-client/chromium-41/.config/chromium/Default/Bookmarks.ru b/profiles/templates/3.3/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/Bookmarks.ru
similarity index 90%
rename from profiles/templates/3.3/6_ac_desktop_profile/2-user/www-client/chromium-41/.config/chromium/Default/Bookmarks.ru
rename to profiles/templates/3.3/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/Bookmarks.ru
index 9b94ce281..a8deeb81f 100644
--- a/profiles/templates/3.3/6_ac_desktop_profile/2-user/www-client/chromium-41/.config/chromium/Default/Bookmarks.ru
+++ b/profiles/templates/3.3/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/Bookmarks.ru
@@ -39,7 +39,7 @@
          {
             "name": "DistroWatch.com",
             "type": "url",
-            "url": "http://distrowatch.com/"
+            "url": "http://distrowatch.com/calculate"
          },
          {
             "name": "Gentoo Linux",
@@ -52,9 +52,9 @@
             "url": "http://tux.in.ua"
          },
          {
-            "name": "В Контакте | Calculate Linux",
+            "name": "ВКонтакте | Calculate Linux",
             "type": "url",
-            "url": "http://vkontakte.ru/club10221243"
+            "url": "https://vk.com/calculatelinux"
          }],
          "type": "folder"
       }
diff --git a/profiles/templates/3.3/6_ac_desktop_profile/2-user/www-client/chromium-41/.config/chromium/Default/History b/profiles/templates/3.3/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/History
similarity index 100%
rename from profiles/templates/3.3/6_ac_desktop_profile/2-user/www-client/chromium-41/.config/chromium/Default/History
rename to profiles/templates/3.3/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/History
diff --git a/profiles/templates/3.3/6_ac_desktop_profile/2-user/www-client/chromium-41/.config/chromium/Default/Preferences b/profiles/templates/3.3/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/Preferences
similarity index 100%
rename from profiles/templates/3.3/6_ac_desktop_profile/2-user/www-client/chromium-41/.config/chromium/Default/Preferences
rename to profiles/templates/3.3/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/Preferences
diff --git a/profiles/templates/3.3/6_ac_desktop_profile/2-user/www-client/chromium-41/.config/chromium/Default/Thumbnails b/profiles/templates/3.3/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/Thumbnails
similarity index 100%
rename from profiles/templates/3.3/6_ac_desktop_profile/2-user/www-client/chromium-41/.config/chromium/Default/Thumbnails
rename to profiles/templates/3.3/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/Thumbnails
diff --git a/profiles/templates/3.3/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/install-themes-calculate.sh b/profiles/templates/3.3/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/install-themes-calculate.sh
new file mode 100644
index 000000000..b6156fb35
--- /dev/null
+++ b/profiles/templates/3.3/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/install-themes-calculate.sh
@@ -0,0 +1,6 @@
+# Calculate pkg(www-plugins/chrome-themes-calculate)!= exec=/bin/bash
+
+mkdir -p #-ur_home_path-#/.config/chromium/Default/Extensions/clcbojcafbggjenbeflknhfimpcikmlc
+cp -r /usr/share/chrome-themes-calculate/* #-ur_home_path-#/.config/chromium/Default/Extensions/clcbojcafbggjenbeflknhfimpcikmlc
+chown #-ur_login-#:#-ur_group-# -R #-ur_home_path-#/.config/chromium/Default/Extensions
+exit 0
diff --git a/profiles/templates/3.3/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/install-ublock.sh b/profiles/templates/3.3/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/install-ublock.sh
new file mode 100644
index 000000000..e6b2aec13
--- /dev/null
+++ b/profiles/templates/3.3/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/install-ublock.sh
@@ -0,0 +1,6 @@
+# Calculate pkg(www-plugins/chrome-ublock)!= exec=/bin/bash
+
+mkdir -p #-ur_home_path-#/.config/chromium/Default/Extensions/cjpalhdlnbpafiamejdnhcphjbkeiagm
+cp -r /usr/share/chrome-ublock/* #-ur_home_path-#/.config/chromium/Default/Extensions/cjpalhdlnbpafiamejdnhcphjbkeiagm
+chown #-ur_login-#:#-ur_group-# -R #-ur_home_path-#/.config/chromium/Default/Extensions
+exit 0
diff --git a/profiles/templates/3.3/6_ac_desktop_profile/2-user/www-client/chromium-41/First Run b/profiles/templates/3.3/6_ac_desktop_profile/2-user/www-client/chromium-41/First Run
new file mode 100644
index 000000000..68295c177
--- /dev/null
+++ b/profiles/templates/3.3/6_ac_desktop_profile/2-user/www-client/chromium-41/First Run	
@@ -0,0 +1 @@
+# Calculate path=~/.config/chromium 
diff --git a/profiles/updates/1Q-2015 b/profiles/updates/1Q-2015
new file mode 100644
index 000000000..473cd31b9
--- /dev/null
+++ b/profiles/updates/1Q-2015
@@ -0,0 +1 @@
+move www-apps/chromium-ublock www-plugins/chrome-ublock
diff --git a/www-apps/chromium-adblock/Manifest b/www-apps/chromium-adblock/Manifest
deleted file mode 100644
index 4a26abfcb..000000000
--- a/www-apps/chromium-adblock/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST chromium-adblock-2.14.4.tar.bz2 542553 SHA256 f07e71fa2577d28c8e33bb0b21d293cdd614e48831ad2f718936601e861cbf2c SHA512 ef5c0113350227bdb2a4fe80bdb1a41bd44b51c9f9a9a689d991d3dfb3812e9c24b0fcea81afe9bb4e6420d1f3076edf3d42d017d3515600812f5671fbb8db1f WHIRLPOOL 267d1f6e3a6192f7fb9cd2b58033fa82cc7a3f023b553547d3169f32f8e7cb7340e7c31b244369aaa5d3be2c3395d5bc34a5f652751e64cfebb4146e2c2a507b
-DIST chromium-adblock-2.5.15.tar.bz2 343135 SHA256 5d8290d4b9ef0a1acae93249b155e20dae40e4fe42af4bbcc11346e27a939252 SHA512 6d73d3f7ec6e171ab0633021c1c35f03a9ede2dfac7824e95b215ad38679b98c9b1162d89b6513d0c7470090dec703300c2634c81d6d86baa37584bcf8cef1ef WHIRLPOOL 9d63ab2df4114b236deb2e1a780a318af250baee366af5e58ceade4366d15d6eb34cb1f9cdbad048b76bb18bf4f459902981aa6d0162bc06315e4bbc98dd90ec
-DIST chromium-adblock-2.5.61.tar.bz2 288823 SHA256 281df6021b09ea01f08f425d18022d71fee1f3f9211e418e67d03cd44b2f7393 SHA512 3012e9e3062faf2cebd5666e60038ea6e2c54c4e4bc0ca25b9d950621203c43565137fd62c0dcf9f5fa54d0dc1fff099d98dab3bacef07877a60db99d4cab30b WHIRLPOOL 02045b6efd9e0316ea5967ca6cd55a9f6dc41e0515171d392297a489fcdf783463eb381945d980ed5011cea1354a76e7ab3b43b65350e8c8e8fcc2bb76dfa65f
diff --git a/www-apps/chromium-adblock/chromium-adblock-2.5.15.ebuild b/www-apps/chromium-adblock/chromium-adblock-2.5.15.ebuild
deleted file mode 100644
index f040b9272..000000000
--- a/www-apps/chromium-adblock/chromium-adblock-2.5.15.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-
-inherit eutils
-
-SRC_URI="ftp://ftp.calculate.ru/pub/calculate/${PN}/${P}.tar.bz2
-	http://mirror.yandex.ru/calculate/${PN}/${P}.tar.bz2"
-
-DESCRIPTION="AdBlock for Chrome"
-HOMEPAGE="https://chrome.google.com/webstore/detail/gighmmpiobklfepjocnamgkkbiglidom"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="www-client/chromium"
-
-RDEPEND="${DEPEND}"
-
-src_install() {
-	dodir /usr/share/chromium-adblock
-	insinto /usr/share/chromium-adblock
-	doins -r *
-}
diff --git a/www-apps/chromium-adblock/chromium-adblock-2.5.61.ebuild b/www-apps/chromium-adblock/chromium-adblock-2.5.61.ebuild
deleted file mode 100644
index 6ef09e2ed..000000000
--- a/www-apps/chromium-adblock/chromium-adblock-2.5.61.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-
-inherit eutils
-
-SRC_URI="ftp://ftp.calculate.ru/pub/calculate/${PN}/${P}.tar.bz2
-	http://mirror.yandex.ru/calculate/${PN}/${P}.tar.bz2"
-
-DESCRIPTION="AdBlock for Chrome"
-HOMEPAGE="https://chrome.google.com/webstore/detail/gighmmpiobklfepjocnamgkkbiglidom"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="www-client/chromium"
-
-RDEPEND="${DEPEND}"
-
-src_install() {
-	dodir /usr/share/chromium-adblock
-	insinto /usr/share/chromium-adblock
-	doins -r *
-}
diff --git a/www-apps/chromium-ublock/Manifest b/www-plugins/chrome-themes-calculate/Manifest
similarity index 100%
rename from www-apps/chromium-ublock/Manifest
rename to www-plugins/chrome-themes-calculate/Manifest
diff --git a/www-apps/chromium-ublock/chromium-ublock-0.9.1.1.ebuild b/www-plugins/chrome-themes-calculate/chrome-ublock-0.9.1.1.ebuild
similarity index 79%
rename from www-apps/chromium-ublock/chromium-ublock-0.9.1.1.ebuild
rename to www-plugins/chrome-themes-calculate/chrome-ublock-0.9.1.1.ebuild
index eb6e7f078..73817ac1a 100644
--- a/www-apps/chromium-ublock/chromium-ublock-0.9.1.1.ebuild
+++ b/www-plugins/chrome-themes-calculate/chrome-ublock-0.9.1.1.ebuild
@@ -15,14 +15,15 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-DEPEND="www-client/chromium"
+DEPEND="|| ( www-client/chromium
+			www-client/google-chrome )"
 
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}"
 
 src_install() {
-	dodir /usr/share/chromium-ublock
-	insinto /usr/share/chromium-ublock
+	dodir /usr/share/chrome-ublock
+	insinto /usr/share/chrome-ublock
 	doins -r *
 }
diff --git a/www-plugins/chrome-ublock/Manifest b/www-plugins/chrome-ublock/Manifest
new file mode 100644
index 000000000..ddd4990e6
--- /dev/null
+++ b/www-plugins/chrome-ublock/Manifest
@@ -0,0 +1 @@
+DIST chromium-ublock-0.9.1.1.tar.bz2 3214862 SHA256 b0fdeb131a91787b24b4b1f2db50075aa6fb09a3abb6da8b0a3127f8059bfb4f SHA512 8ad7d4194ee829166e587ae80355d198fe39c2a6310f72a6621d429d98d6b9dcbb42660532dd6f4cd7d7727a5dbd27798acb5495b86cbc358ec33921bee3351a WHIRLPOOL 4354f28967e0f79736f3e31d51daeb9abcc7df0d49ad8c71d216fb45fbfc2667b77bc6114412059cf843a0c881bca526d8f4f040b2439f5f132486d61c9e0049
diff --git a/www-apps/chromium-adblock/chromium-adblock-2.14.4.ebuild b/www-plugins/chrome-ublock/chrome-ublock-0.9.1.1.ebuild
similarity index 56%
rename from www-apps/chromium-adblock/chromium-adblock-2.14.4.ebuild
rename to www-plugins/chrome-ublock/chrome-ublock-0.9.1.1.ebuild
index 6ef09e2ed..73817ac1a 100644
--- a/www-apps/chromium-adblock/chromium-adblock-2.14.4.ebuild
+++ b/www-plugins/chrome-ublock/chrome-ublock-0.9.1.1.ebuild
@@ -2,25 +2,28 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="3"
+EAPI="5"
 
 inherit eutils
 
 SRC_URI="ftp://ftp.calculate.ru/pub/calculate/${PN}/${P}.tar.bz2
 	http://mirror.yandex.ru/calculate/${PN}/${P}.tar.bz2"
 
-DESCRIPTION="AdBlock for Chrome"
-HOMEPAGE="https://chrome.google.com/webstore/detail/gighmmpiobklfepjocnamgkkbiglidom"
+DESCRIPTION="uBlock for Chrome"
+HOMEPAGE="https://chrome.google.com/webstore/detail/cjpalhdlnbpafiamejdnhcphjbkeiagm"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-DEPEND="www-client/chromium"
+DEPEND="|| ( www-client/chromium
+			www-client/google-chrome )"
 
 RDEPEND="${DEPEND}"
 
+S="${WORKDIR}"
+
 src_install() {
-	dodir /usr/share/chromium-adblock
-	insinto /usr/share/chromium-adblock
+	dodir /usr/share/chrome-ublock
+	insinto /usr/share/chrome-ublock
 	doins -r *
 }