diff --git a/config.toml b/config.toml
index 3294ad0..9059754 100644
--- a/config.toml
+++ b/config.toml
@@ -34,7 +34,7 @@ publishDir = "/var/www/qrz.is"
     mediaType = "application/atom"
 
 [outputs]
-  home = ["HTML", "GEMINI_ATOM", "GEMINI"]
+  home = ["HTML", "GEMINI_ATOM", "GEMINI", "RSS"]
   page = ["HTML", "GEMINI"]
 
 # Menu links
@@ -48,20 +48,20 @@ publishDir = "/var/www/qrz.is"
     weight = 3
     url = "/projects/"
 [[menu.main]]
-    name = "About"
+    name = "Tags"
     weight = 4
+    url = "/tags/"
+[[menu.main]]
+    name = "About"
+    weight = 5
     url = "/about/"
 [[menu.main]]
     name = "Impressum"
-    weight = 5
+    weight = 7
     url = "/impressum/"
-[[menu.main]]
-    name = "Datenschutz"
-    weight = 6
-    url = "/privacy/"
 [[menu.main]]
     name = "RSS"
-    weight = 7
+    weight = 6
     url = "/index.xml"
 [[menu.footer]]
     name = "Git"
@@ -76,6 +76,6 @@ publishDir = "/var/www/qrz.is"
     weight = 7
     url = "https://qrz.com/DB/DL6MHC"
 [[menu.footer]]
-    name = "RSS"
+    name = "Privacy/Datenschutz"
     weight = 8
-    url = "/index.xml"
+    url = "/privacy/"
diff --git a/content/post/2011-08-05-the-arduino-enabled-washing-machine.md b/content/post/2011-08-05-the-arduino-enabled-washing-machine.md
index 1b5dea3..f74e654 100644
--- a/content/post/2011-08-05-the-arduino-enabled-washing-machine.md
+++ b/content/post/2011-08-05-the-arduino-enabled-washing-machine.md
@@ -3,10 +3,8 @@ title: The Laundruino
 type: post
 date: 2011-08-05T09:58:52+00:00
 url: /the-arduino-enabled-washing-machine/
-categories:
-  - arduino
 tags:
-  - arduino
+ - Arduino
 ---
 
 My washing machine is located in the basement. Unfortunately, the time data displayed on the front panel is always inaccurate. So instead of constantly running down the stairs and checking if the laundry is done, I decided to connect the washing machine to my LAN and extend it's features by a simple http server. This is what I needed for it:
diff --git a/content/post/2012-10-30-the-one-button-audiobook-player.md b/content/post/2012-10-30-the-one-button-audiobook-player.md
index 3fbac52..47c4358 100644
--- a/content/post/2012-10-30-the-one-button-audiobook-player.md
+++ b/content/post/2012-10-30-the-one-button-audiobook-player.md
@@ -4,11 +4,10 @@ type: post
 author: micha
 date: 2012-10-29T23:20:05+00:00
 url: /the-one-button-audiobook-player/
-categories:
-  - Uncategorized
 tags:
-  - raspberry audiobook
-
+- Raspberry Pi
+- Hardware
+- Python
 ---
 This little Raspberry Pi based project is a gift for my wife's grandmother for her 90th birthday. Being visually impaired, she is hard to entertain but loves to listen to audiobooks. The problem is, that she isn't able to handle a ghetto blaster or MP3 player.
 
diff --git a/content/post/2013-01-29-adressenmeister.md b/content/post/2013-01-29-adressenmeister.md
index 03e52ec..fef96ce 100644
--- a/content/post/2013-01-29-adressenmeister.md
+++ b/content/post/2013-01-29-adressenmeister.md
@@ -3,10 +3,11 @@ title: Adressenmeister
 type: post
 author: micha
 date: 2013-01-29T12:39:02+00:00
+tags:
+ - Software
+ - Basic
+ - C64
 url: /adressenmeister/
-categories:
-  - Uncategorized
-
 ---
 I'd like to share my very first software project from 1992 with you which was written in BASIC 2.0 on my C64. It has never really been finished but had a nice intro screen with moving sprites and was able to print labels on a wire printer 🙂
 
diff --git a/content/post/2013-03-23-little-helper.md b/content/post/2013-03-23-little-helper.md
index e382a32..28feeeb 100644
--- a/content/post/2013-03-23-little-helper.md
+++ b/content/post/2013-03-23-little-helper.md
@@ -4,9 +4,9 @@ type: post
 author: micha
 date: 2013-03-23T11:49:38+00:00
 url: /little-helper/
-categories:
-  - Uncategorized
-
+tags:
+- Hardware
+- DIY
 ---
 Here's the result of my attempt to recreate [Gyro Gearloose's Little Helper (in German: Daniel Düsentrieb's Helferlein)](https://www.duckipedia.de/Helferlein):
 
diff --git a/content/post/2013-05-03-one-button-audiobook-player-features-in-new-book.md b/content/post/2013-05-03-one-button-audiobook-player-features-in-new-book.md
index 4cf94b5..602945f 100644
--- a/content/post/2013-05-03-one-button-audiobook-player-features-in-new-book.md
+++ b/content/post/2013-05-03-one-button-audiobook-player-features-in-new-book.md
@@ -3,9 +3,10 @@ title: One-button audiobook player features in new book
 type: post
 author: micha
 date: 2013-05-03T13:16:03+00:00
+tags:
+- Hardware
+- Raspberry Pi
 url: /one-button-audiobook-player-features-in-new-book/
-categories:
-  - Uncategorized
 
 ---
 The One-button audiobook player has been included in the new book Raspberry Pi For Dummies by Sean McManus and Mike Cook. The book covers setting up the Raspberry Pi, using Linux on it, using the Pi for work and play, programming the Raspberry Pi in Scratch and Python, and creating electronics projects.
diff --git a/content/post/2014-05-05-nse-script-sqlite-output-for-nmap.md b/content/post/2014-05-05-nse-script-sqlite-output-for-nmap.md
index 128c6ce..7ae128e 100644
--- a/content/post/2014-05-05-nse-script-sqlite-output-for-nmap.md
+++ b/content/post/2014-05-05-nse-script-sqlite-output-for-nmap.md
@@ -4,9 +4,9 @@ type: post
 author: micha
 date: 2014-05-05T13:36:29+00:00
 url: /nse-script-sqlite-output-for-nmap/
-categories:
-  - Uncategorized
-
+tags:
+ - Software
+ - Nmap
 ---
 I wrote this little NSE script that allows you to store the output of Nmap into a SQLite database: [https://git.qrz.is/clemens/nmap-sqlite-output](https://git.qrz.is/clemens/nmap-sqlite-output)
   
diff --git a/content/post/2016-05-25-patch-for-the-cli-password-manager-pass.md b/content/post/2016-05-25-patch-for-the-cli-password-manager-pass.md
index b9c2c74..801c21a 100644
--- a/content/post/2016-05-25-patch-for-the-cli-password-manager-pass.md
+++ b/content/post/2016-05-25-patch-for-the-cli-password-manager-pass.md
@@ -4,9 +4,9 @@ type: post
 author: micha
 date: 2016-05-25T21:47:20+00:00
 url: /patch-for-the-cli-password-manager-pass/
-categories:
-  - Uncategorized
-
+tags:
+ - Software
+ - CLI
 ---
 I use Pass (https://www.passwordstore.org/) to store and synchronize all my passwords.
 
diff --git a/content/post/2018-04-29-correlation-rule-documentation-generator-for-mcafee-siem.md b/content/post/2018-04-29-correlation-rule-documentation-generator-for-mcafee-siem.md
index cd64b84..232088d 100644
--- a/content/post/2018-04-29-correlation-rule-documentation-generator-for-mcafee-siem.md
+++ b/content/post/2018-04-29-correlation-rule-documentation-generator-for-mcafee-siem.md
@@ -4,8 +4,10 @@ type: post
 author: micha
 date: 2018-04-29T13:09:57+00:00
 url: /correlation-rule-documentation-generator-for-mcafee-siem/
-categories:
-  - Uncategorized
+tags:
+ - Software
+ - SIEM
+ - Python
 
 ---
 Since we are required to document all custom correlation rules inside our SIEM (McAfee Enterprise Security Manager) for our customers, I wrote a Python script that converts XML rule exports to Markdown. Afterwards its easy to convert teh resulting file e.g. to PDF, DOCX, HTML or even variuous wiki-formats with e.g. Pandoc. This way it's possible to generate a PDF documentation of all rules with just a few clicks/commands.
diff --git a/content/post/2018-05-03-dynamic-dns-for-nsd.md b/content/post/2018-05-03-dynamic-dns-for-nsd.md
index c79f7e8..0fdfae0 100644
--- a/content/post/2018-05-03-dynamic-dns-for-nsd.md
+++ b/content/post/2018-05-03-dynamic-dns-for-nsd.md
@@ -4,8 +4,11 @@ type: post
 author: micha
 date: 2018-05-03T02:26:11+00:00
 url: /dynamic-dns-for-nsd/
-categories:
-  - Uncategorized
+tags:
+ - DNS
+ - OpenBSD
+ - Linux
+ - Software
 
 ---
 # Introduction
diff --git a/content/post/30m-shortened-dipole.md b/content/post/30m-shortened-dipole.md
index 22880de..0b75b9f 100644
--- a/content/post/30m-shortened-dipole.md
+++ b/content/post/30m-shortened-dipole.md
@@ -2,6 +2,9 @@
 title: "Shortened 30m Dipole"
 date: 2020-02-02T15:00:00+02:00
 type: post
+tags:
+ - Ham Radio
+ - Antenna
 url: /30m-dipole/
 ---
 
diff --git a/content/post/amberterm.md b/content/post/amberterm.md
new file mode 100644
index 0000000..34ab055
--- /dev/null
+++ b/content/post/amberterm.md
@@ -0,0 +1,20 @@
+---
+title: "Gemini / Amberterm"
+type: post
+author: micha
+date: 2021-07-21T12:00:00+02:00
+tags:
+ - Gemini
+ - Hugo
+url: /gemini-amberterm/
+---
+
+For the relaunch of my personal website, I first used the brilliant theme [smol](https://github.com/colorchestra/smol/). After having customized numerous files of the theme, I have now decided to create my own Hugo theme called ["Amberterm" (git.qrz.is)](https://git.qrz.is/clemens/amberterm). This is largely based on "smol", but contains some cosmetic adjustments as well as all layout files in order to be able to generate [Gemini](https://gemini.circumlunar.space/) files with the help of [Hugo](https://gohugo.io/). In this way it is now possible for me - without any additional effort - to publish a new post for the [WWW version of my website](https://qrz.is) as well as for the [Gemini version](gemini://qrz.is).
+
+To view the Gemini version of this page, you either need a Gemini client or you use a Gemini http proxy.
+
+The Gemini URL of this page is [gemini://qrz.is](gemini://qrz.is).
+
+A nice Gemini client is e.g. [Kristall](https://kristall.random-projects.net/). More clients can be found here: [https://gemini.circumlunar.space/software/](https://gemini.circumlunar.space/software/).
+
+A proxified version of my Gemini capsule can be accessed via a proxy service as follows: [https://portal.mozz.us/gemini/qrz.is ](https://portal.mozz.us/gemini/qrz.is)
diff --git a/content/post/antenna-switch.md b/content/post/antenna-switch.md
index a981a1e..663f0fa 100644
--- a/content/post/antenna-switch.md
+++ b/content/post/antenna-switch.md
@@ -3,6 +3,10 @@ title: "Remote Antenna Switch"
 type: post
 author: micha
 date: 2020-03-13T15:00:00+02:00
+tags:
+- Ham Radio
+- Antenna
+- Raspberry Pi
 url: /antenna-switch/
 ---
 New project: raspberry pi controlled remote antenna switch. One remote rpi for triggering the 4 relais inside the antenna switch and one rpi connected to the TRX in the shack measuring the ATU port's voltage to fully automatically choose the correct antenna for each band.
diff --git a/content/post/atu-100.md b/content/post/atu-100.md
index de91560..9a78515 100644
--- a/content/post/atu-100.md
+++ b/content/post/atu-100.md
@@ -4,6 +4,11 @@ type: post
 author: micha
 date: 2021-01-09T15:00:00+02:00
 url: /atu-100/
+tags:
+ - ATU-100
+ - Antenna
+ - Hardware
+ - Ham Radio
 ---
 
 Just finished my ATU-100 build. It's fun to build, super affordable and works without problems so far.  
diff --git a/content/post/bitx40.md b/content/post/bitx40.md
index c993966..6fb8ddc 100644
--- a/content/post/bitx40.md
+++ b/content/post/bitx40.md
@@ -4,6 +4,9 @@ type: post
 author: micha
 date: 2021-05-13T15:00:00+02:00
 url: /bitx40/
+tags:
+ - Ham Radio
+ - Bitx40
 ---
 
 Finally fixed some issues with the BITX40 and had my first QSO with it today (YU1XA, report 55) - two years after I purchased the kit. There are still some issues but I am on the right track.
diff --git a/content/post/dxcc-100.md b/content/post/dxcc-100.md
index 4e56d82..eee5bd4 100644
--- a/content/post/dxcc-100.md
+++ b/content/post/dxcc-100.md
@@ -4,6 +4,8 @@ type: post
 author: micha
 date: 2021-07-03T15:00:00+02:00
 url: /dxcc-phone/
+tags:
+ - Ham Radio
 ---
 
 I finally managed to work 100 confirmed entities (SSB/Phone) and have now received the ARRL DXCC Phone award. My new adventures will be working QRP with my recently purchased FT-817ND and building a small PA for the times I need a small boost.
diff --git a/content/post/g1m-stand.md b/content/post/g1m-stand.md
index a678b44..3b4cbdc 100644
--- a/content/post/g1m-stand.md
+++ b/content/post/g1m-stand.md
@@ -3,6 +3,11 @@ title: "Xiegu G1M Stand"
 type: post
 author: micha
 date: 2021-06-05T15:00:00+02:00
+tags:
+ - Ham Radio
+ - Hardware
+ - Xiegu
+ - Mods
 url: /g1m-stand/
 ---
 
diff --git a/content/post/g90-mods.md b/content/post/g90-mods.md
index 5c331c8..e1a29cb 100644
--- a/content/post/g90-mods.md
+++ b/content/post/g90-mods.md
@@ -3,6 +3,11 @@ title: "Xiegu G90 Mods"
 type: post
 author: micha
 date: 2020-01-17T15:00:00+02:00
+tags:
+ - Ham Radio
+ - Hardware
+ - Xiegu
+ - Mods
 url: /g90-mods/
 ---
 
diff --git a/content/post/heated_trackball.md b/content/post/heated_trackball.md
index 72e3c83..be3b13d 100644
--- a/content/post/heated_trackball.md
+++ b/content/post/heated_trackball.md
@@ -4,6 +4,9 @@ date: 2014-12-22T14:34:34+02:00
 draft: false
 type: post
 url: /heated-trackball/
+tags:
+ - Hardware
+ - Trackball
 ---
 
 ## Parts needed
diff --git a/content/post/mikrotik-auto-backup.md b/content/post/mikrotik-auto-backup.md
index 24c1970..29c5237 100644
--- a/content/post/mikrotik-auto-backup.md
+++ b/content/post/mikrotik-auto-backup.md
@@ -4,10 +4,10 @@ type: post
 author: micha
 date: 2019-01-04T22:00:11+02:00
 url: /mikrotik-auto-backup/
+tags:
+ - Mikrotik
+ - Backup
 draft: false
-categories:
-  - MikroTik
-
 ---
 # Einführung
 
diff --git a/content/post/mikrotik-capsman-setup.md b/content/post/mikrotik-capsman-setup.md
index ce122fb..b9e6f41 100644
--- a/content/post/mikrotik-capsman-setup.md
+++ b/content/post/mikrotik-capsman-setup.md
@@ -4,9 +4,11 @@ type: post
 author: micha
 date: 2018-12-31T16:00:11+02:00
 url: /mikrotik-capsman-setup/
+tags:
+ - Ham Radio
+ - WiFi
+ - CAPsMAN
 draft: false
-categories:
-  - MikroTik
 
 ---
 # Einführung
diff --git a/content/post/mikrotik-execute-scripts-via-sms.md b/content/post/mikrotik-execute-scripts-via-sms.md
index 8281ff7..ed2d6df 100644
--- a/content/post/mikrotik-execute-scripts-via-sms.md
+++ b/content/post/mikrotik-execute-scripts-via-sms.md
@@ -4,9 +4,9 @@ type: post
 author: micha
 date: 2018-12-30T13:00:11+02:00
 url: /mikrotik-exec-scripts-via-sms/
+tags:
+- Mikrotik
 draft: false
-categories:
-  - MikroTik
 
 ---
 # Einführung
diff --git a/content/post/qrz-sh.md b/content/post/qrz-sh.md
index 8eb6f26..565fa03 100644
--- a/content/post/qrz-sh.md
+++ b/content/post/qrz-sh.md
@@ -4,6 +4,11 @@ type: post
 author: micha
 date: 2020-11-09T17:00:00+02:00
 url: /qrz-sh/
+tags:
+ - Software
+ - Bash
+ - CLI
+ - Ham Radio
 ---
 
 # About
diff --git a/content/post/qrzlogger.md b/content/post/qrzlogger.md
index eef58c1..8b77d08 100644
--- a/content/post/qrzlogger.md
+++ b/content/post/qrzlogger.md
@@ -4,6 +4,10 @@ type: post
 author: micha
 date: 2021-07-13T15:00:00+02:00
 url: /qrzlogger/
+tags:
+ - Software
+ - Python
+ - Ham Radio
 ---
 
 I'm in the progress of developing a Python command line application to log QSOs directly into the QRZ.com logbook.  
diff --git a/content/post/solar-powered-shack.md b/content/post/solar-powered-shack.md
index 1efd8e9..bb69b8f 100644
--- a/content/post/solar-powered-shack.md
+++ b/content/post/solar-powered-shack.md
@@ -3,6 +3,9 @@ title: "Solar Powered Amateur Radio Station"
 type: post
 author: micha
 date: 2021-07-20T12:00:00+02:00
+tags:
+ - Ham Radio
+ - Solar
 url: /solar-powered-shack/
 ---
 
diff --git a/content/post/the-antennapi.md b/content/post/the-antennapi.md
index f14560b..b9d2d8b 100644
--- a/content/post/the-antennapi.md
+++ b/content/post/the-antennapi.md
@@ -3,6 +3,11 @@ title: "The AntennaPi"
 type: post
 author: micha
 date: 2019-07-05T13:29:09+02:00
+tags:
+ - Ham Radio
+ - Antenna
+ - Hardware
+ - Raspberry Pi
 url: /the-antennapi/
 ---
 
diff --git a/content/post/uBitx.md b/content/post/uBitx.md
index fbbd533..ef9e3e1 100644
--- a/content/post/uBitx.md
+++ b/content/post/uBitx.md
@@ -3,6 +3,9 @@ title: "uBitx v6"
 type: post
 author: micha
 date: 2021-05-18T15:00:00+02:00
+tags:
+- Ham Radio
+- uBitx
 url: /uBitx_v6/
 ---
 
diff --git a/content/post/uBitx_agc.md b/content/post/uBitx_agc.md
index 2134457..c8c7302 100644
--- a/content/post/uBitx_agc.md
+++ b/content/post/uBitx_agc.md
@@ -3,6 +3,10 @@ title: "uBitx AGC Mod"
 type: post
 author: micha
 date: 2021-06-15T15:00:00+02:00
+tags:
+ - Ham Radio
+ - Mods
+ - uBitx
 url: /uBitx_agc/
 ---
 
diff --git a/content/post/uBitx_printed_knobs.md b/content/post/uBitx_printed_knobs.md
index 4d3d66c..ccc030d 100644
--- a/content/post/uBitx_printed_knobs.md
+++ b/content/post/uBitx_printed_knobs.md
@@ -3,6 +3,10 @@ title: "uBitx VFO Knob Mod"
 type: post
 author: micha
 date: 2021-06-18T15:00:00+02:00
+tags:
+ - Ham Radio
+ - Mods
+ - 3D Printing
 url: /uBitx_vfo_knob/
 ---
 
diff --git a/content/post/uBitx_s-meter.md b/content/post/uBitx_s-meter.md
index e67b175..1b209cc 100644
--- a/content/post/uBitx_s-meter.md
+++ b/content/post/uBitx_s-meter.md
@@ -3,6 +3,10 @@ title: "uBitx S-Meter Mod"
 type: post
 author: micha
 date: 2021-06-16T15:00:00+02:00
+tags:
+ - Ham Radio
+ - Mods
+ - uBitx
 url: /uBitx_smeter/
 ---
 
diff --git a/themes/amberterm b/themes/amberterm
index a352174..641cb53 160000
--- a/themes/amberterm
+++ b/themes/amberterm
@@ -1 +1 @@
-Subproject commit a3521745216a20db4a8bdd6cd45072f52cef4aab
+Subproject commit 641cb536cf5ae4c374567627fb3b7c37a2125ebd