diff --git a/HISTORY.md b/HISTORY.md
index 69e4cc2..b130f1c 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,3 +1,7 @@
+### v2.2.0
+* Support BitBucket (experimental)
+* Fix minor bugs
+
 ### v2.1.0
 * Remove GitLab support
 * Improve GitHub styling
diff --git a/README.md b/README.md
index e98cba8..43e6d72 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[![OpenCollective](https://opencollective.com/octotree/backers/badge.svg)](#backers) 
+[![OpenCollective](https://opencollective.com/octotree/backers/badge.svg)](#backers)
 [![OpenCollective](https://opencollective.com/octotree/sponsors/badge.svg)](#sponsors)
 
 ## Octotree
@@ -48,10 +48,10 @@ Octotree uses [GitHub API](https://developer.github.com/v3/) to retrieve reposit
 
 When that happens, Octotree will ask for your [GitHub personal access token](https://help.github.com/articles/creating-an-access-token-for-command-line-use). If you don't already have one, [create one](https://github.com/settings/tokens/new), then copy and paste it into the textbox. Note that the minimal scopes that should be granted are `public_repo` and `repo` (if you need access to private repositories).
 
-#### Bitbucket
-Octotree uses [Bitbucket API](https://confluence.atlassian.com/bitbucket/repositories-endpoint-1-0-296092719.html) to retrieve repository metadata. By defualt, Octotree will ask for your [Bitbucket App password](https://confluence.atlassian.com/bitbucket/app-passwords-828781300.html). If you don't already have one, [create one](https://bitbucket.org/account/admin/app-passwords) (the minimal requirement is `Repositories`'s `Read` permission), then copy and paste it into the textbox.
+#### Bitbucket (experimental)
+Octotree uses [Bitbucket API](https://confluence.atlassian.com/bitbucket/repositories-endpoint-1-0-296092719.html) to retrieve repository metadata. By default, Octotree asks for your [Bitbucket App password](https://confluence.atlassian.com/bitbucket/app-passwords-828781300.html). If you don't already have one, [create one](https://bitbucket.org/account/admin/app-passwords) (the minimal requirement is `Repositories`'s `Read` permission), then copy and paste it into the textbox.
 
-Note that Octotree extract your username from your current page by default for calling Bitbucket API. If fail to extract, Octotree will ask you for a token update, then you just need to prepend your username to the token, separated by a colon, i.e. `USERNAME:TOKEN`.
+Note that Octotree extracts your username from the current page to invoke the Bitbucket API. If fail to do so, Octotree will ask you for a token update, you just need to prepend your username to the token, separated by a colon, i.e. `USERNAME:TOKEN`.
 
 ### Enterprise URLs
 By default, Octotree only works on `github.com`. To support enterprise version (Chrome and Opera only), you must grant Octotree sufficient permissions. Follow these steps to do so:
diff --git a/dist/chrome.crx b/dist/chrome.crx
index de3b075..bac7902 100644
Binary files a/dist/chrome.crx and b/dist/chrome.crx differ
diff --git a/dist/chrome.zip b/dist/chrome.zip
index 5150615..042a111 100644
Binary files a/dist/chrome.zip and b/dist/chrome.zip differ
diff --git a/dist/firefox.xpi b/dist/firefox.zip
similarity index 88%
rename from dist/firefox.xpi
rename to dist/firefox.zip
index 1015bb5..0a48ab7 100644
Binary files a/dist/firefox.xpi and b/dist/firefox.zip differ
diff --git a/dist/opera.nex b/dist/opera.nex
index de3b075..c778787 100644
Binary files a/dist/opera.nex and b/dist/opera.nex differ
diff --git a/package.json b/package.json
index 0d07013..8cea718 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "octotree",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "Code tree for GitHub",
   "main": "inject.js",
   "scripts": {
diff --git a/src/config/chrome/manifest.json b/src/config/chrome/manifest.json
index ce4fe80..32705ec 100755
--- a/src/config/chrome/manifest.json
+++ b/src/config/chrome/manifest.json
@@ -9,8 +9,8 @@
     "128": "icons/icon128.png"
   },
   "permissions": [
-    "https://bitbucket.org/*",
     "https://github.com/*",
+    "https://bitbucket.org/*",
     "storage"
   ],
   "optional_permissions": [
diff --git a/src/config/firefox/manifest.json b/src/config/firefox/manifest.json
index 061fd7c..6a493fb 100755
--- a/src/config/firefox/manifest.json
+++ b/src/config/firefox/manifest.json
@@ -11,6 +11,7 @@
   },
   "permissions": [
     "https://*.github.com/*",
+    "https://*.bitbucket.com/*",
     "storage"
   ],
   "content_scripts": [