diff --git a/.gitignore b/.gitignore
index 85583dc..bcb16e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+Credentials.mk
 .web-extension-id
 improved-crowdcast-ux.xpi
 improved-crowdcast-ux.crx
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..370abe8
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,8 @@
+include Credentials.mk
+
+.PHONY: improved-crowdcast-ux.xpi
+
+improved-crowdcast-ux.xpi:
+	web-ext sign --api-key=$(API_KEY) --api-secret=$(API_SECRET) \
+				 --source-dir=improved-crowdcast-ux \
+				 --artifacts-dir=. --filename=improved-crowdcast-ux.xpi
diff --git a/LICENSE b/improved-crowdcast-ux/LICENSE
similarity index 100%
rename from LICENSE
rename to improved-crowdcast-ux/LICENSE
diff --git a/content.css b/improved-crowdcast-ux/content.css
similarity index 100%
rename from content.css
rename to improved-crowdcast-ux/content.css
diff --git a/content.js b/improved-crowdcast-ux/content.js
similarity index 100%
rename from content.js
rename to improved-crowdcast-ux/content.js
diff --git a/emojis.js b/improved-crowdcast-ux/emojis.js
similarity index 100%
rename from emojis.js
rename to improved-crowdcast-ux/emojis.js
diff --git a/icons/128.png b/improved-crowdcast-ux/icons/128.png
similarity index 100%
rename from icons/128.png
rename to improved-crowdcast-ux/icons/128.png
diff --git a/icons/16.png b/improved-crowdcast-ux/icons/16.png
similarity index 100%
rename from icons/16.png
rename to improved-crowdcast-ux/icons/16.png
diff --git a/icons/32.png b/improved-crowdcast-ux/icons/32.png
similarity index 100%
rename from icons/32.png
rename to improved-crowdcast-ux/icons/32.png
diff --git a/icons/48.png b/improved-crowdcast-ux/icons/48.png
similarity index 100%
rename from icons/48.png
rename to improved-crowdcast-ux/icons/48.png
diff --git a/icons/64.png b/improved-crowdcast-ux/icons/64.png
similarity index 100%
rename from icons/64.png
rename to improved-crowdcast-ux/icons/64.png
diff --git a/improved-crowdcast-ux/icons/x.svg b/improved-crowdcast-ux/icons/x.svg
new file mode 100644
index 0000000..8a45715
--- /dev/null
+++ b/improved-crowdcast-ux/icons/x.svg
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:export-ydpi="12.7"
+   inkscape:export-xdpi="12.7"
+   inkscape:export-filename="/home/turbotraktor/crowdcast/icons/16.png"
+   width="32mm"
+   height="32mm"
+   viewBox="0 0 32 32"
+   version="1.1"
+   id="svg8"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="x.svg">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     fit-margin-bottom="0"
+     fit-margin-right="0"
+     fit-margin-left="0"
+     fit-margin-top="0"
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.4"
+     inkscape:cx="133.70941"
+     inkscape:cy="301.77185"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     inkscape:document-rotation="0"
+     showgrid="false"
+     inkscape:window-width="3840"
+     inkscape:window-height="2089"
+     inkscape:window-x="3840"
+     inkscape:window-y="71"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Vrstva 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       ry="5.278861"
+       y="0"
+       x="0"
+       height="32"
+       width="32"
+       id="rect831"
+       style="fill:#000000;fill-opacity:1;stroke-width:0.502486;stroke-miterlimit:4;stroke-dasharray:none" />
+    <path
+       id="path839"
+       d="M 16,9 C 17.932997,9 19.5,7.4329966 19.5,5.5 19.5,3.5670034 17.932997,2 16,2 14.067003,2 12.5,3.5670034 12.5,5.5 12.5,7.4329966 14.067003,9 16,9 Z"
+       style="fill:#ec5f3e;fill-opacity:1" />
+    <path
+       id="path837"
+       d="m 8.5,11 v 4.999999 h 15 V 11 Z"
+       style="fill:#d4412b;fill-opacity:1" />
+    <path
+       id="path835"
+       d="m 8.5,17.999999 v 5 h 15 v -5 z"
+       style="fill:#b61c12;fill-opacity:1" />
+    <path
+       id="Rectangle-2"
+       d="m 8.5,24.999999 v 5 h 15 v -5 z"
+       style="fill:#a00000;fill-opacity:1" />
+  </g>
+</svg>
diff --git a/manifest.json b/improved-crowdcast-ux/manifest.json
similarity index 96%
rename from manifest.json
rename to improved-crowdcast-ux/manifest.json
index eca9c3a..d3d155b 100644
--- a/manifest.json
+++ b/improved-crowdcast-ux/manifest.json
@@ -1,7 +1,7 @@
 {
     "manifest_version": 2,
     "name": "Improved Crowdcast UX",
-    "version": "0.1",
+    "version": "0.2",
     "icons": {
         "16": "icons/16.png",
         "32": "icons/32.png",
diff --git a/popup.css b/improved-crowdcast-ux/popup.css
similarity index 100%
rename from popup.css
rename to improved-crowdcast-ux/popup.css
diff --git a/popup.html b/improved-crowdcast-ux/popup.html
similarity index 100%
rename from popup.html
rename to improved-crowdcast-ux/popup.html
diff --git a/popup.js b/improved-crowdcast-ux/popup.js
similarity index 100%
rename from popup.js
rename to improved-crowdcast-ux/popup.js