diff --git a/Manifest.json b/Manifest.json
index 1f0c4595..50f87498 100644
--- a/Manifest.json
+++ b/Manifest.json
@@ -11,7 +11,7 @@
         "email": "tobi@itis.swiss"
       }
     ],
-    "version": "0.4.12"
+    "version": "0.4.13"
   },
   "provides": {
     "namespace": "osparc.theme",
diff --git a/source/resource/theme/font/LICENSE.txt b/source/resource/osparc/theme/font/LICENSE.txt
similarity index 100%
rename from source/resource/theme/font/LICENSE.txt
rename to source/resource/osparc/theme/font/LICENSE.txt
diff --git a/source/resource/theme/font/README-opensans.txt b/source/resource/osparc/theme/font/README-opensans.txt
similarity index 100%
rename from source/resource/theme/font/README-opensans.txt
rename to source/resource/osparc/theme/font/README-opensans.txt
diff --git a/source/resource/theme/font/roboto-mono-v6-latin_latin-ext-700.eot b/source/resource/osparc/theme/font/roboto-mono-v6-latin_latin-ext-700.eot
similarity index 100%
rename from source/resource/theme/font/roboto-mono-v6-latin_latin-ext-700.eot
rename to source/resource/osparc/theme/font/roboto-mono-v6-latin_latin-ext-700.eot
diff --git a/source/resource/theme/font/roboto-mono-v6-latin_latin-ext-700.svg b/source/resource/osparc/theme/font/roboto-mono-v6-latin_latin-ext-700.svg
similarity index 100%
rename from source/resource/theme/font/roboto-mono-v6-latin_latin-ext-700.svg
rename to source/resource/osparc/theme/font/roboto-mono-v6-latin_latin-ext-700.svg
diff --git a/source/resource/theme/font/roboto-mono-v6-latin_latin-ext-700.ttf b/source/resource/osparc/theme/font/roboto-mono-v6-latin_latin-ext-700.ttf
similarity index 100%
rename from source/resource/theme/font/roboto-mono-v6-latin_latin-ext-700.ttf
rename to source/resource/osparc/theme/font/roboto-mono-v6-latin_latin-ext-700.ttf
diff --git a/source/resource/theme/font/roboto-mono-v6-latin_latin-ext-700.woff b/source/resource/osparc/theme/font/roboto-mono-v6-latin_latin-ext-700.woff
similarity index 100%
rename from source/resource/theme/font/roboto-mono-v6-latin_latin-ext-700.woff
rename to source/resource/osparc/theme/font/roboto-mono-v6-latin_latin-ext-700.woff
diff --git a/source/resource/theme/font/roboto-mono-v6-latin_latin-ext-700.woff2 b/source/resource/osparc/theme/font/roboto-mono-v6-latin_latin-ext-700.woff2
similarity index 100%
rename from source/resource/theme/font/roboto-mono-v6-latin_latin-ext-700.woff2
rename to source/resource/osparc/theme/font/roboto-mono-v6-latin_latin-ext-700.woff2
diff --git a/source/resource/theme/font/roboto-mono-v6-latin_latin-ext-700italic.eot b/source/resource/osparc/theme/font/roboto-mono-v6-latin_latin-ext-700italic.eot
similarity index 100%
rename from source/resource/theme/font/roboto-mono-v6-latin_latin-ext-700italic.eot
rename to source/resource/osparc/theme/font/roboto-mono-v6-latin_latin-ext-700italic.eot
diff --git a/source/resource/theme/font/roboto-mono-v6-latin_latin-ext-700italic.svg b/source/resource/osparc/theme/font/roboto-mono-v6-latin_latin-ext-700italic.svg
similarity index 100%
rename from source/resource/theme/font/roboto-mono-v6-latin_latin-ext-700italic.svg
rename to source/resource/osparc/theme/font/roboto-mono-v6-latin_latin-ext-700italic.svg
diff --git a/source/resource/theme/font/roboto-mono-v6-latin_latin-ext-700italic.ttf b/source/resource/osparc/theme/font/roboto-mono-v6-latin_latin-ext-700italic.ttf
similarity index 100%
rename from source/resource/theme/font/roboto-mono-v6-latin_latin-ext-700italic.ttf
rename to source/resource/osparc/theme/font/roboto-mono-v6-latin_latin-ext-700italic.ttf
diff --git a/source/resource/theme/font/roboto-mono-v6-latin_latin-ext-700italic.woff b/source/resource/osparc/theme/font/roboto-mono-v6-latin_latin-ext-700italic.woff
similarity index 100%
rename from source/resource/theme/font/roboto-mono-v6-latin_latin-ext-700italic.woff
rename to source/resource/osparc/theme/font/roboto-mono-v6-latin_latin-ext-700italic.woff
diff --git a/source/resource/theme/font/roboto-mono-v6-latin_latin-ext-700italic.woff2 b/source/resource/osparc/theme/font/roboto-mono-v6-latin_latin-ext-700italic.woff2
similarity index 100%
rename from source/resource/theme/font/roboto-mono-v6-latin_latin-ext-700italic.woff2
rename to source/resource/osparc/theme/font/roboto-mono-v6-latin_latin-ext-700italic.woff2
diff --git a/source/resource/theme/font/roboto-mono-v6-latin_latin-ext-italic.eot b/source/resource/osparc/theme/font/roboto-mono-v6-latin_latin-ext-italic.eot
similarity index 100%
rename from source/resource/theme/font/roboto-mono-v6-latin_latin-ext-italic.eot
rename to source/resource/osparc/theme/font/roboto-mono-v6-latin_latin-ext-italic.eot
diff --git a/source/resource/theme/font/roboto-mono-v6-latin_latin-ext-italic.svg b/source/resource/osparc/theme/font/roboto-mono-v6-latin_latin-ext-italic.svg
similarity index 100%
rename from source/resource/theme/font/roboto-mono-v6-latin_latin-ext-italic.svg
rename to source/resource/osparc/theme/font/roboto-mono-v6-latin_latin-ext-italic.svg
diff --git a/source/resource/theme/font/roboto-mono-v6-latin_latin-ext-italic.ttf b/source/resource/osparc/theme/font/roboto-mono-v6-latin_latin-ext-italic.ttf
similarity index 100%
rename from source/resource/theme/font/roboto-mono-v6-latin_latin-ext-italic.ttf
rename to source/resource/osparc/theme/font/roboto-mono-v6-latin_latin-ext-italic.ttf
diff --git a/source/resource/theme/font/roboto-mono-v6-latin_latin-ext-italic.woff b/source/resource/osparc/theme/font/roboto-mono-v6-latin_latin-ext-italic.woff
similarity index 100%
rename from source/resource/theme/font/roboto-mono-v6-latin_latin-ext-italic.woff
rename to source/resource/osparc/theme/font/roboto-mono-v6-latin_latin-ext-italic.woff
diff --git a/source/resource/theme/font/roboto-mono-v6-latin_latin-ext-italic.woff2 b/source/resource/osparc/theme/font/roboto-mono-v6-latin_latin-ext-italic.woff2
similarity index 100%
rename from source/resource/theme/font/roboto-mono-v6-latin_latin-ext-italic.woff2
rename to source/resource/osparc/theme/font/roboto-mono-v6-latin_latin-ext-italic.woff2
diff --git a/source/resource/theme/font/roboto-mono-v6-latin_latin-ext-regular.eot b/source/resource/osparc/theme/font/roboto-mono-v6-latin_latin-ext-regular.eot
similarity index 100%
rename from source/resource/theme/font/roboto-mono-v6-latin_latin-ext-regular.eot
rename to source/resource/osparc/theme/font/roboto-mono-v6-latin_latin-ext-regular.eot
diff --git a/source/resource/theme/font/roboto-mono-v6-latin_latin-ext-regular.svg b/source/resource/osparc/theme/font/roboto-mono-v6-latin_latin-ext-regular.svg
similarity index 100%
rename from source/resource/theme/font/roboto-mono-v6-latin_latin-ext-regular.svg
rename to source/resource/osparc/theme/font/roboto-mono-v6-latin_latin-ext-regular.svg
diff --git a/source/resource/theme/font/roboto-mono-v6-latin_latin-ext-regular.ttf b/source/resource/osparc/theme/font/roboto-mono-v6-latin_latin-ext-regular.ttf
similarity index 100%
rename from source/resource/theme/font/roboto-mono-v6-latin_latin-ext-regular.ttf
rename to source/resource/osparc/theme/font/roboto-mono-v6-latin_latin-ext-regular.ttf
diff --git a/source/resource/theme/font/roboto-mono-v6-latin_latin-ext-regular.woff b/source/resource/osparc/theme/font/roboto-mono-v6-latin_latin-ext-regular.woff
similarity index 100%
rename from source/resource/theme/font/roboto-mono-v6-latin_latin-ext-regular.woff
rename to source/resource/osparc/theme/font/roboto-mono-v6-latin_latin-ext-regular.woff
diff --git a/source/resource/theme/font/roboto-mono-v6-latin_latin-ext-regular.woff2 b/source/resource/osparc/theme/font/roboto-mono-v6-latin_latin-ext-regular.woff2
similarity index 100%
rename from source/resource/theme/font/roboto-mono-v6-latin_latin-ext-regular.woff2
rename to source/resource/osparc/theme/font/roboto-mono-v6-latin_latin-ext-regular.woff2
diff --git a/source/resource/theme/font/roboto-v18-latin_latin-ext-700.eot b/source/resource/osparc/theme/font/roboto-v18-latin_latin-ext-700.eot
similarity index 100%
rename from source/resource/theme/font/roboto-v18-latin_latin-ext-700.eot
rename to source/resource/osparc/theme/font/roboto-v18-latin_latin-ext-700.eot
diff --git a/source/resource/theme/font/roboto-v18-latin_latin-ext-700.svg b/source/resource/osparc/theme/font/roboto-v18-latin_latin-ext-700.svg
similarity index 100%
rename from source/resource/theme/font/roboto-v18-latin_latin-ext-700.svg
rename to source/resource/osparc/theme/font/roboto-v18-latin_latin-ext-700.svg
diff --git a/source/resource/theme/font/roboto-v18-latin_latin-ext-700.ttf b/source/resource/osparc/theme/font/roboto-v18-latin_latin-ext-700.ttf
similarity index 100%
rename from source/resource/theme/font/roboto-v18-latin_latin-ext-700.ttf
rename to source/resource/osparc/theme/font/roboto-v18-latin_latin-ext-700.ttf
diff --git a/source/resource/theme/font/roboto-v18-latin_latin-ext-700.woff b/source/resource/osparc/theme/font/roboto-v18-latin_latin-ext-700.woff
similarity index 100%
rename from source/resource/theme/font/roboto-v18-latin_latin-ext-700.woff
rename to source/resource/osparc/theme/font/roboto-v18-latin_latin-ext-700.woff
diff --git a/source/resource/theme/font/roboto-v18-latin_latin-ext-700.woff2 b/source/resource/osparc/theme/font/roboto-v18-latin_latin-ext-700.woff2
similarity index 100%
rename from source/resource/theme/font/roboto-v18-latin_latin-ext-700.woff2
rename to source/resource/osparc/theme/font/roboto-v18-latin_latin-ext-700.woff2
diff --git a/source/resource/theme/font/roboto-v18-latin_latin-ext-700italic.eot b/source/resource/osparc/theme/font/roboto-v18-latin_latin-ext-700italic.eot
similarity index 100%
rename from source/resource/theme/font/roboto-v18-latin_latin-ext-700italic.eot
rename to source/resource/osparc/theme/font/roboto-v18-latin_latin-ext-700italic.eot
diff --git a/source/resource/theme/font/roboto-v18-latin_latin-ext-700italic.svg b/source/resource/osparc/theme/font/roboto-v18-latin_latin-ext-700italic.svg
similarity index 100%
rename from source/resource/theme/font/roboto-v18-latin_latin-ext-700italic.svg
rename to source/resource/osparc/theme/font/roboto-v18-latin_latin-ext-700italic.svg
diff --git a/source/resource/theme/font/roboto-v18-latin_latin-ext-700italic.ttf b/source/resource/osparc/theme/font/roboto-v18-latin_latin-ext-700italic.ttf
similarity index 100%
rename from source/resource/theme/font/roboto-v18-latin_latin-ext-700italic.ttf
rename to source/resource/osparc/theme/font/roboto-v18-latin_latin-ext-700italic.ttf
diff --git a/source/resource/theme/font/roboto-v18-latin_latin-ext-700italic.woff b/source/resource/osparc/theme/font/roboto-v18-latin_latin-ext-700italic.woff
similarity index 100%
rename from source/resource/theme/font/roboto-v18-latin_latin-ext-700italic.woff
rename to source/resource/osparc/theme/font/roboto-v18-latin_latin-ext-700italic.woff
diff --git a/source/resource/theme/font/roboto-v18-latin_latin-ext-700italic.woff2 b/source/resource/osparc/theme/font/roboto-v18-latin_latin-ext-700italic.woff2
similarity index 100%
rename from source/resource/theme/font/roboto-v18-latin_latin-ext-700italic.woff2
rename to source/resource/osparc/theme/font/roboto-v18-latin_latin-ext-700italic.woff2
diff --git a/source/resource/theme/font/roboto-v18-latin_latin-ext-italic.eot b/source/resource/osparc/theme/font/roboto-v18-latin_latin-ext-italic.eot
similarity index 100%
rename from source/resource/theme/font/roboto-v18-latin_latin-ext-italic.eot
rename to source/resource/osparc/theme/font/roboto-v18-latin_latin-ext-italic.eot
diff --git a/source/resource/theme/font/roboto-v18-latin_latin-ext-italic.svg b/source/resource/osparc/theme/font/roboto-v18-latin_latin-ext-italic.svg
similarity index 100%
rename from source/resource/theme/font/roboto-v18-latin_latin-ext-italic.svg
rename to source/resource/osparc/theme/font/roboto-v18-latin_latin-ext-italic.svg
diff --git a/source/resource/theme/font/roboto-v18-latin_latin-ext-italic.ttf b/source/resource/osparc/theme/font/roboto-v18-latin_latin-ext-italic.ttf
similarity index 100%
rename from source/resource/theme/font/roboto-v18-latin_latin-ext-italic.ttf
rename to source/resource/osparc/theme/font/roboto-v18-latin_latin-ext-italic.ttf
diff --git a/source/resource/theme/font/roboto-v18-latin_latin-ext-italic.woff b/source/resource/osparc/theme/font/roboto-v18-latin_latin-ext-italic.woff
similarity index 100%
rename from source/resource/theme/font/roboto-v18-latin_latin-ext-italic.woff
rename to source/resource/osparc/theme/font/roboto-v18-latin_latin-ext-italic.woff
diff --git a/source/resource/theme/font/roboto-v18-latin_latin-ext-italic.woff2 b/source/resource/osparc/theme/font/roboto-v18-latin_latin-ext-italic.woff2
similarity index 100%
rename from source/resource/theme/font/roboto-v18-latin_latin-ext-italic.woff2
rename to source/resource/osparc/theme/font/roboto-v18-latin_latin-ext-italic.woff2
diff --git a/source/resource/theme/font/roboto-v18-latin_latin-ext-regular.eot b/source/resource/osparc/theme/font/roboto-v18-latin_latin-ext-regular.eot
similarity index 100%
rename from source/resource/theme/font/roboto-v18-latin_latin-ext-regular.eot
rename to source/resource/osparc/theme/font/roboto-v18-latin_latin-ext-regular.eot
diff --git a/source/resource/theme/font/roboto-v18-latin_latin-ext-regular.svg b/source/resource/osparc/theme/font/roboto-v18-latin_latin-ext-regular.svg
similarity index 100%
rename from source/resource/theme/font/roboto-v18-latin_latin-ext-regular.svg
rename to source/resource/osparc/theme/font/roboto-v18-latin_latin-ext-regular.svg
diff --git a/source/resource/theme/font/roboto-v18-latin_latin-ext-regular.ttf b/source/resource/osparc/theme/font/roboto-v18-latin_latin-ext-regular.ttf
similarity index 100%
rename from source/resource/theme/font/roboto-v18-latin_latin-ext-regular.ttf
rename to source/resource/osparc/theme/font/roboto-v18-latin_latin-ext-regular.ttf
diff --git a/source/resource/theme/font/roboto-v18-latin_latin-ext-regular.woff b/source/resource/osparc/theme/font/roboto-v18-latin_latin-ext-regular.woff
similarity index 100%
rename from source/resource/theme/font/roboto-v18-latin_latin-ext-regular.woff
rename to source/resource/osparc/theme/font/roboto-v18-latin_latin-ext-regular.woff
diff --git a/source/resource/theme/font/roboto-v18-latin_latin-ext-regular.woff2 b/source/resource/osparc/theme/font/roboto-v18-latin_latin-ext-regular.woff2
similarity index 100%
rename from source/resource/theme/font/roboto-v18-latin_latin-ext-regular.woff2
rename to source/resource/osparc/theme/font/roboto-v18-latin_latin-ext-regular.woff2