diff --git a/Makefile b/Makefile
index 2bd1915..510f565 100644
--- a/Makefile
+++ b/Makefile
@@ -4,12 +4,14 @@ default: zip
 
 install: uninstall
 	mkdir -p $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io \
+		$(PREFIX)/share/webext/i2ppb@eyedeekay.github.io/i2pcontrol \
 		$(PREFIX)/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}
 	cp -r ./chromium/ $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io/
 	cp -r ./icons/ $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io/
 	cp -r ./_locales/ $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io/
 	cp -r ./options/ $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io/
 	cp ./*.js $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io/
+	cp ./i2pcontrol/i2pcontrol.js $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io/i2pcontrol/i2pcontrol.js
 	cp ./*.html $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io/
 	cp ./*.css $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io/
 	cp ./*.md $(PREFIX)/share/webext/i2ppb@eyedeekay.github.io/
@@ -110,6 +112,7 @@ deborig:
 		-cvz \
 		--exclude=.git \
 		--exclude=i2psetproxy.js.gif \
+		--exclude=node_modules \
 		-f ../i2psetproxy.js_$(VERSION).orig.tar.gz \
 		.
 
diff --git a/README.md b/README.md
index a9e8c1c..2dd00c5 100644
--- a/README.md
+++ b/README.md
@@ -40,6 +40,15 @@ releases page. The latest AMO Plugin will always be identical to the latest
 github release, except for the version number, which must be incremented for
 submission to AMO.
 
+Debian usage:
+-------------
+
+Should you prefer, it is possible to install this extension system-wide by
+side-loading it into Debian. You can generate your own deb file by running the
+command:
+
+        make deb
+
 ### Features
 
   * [done] **Provide** a way to launch into an I2P-Specific contextual identity
diff --git a/background.js b/background.js
index 3fdbcd3..172c7c9 100644
--- a/background.js
+++ b/background.js
@@ -137,7 +137,6 @@ function setTitle(window) {
       if (context.name == "i2pbrowser") {
         console.log("Active in I2P window");
 
-        console.log("Active in I2P window");
         if (window.incognito) {
           chrome.windows.update(window.id, {
             titlePreface: titleprefpriv
@@ -157,6 +156,16 @@ function setTitle(window) {
       browser.contextualIdentities
         .get(tabInfo[0].cookieStoreId)
         .then(onGot, onError);
+    } else {
+      if (window.incognito) {
+        chrome.windows.update(window.id, {
+          titlePreface: ""
+        });
+      } else {
+        chrome.windows.update(window.id, {
+          titlePreface: ""
+        });
+      }
     }
   }
 
diff --git a/debian/rules b/debian/rules
index b9d7703..e33ed7d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,12 +5,14 @@
 
 override_dh_auto_install:
 	mkdir -p $$(pwd)/debian/i2psetproxy.js/usr/share/webext/i2ppb@eyedeekay.github.io \
+		$$(pwd)/debian/i2psetproxy.js/usr/share/webext/i2ppb@eyedeekay.github.io/i2pcontrol \
 		$$(pwd)/debian/i2psetproxy.js/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}
 	cp -r ./chromium/ $$(pwd)/debian/i2psetproxy.js/usr/share/webext/i2ppb@eyedeekay.github.io/
 	cp -r ./icons/ $$(pwd)/debian/i2psetproxy.js/usr/share/webext/i2ppb@eyedeekay.github.io/
 	cp -r ./options/ $$(pwd)/debian/i2psetproxy.js/usr/share/webext/i2ppb@eyedeekay.github.io/
 	cp -r ./_locales/ $$(pwd)/debian/i2psetproxy.js/usr/share/webext/i2ppb@eyedeekay.github.io/
 	cp ./*.js $$(pwd)/debian/i2psetproxy.js/usr/share/webext/i2ppb@eyedeekay.github.io/
+	cp ./i2pcontrol/i2pcontrol.js $$(pwd)/debian/i2psetproxy.js/usr/share/webext/i2ppb@eyedeekay.github.io/i2pcontrol/
 	cp ./*.html $$(pwd)/debian/i2psetproxy.js/usr/share/webext/i2ppb@eyedeekay.github.io/
 	cp ./*.css $$(pwd)/debian/i2psetproxy.js/usr/share/webext/i2ppb@eyedeekay.github.io/
 	cp ./*.md $$(pwd)/debian/i2psetproxy.js/usr/share/webext/i2ppb@eyedeekay.github.io/