diff --git a/makefiles/app-profile.mk b/makefiles/app-profile.mk
index b1bb5f5..4410818 100644
--- a/makefiles/app-profile.mk
+++ b/makefiles/app-profile.mk
@@ -1,4 +1,4 @@
-app-profile: .version build/app-profile/user.js build/app-profile/prefs.js build/app-profile/chrome/userChrome.css build/app-profile/bookmarks.html build/app-profile/storage-sync.sqlite copy-app-xpi
+app-profile: .version build/app-profile/user.js build/app-profile/prefs.js build/app-profile/chrome/userChrome.css build/app-profile/bookmarks.html build/app-profile/storage-sync.sqlite
 
 app-profile.tgz: app-profile
 #	$(eval PROFILE_VERSION := $(shell cat src/app-profile/version.txt))
@@ -29,8 +29,3 @@ build/app-profile/bookmarks.html: build/app-profile src/app-profile/bookmarks.ht
 
 build/app-profile/storage-sync.sqlite: build/app-profile src/app-profile/storage-sync.sqlite
 	cp src/app-profile/storage-sync.sqlite build/app-profile/storage-sync.sqlite
-
-copy-app-xpi: build/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi build/https-everywhere-eff@eff.org.xpi build/i2ppb@eyedeekay.github.io.xpi build/app-profile/extensions
-	cp build/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi "build/app-profile/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi"
-	cp build/https-everywhere-eff@eff.org.xpi "build/app-profile/extensions/https-everywhere-eff@eff.org.xpi"
-	cp build/i2ppb@eyedeekay.github.io.xpi build/app-profile/extensions/i2ppb@eyedeekay.github.io.xpi
\ No newline at end of file
diff --git a/makefiles/extensions.mk b/makefiles/extensions.mk
index 1493a56..a1e78ea 100644
--- a/makefiles/extensions.mk
+++ b/makefiles/extensions.mk
@@ -1,25 +1 @@
-
-build-extensions: extensions build/i2ppb@eyedeekay.github.io.xpi build/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi build/https-everywhere-eff@eff.org.xpi
-
-build/i2ppb@eyedeekay.github.io.xpi: i2psetproxy.url
-	curl -L `cat i2psetproxy.url` > build/i2ppb@eyedeekay.github.io.xpi
-
-build/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi: NoScript.url
-	curl -L `cat NoScript.url` > "build/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi"
-
-build/https-everywhere-eff@eff.org.xpi: HTTPSEverywhere.url
-	curl -L `cat HTTPSEverywhere.url` > build/https-everywhere-eff@eff.org.xpi
-
-clean-extensions:
-	rm -fv i2psetproxy.url NoScript.url HTTPSEverywhere.url build/i2ppb@eyedeekay.github.io.xpi build/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi build/https-everywhere-eff@eff.org.xpi
-
-extensions: HTTPSEverywhere.url NoScript.url i2psetproxy.url
-
-HTTPSEverywhere.url:
-	@echo `./amo-version.sh https-everywhere` > HTTPSEverywhere.url
-
-NoScript.url:
-	@echo `./amo-version.sh noscript` > NoScript.url
-
-i2psetproxy.url:
-	@echo `./amo-version.sh i2p-in-private-browsing` > i2psetproxy.url
+#DEPRECATED moved to i2p.plugins.firefox as "Base/Strict Mode"
\ No newline at end of file
diff --git a/makefiles/new-extensions.mk b/makefiles/new-extensions.mk
index a5239a9..a9f3c26 100644
--- a/makefiles/new-extensions.mk
+++ b/makefiles/new-extensions.mk
@@ -1,31 +1 @@
-
-build-new-extensions: build/i2ppb@eyedeekay.github.io.xpi build/uBlock0@raymondhill.net.xpi build/jsr@javascriptrestrictor.xpi build/onioncbt@eyedeekay.github.io.xpi build/{b86e4813-687a-43e6-ab65-0bde4ab75758}.xpi
-
-build/uBlock0@raymondhill.net.xpi:
-	curl -L `cat UBlockOrigin.url` > build/uBlock0@raymondhill.net.xpi
-
-build/jsr@javascriptrestrictor.xpi:
-	curl -L `cat JShelter.url` > build/jsr@javascriptrestrictor.xpi
-
-build/onioncbt@eyedeekay.github.io.xpi:
-	curl -L `cat onioncontainer.url` > build/onioncbt@eyedeekay.github.io.xpi
-
-build/{b86e4813-687a-43e6-ab65-0bde4ab75758}.xpi:
-	curl -L `cat LocalCDN.url` > build//{b86e4813-687a-43e6-ab65-0bde4ab75758}.xpi
-
-UBlockOrigin.url:
-	@echo `./amo-version.sh ublock-origin` > UBlockOrigin.url
-
-JShelter.url:
-	@echo "`./amo-version.sh javascript-restrictor`" > JShelter.url
-
-onioncontainer.url:
-	@echo `./amo-version.sh onion-in-container-browsing` > onioncontainer.url
-
-LocalCDN.url:
-	@echo `./amo-version.sh localcdn-fork-of-decentraleyes` > LocalCDN.url
-
-clean-new-extensions:
-	rm -f UBlockOrigin.url JShelter.url onioncontainer.url LocalCDN.url build/i2ppb@eyedeekay.github.io.xpi build/onioncbt@eyedeekay.github.io.xpi
-
-new-extensions: UBlockOrigin.url JShelter.url onioncontainer.url LocalCDN.url
\ No newline at end of file
+#DEPRECATED moved to i2p.plugins.firefox as "Usability Mode"
\ No newline at end of file
diff --git a/makefiles/profile.mk b/makefiles/profile.mk
index f733cff..6b87302 100644
--- a/makefiles/profile.mk
+++ b/makefiles/profile.mk
@@ -1,5 +1,5 @@
 
-profile: build/profile/user.js build/profile/prefs.js build/profile/bookmarks.html build/profile/storage-sync.sqlite copy-xpi
+profile: build/profile/user.js build/profile/prefs.js build/profile/bookmarks.html build/profile/storage-sync.sqlite
 
 profile.tgz: .version profile
 #	$(eval PROFILE_VERSION := $(shell cat src/profile/version.txt))
@@ -26,8 +26,3 @@ build/profile/bookmarks.html: build/profile src/profile/bookmarks.html
 
 build/profile/storage-sync.sqlite: build/profile src/profile/storage-sync.sqlite
 	cp src/profile/storage-sync.sqlite build/profile/storage-sync.sqlite
-
-copy-xpi: build/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi build/https-everywhere-eff@eff.org.xpi build/i2ppb@eyedeekay.github.io.xpi build/profile/extensions
-	cp build/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi "build/profile/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi"
-	cp build/https-everywhere-eff@eff.org.xpi "build/profile/extensions/https-everywhere-eff@eff.org.xpi"
-	cp build/i2ppb@eyedeekay.github.io.xpi build/profile/extensions/i2ppb@eyedeekay.github.io.xpi