diff --git a/dockerhub/fda-search-service.md b/dockerhub/fda-search-service.md
new file mode 100644
index 0000000000000000000000000000000000000000..aed8332b36cdd0e78473e7030aa92f26f677f314
--- /dev/null
+++ b/dockerhub/fda-search-service.md
@@ -0,0 +1,19 @@
+# How to use this image
+
+```console
+$ docker run -p 9200:9200 dbrepo/search-service:latest
+```
+
+## Customization
+
+Change the default behavior by setting the following environment variables to different values:
+
+* `ELASTIC_PASSWORD`, default: `elastic`
+
+  The password for the username `elastic`. By default the credentials are `elastic:elastic`.
+
+## Elastic Search Endpoints
+
+* **Index**:
+
+  http://localhost:9200/
diff --git a/dockerhub/release.py b/dockerhub/release.py
index b99fc19177c524831a749f00dd67a318c619b054..9ea3e8c3c596c391b40c70cb1b98bee764f2b6c6 100755
--- a/dockerhub/release.py
+++ b/dockerhub/release.py
@@ -9,6 +9,7 @@ dockerhub = Dockerhub()
 if __name__ == "__main__":
     for component in ["analyse-service", "authentication-service", "broker-service", "container-service",
                       "database-service", "discovery-service", "gateway-service", "identifier-service",
-                      "metadata-db", "metadata-service", "query-service", "table-service", "ui", "semantics-service"]:
+                      "metadata-db", "metadata-service", "query-service", "table-service", "ui", "semantics-service",
+                      "search-service"]:
         response = dockerhub.modify_description(component)
         print(response)
diff --git a/docs/images/DS-icon_white_hiRes.png b/docs/images/DS-icon_white_hiRes.png
new file mode 100644
index 0000000000000000000000000000000000000000..862c2124ca4190ff6a12de31aeffa08f8e77f300
Binary files /dev/null and b/docs/images/DS-icon_white_hiRes.png differ
diff --git a/docs/images/architecture.png b/docs/images/architecture.png
new file mode 100644
index 0000000000000000000000000000000000000000..bce8dcb74293782829e314bd30af8bbfe38c31e9
Binary files /dev/null and b/docs/images/architecture.png differ
diff --git a/docs/stylesheets/extra.css b/docs/stylesheets/extra.css
index fda28f0e33f3292474d32fe3d0181737446c6501..03a3c66d0fe57e411d25cfdeb12ddd01c46d6312 100644
--- a/docs/stylesheets/extra.css
+++ b/docs/stylesheets/extra.css
@@ -1,4 +1,44 @@
-:root {
-    --md-primary-fg-color: #006699;
-    --md-accent-fg-color: #5485AB;
+.md-typeset a,
+.md-typeset a {
+    color: var(--md-typeset-color);
+    border-bottom: 2px solid var(--md-primary-fg-color);
 }
+
+.md-typeset a:focus,
+.md-typeset a:hover {
+    color: var(--md-typeset-color);
+    border-bottom: 2px solid var(--md-primary-fg-color--dark);
+}
+
+[data-md-color-scheme="default"] .md-header,
+[data-md-color-scheme="default"] .md-tabs {
+    background: #5e7677;
+}
+
+[data-md-color-scheme="slate"] .md-header,
+[data-md-color-scheme="slate"] .md-tabs {
+    background-color: hsla(var(--md-hue), 15%, 12%, 1.00);
+}
+
+/* buttons */
+
+.md-typeset .md-button {
+    background-color: #5e7677;
+    border-color: #5e7677;
+}
+
+.md-typeset .md-button:is(:focus,:hover) {
+    background-color: #435556;
+    border-color: #435556;
+}
+
+/* tabs */
+
+.md-typeset .tabbed-set > input:first-child:checked ~ .tabbed-labels > :first-child,
+.md-typeset .tabbed-labels > label:hover {
+    color: #5e7677;
+}
+
+.js .md-typeset .tabbed-labels:before {
+    background: #5e7677;
+}
\ No newline at end of file
diff --git a/docs/system.md b/docs/system.md
index 5ede2ebcf01cf705903a730b19472c78e441e7dd..6538db49f1be9cf6d55eb3ef99e3f31bfbd5bbc1 100644
--- a/docs/system.md
+++ b/docs/system.md
@@ -14,7 +14,7 @@ technologies. The conceptualized microservices operate the basic database operat
 *findability*, *accessability*, *interoperability* and *reuseability* (FAIR).
 
 <figure markdown>
-![Microservice cloud architecture](/images/interaction-gateway.svg) 
+![Microservice cloud architecture](/images/architecture.png) 
 <figcaption>Microservice cloud architecture</figcaption>
 </figure>
 
diff --git a/misc/architecture.drawio b/misc/architecture.drawio
new file mode 100644
index 0000000000000000000000000000000000000000..8ce2f771feb94d29b4e45cdd5ba294585340b2f0
--- /dev/null
+++ b/misc/architecture.drawio
@@ -0,0 +1 @@
+<mxfile host="app.diagrams.net" modified="2023-02-14T08:32:46.873Z" agent="5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/109.0.0.0 Safari/537.36" etag="LFuOAn-oVRe2YUVyEZzB" version="20.8.20" type="device"><diagram name="Page-1" id="BS_rNRZWEkVqn4O3IFNu">7V1bc+I6Ev41edgHKCTf4DEkYXZOzTmVs+zUyTxNCVtgTYzlsUQC++tXsiXAlgkksbGLZKpmym7rYn9fq1vdkpgr62a5/pKiJPyTBji6goNgfWXdXkE4Go7Ev1KwyQUOUIJFSoJcBHaCKfkfVsKBkq5IgFmhIKc04iQpCn0ax9jnBRlKU/pcLDanUbHXBC2wIZj6KDKl/5CAh7l0aA928n9jsghVz85Afd4S6bKqJAtRQJ/3RNbdlXWTUsrzq+X6BkcSOg1LXm9y4On2vVIc81Mq/P5jNv1uwa/xd2T9fvgH3Px8mPccK2/mCUUr9cHqbflGI5DSVRxg2crgyho/h4TjaYJ8+fRZUC5kIV9G4g6IS8ZT+ohvaETTrLY1yP6IJ3Ma80o5iSItj2ksmh2rd8Ipx+uDXwu2GArVw3SJeboRRZSaQS+v8VzBWbjHl63pQUpPFtumdliKCwXnK6Ad2o1Cq6CSqKpBA8poCpRvx3fjifiKcYBYmHUE1M094hyncSaBA1tVnap3YzSSH/cuJlQF6OQ19Ph3DWK8UQUxoDlinC4Q49wNb+0uEQO8U5kZwoaYsWyDCBwIa6xuacpDuqAxiu520nGRql2Zb5QmCtZfmPONIgOtOC3Sh9eEP8jqfc9Rtz/2Ht2uVdPZzUbfxOKDH/ZvfmRNOPp2Vy270/UOWUHGUcqvpb8SD/wIMUZ8LZ6QSL9rjo8E5WXSBYZ0lfr4BbC1M0XpAvOXSIHVWpTiCHHyVHyR+lXCaVcl4BtUAly8SlitqoTXpkqAPX1Q3H4aiZ51wNWcSSOG7RqJt7iNnRL8KOjApWhEu15j1KpCvMVElJ0GcN+oElmpe5wSASVOVeEO68moTUUBRijwHywm1QwL4X1K16IHNxKvP56l4mohr/768vWvhxcCBnA8YCjFApPsz5uC5xrCAMspxgGuGTkDqypybio+gwYn37+aNMg+3kVCA9CB4bBl7Mx0zhfE8TOSLz3F6RMRYHQNNWi3jZqZqbklzKfiK7uMmzVoGzczkXIj7BQisfA7HcLN7Zi6uQZs/0WzCHcIMtctYta+YfMMzP5edWx4FiFrf3QOTauGOJoh1iVNk/PcbmnayIDtayA+hsxJl61a+7jpBbs94K5XPJTQ+WImT+MOgQdGXfMJwIxErkXsuen0YG3fxgEzWJhilPphh1ArO9MOKJsZJkzxEsmRyjoEXFndOgCcGSn8iTkKhF/tEG5l62bpPQnt4WZGCmOZ6uiSQy2j1r5HdYAByhmymIfzioFOIKolbiFRuUP5/ISF7PxzjqcX35ENVFXvKREtbrn19JqRHhEjWGwiT1OqWjvajIZsbYIONZTnRY2GMv633/OO3Jg5O71PZashXrGqJFkukZwWFMn9vaL6QY9lqnAtCoBBss6rqed72bbE6EcI84Z1mfeM4E7lRMu2wDW3Rpw5/G1nGfzAatX2WTOrVXuWZldoZ2zeuvZ2xEDBetc/tHo0vwCSVRWAZUleXSCRFogdtohgAIreDsIXDR90XywvLvI3qNXaWRUhZSTGtZiqooWcPFyMwbE6Zm8sMxz1r4MnwmjarJfxUbGXy/Ux5eim9XU3y4yl/1glG2Eiw9WsWdZ/Gf18HN5BxVblMxNfsWqYorkwss2yvih2crmUG6Fl65S77eyhq3n30wkTxRpndLZ94ozOhe+c0b0vawDboPYSswaWPru0DfZBX2+Sf23iwDveVMOpg1Er2aRzb5IsHLloPAyt0bo4p1qXWnT9teHi9piU1l+vpKINRH9OsweoXns2reY5gQ3Kx2/MKUHFjKCxU1GOmaLnfiIEQ9HjjTTFtmXALz6fv4SxPgtlHvFDEVlIIx/huWxBQkl8FF0r8ZIEQWaAqigtkt7gvM2GZhyuQ/OzkOK1cyCqnWMLDaX96rTR7qk22mlkQgK84jJGOTw4MIN4dW6w1E3R2B8tDtWugGadg7mJ7oKcA/CsbjkHc/td7hwc1zNxv3CvAIYVB2XP6RUcc2ffBem+rff0aCNnta385pprrvwg+2hoZqoufABsp0WaIb1Roa0B4ZqZ60saECWn3/Z4cM108cceD6Wl0faHw0UHzp5T3ILT/ng4FDl/1PHgucVkZ+WAAOdkqJ3jwN1d7ag9MrVBOTIdFps4EJoeb0iP7iMJ97riSm/wqSoN78V0rXpUxWjo3KpipiCCWYoTCvrY7/PVM8FxH/l9xBtwAL5gSZ7u76oLsIpOGtqGB3ArfLTVlAcYmjvJDFJYiBJ5SZbZTwJukf2GZji6p4xkh5is2xnlnC5FgUg+GCP/cZHhqqEM8Bytoir3zKU5GCOW5D9UOCdrycU46/BaSwdaIq5DzuXPHF5nh90nC8JFl/0AP+GIJjhlfR8tpYatHsXTVRJRFDBx1RN/2YZxvMy37f6SDcMJekJiRIgL27ElnD5dJpThfhIvaiLdtvulMVmxkc3NfmfLoN7zmqLezF2Bf33AETksjkigl3P2qNHbUs4zJM0sFvzkBVoVpvK8vJjpLjleXLSUuMQzlgeHFYYpCREJUtSn6ULu5UIk7cmTUT20EpwR1AtmPekehSGl8j0n8wD1WH76R5utWURn8q0Rk5zBSUD9R5z2tKnS/nUjtMHYmgZPe8uiYxZdCa2I+8+YyKOWk7yHnij0hjeq1t1jO9VO3LVQg66VM6ueGZc5sCp0HjWka/CEn+Jkj5j7oRqIhu/cA1Ita4lKzvjKua0yAdq172MO9/wtWUrNjUjGOPOR1Ijp399+6oPzPxc4xinx++ypJp9pjUrDv2IbsJ5L7VPiNPZbKCckjy6cEqtjjJgG+YMx4tlOtygZnfCz2Z0PJxBjmLM+E20+ihigL1yakGZlpTt2hvZwMAfQx3MwALY/mDnYHlmgvnihnDcfDExWRURRMfmBVlPEnmL9Pol97QJhF5g9ZarxyewxS+zBvpHqbZJccbv7LxLyzN3uv5mw7v4P</diagram></mxfile>
\ No newline at end of file
diff --git a/mkdocs.yml b/mkdocs.yml
index bad9f23a4befc135f9e2fa8cccb65eb1ae4a143d..579e2ff6e0f9c86556733fbc8dffee265425c691 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -8,8 +8,6 @@ extra:
   social:
     - icon: fontawesome/brands/gitlab
       link: https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services
-  version:
-    provider: mike
 nav:
   - Home: index.md
   - getting-started.md
@@ -20,10 +18,10 @@ nav:
 extra_css:
   - stylesheets/extra.css
 theme:
-  favicon: images/TU_Signet_weiss_transparent_72dpi_RGB.png
-  logo: images/TU_Signet_weiss_transparent_300dpi_RGB.png
+  favicon: images/DS-icon_white_hiRes.png
+  logo: images/DS-icon_white_hiRes.png
   font:
-    text: IBM Plex Sans
+    text: IBM Plex Serif
     code: IBM Plex Mono
   features:
     - navigation.tabs
@@ -32,13 +30,17 @@ theme:
   icon:
     repo: fontawesome/brands/git-alt
   palette:
-    - scheme: indigo
+    - scheme: default
+      primary: "#5e7677"
+      accent: "#435556"
       font:
         code: Roboto Mono
       toggle:
         icon: material/weather-night
         name: Switch to light mode
     - scheme: slate
+      primary: red
+      accent: red
       font:
         code: Roboto Mono
       toggle:
diff --git a/swagger/generate.sh b/swagger/generate.sh
index e3c3f2209edd7a94a666bf92ce922e7fe438ca00..2a0f1f75cc0411165380f4e5760d5396081416c3 100755
--- a/swagger/generate.sh
+++ b/swagger/generate.sh
@@ -60,6 +60,3 @@ for key in "${!services[@]}"; do
   replace "$key" "${services[$key]}"
   move "${services[$key]}"
 done
-
-cp -r ./api/* "${HOME}/Projects/dbrepo-tuw/worker-airquality/" || true
-cp -r ./client "${HOME}/Projects/dbrepo-tuw/worker-airquality/" || true
diff --git a/swagger/metadata/.swagger-codegen/VERSION b/swagger/metadata/.swagger-codegen/VERSION
new file mode 100644
index 0000000000000000000000000000000000000000..10bbf276ee45aaec75c7b2ada3ff71d798f89fd9
--- /dev/null
+++ b/swagger/metadata/.swagger-codegen/VERSION
@@ -0,0 +1 @@
+3.0.34
\ No newline at end of file