diff --git a/en/faq.md b/en/faq.md
index ee005f0fa957603d145591ad6fcc669688ad06e7..d01c837506fb5679da7430feec4fbff8a6f4ebc4 100644
--- a/en/faq.md
+++ b/en/faq.md
@@ -28,18 +28,11 @@ The display has a polarizing filter. With some sunglasses this has the unfortion
 
 ## What can I do if the filesystem of my badge is read-only?
 tl;dr: `fsck`
-
-One possible reason for a read-only filesystem is a set "dirty-bit".
-To change this the linux tool fsck can be used.
-First the badge needs to be ejected safely, then it needs to be restartet and put back into "USB storage" mode.
-The device should not be mounted. Now `lsblk` can help with finding the correct blockdevice.
-Then you can check the filesystem with `fsck /dev/sdX` (replace `sdX` with the correct device).
-If neccessary the tool will ask if the "dirty bit" should be removed, this needs to be answered with yes.
-After this, the problem should be solved.
+The [maintenance and repair](/en/maintenance/_index) section of card10logix includes information about [filsystem repairs](/en/maintenance/filesystem).
 
 ## Help! My Display is not working / it cracked
 During camp we discovered that the badge display is one of the parts that easily gets damaged.
 If you get a crack due to a mechanical crash or similar incident you have to replace your display.
-The [upkeep](/en/upkeep/_index) section of card10logix includes a [guide for display replacement](/en/upkeep/display).
+The [maintenance and repair](/en/maintenance/_index) section of card10logix includes a [guide for display replacement](/en/maintenance/display).
 
 
diff --git a/en/upkeep/_index.md b/en/maintenance/_index.md
similarity index 90%
rename from en/upkeep/_index.md
rename to en/maintenance/_index.md
index fc420af2bed87e8a52329318e1c7159591a9168b..ae368701953b565641aead3cd6a56df1d936ebcc 100644
--- a/en/upkeep/_index.md
+++ b/en/maintenance/_index.md
@@ -1,5 +1,5 @@
 ---
-title: Upkeep and Repair Instructions
+title: Maintenance and Repair Instructions
 ---
 
 An important aspect of open hardware is that you have the information you need so you can fix it - if you have the skills to do so.
diff --git a/en/upkeep/display.md b/en/maintenance/display.md
similarity index 100%
rename from en/upkeep/display.md
rename to en/maintenance/display.md
diff --git a/en/upkeep/filesystem.md b/en/maintenance/filesystem.md
similarity index 90%
rename from en/upkeep/filesystem.md
rename to en/maintenance/filesystem.md
index 5db1a8aa9fa3dd1670533b8838cf96afd6c47eb9..e1ae147a659e133b4f951dfed4c132b98a803c17 100644
--- a/en/upkeep/filesystem.md
+++ b/en/maintenance/filesystem.md
@@ -1,5 +1,7 @@
-### File system maintainance
-#### Read only file system
+---
+title: File system maintainance
+---
+## Read only file system
 
 One possible reason for a read-only filesystem is a set "dirty-bit".
 To change this the linux tool fsck can be used.
@@ -9,7 +11,7 @@ Then you can check the filesystem with `fsck /dev/sdX` (replace `sdX` with the c
 If neccessary the tool will ask if the "dirty bit" should be removed, this needs to be answered with yes.
 After this, the problem should be solved.
 
-#### No file system detected
+## No file system detected
 If operating does not show a file system after activating _USB Storage Mode_ and attaching it via USB, a few things might be at fault:
 
  - The file system might be corrupted. Please try to create a new FAT file system and copy over the data from a working firmware release.
diff --git a/en/tutorials/_index.md b/en/tutorials/_index.md
index 6a3a72830c4f9912c5343373a02f8419ca8a41d3..902d254147b6286ea23185842a375807af7e6fb3 100644
--- a/en/tutorials/_index.md
+++ b/en/tutorials/_index.md
@@ -17,6 +17,6 @@ title: Tutorials
 
 * ECG kit assembly https://card10.badge.events.ccc.de/en/ecg_kit_assembly/
 
-## Repairs
+## Maintenance and repairs
 
-We dedicated a separate section of card10logix to repair work for the upkeep of your card10: https://card10.badge.events.ccc.de/en/upkeep/display/
+We dedicated a separate section of card10logix to repair work for the maintenance of your card10: https://card10.badge.events.ccc.de/en/maintenance
diff --git a/en/userguide/general-usage.md b/en/userguide/general-usage.md
index 0637545ad5d33abe211036f28b64516e80638830..2d886102ccfaa5f11d231a38ab6c8d4aa5255e5b 100644
--- a/en/userguide/general-usage.md
+++ b/en/userguide/general-usage.md
@@ -77,5 +77,5 @@ You can now browse the different applications. After selecting one, you can pres
 
 After transferring the application files don't forget to use the "Eject Safely" functionality of your operating system to make sure all data gets written to the card10.
 
-If you experience issues with apps not working, weird files showing up, the file system being read-only or your operating system talking about a corrupted file system, go to the [file system maintenance page](../../upkeep/filesystem) and follow the instructions to repair the file system.
+If you experience issues with apps not working, weird files showing up, the file system being read-only or your operating system talking about a corrupted file system, go to the [file system maintenance page](../../maintenance/filesystem) and follow the instructions to repair the file system.
 
diff --git a/en/userguide/general-usage.md.bak b/en/userguide/general-usage.md.bak
deleted file mode 100644
index e83ce6eb5af25ab9d80297da4feb7afcd2bb9cca..0000000000000000000000000000000000000000
--- a/en/userguide/general-usage.md.bak
+++ /dev/null
@@ -1,81 +0,0 @@
----
-title: "1: General Usage"
----
-
-## Buttons
-There are four buttons on the card10 _harmonic_ board: On the top left, just above the USB-C connector is the `POWER` button. Below is the `LEFT/UP` button. The buttons on the right side are closer together. On this side, the top button is the `SELECT` button, the one below it is the `RIGHT/DOWN` button.
-
-[![Drawing of card10 with button names](/media/card10buttons.svg)](/media/card10buttons.svg)
-
-
-## Powering on
-To switch on card10, briefly press the `POWER` button. After showing you which firmware version is installed, it will launch the [default app](../menu-system#selecting-a-default-app).
-
-### Expected run time
-With the default watch face and the current firmware (version 1.16) , a card10 should last around 24 hours. It will go into standby mode when the battery reaches a critically low level. In standby mode it continues to keep the time for multiple days. Even with an "empty" battery.
-
-The card10 signals going to sleep with this screen and by turning on the vibration motor:
-
-## Going to standby
-The card10 has a standby mode in which it continues to keep the current time and date. In this mode it draws very little power and should last multiple months with a full battery.
-
-To go the standby mode press the `POWER` button for a few seconds until you see this screen:
-
-[![Going to standby](/media/ug/1-standby.jpg)](/media/ug/1-standby.jpg)
-
-Let go of the button before the counter reaches 0 and your card10 will go to standby. If you keep pressing until the counter reaches 0, you card10 will hard turn off and lose the current time and date.
-
-## Powering off
-Sometimes it is necessary to fully power off the card10:
-
-  - When storing it for a longer perios to preserve the battery
-  - To reset it if the firmware is not able to go to standby anymore
-  - To reduce power consumption if a debugger was attached before
-
-To fully power of the card10, press the `POWER` button for at least 10 seconds. If the firmware is working, you will see the card10 counting down until 0 and then turn off. If the firmware is not working, slowly count to 10 and let go of the button. Afterwards you can turn on the card10 as usual again.
-
-## Starting apps
-When your card10 is switched on, a short press of the `POWER` button
-brings you to the app menu. You can scroll down with the `RIGHT/DOWN` button,
-and up with the `LEFT/UP` button. The `SELECT` button starts the selected app.
-The POWER button will always bring you back to the main menu, no matter what the current app is doing.
-
-If you chose "Home" or let the menu time out (after 30 seconds) it will launch the [default app](../menu-system#selecting-a-default-app).
-
-Each time you press the `POWER` button the card10 will be reset into a known state. The LEDs, the sensors and the vibration motor will turn off. The display will turn on.
-
-## Setting your personal state
-The card10 comes with an app to set your [personal state](/ps). Enter the menu
-by pressing the POWER button briefly. Select the `Personal State` app with the `SELECT` button,
-and navigate to your state with the `LEFT/UP` and `RIGHT/DOWN` buttons. Unlike the other apps, the state of the personal
-state LED will remain blinking and glowing even after you leave the app.
-
-
-## Installing apps via USB
-Your card10 can function similar to a USB stick in its _USB Storage Mode_. You can use this mode to upload configuration files, firmware updates and apps. Another way to install apps is via [Bluetooth](../ble) using your mobile phone and the [card10companion app](/app).
-
-First: connect another computer (or mobile phone) via USB to the card10.
-
-Press the `POWER` button to enter the menu and navigate to `USB Storage`. Then use the `SELECT` button to activate the USB storage mode.
-
-
-[![Going to standby](/media/ug/1-usb-storage.jpg)](/media/ug/1-usb-storage.jpg)
-[![Going to standby](/media/ug/1-usb-active.jpg)](/media/ug/1-usb-active.jpg)
-
-If you don't have a `USB Storage` menu entry or your card10 reboots while using it, you can also use the bootloader to access your card10: First put your card10 into [standby](#going-to-standby) with a long press of the `POWER` button. Next, hold down the `RIGHT/DOWN` button and press the `POWER` button, until your display shows the text "USB activated. Ready.". Use your operating systems "Eject Safely" function or press the POWER button again to exit the bootloader after you are done.
-
-You can now use your computer to access the internal file system of the card10. The `apps` folder contains all applications which are installed on the card10. The card10 comes with a few applications already pre-installed which you can find as well in the `apps` folder.
-
-**Important:** Don't forget to eject/unmount the card10 before unplugging it or pressing any button.
-
-To get additional applications please go to the [badge.team hatchery](https://badge.team/badge/card10) and select `card10` as the badge model:
-[![Going to standby](/media/ug/1-badge-team.png)](https://badge.team/badge/card10)
-
-You can now browse the different applications. After selecting one, you can press "Download latest egg (tar.gz)" which contains the files needed to execute the app on your card10. Simply download the file and extract its contents into the `apps` folder on the card10. You can also update already installed applications this way:
-
-![Going to standby](/media/ug/1-download-egg.png)
-
-After transferring the application files don't forget to use the "Eject Safely" functionality of your operating system to make sure all data gets written to the card10.
-
-If you experience issues with apps not working, weird files showing up, the file system being read-only or your operating system talking about a corrupted file system, go the [file system maintainance page](../../upkeep/filesystem) and follow the instructions to repair the file system.
-