Merge pull request 'add check if menu exists before adding event listeners (#210 )' (#211 ) from feature/issue210 into v2.x

Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/211
release v2.5.2
2023-01-21 21:49:02 +01:00 · 2023-01-21 21:45:41 +01:00 · 2023-01-21 21:41:22 +01:00 · 2022-10-11 22:49:02 +02:00 · 2022-09-01 17:00:32 +02:00 · 2022-09-01 16:59:46 +02:00
56 changed files with 2491 additions and 2416 deletions
@@ -0,0 +1,5 @@
+{
+    "rules": {
+        "indentation": 4
+    }
+}
@@ -0,0 +1,42 @@
+pipeline:
+  dependencies:
+    image: deblan/devenv
+    commands:
+      - npm install
+    when:
+      event: [tag, push, pull_request]
+      branch: [master, develop, v2.x, feature/*]
+
+  build:
+    image: deblan/devenv
+    commands:
+      - make npm-build
+    when:
+      event: [push, pull_request]
+
+  package:
+    image: deblan/devenv
+    volumes:
+      - /var/www/html/artifacts:/var/www/html/artifacts
+    secrets: [app_certificate]
+    commands:
+      - mkdir -p "$HOME/.nextcloud/certificates"
+      - echo "$APP_CERTIFICATE" > "$HOME/.nextcloud/certificates/side_menu.key"
+      - export VERSION=$(grep "<version>" appinfo/info.xml | grep -o "[0-9]*\.[0-9]*\.[0-9]*" --color=never)
+      - export RELEASE_DIRECTORY="/var/www/html/artifacts/deblan/side_menu"
+      - make release
+    when:
+      event: [tag]
+
+  release:
+    image: plugins/gitea-release
+    volumes:
+      - /var/www/html/artifacts:/var/www/html/artifacts
+    settings:
+      api_key:
+        from_secret: gitnet_api_key
+      base_url: https://gitnet.fr
+      note: ${CI_COMMIT_MESSAGE}
+      files: /var/www/html/artifacts/deblan/side_menu/${CI_COMMIT_TAG/v//}/*
+    when:
+      event: [tag]
@@ -1,255 +1,387 @@
-## v1.25.1
+## [Unreleased]
+
+## 2.5.2
+### Fixed
+* add check if menu exists before adding event listeners (#210)
+
+## 2.5.1
+### Fixed
+* fix icon render (#133)
+
+## 2.5.0
+### Changed
+* upgrade dependencies
+### Fixed
+* remove duplicated code
+* remove unused variables and packages
+* replace repeated strings with variables
+* add html attributes
+* replace var with let
+* replace v-html with v-text to prevent xss
+
+## 2.4.3
+### Fixed
+* fix translations
+
+## 2.4.2
+### Fixed
+* fix typo
+### Changed
+* change ci/cd
+
+## 2.4.1
+### Fixed
+* fix user setting save
+
+## 2.4.0
+### Added
+* remove focus on opener after click
+* add button to set default colors
+* add menu hover effect
+* add translations
+### Fixed
+* fix deprecated app.php file
+* fix menu with categories header
+* fix minor issues
+### Changed
+* change saving progression
+### Removed
+* Nextcloud 19 is not supported anymore
+* PHP 7.3 is not supported anymore
+
+## 2.3.5
+### Fixed
+* fix white square (#99)
+
+## 2.3.4
+### Fixed
+* fix blank line when settings are open (#96)
+
+## 2.3.3
+### Added
+* hide the scrollbar when mouse is out (menu always displayed)
+### Fixed
+* fix SQL Exception InvalidFieldNameException (#93)
+
+## 2.3.2
+### Fixed
+- fix hidden menu
+
+## 2.3.1
+### Fixed
+- fix #88: does not work with default menu
+
+## 2.3.0
+### Added
+- fix #82: add an option to keep visible an app in both menus
+- fix #83: add custom categories
+- add auto-reload when settings are saved
+
+## 2.2.0
+### Added
+- fix #84: update icons
+- fix #85: use Nextcloud colors by default
+
+### Fixed
+- fix categories order in large menu
+
+## 2.1.0
+### Added
+- add compatibility with Nextcloud 23
+
+## 2.0.1
+### Fixed
+- fix #78: Top menu is broken - invisible apps are shown
+- fix #77: Update personal settings - HTTP error 412 (Precondition Failed)
+- fix js error on the personal settings page (undefined sortable)
+
+## 2.0.0
+### Fixed
+- fix #66: removing usage of setInterval
+- fix #73: icon background
+### Changed
+- fix #67: replace jQuery with Vanilla JS
+### Removed
+- Nextcloud 18 is not supported anymore
+
+## 1.28.0
+### Added
+- fix #63: add a new side menu with categories
+
+## 1.27.2
+### Fixed
+- fix #62: hide app notification icon
+
+## 1.27.1
+### Fixed
+- fix German translation render
+
+## 1.27.0
+### Added
+- hide personal settings access when settings are forced by the administrator
+### Fixed
+- improve German translations
+
+## 1.26.0
+### Added
+- add Czech translation
+
+## 1.25.2
+### Fixed
+- fix CHANGELOG
+
+## 1.25.1
 ### Added
 - add PHP version as dependency
 - add chinese translation
 ### Fixed
 - fix CHANGELOG

-## v1.25.0
+## 1.25.0
 ### Added
 - add compatibility with Nextcloud 22
 - add CHANGELOG.md (fix #59)
 - update app icon

-## v1.24.0
+## 1.24.0
 ### Added
 - add option to define the background opacity (fix #53)
 - add missing translations

-## v1.23.1
+## 1.23.1
 ### Fixed
 - fix but wih dark mode opener option

-## v1.23.0
+## 1.23.0
 ### Added
 - add support of dark Theme and Breeze Dark
 - add support of Nextcloud 21

-## v1.22.2
+## 1.22.2
 ### Fixed
 - fix regression: apps does not open in new tab (fix #55)

-## v1.22.1
+## 1.22.1
 ### Fixed
 - fix regression: apps does not open in new tab

-## v1.22.0
+## 1.22.0
 ### Added
 - Add option to sort categories (fix #53)
 - Update admin UI

-## v1.21.0
+## 1.21.0
 ### Added
 - [FEATURE] Logo in the menu links to main page of installation (#51)

-## v1.20.1
+## 1.20.1
 ### Fixed
 - Fix translations

-## v1.20.0
+## 1.20.0
 ### Added
 - [FEATURE] Ability to remove apps from the Big Menu (#49)

-## v1.19.1
+## 1.19.1
 ### Fixed
 - fix #47: setting for list/grid view in files app flashes and dissapears

-## v1.19.0
+## 1.19.0
 ### Added
 - add option: the menu is enabled by default for users (fix #46)

-## v1.18.0
+## 1.18.0
 ### Added
 - add option to show link to settings (fix #44)
 - refactor menus using several components

-## v1.17.0
+## 1.17.0
 ### Added
 - compliance with the app checker
 - add an action to export the configuration
 - add an action to purge the cache

-## v1.16.3
+## 1.16.3
 ### Fixed
 - fix links that must be opened in new window (https://help.nextcloud.com/t/external-petit-probleme-concernant-lapplication-external-sites-ou-sites-externes/94884/11)

-## v1.16.2
+## 1.16.2
 ### Fixed
 - fix issue with personal settings when global settings are forced

-## v1.16.1
+## 1.16.1
 ### Fixed
 - fix #42: add cache to manage failures to access apps.nextcloud.com
 - fix #41: side menu was hover apps list

-## v1.16.0
+## 1.16.0
 ### Added
 - add an option to force settings to users (fix #38)

-## v1.15.0
+## 1.15.0
 ### Changed
 - New name
 ### Fixed
 - Fix #36: always displayed is not expanding

-## v1.14.0
+## 1.14.0
 ### Added
 - add an api accessed by components
 - add a config proxy in controllers
 ### Fixed
 - fix translations

-## v1.13.0
+## 1.13.0
 ### Added
 - add an option to display the avatar instead of the logo (fix #34)

-## v1.12.3
+## 1.12.3
 ### Added
 - add a delay before moving elements (fix #33)

-## v1.12.2
+## 1.12.2
 ### Fixed
 - fix #30: `Always displayed` menu can not be close using touchscreens

-## v1.12.1
+## 1.12.1
 ### Fixed
 - fix typo
 - fix translations

-## v1.12.0
+## 1.12.0
 ### Fixed
 - fix #30: administrators and users can select what apps must be opened in new tab
 - fix typo

-## v1.11.0
+## 1.11.0
 ### Added
 - add the option for opening apps in new tab (fix #29)
 ### Fixed
 - fix issue with the header of the always displayed menu

-## v1.10.0
+## 1.10.0
 ### Added
 - add images to select the display of the menu
 - add live preview
 - update translations
 - update app info

-## v1.9.3
+## 1.9.3
 ### Fixed
 - fix regression with logo display

-## v1.9.2
+## 1.9.2
 ### Added
 - add the option “always displayed” which fixes the position of the menu to the left and always displays the application icons (fix #21, fix #2)

-## v1.8.6
+## 1.8.6
 ### Added
 - add translations: `fr` and `de`
 - improve and publish the `Makefile`
 - update documentation

-## v1.8.5
+## 1.8.5
 ### Fixed
 - fix #28: menu items invisible after 1.8.4

-## v1.8.4
+## 1.8.4
 ### Fixed
 - fix #27: disable side menu on public pages - broken in 1.8.3

-## v1.8.3
+## 1.8.3
 ### Fixed
 - fix alphabetic order of apps (#26)

-## v1.8.2
+## 1.8.2
 ### Added
 - add icon for closing the big menu (fix #25)
 ### Fixed
 - fix hidden icons in the top menu (fix #23)
 - fix missing apps (fix #24)

-## v1.8.1
+## 1.8.1
 ### Fixed
 - fix issue with links
 - fix missing l10n files

-## v1.8.0
+## 1.8.0
 ### Added
 - add a `big menu` display (fix #22)
 - add the possibility to choose what apps are displayed in the top menu (fix #22)
 - add icon color filter
 - add icon opacity filter

-## v1.8.0-rc2
+## 1.8.0-rc2

-## v1.7.0
+## 1.7.0
 ### Added
 - add a loader when the page is unloading
 - add compatibility with Nextcloud 19

-## v1.6.3
+## 1.6.3
 ### Fixed
 - fix #20: add a shortcut to open and to hide the menu

-## v1.6.2
+## 1.6.2
 ### Fixed
 - fix #19: add a cache to limit flashes

-## v1.6.1
+## 1.6.1
 ### Fixed
 - fix #19: add a hack to show external sites in the top menu with navigation

-## v1.6.0
+## 1.6.0
 ### Added
 - Add a page of personal settings
 - Add an option to disable the side menu as user
 - Refactoring of javascripts

-## v1.5.0
+## 1.5.0
 ### Added
 - add option to force light icons instead of dark icons
 ### Fixed
 - fix #19: add option to keep external sites in the top menu
 - fix #16 #17: add dark icons and handle the svg filters

-## v1.4.1
+## 1.4.1
 ### Added
 - Rendering  harmonization with browsers
 ### Fixed
 - FIX #15: make menu start after icon

-## v1.4.0
+## 1.4.0
 ### Fixed
 - Fix #12: add an option to hide the opener and the panel when there is no application

-## v1.3.4
+## 1.3.4
 ### Fixed
 - FIX #14: add option to show only the opener
 - FIX #13: add alternate hamburger icon
 - FIX #11: remove error in the console

-## v1.3.3
+## 1.3.3
 ### Added
 - Add a second background color to create a background gradiant
 - Update documentation
 ### Fixed
 - FIX #10: add options to select the size of the icons and the text, or hide them

-## v1.3.2
+## 1.3.2
 ### Fixed
 - FIX #9: opener icon not visible with multiple apps_paths

-## v1.3.1
+## 1.3.1
 ### Fixed
 - FIX #3: Add an opition the choose the position of the opener (after or before the logo)
 - FIX #8: Remove extension of dynamic asset's routes (js, css)

-## v1.3.0
+## 1.3.0
 ### Added
 - `main.js` is replaced by a controller and a template
 ### Fixed
 -  FIX #2: add option to open the menu by hovering over opener

-## v1.2.4
+## 1.2.4
 ### Fixed
 - FIX #7: Opener icon not visible in Safari

@@ -11,10 +11,14 @@ release: npm-build translations
 		exit 1
 	fi

-	test -d releases/$$VERSION && rm -fr releases/$$VERSION
-	mkdir -p releases/$$VERSION/side_menu
-	cp -r README.md CHANGELOG.md appinfo css lib img l10n js src templates screenshots releases/$$VERSION/side_menu
-	cd releases/$$VERSION
+	if [ -z "$$RELEASE_DIRECTORY" ]; then
+		RELEASE_DIRECTORY=releases
+	fi
+
+	test -d $$RELEASE_DIRECTORY/$$VERSION && rm -fr $$RELEASE_DIRECTORY/$$VERSION
+	mkdir -p $$RELEASE_DIRECTORY/$$VERSION/side_menu
+	cp -r README.md CHANGELOG.md appinfo css lib img l10n js src templates screenshots vendor $$RELEASE_DIRECTORY/$$VERSION/side_menu
+	cd $$RELEASE_DIRECTORY/$$VERSION
 	zip -r side_menu_v$$VERSION.zip side_menu
 	tar cvzf side_menu_v$$VERSION.tar.gz side_menu
 	rm -fr side_menu
@@ -22,3 +26,8 @@ release: npm-build translations

 translations:
 	php bin/generate_l10n.php
+
+.ONESHELL:
+run-code-quality-analysis:
+	export SONAR_TOKEN="$$SONAR_TOKEN_DEBLAN_SIDE_MENU"
+	sonar-scanner -Dsonar.projectKey=deblan-side_menu -Dsonar.sources=. -Dsonar.host.url=https://cq.gitnet.fr
@@ -2,7 +2,7 @@
 ===============================

 Allows you to modify the position of the main menu by creating a panel on the left of the interface or with a big menu on the top.
-You can also define apps that must be displayed in the top menu. Fully customisable.
+You can also add and sort custom categories, define apps that must be displayed in the top menu, etc. Fully customisable.

 This application is rather suitable for instances that activate a lot of applications.

@@ -10,14 +10,17 @@ You can customize colors depending of the theme (Dark theme and Breeze Dark). Co

 * [Installation and upgrade](#installation-and-upgrade)
 * [How to contribute?](#how-to-contribute)
+* [Support](#support)
 * [Screenshots](https://gitnet.fr/deblan/side_menu/src/branch/master/screenshots/)

 You like this app and you want to support me? ☕ [Buy me a coffee](https://www.buymeacoffee.com/deblan) or [Donate with liberapay](https://liberapay.com/deblan)

+[![Build Status](https://ci.gitnet.fr/api/badges/deblan/side_menu/status.svg)](https://ci.gitnet.fr/deblan/side_menu)
+
 Requirements
 ------------

-* PHP >= 7.3
+* PHP >= 7.4
 * App `theming` enabled

 Installation and upgrade
@@ -58,3 +61,8 @@ If you are a developer:
 Build javascripts using `make npm-build` (or `make npm-watch` to build them in real time).

 Then commit and create a pull request.
+
+Support
+-------
+
+You can join the official room on Matrix: [#custommenu:neutralnetwork.org](https://matrix.to/#/#custommenu:neutralnetwork.org).
@@ -1,10 +0,0 @@
-<?php
-
-use OCA\SideMenu\AppInfo\Application;
-
-$app = new Application();
-
-if ($app->isEnabled()) {
-    $app->registerAssets();
-    $app->registerServices();
-}
@@ -17,7 +17,7 @@ You can report a bug or request a feature by opening an issue.

 Requirements:

-* PHP >= 7.3
+* PHP >= 7.4
 * App `theming` enabled

 If you like this application and if you want to support the development:
@@ -26,7 +26,7 @@ If you like this application and if you want to support the development:
 * [Donate with liberapay](https://liberapay.com/deblan)
 * [Leave a comment](https://apps.nextcloud.com/apps/side_menu#comments)
 ]]></description>
-    <version>1.25.1</version>
+    <version>2.5.2</version>
    <licence>agpl</licence>
    <author mail="contact@deblan.fr" homepage="https://www.deblan.io/">Simon Vieille</author>
    <namespace>SideMenu</namespace>
@@ -46,8 +46,8 @@ If you like this application and if you want to support the development:
    <screenshot>https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/nc20_big_menu_responsive.png</screenshot>
    <screenshot>https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/personal_settings.png</screenshot>
    <dependencies>
-        <nextcloud min-version="18" max-version="22"/>
-        <php min-version="7.3"/>
+        <nextcloud min-version="20" max-version="24"/>
+        <php min-version="7.4"/>
    </dependencies>
    <settings>
        <admin>OCA\SideMenu\Settings\Admin</admin>
@@ -20,7 +20,7 @@
    margin: 10px 0 10px 0;
 }

-#side-menu-section input[type="checkbox"] {
+#-dropside-menu-section input[type="checkbox"] {
    vertical-align: middle;
 }

@@ -81,6 +81,12 @@
    cursor: pointer;
 }

+.side-menu-setting-list-drop {
+    background: yellow;
+    border-color: yellow;
+    height: 34px;
+}
+
 .side-menu-setting.arrow {
    color: #ccc;
    padding-right: 5px;
@@ -91,6 +97,10 @@
    margin-top: -1px;
 }

+#apps-categories-custom-list select {
+    width: 100%;
+}
+

 .side-menu-setting-table {
    display: table;
@@ -109,7 +119,7 @@

 .side-menu-setting-form {
    display: table-cell;
-    width: 300px;
+    min-width: 300px;
 }

 .side-menu-setting-label-short {
@@ -119,3 +129,18 @@
 .side-menu-setting-form-long {
    width: 400px;
 }
+
+#side-menu-save-progress {
+    display: inline-block;
+    width: 0;
+    height: 15px;
+    background: #fff;
+}
+
+.btn-reset {
+    display: inline-block;
+    cursor: pointer;
+    position: absolute;
+    margin-top: 17px;
+    margin-left: 5px;
+}
@@ -29,12 +29,16 @@
    display: none;
 }

+#side-menu a {
+    transition: 0.2s;
+}
+
 #side-menu.open {
    display: block;
 }

 #header .side-menu-opener {
-    margin-left: 5px;
+    margin-left: 0px;
 }

 .side-menu-settings {
@@ -59,6 +63,8 @@
 .side-menu-settings img {
    vertical-align: bottom;
    margin-left: 3px;
+    width: 32px;
+    height: 32px;
 }

 #side-menu.open .side-menu-settings {
@@ -67,10 +73,19 @@

 .side-menu-opener {
    background: var(--side-menu-opener, url('../img/side-menu-opener.svg'));
-    height: 40px;
-    width: 40px;
-    border-radius: 0;
-    border: 0;
+    background-color: transparent !important;
+    height: 40px !important;
+    width: 40px !important;
+    border-radius: 0 !important;
+    border: 0 !important;
+    padding-right: 12px !important;
+    padding-left: 12px !important;
+    margin-left: 5px !important;
+    margin-left: 3px !important;
+}
+
+.side-menu-opener:active, .side-menu-opener:focus {
+    background-color: var(--side-menu-current-app-background-color, #444) !important;
 }

 .side-menu-closer {
@@ -105,6 +120,10 @@
    margin-top: -3px;
 }

+.side-menu-app-icon .app-icon-notification {
+    display: none;
+}
+
 .side-menu-app a {
    line-height: 30px;
    color: var(--side-menu-text-color, #fff);
@@ -135,10 +154,13 @@
    max-width: 250px;
    position: fixed;
    padding-top: 2px;
-    padding-left: 5px;
    top: 0;
 }

+#side-menu.side-menu-with-categories .side-menu-header {
+    max-width: 295px;
+}
+
 #side-menu.hide-opener .side-menu-logo {
    margin-top: 20px;
 }
@@ -158,23 +180,23 @@
    transition-property: width;
 }

-#side-menu.side-menu-big {
+#side-menu.side-menu-big, #side-menu.side-menu-with-categories {
    max-width: 100%;
    height: auto;
 }

-.side-menu-big .side-menu-header {
+.side-menu-big .side-menu-header, .side-menu-with-categories .side-menu-header {
    height: auto;
 }

-.side-menu-big .side-menu-apps-list {
+.side-menu-big .side-menu-apps-list, .side-menu-with-categories .side-menu-apps-list {
    height: auto;
    position: static;
    max-width: 100vw;
    overflow: auto;
 }

-.side-menu-big .side-menu-app a {
+.side-menu-big .side-menu-app a, .side-menu-with-categories .side-menu-app a {
    padding: 7px 0 7px 7px;
 }

@@ -213,7 +235,7 @@
    stroke: var(--side-menu-text-color, #fff);
 }

-.side-menu-big .side-menu-app-icon {
+.side-menu-with-categories .side-menu-app-icon, .side-menu-big .side-menu-app-icon {
    vertical-align: middle;
    margin-top: -2px;
 }
@@ -235,6 +257,11 @@
 .side-menu-always-displayed .side-menu-apps-list {
    height: calc(100vh - 49px);
    top: 49px;
+    overflow: hidden;
+}
+
+.side-menu-always-displayed .side-menu-apps-list:hover {
+    overflow: auto;
 }

 .side-menu-always-displayed #side-menu,
@@ -267,9 +294,28 @@
    transform: translateX(calc(-100% + 50px)) !important;
 }

+#side-menu.side-menu-with-categories {
+    max-width: 290px;
+    height: 100vh;
+}
+
+.side-menu-with-categories .side-menu-categories {
+    display: block;
+    padding: 0;
+}
+
+.side-menu-with-categories .side-menu-category {
+    padding: 10px 0;
+}
+
+.side-menu-always-displayed #body-settings, #body-settings.body-settings-side-menu {
+    overflow-x: visible;
+}
+
@media screen and (max-width: 1024px) {
    #side-menu.side-menu-big {
        max-width: 290px;
+        height: 100vh;
    }

    .side-menu-categories {
@@ -280,10 +326,6 @@
    .side-menu-category {
        padding: 10px 0;
    }
-
-    #side-menu.side-menu-big {
-        height: 100vh;
-    }
 }

@media screen and (min-width: 1024px) {
@@ -0,0 +1,224 @@
+<?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"
+   width="571.907"
+   height="156.921"
+   viewBox="0 0 151.317 41.519"
+   version="1.1"
+   id="svg901"
+   sodipodi:docname="layout-side-menu-with-categories.svg"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
+  <metadata
+     id="metadata907">
+    <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>
+  <defs
+     id="defs905" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1918"
+     inkscape:window-height="1036"
+     id="namedview903"
+     showgrid="false"
+     inkscape:zoom="1.6086532"
+     inkscape:cx="455.61054"
+     inkscape:cy="16.694081"
+     inkscape:window-x="0"
+     inkscape:window-y="21"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg901"
+     showguides="false" />
+  <path
+     style="marker:none"
+     color="#000"
+     overflow="visible"
+     fill="#fff"
+     stroke="#b3b3b3"
+     stroke-width=".359"
+     stroke-linecap="square"
+     paint-order="fill markers stroke"
+     d="M.18.18h58.532v41.16H.18zM62.735.18h58.532v41.16H62.735z"
+     id="path853" />
+  <g
+     fill="#b3b3b3"
+     stroke="#ccc"
+     fill-rule="evenodd"
+     stroke-width="1.465"
+     stroke-linecap="round"
+     id="g857">
+    <path
+       d="M84.066 21.35l5.055-5.056M82.925 29.835l18.152-18.151M95.893 25.225l3.585-3.586"
+       id="path855" />
+  </g>
+  <path
+     style="marker:none"
+     color="#000"
+     overflow="visible"
+     fill="none"
+     stroke="#b3b3b3"
+     stroke-width=".359"
+     stroke-linecap="square"
+     paint-order="fill markers stroke"
+     d="M62.735.18h58.532v41.16H62.735z"
+     id="path861" />
+  <path
+     style="marker:none"
+     color="#000"
+     overflow="visible"
+     fill="#f9f9f9"
+     stroke="#ccc"
+     stroke-width=".359"
+     stroke-linecap="square"
+     paint-order="fill markers stroke"
+     d="M.18.18h58.532v5.063H.18z"
+     id="path877" />
+  <path
+     style="marker:none"
+     color="#000"
+     overflow="visible"
+     fill="none"
+     stroke="#b3b3b3"
+     stroke-width=".359"
+     stroke-linecap="square"
+     paint-order="fill markers stroke"
+     d="M.18.18h58.532v41.16H.18z"
+     id="path879" />
+  <path
+     style="marker:none"
+     color="#000"
+     overflow="visible"
+     fill="#666"
+     stroke="#ccc"
+     stroke-width=".359"
+     stroke-linecap="square"
+     paint-order="fill markers stroke"
+     d="M1.357 1.034h3.496V4.39H1.357z"
+     id="path881" />
+  <path
+     style="marker:none"
+     color="#000"
+     overflow="visible"
+     fill="#e6e6e6"
+     stroke="#ccc"
+     stroke-width=".359"
+     stroke-linecap="square"
+     paint-order="fill markers stroke"
+     d="M6.068 1.034h6.102V4.39H6.068z"
+     id="path883" />
+  <g
+     fill="#b3b3b3"
+     stroke="#ccc"
+     fill-rule="evenodd"
+     stroke-width="1.465"
+     stroke-linecap="round"
+     id="g887">
+    <path
+       d="M21.51 21.35l5.056-5.056M20.37 29.835L38.52 11.684M33.337 25.225l3.586-3.586"
+       id="path885" />
+  </g>
+  <path
+     style="marker:none"
+     color="#000"
+     overflow="visible"
+     fill="#fff"
+     stroke="#b3b3b3"
+     stroke-width=".359"
+     stroke-linecap="square"
+     paint-order="fill markers stroke"
+     d="M125.857.18h25.28v41.16h-25.28z"
+     id="path889" />
+  <path
+     style="marker:none"
+     color="#000"
+     overflow="visible"
+     fill="#f9f9f9"
+     stroke="#ccc"
+     stroke-width=".359"
+     stroke-linecap="square"
+     paint-order="fill markers stroke"
+     d="M125.857.18h25.257v5.063h-25.257z"
+     id="path891" />
+  <path
+     style="marker:none"
+     color="#000"
+     overflow="visible"
+     fill="none"
+     stroke="#b3b3b3"
+     stroke-width=".359"
+     stroke-linecap="square"
+     paint-order="fill markers stroke"
+     d="M125.857.18h25.257v41.16h-25.257z"
+     id="path893" />
+  <path
+     style="marker:none"
+     color="#000"
+     overflow="visible"
+     fill="#4d4d4d"
+     stroke="#b3b3b3"
+     stroke-width=".359"
+     stroke-linecap="square"
+     paint-order="fill markers stroke"
+     d="M125.857.18h20.829v41.16h-20.83z"
+     id="path895" />
+  <path
+     style="marker:none"
+     color="#000"
+     overflow="visible"
+     fill="#666"
+     stroke="#ccc"
+     stroke-width=".359"
+     stroke-linecap="square"
+     paint-order="fill markers stroke"
+     d="M127.034 1.034h3.496V4.39h-3.496z"
+     id="path897" />
+  <path
+     style="marker:none"
+     color="#000"
+     overflow="visible"
+     fill="#e6e6e6"
+     stroke="#ccc"
+     stroke-width=".359"
+     stroke-linecap="square"
+     paint-order="fill markers stroke"
+     d="M127.569 10.155h1.893v1.81h-1.893zM130.498 10.486h12.463v1.148h-12.463zM127.569 13.696h1.893v1.81h-1.893zM130.498 14.027h10.592v1.148h-10.592zM127.569 17.104h1.893v1.81h-1.893zM130.498 17.435h12.997v1.148h-12.997zM127.569 24.708h1.893v1.81h-1.893zM130.498 25.04h7.585v1.147h-7.585zM127.569 28.116h1.893v1.81h-1.893zM130.498 28.447h11.46v1.148h-11.46zM127.569 31.657h1.893v1.81h-1.893zM130.498 31.988h9.322v1.148h-9.322zM127.569 35.065h1.893v1.81h-1.893zM130.498 35.396h11.126v1.148h-11.126zM127.616 6.848h11.518v1.148h-11.518zM127.569 21.311h9.344v1.148h-9.344z"
+     id="path899" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;overflow:visible;fill:#4d4d4d;stroke:#b3b3b3;stroke-width:0.359;stroke-linecap:square;marker:none;paint-order:fill markers stroke"
+     overflow="visible"
+     d="m 62.728587,0.17999881 h 20.829 V 41.34 h -20.83 z"
+     id="path895-5" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;overflow:visible;fill:#666666;stroke:#cccccc;stroke-width:0.359;stroke-linecap:square;marker:none;paint-order:fill markers stroke"
+     overflow="visible"
+     d="m 63.905587,1.0339988 h 3.496 V 4.389999 h -3.496 z"
+     id="path897-3" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;overflow:visible;fill:#e6e6e6;stroke:#cccccc;stroke-width:0.359;stroke-linecap:square;marker:none;paint-order:fill markers stroke"
+     overflow="visible"
+     d="m 64.440587,10.154999 h 1.893 v 1.81 h -1.893 z m 2.929,0.331 h 12.463 v 1.148 h -12.463 z m -2.929,3.21 h 1.893 v 1.81 h -1.893 z m 2.929,0.331 h 10.592 v 1.148 h -10.592 z m -2.929,3.077 h 1.893 v 1.81 h -1.893 z m 2.929,0.331 h 12.997 v 1.148 h -12.997 z m -2.929,7.273 h 1.893 V 26.518 h -1.893 z m 2.929,0.332 h 7.585 v 1.147 h -7.585 z m -2.929,3.076001 h 1.893 v 1.81 h -1.893 z m 2.929,0.330999 h 11.46 v 1.147999 h -11.46 z m -2.929,3.21 h 1.893 v 1.809999 h -1.893 z m 2.929,0.330999 h 9.322 v 1.148001 h -9.322 z m -2.929,3.077001 h 1.893 v 1.809999 h -1.893 z m 2.929,0.331001 h 11.126 v 1.147999 h -11.126 z m -2.882,-28.5480012 h 11.518 v 1.1480001 h -11.518 z m -0.047,14.4630002 h 9.344 v 1.148 h -9.344 z"
+     id="path899-5" />
+</svg>
@@ -0,0 +1,223 @@
+<?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"
+   width="571.907"
+   height="156.921"
+   viewBox="0 0 151.317 41.519"
+   version="1.1"
+   id="svg901"
+   sodipodi:docname="layout-side-menu-with-categories.svg"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
+  <metadata
+     id="metadata907">
+    <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>
+  <defs
+     id="defs905" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1918"
+     inkscape:window-height="1036"
+     id="namedview903"
+     showgrid="false"
+     inkscape:zoom="1.6086532"
+     inkscape:cx="455.61054"
+     inkscape:cy="16.694081"
+     inkscape:window-x="0"
+     inkscape:window-y="21"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg901" />
+  <path
+     style="marker:none"
+     color="#000"
+     overflow="visible"
+     fill="#fff"
+     stroke="#b3b3b3"
+     stroke-width=".359"
+     stroke-linecap="square"
+     paint-order="fill markers stroke"
+     d="M.18.18h58.532v41.16H.18zM62.735.18h58.532v41.16H62.735z"
+     id="path853" />
+  <g
+     fill="#b3b3b3"
+     stroke="#ccc"
+     fill-rule="evenodd"
+     stroke-width="1.465"
+     stroke-linecap="round"
+     id="g857">
+    <path
+       d="M84.066 21.35l5.055-5.056M82.925 29.835l18.152-18.151M95.893 25.225l3.585-3.586"
+       id="path855" />
+  </g>
+  <path
+     style="marker:none"
+     color="#000"
+     overflow="visible"
+     fill="none"
+     stroke="#b3b3b3"
+     stroke-width=".359"
+     stroke-linecap="square"
+     paint-order="fill markers stroke"
+     d="M62.735.18h58.532v41.16H62.735z"
+     id="path861" />
+  <path
+     style="marker:none"
+     color="#000"
+     overflow="visible"
+     fill="#f9f9f9"
+     stroke="#ccc"
+     stroke-width=".359"
+     stroke-linecap="square"
+     paint-order="fill markers stroke"
+     d="M.18.18h58.532v5.063H.18z"
+     id="path877" />
+  <path
+     style="marker:none"
+     color="#000"
+     overflow="visible"
+     fill="none"
+     stroke="#b3b3b3"
+     stroke-width=".359"
+     stroke-linecap="square"
+     paint-order="fill markers stroke"
+     d="M.18.18h58.532v41.16H.18z"
+     id="path879" />
+  <path
+     style="marker:none"
+     color="#000"
+     overflow="visible"
+     fill="#666"
+     stroke="#ccc"
+     stroke-width=".359"
+     stroke-linecap="square"
+     paint-order="fill markers stroke"
+     d="M1.357 1.034h3.496V4.39H1.357z"
+     id="path881" />
+  <path
+     style="marker:none"
+     color="#000"
+     overflow="visible"
+     fill="#e6e6e6"
+     stroke="#ccc"
+     stroke-width=".359"
+     stroke-linecap="square"
+     paint-order="fill markers stroke"
+     d="M6.068 1.034h6.102V4.39H6.068z"
+     id="path883" />
+  <g
+     fill="#b3b3b3"
+     stroke="#ccc"
+     fill-rule="evenodd"
+     stroke-width="1.465"
+     stroke-linecap="round"
+     id="g887">
+    <path
+       d="M21.51 21.35l5.056-5.056M20.37 29.835L38.52 11.684M33.337 25.225l3.586-3.586"
+       id="path885" />
+  </g>
+  <path
+     style="marker:none"
+     color="#000"
+     overflow="visible"
+     fill="#fff"
+     stroke="#b3b3b3"
+     stroke-width=".359"
+     stroke-linecap="square"
+     paint-order="fill markers stroke"
+     d="M125.857.18h25.28v41.16h-25.28z"
+     id="path889" />
+  <path
+     style="marker:none"
+     color="#000"
+     overflow="visible"
+     fill="#f9f9f9"
+     stroke="#ccc"
+     stroke-width=".359"
+     stroke-linecap="square"
+     paint-order="fill markers stroke"
+     d="M125.857.18h25.257v5.063h-25.257z"
+     id="path891" />
+  <path
+     style="marker:none"
+     color="#000"
+     overflow="visible"
+     fill="none"
+     stroke="#b3b3b3"
+     stroke-width=".359"
+     stroke-linecap="square"
+     paint-order="fill markers stroke"
+     d="M125.857.18h25.257v41.16h-25.257z"
+     id="path893" />
+  <path
+     style="marker:none"
+     color="#000"
+     overflow="visible"
+     fill="#4d4d4d"
+     stroke="#b3b3b3"
+     stroke-width=".359"
+     stroke-linecap="square"
+     paint-order="fill markers stroke"
+     d="M125.857.18h20.829v41.16h-20.83z"
+     id="path895" />
+  <path
+     style="marker:none"
+     color="#000"
+     overflow="visible"
+     fill="#666"
+     stroke="#ccc"
+     stroke-width=".359"
+     stroke-linecap="square"
+     paint-order="fill markers stroke"
+     d="M127.034 1.034h3.496V4.39h-3.496z"
+     id="path897" />
+  <path
+     style="marker:none"
+     color="#000"
+     overflow="visible"
+     fill="#e6e6e6"
+     stroke="#ccc"
+     stroke-width=".359"
+     stroke-linecap="square"
+     paint-order="fill markers stroke"
+     d="M127.569 10.155h1.893v1.81h-1.893zM130.498 10.486h12.463v1.148h-12.463zM127.569 13.696h1.893v1.81h-1.893zM130.498 14.027h10.592v1.148h-10.592zM127.569 17.104h1.893v1.81h-1.893zM130.498 17.435h12.997v1.148h-12.997zM127.569 24.708h1.893v1.81h-1.893zM130.498 25.04h7.585v1.147h-7.585zM127.569 28.116h1.893v1.81h-1.893zM130.498 28.447h11.46v1.148h-11.46zM127.569 31.657h1.893v1.81h-1.893zM130.498 31.988h9.322v1.148h-9.322zM127.569 35.065h1.893v1.81h-1.893zM130.498 35.396h11.126v1.148h-11.126zM127.616 6.848h11.518v1.148h-11.518zM127.569 21.311h9.344v1.148h-9.344z"
+     id="path899" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;overflow:visible;fill:#4d4d4d;stroke:#b3b3b3;stroke-width:0.359;stroke-linecap:square;marker:none;paint-order:fill markers stroke"
+     overflow="visible"
+     d="m 62.728587,0.17999881 h 20.829 V 41.34 h -20.83 z"
+     id="path895-5" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;overflow:visible;fill:#666666;stroke:#cccccc;stroke-width:0.359;stroke-linecap:square;marker:none;paint-order:fill markers stroke"
+     overflow="visible"
+     d="m 63.905587,1.0339988 h 3.496 V 4.389999 h -3.496 z"
+     id="path897-3" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;overflow:visible;fill:#e6e6e6;stroke:#cccccc;stroke-width:0.359;stroke-linecap:square;marker:none;paint-order:fill markers stroke"
+     overflow="visible"
+     d="m 64.440587,10.154999 h 1.893 v 1.81 h -1.893 z m 2.929,0.331 h 12.463 v 1.148 h -12.463 z m -2.929,3.21 h 1.893 v 1.81 h -1.893 z m 2.929,0.331 h 10.592 v 1.148 h -10.592 z m -2.929,3.077 h 1.893 v 1.81 h -1.893 z m 2.929,0.331 h 12.997 v 1.148 h -12.997 z m -2.929,7.273 h 1.893 V 26.518 h -1.893 z m 2.929,0.332 h 7.585 v 1.147 h -7.585 z m -2.929,3.076001 h 1.893 v 1.81 h -1.893 z m 2.929,0.330999 h 11.46 v 1.147999 h -11.46 z m -2.929,3.21 h 1.893 v 1.809999 h -1.893 z m 2.929,0.330999 h 9.322 v 1.148001 h -9.322 z m -2.929,3.077001 h 1.893 v 1.809999 h -1.893 z m 2.929,0.331001 h 11.126 v 1.147999 h -11.126 z m -2.882,-28.5480012 h 11.518 v 1.1480001 h -11.518 z m -0.047,14.4630002 h 9.344 v 1.148 h -9.344 z"
+     id="path899-5" />
+</svg>
@@ -1,6 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 10.583 10.583">
-  <g color="#000" fill="#fff">
-    <rect transform="rotate(135)" ry=".545" rx=".545" y="-8.209" x="-3.608" height="1.451" width="7.216" style="marker:none" overflow="visible" paint-order="stroke markers fill"/>
-    <rect transform="rotate(-135)" ry=".545" rx=".545" y="-.726" x="-11.091" height="1.451" width="7.216" style="marker:none" overflow="visible" paint-order="stroke markers fill"/>
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 10.583 10.583"><g fill="#fff" color="#000" transform="translate(-.067 .224)"><rect width="5.027" height=".777" x="-2.307" y="6.984" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none" transform="rotate(-45)"/><rect width="5.027" height=".777" x="4.859" y="-.595" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none" transform="rotate(45)"/></g></svg>
@@ -1,173 +1 @@
-<?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"
-   width="40"
-   height="40"
-   viewBox="0 0 10.583 10.583"
-   version="1.1"
-   id="svg935"
-   sodipodi:docname="side-menu-opener-dark.svg"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
-  <metadata
-     id="metadata941">
-    <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>
-  <defs
-     id="defs939" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1918"
-     inkscape:window-height="1008"
-     id="namedview937"
-     showgrid="false"
-     inkscape:zoom="8.34386"
-     inkscape:cx="83.025045"
-     inkscape:cy="14.304895"
-     inkscape:window-x="0"
-     inkscape:window-y="41"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg935" />
-  <g
-     transform="translate(.3 -286.074)"
-     fill="#fff"
-     color="#000"
-     fill-opacity=".855"
-     id="g933"
-     style="fill:#000000;fill-opacity:0.89855075">
-    <rect
-       ry="0"
-       rx="0"
-       y="288.474"
-       x="4.266"
-       height="1.451"
-       width="1.451"
-       style="marker:none;fill:#000000;fill-opacity:0.89855075"
-       overflow="visible"
-       paint-order="stroke markers fill"
-       id="rect909" />
-    <g
-       transform="translate(-.13)"
-       id="g915"
-       style="fill:#000000;fill-opacity:0.89855075">
-      <rect
-         style="marker:none;fill:#000000;fill-opacity:0.89855075"
-         width="1.451"
-         height="1.451"
-         x="6.445"
-         y="288.474"
-         rx="0"
-         ry="0"
-         overflow="visible"
-         paint-order="stroke markers fill"
-         id="rect911" />
-      <rect
-         style="marker:none;fill:#000000;fill-opacity:0.89855075"
-         width="1.451"
-         height="1.451"
-         x="2.345"
-         y="288.474"
-         rx="0"
-         ry="0"
-         overflow="visible"
-         paint-order="stroke markers fill"
-         id="rect913" />
-    </g>
-    <rect
-       ry="0"
-       rx="0"
-       y="290.631"
-       x="4.266"
-       height="1.451"
-       width="1.451"
-       style="marker:none;fill:#000000;fill-opacity:0.89855075"
-       overflow="visible"
-       paint-order="stroke markers fill"
-       id="rect917" />
-    <g
-       transform="translate(-.13 2.157)"
-       id="g923"
-       style="fill:#000000;fill-opacity:0.89855075">
-      <rect
-         style="marker:none;fill:#000000;fill-opacity:0.89855075"
-         width="1.451"
-         height="1.451"
-         x="6.445"
-         y="288.474"
-         rx="0"
-         ry="0"
-         overflow="visible"
-         paint-order="stroke markers fill"
-         id="rect919" />
-      <rect
-         style="marker:none;fill:#000000;fill-opacity:0.89855075"
-         width="1.451"
-         height="1.451"
-         x="2.345"
-         y="288.474"
-         rx="0"
-         ry="0"
-         overflow="visible"
-         paint-order="stroke markers fill"
-         id="rect921" />
-    </g>
-    <rect
-       ry="0"
-       rx="0"
-       y="292.808"
-       x="4.266"
-       height="1.451"
-       width="1.451"
-       style="marker:none;fill:#000000;fill-opacity:0.89855075"
-       overflow="visible"
-       paint-order="stroke markers fill"
-       id="rect925" />
-    <g
-       transform="translate(-.13 4.334)"
-       id="g931"
-       style="fill:#000000;fill-opacity:0.89855075">
-      <rect
-         style="marker:none;fill:#000000;fill-opacity:0.89855075"
-         width="1.451"
-         height="1.451"
-         x="6.445"
-         y="288.474"
-         rx="0"
-         ry="0"
-         overflow="visible"
-         paint-order="stroke markers fill"
-         id="rect927" />
-      <rect
-         style="marker:none;fill:#000000;fill-opacity:0.89855075"
-         width="1.451"
-         height="1.451"
-         x="2.345"
-         y="288.474"
-         rx="0"
-         ry="0"
-         overflow="visible"
-         paint-order="stroke markers fill"
-         id="rect929" />
-    </g>
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 10.583 10.583"><g fill-opacity=".898" color="#000" transform="matrix(.90559 0 0 .86896 .772 -247.893)"><rect width="1.451" height="1.451" x="4.266" y="288.474" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/><g transform="translate(-.13)"><rect width="1.451" height="1.451" x="6.445" y="288.474" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/><rect width="1.451" height="1.451" x="2.345" y="288.474" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/></g><rect width="1.451" height="1.451" x="4.266" y="290.631" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/><g transform="translate(-.13 2.157)"><rect width="1.451" height="1.451" x="6.445" y="288.474" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/><rect width="1.451" height="1.451" x="2.345" y="288.474" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/></g><rect width="1.451" height="1.451" x="4.266" y="292.808" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/><g transform="translate(-.13 4.334)"><rect width="1.451" height="1.451" x="6.445" y="288.474" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/><rect width="1.451" height="1.451" x="2.345" y="288.474" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/></g></g></svg>
@@ -1,102 +1 @@
-<?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"
-   width="40"
-   height="40"
-   viewBox="0 0 10.583 10.583"
-   version="1.1"
-   id="svg1090"
-   sodipodi:docname="side-menu-opener-hamburger-2-dark.svg"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
-  <metadata
-     id="metadata1096">
-    <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>
-  <defs
-     id="defs1094" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1918"
-     inkscape:window-height="1008"
-     id="namedview1092"
-     showgrid="false"
-     inkscape:zoom="8.34386"
-     inkscape:cx="84.523455"
-     inkscape:cy="12.270318"
-     inkscape:window-x="0"
-     inkscape:window-y="41"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg1090" />
-  <rect
-     overflow="visible"
-     style="marker:none;fill:#000000;fill-opacity:1"
-     width="4.806"
-     height="1.256"
-     x="2.888"
-     y="2.787"
-     rx="0"
-     ry=".472"
-     color="#000"
-     fill="#fff"
-     fill-opacity=".855"
-     paint-order="stroke markers fill"
-     id="rect1082" />
-  <rect
-     overflow="visible"
-     style="marker:none;fill:#000000;fill-opacity:1"
-     width="4.806"
-     height="1.256"
-     x="2.888"
-     y="4.655"
-     rx="0"
-     ry=".472"
-     color="#000"
-     fill="#fff"
-     fill-opacity=".855"
-     paint-order="stroke markers fill"
-     id="rect1084" />
-  <rect
-     overflow="visible"
-     style="marker:none;fill:#000000;fill-opacity:1"
-     width="4.806"
-     height="1.256"
-     x="2.888"
-     y="6.54"
-     rx="0"
-     ry=".472"
-     color="#000"
-     fill="#fff"
-     fill-opacity=".855"
-     paint-order="stroke markers fill"
-     id="rect1086" />
-  <path
-     style="marker:none;fill:#000000;fill-opacity:1"
-     d="M1.243.71A.469.469 0 0 0 .881.88a.469.469 0 0 0-.171.362V9.34c0 .146.067.275.171.362a.469.469 0 0 0 .362.171H9.34a.469.469 0 0 0 .362-.171.469.469 0 0 0 .171-.362V1.243a.469.469 0 0 0-.171-.362A.469.469 0 0 0 9.34.71zm.723 1.256h6.65v6.65h-6.65z"
-     color="#000"
-     overflow="visible"
-     fill="#fff"
-     fill-opacity=".855"
-     paint-order="stroke markers fill"
-     id="path1088" />
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 10.583 10.583"><rect width="7.62" height="7.62" x="1.482" y="1.482" fill="none" stroke="#000" stroke-linecap="square" stroke-width=".777" color="#000" overflow="visible" paint-order="markers fill stroke" rx="0" ry="0" style="marker:none"/><rect width="5.027" height=".777" x="2.778" y="3.148" color="#000" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/><rect width="5.027" height=".777" x="2.778" y="6.658" color="#000" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/><rect width="5.027" height=".777" x="2.778" y="4.936" color="#000" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/></svg>
@@ -1,101 +1 @@
-<?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"
-   width="40"
-   height="40"
-   viewBox="0 0 10.583 10.583"
-   version="1.1"
-   id="svg1443"
-   sodipodi:docname="side-menu-opener-hamburger-2.svg"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
-  <metadata
-     id="metadata1449">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs1447" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1918"
-     inkscape:window-height="1008"
-     id="namedview1445"
-     showgrid="false"
-     inkscape:zoom="5.9"
-     inkscape:cx="90.508475"
-     inkscape:cy="4.5762712"
-     inkscape:window-x="0"
-     inkscape:window-y="41"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg1443" />
-  <rect
-     overflow="visible"
-     style="marker:none;fill:#ffffff;fill-opacity:1"
-     width="4.806"
-     height="1.256"
-     x="2.888"
-     y="2.787"
-     rx="0"
-     ry=".472"
-     color="#000"
-     fill="#fff"
-     fill-opacity=".855"
-     paint-order="stroke markers fill"
-     id="rect1435" />
-  <rect
-     overflow="visible"
-     style="marker:none;fill:#ffffff;fill-opacity:1"
-     width="4.806"
-     height="1.256"
-     x="2.888"
-     y="4.655"
-     rx="0"
-     ry=".472"
-     color="#000"
-     fill="#fff"
-     fill-opacity=".855"
-     paint-order="stroke markers fill"
-     id="rect1437" />
-  <rect
-     overflow="visible"
-     style="marker:none;fill:#ffffff;fill-opacity:1"
-     width="4.806"
-     height="1.256"
-     x="2.888"
-     y="6.54"
-     rx="0"
-     ry=".472"
-     color="#000"
-     fill="#fff"
-     fill-opacity=".855"
-     paint-order="stroke markers fill"
-     id="rect1439" />
-  <path
-     style="marker:none;fill:#ffffff;fill-opacity:1"
-     d="M1.243.71A.469.469 0 0 0 .881.88a.469.469 0 0 0-.171.362V9.34c0 .146.067.275.171.362a.469.469 0 0 0 .362.171H9.34a.469.469 0 0 0 .362-.171.469.469 0 0 0 .171-.362V1.243a.469.469 0 0 0-.171-.362A.469.469 0 0 0 9.34.71zm.723 1.256h6.65v6.65h-6.65z"
-     color="#000"
-     overflow="visible"
-     fill="#fff"
-     fill-opacity=".855"
-     paint-order="stroke markers fill"
-     id="path1441" />
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 10.583 10.583"><rect width="7.62" height="7.62" x="1.482" y="1.482" fill="none" stroke="#fff" stroke-linecap="square" stroke-width=".777" color="#000" overflow="visible" paint-order="markers fill stroke" rx="0" ry="0" style="marker:none"/><g fill="#fff" color="#000" transform="translate(0 .034)"><rect width="5.027" height=".777" x="2.778" y="3.114" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/><rect width="5.027" height=".777" x="2.778" y="6.624" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/><rect width="5.027" height=".777" x="2.778" y="4.903" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/></g></svg>
@@ -1,92 +1 @@
-<?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"
-   width="40"
-   height="40"
-   viewBox="0 0 10.583 10.583"
-   version="1.1"
-   id="svg1168"
-   sodipodi:docname="side-menu-opener-hamburger-dark.svg"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
-  <metadata
-     id="metadata1174">
-    <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>
-  <defs
-     id="defs1172" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1918"
-     inkscape:window-height="1008"
-     id="namedview1170"
-     showgrid="false"
-     inkscape:zoom="5.9"
-     inkscape:cx="112.71186"
-     inkscape:cy="0.16949153"
-     inkscape:window-x="0"
-     inkscape:window-y="41"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg1168" />
-  <g
-     color="#000"
-     fill="#fff"
-     fill-opacity=".855"
-     transform="translate(0 -286.417)"
-     id="g1166"
-     style="fill:#000000;fill-opacity:0.99637681">
-    <rect
-       ry=".545"
-       rx="0"
-       y="288.816"
-       x="2.516"
-       height="1.451"
-       width="5.551"
-       style="marker:none;fill:#000000;fill-opacity:0.99637681"
-       overflow="visible"
-       paint-order="stroke markers fill"
-       id="rect1160" />
-    <rect
-       ry=".545"
-       rx="0"
-       y="290.973"
-       x="2.516"
-       height="1.451"
-       width="5.551"
-       style="marker:none;fill:#000000;fill-opacity:0.99637681"
-       overflow="visible"
-       paint-order="stroke markers fill"
-       id="rect1162" />
-    <rect
-       ry=".545"
-       rx="0"
-       y="293.15"
-       x="2.516"
-       height="1.451"
-       width="5.551"
-       style="marker:none;fill:#000000;fill-opacity:0.99637681"
-       overflow="visible"
-       paint-order="stroke markers fill"
-       id="rect1164" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 10.583 10.583"><g color="#000" transform="matrix(.85624 0 0 .9944 .747 .03)"><g transform="matrix(1.0055 0 0 1 -.013 0)"><rect width="5.839" height=".782" x="2.372" y="2.764" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/><rect width="5.839" height=".782" x="2.372" y="7.037" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/></g><rect width="5.871" height=".782" x="2.372" y="4.901" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/></g></svg>
@@ -1,91 +1 @@
-<?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"
-   width="40"
-   height="40"
-   viewBox="0 0 10.583 10.583"
-   version="1.1"
-   id="svg1382"
-   sodipodi:docname="side-menu-opener-hamburger.svg"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
-  <metadata
-     id="metadata1388">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs1386" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1918"
-     inkscape:window-height="1008"
-     id="namedview1384"
-     showgrid="false"
-     inkscape:zoom="5.9"
-     inkscape:cx="108.13559"
-     inkscape:cy="3.8983051"
-     inkscape:window-x="0"
-     inkscape:window-y="41"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg1382" />
-  <g
-     color="#000"
-     fill="#fff"
-     fill-opacity=".855"
-     transform="translate(0 -286.417)"
-     id="g1380"
-     style="fill:#ffffff;fill-opacity:1">
-    <rect
-       ry=".545"
-       rx="0"
-       y="288.816"
-       x="2.516"
-       height="1.451"
-       width="5.551"
-       style="marker:none;fill:#ffffff;fill-opacity:1"
-       overflow="visible"
-       paint-order="stroke markers fill"
-       id="rect1374" />
-    <rect
-       ry=".545"
-       rx="0"
-       y="290.973"
-       x="2.516"
-       height="1.451"
-       width="5.551"
-       style="marker:none;fill:#ffffff;fill-opacity:1"
-       overflow="visible"
-       paint-order="stroke markers fill"
-       id="rect1376" />
-    <rect
-       ry=".545"
-       rx="0"
-       y="293.15"
-       x="2.516"
-       height="1.451"
-       width="5.551"
-       style="marker:none;fill:#ffffff;fill-opacity:1"
-       overflow="visible"
-       paint-order="stroke markers fill"
-       id="rect1378" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 10.583 10.583"><g fill="#fff" color="#000" transform="matrix(.85624 0 0 .9944 .747 .03)"><g transform="matrix(1.0055 0 0 1 -.013 0)"><rect width="5.839" height=".782" x="2.372" y="2.764" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/><rect width="5.839" height=".782" x="2.372" y="7.037" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/></g><rect width="5.871" height=".782" x="2.372" y="4.901" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/></g></svg>
@@ -1,172 +1 @@
-<?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"
-   width="40"
-   height="40"
-   viewBox="0 0 10.583 10.583"
-   version="1.1"
-   id="svg1321"
-   sodipodi:docname="side-menu-opener.svg"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
-  <metadata
-     id="metadata1327">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs1325" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1918"
-     inkscape:window-height="1008"
-     id="namedview1323"
-     showgrid="false"
-     inkscape:zoom="5.9"
-     inkscape:cx="78.983051"
-     inkscape:cy="5.5932203"
-     inkscape:window-x="0"
-     inkscape:window-y="41"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg1321" />
-  <g
-     transform="translate(.3 -286.074)"
-     fill="#fff"
-     color="#000"
-     fill-opacity=".855"
-     id="g1319"
-     style="fill:#ffffff;fill-opacity:0.94565219">
-    <rect
-       ry="0"
-       rx="0"
-       y="288.474"
-       x="4.266"
-       height="1.451"
-       width="1.451"
-       style="marker:none;fill:#ffffff;fill-opacity:0.94565219"
-       overflow="visible"
-       paint-order="stroke markers fill"
-       id="rect1295" />
-    <g
-       transform="translate(-.13)"
-       id="g1301"
-       style="fill:#ffffff;fill-opacity:0.94565219">
-      <rect
-         style="marker:none;fill:#ffffff;fill-opacity:0.94565219"
-         width="1.451"
-         height="1.451"
-         x="6.445"
-         y="288.474"
-         rx="0"
-         ry="0"
-         overflow="visible"
-         paint-order="stroke markers fill"
-         id="rect1297" />
-      <rect
-         style="marker:none;fill:#ffffff;fill-opacity:0.94565219"
-         width="1.451"
-         height="1.451"
-         x="2.345"
-         y="288.474"
-         rx="0"
-         ry="0"
-         overflow="visible"
-         paint-order="stroke markers fill"
-         id="rect1299" />
-    </g>
-    <rect
-       ry="0"
-       rx="0"
-       y="290.631"
-       x="4.266"
-       height="1.451"
-       width="1.451"
-       style="marker:none;fill:#ffffff;fill-opacity:0.94565219"
-       overflow="visible"
-       paint-order="stroke markers fill"
-       id="rect1303" />
-    <g
-       transform="translate(-.13 2.157)"
-       id="g1309"
-       style="fill:#ffffff;fill-opacity:0.94565219">
-      <rect
-         style="marker:none;fill:#ffffff;fill-opacity:0.94565219"
-         width="1.451"
-         height="1.451"
-         x="6.445"
-         y="288.474"
-         rx="0"
-         ry="0"
-         overflow="visible"
-         paint-order="stroke markers fill"
-         id="rect1305" />
-      <rect
-         style="marker:none;fill:#ffffff;fill-opacity:0.94565219"
-         width="1.451"
-         height="1.451"
-         x="2.345"
-         y="288.474"
-         rx="0"
-         ry="0"
-         overflow="visible"
-         paint-order="stroke markers fill"
-         id="rect1307" />
-    </g>
-    <rect
-       ry="0"
-       rx="0"
-       y="292.808"
-       x="4.266"
-       height="1.451"
-       width="1.451"
-       style="marker:none;fill:#ffffff;fill-opacity:0.94565219"
-       overflow="visible"
-       paint-order="stroke markers fill"
-       id="rect1311" />
-    <g
-       transform="translate(-.13 4.334)"
-       id="g1317"
-       style="fill:#ffffff;fill-opacity:0.94565219">
-      <rect
-         style="marker:none;fill:#ffffff;fill-opacity:0.94565219"
-         width="1.451"
-         height="1.451"
-         x="6.445"
-         y="288.474"
-         rx="0"
-         ry="0"
-         overflow="visible"
-         paint-order="stroke markers fill"
-         id="rect1313" />
-      <rect
-         style="marker:none;fill:#ffffff;fill-opacity:0.94565219"
-         width="1.451"
-         height="1.451"
-         x="2.345"
-         y="288.474"
-         rx="0"
-         ry="0"
-         overflow="visible"
-         paint-order="stroke markers fill"
-         id="rect1315" />
-    </g>
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 10.583 10.583"><g fill="#fff" fill-opacity=".946" color="#000" transform="matrix(.90559 0 0 .86896 .772 -247.893)"><rect width="1.451" height="1.451" x="4.266" y="288.474" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/><g transform="translate(-.13)"><rect width="1.451" height="1.451" x="6.445" y="288.474" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/><rect width="1.451" height="1.451" x="2.345" y="288.474" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/></g><rect width="1.451" height="1.451" x="4.266" y="290.631" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/><g transform="translate(-.13 2.157)"><rect width="1.451" height="1.451" x="6.445" y="288.474" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/><rect width="1.451" height="1.451" x="2.345" y="288.474" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/></g><rect width="1.451" height="1.451" x="4.266" y="292.808" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/><g transform="translate(-.13 4.334)"><rect width="1.451" height="1.451" x="6.445" y="288.474" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/><rect width="1.451" height="1.451" x="2.345" y="288.474" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/></g></g></svg>
@@ -9,6 +9,9 @@ use OCA\SideMenu\Service\AppRepository;
 use OCA\SideMenu\Service\CategoryRepository;
 use OCA\SideMenu\Service\ConfigProxy;
 use OCP\AppFramework\App;
+use OCP\AppFramework\Bootstrap\IBootContext;
+use OCP\AppFramework\Bootstrap\IBootstrap;
+use OCP\AppFramework\Bootstrap\IRegistrationContext;
 use OCP\IUserSession;
 use OCP\Util;
 use Psr\Container\ContainerInterface;
@@ -18,7 +21,7 @@ use Psr\Container\ContainerInterface;
 *
 * @author Simon Vieille <simon@deblan.fr>
 */
-class Application extends App
+class Application extends App implements IBootstrap
 {
    public const APP_ID = 'side_menu';

@@ -44,16 +47,9 @@ class Application extends App
    public function __construct(array $urlParams = [])
    {
        parent::__construct(self::APP_ID, $urlParams);
-
-        $this->config = OC::$server->getConfig();
-        $this->cspnm = OC::$server->getContentSecurityPolicyNonceManager();
-        $this->user = OC::$server[IUserSession::class]->getUser();
    }

-    /**
-     * Checks if this app is enabled.
-     */
-    public function isEnabled(): bool
+    protected function isEnabled(): bool
    {
        $enabled = true;
        $isForced = (bool) $this->config->getAppValue(self::APP_ID, 'force', '0');
@@ -74,64 +70,65 @@ class Application extends App
        return $enabled;
    }

-    /**
-     * Registes services.
-     */
-    public function registerServices()
-    {
-        $container = $this->getContainer();
-
-        $container->registerService('AppRepository', function (ContainerInterface $c) {
-            return new AppRepository();
-        });
-
-        $container->registerService('CategoryRepository', function (ContainerInterface $c) {
-            return new CategoryRepository();
-        });
-
-        $container->registerService('ConfigProxy', function (ContainerInterface $c) {
-            return new ConfigProxy();
-        });
-    }
-
-    /**
-     * Registers assets.
-     */
-    public function registerAssets()
+    protected function addAssets()
    {
        Util::addScript(self::APP_ID, 'sideMenu');
        Util::addStyle(self::APP_ID, 'sideMenu');

-        $stylesheet = OC::$server->getURLGenerator()->linkToRoute(
-            'side_menu.Css.stylesheet',
-            [
-                'v' => $this->config->getAppValue(self::APP_ID, 'cache', '0'),
-            ]
-        );
-
-        $script = OC::$server->getURLGenerator()->linkToRoute(
-            'side_menu.Js.script',
-            [
-                'v' => $this->config->getAppValue(self::APP_ID, 'cache', '0'),
-            ]
-        );
-
-        Util::addHeader(
-            'link',
-            [
-                'href' => $stylesheet,
-                'rel' => 'stylesheet',
+        $assets = [
+            'stylesheet' => [
+                'route' => 'side_menu.Css.stylesheet',
+                'type' => 'link',
+                'route_attr' => 'href',
+                'attr' => [
+                    'rel' => 'stylesheet',
+                ],
            ],
-            ''
-        );
-
-        Util::addHeader(
-            'script',
-            [
-                'src' => $script,
-                'nonce' => $this->cspnm->getNonce(),
+            'script' => [
+                'route' => 'side_menu.Js.script',
+                'type' => 'script',
+                'route_attr' => 'src',
+                'attr' => [
+                    'nonce' => $this->cspnm->getNonce(),
+                ],
            ],
-            ''
-        );
+        ];
+
+        $cache = $this->config->getAppValue(self::APP_ID, 'cache', '0');
+
+        foreach ($assets as $value) {
+            $route = OC::$server->getURLGenerator()->linkToRoute($value['route'], ['v' => $cache]);
+            $value['attr'][$value['route_attr']] = $route;
+
+            Util::addHeader($value['type'], $value['attr'], '');
+        }
+    }
+
+    public function register(IRegistrationContext $context): void
+    {
+        $context->registerService('AppRepository', function () {
+            return new AppRepository();
+        });
+
+        $context->registerService('CategoryRepository', function () {
+            return new CategoryRepository();
+        });
+
+        $context->registerService('ConfigProxy', function () {
+            return new ConfigProxy();
+        });
+    }
+
+    public function boot(IBootContext $context): void
+    {
+        $this->config = OC::$server->getConfig();
+        $this->cspnm = OC::$server->getContentSecurityPolicyNonceManager();
+        $this->user = OC::$server[IUserSession::class]->getUser();
+
+        if (!$this->isEnabled()) {
+            return;
+        }
+
+        $this->addAssets();
    }
 }
@@ -69,7 +69,7 @@ class AdminSettingController extends Controller
    public function exportConfiguration()
    {
        $keys = $this->config->getAppKeys(Application::APP_ID);
-        $config = [];
+        $appConfig = [];
        $excludedKeys = [
            'cache',
            'cache-categories',
@@ -80,11 +80,11 @@ class AdminSettingController extends Controller
                continue;
            }

-            $config[$key] = $this->config->getAppValue(Application::APP_ID, $key);
+            $appConfig[$key] = $this->config->getAppValue(Application::APP_ID, $key);
        }

        return new DataDownloadResponse(
-            json_encode($config, JSON_PRETTY_PRINT),
+            json_encode($appConfig, JSON_PRETTY_PRINT),
            'config.json',
            'text/json'
        );
@@ -27,6 +27,8 @@ use OCP\AppFramework\Http\Response;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\IRequest;
 use OCP\IUserSession;
+use OCA\Theming\ThemingDefaults;
+use OCA\SideMenu\Service\Color;

 class CssController extends Controller
 {
@@ -40,12 +42,30 @@ class CssController extends Controller
     */
    protected $user;

-    public function __construct(string $appName, IRequest $request, ConfigProxy $config)
+    /**
+     * @var ThemingDefaults
+     */
+    protected $theming;
+
+    /**
+     * @var Color
+     */
+    protected $color;
+
+    public function __construct(
+        string $appName,
+        IRequest $request,
+        ConfigProxy $config,
+        ThemingDefaults $theming,
+        Color $color
+    )
    {
        parent::__construct($appName, $request);

        $this->user = OC::$server[IUserSession::class]->getUser();
        $this->config = $config;
+        $this->theming = $theming;
+        $this->color = $color;
    }

    /**
@@ -67,6 +87,7 @@ class CssController extends Controller
    {
        $isForced = $this->config->getAppValueBool('force', '0');
        $topMenuApps = $this->config->getAppValueArray('top-menu-apps', '[]');
+        $topSideMenuApps = $this->config->getAppValueArray('top-side-menu-apps', '[]');

        $isAccessibilityAppEnabled = $this->config->getAppValueBool('enabled', '0', 'accessibility');
        $isBreezeDarkAppEnabled = $this->config->getAppValueBool('enabled', '0', 'breezedark');
@@ -74,11 +95,16 @@ class CssController extends Controller

        if ($this->user) {
            $userTopMenuApps = $this->config->getUserValueArray($this->user, 'top-menu-apps', '[]');
+            $userTopSideMenuApps = $this->config->getUserValueArray($this->user, 'top-side-menu-apps', '[]');

            if (!empty($userTopMenuApps) && !$isForced) {
                $topMenuApps = $userTopMenuApps;
            }

+            if (!empty($userTopSideMenuApps) && !$isForced) {
+                $topSideMenuApps = $userTopSideMenuApps;
+            }
+
            $isDarkThemeUserEnabled = $this->config->getUserValue($this->user, 'theme', '', 'accessibility') === 'dark';
            $isBreezeDarkUserEnabled = $this->config->getUserValue($this->user, 'theme_enabled', '', 'breezedark');

@@ -90,23 +116,29 @@ class CssController extends Controller

        $isDarkMode = ($isAccessibilityAppEnabled && $isDarkThemeUserEnabled) || ($isBreezeDarkAppEnabled && $isBreezeDarkUserEnabled);

+        $primaryColor = $this->theming->getColorPrimary();
+        $lightenPrimaryColor = $this->color->adjustBrightness($primaryColor, 0.2);
+        $darkenPrimaryColor = $this->color->adjustBrightness($primaryColor, -0.2);
+        $darkenPrimaryColor2 = $this->color->adjustBrightness($primaryColor, -0.3);
+        $textColor = $this->theming->getTextColorPrimary();
+
        if ($isDarkMode) {
-            $backgroundColor = $this->config->getAppValue('dark-mode-background-color', '#333333');
-            $backgroundColorTo = $this->config->getAppValue('dark-mode-background-color-to', $backgroundColor);
-            $currentAppBackgroundColor = $this->config->getAppValue('dark-mode-current-app-background-color', '#444444');
-            $loaderColor = $this->config->getAppValue('dark-mode-loader-color', '#cccccc');
-            $textColor = $this->config->getAppValue('dark-mode-text-color', '#FFFFFF');
+            $backgroundColor = $this->config->getAppValue('dark-mode-background-color', $darkenPrimaryColor);
+            $backgroundColorTo = $this->config->getAppValue('dark-mode-background-color-to', $darkenPrimaryColor);
+            $currentAppBackgroundColor = $this->config->getAppValue('dark-mode-current-app-background-color', $darkenPrimaryColor2);
+            $loaderColor = $this->config->getAppValue('dark-mode-loader-color', $lightenPrimaryColor);
+            $textColor = $this->config->getAppValue('dark-mode-text-color', $textColor);
            $iconInvertFilter = abs($this->config->getAppValueInt('dark-mode-icon-invert-filter', '0')).'%';
            $iconOpacity = abs($this->config->getAppValueInt('dark-mode-icon-opacity', '100') / 100);
            $opener = $this->config->getAppValue('dark-mode-opener', 'side-menu-opener');

            $backgroundOpacity = dechex($this->config->getAppValueInt('dark-mode-background-color-opacity', '100') * 255 / 100);
        } else {
-            $backgroundColor = $this->config->getAppValue('background-color', '#333333');
-            $backgroundColorTo = $this->config->getAppValue('background-color-to', $backgroundColor);
-            $currentAppBackgroundColor = $this->config->getAppValue('current-app-background-color', '#444444');
-            $loaderColor = $this->config->getAppValue('loader-color', '#0e75ac');
-            $textColor = $this->config->getAppValue('text-color', '#FFFFFF');
+            $backgroundColor = $this->config->getAppValue('background-color', $darkenPrimaryColor);
+            $backgroundColorTo = $this->config->getAppValue('background-color-to', $darkenPrimaryColor);
+            $currentAppBackgroundColor = $this->config->getAppValue('current-app-background-color', $darkenPrimaryColor2);
+            $loaderColor = $this->config->getAppValue('loader-color', $lightenPrimaryColor);
+            $textColor = $this->config->getAppValue('text-color', $textColor);
            $iconInvertFilter = abs($this->config->getAppValueInt('icon-invert-filter', '0')).'%';
            $iconOpacity = abs($this->config->getAppValueInt('icon-opacity', '100') / 100);
            $opener = $this->config->getAppValue('opener', 'side-menu-opener');
@@ -136,6 +168,7 @@ class CssController extends Controller
            'always-displayed' => $this->config->getAppValueBool('always-displayed', '0'),
            'big-menu' => $this->config->getAppValueBool('big-menu', '0'),
            'top-menu-apps' => $topMenuApps,
+            'top-side-menu-apps' => $topSideMenuApps,
        ];
    }
 }
@@ -94,6 +94,7 @@ class JsController extends Controller
    protected function getConfig(): array
    {
        $topMenuApps = $this->config->getAppValueArray('top-menu-apps', '[]');
+        $topSideMenuApps = $this->config->getAppValueArray('top-side-menu-apps', '[]');
        $targetBlankApps = $this->config->getAppValueArray('target-blank-apps', '[]');
        $useAvatar = $this->config->getAppValueBool('use-avatar', '0');
        $isForced = $this->config->getAppValueBool('force', '0');
@@ -103,11 +104,16 @@ class JsController extends Controller

        if ($this->user) {
            $userTopMenuApps = $this->config->getUserValueArray($this->user, 'top-menu-apps', '[]');
+            $userTopSideMenuApps = $this->config->getUserValueArray($this->user, 'top-side-menu-apps', '[]');

            if (!empty($userTopMenuApps) && !$isForced) {
                $topMenuApps = $userTopMenuApps;
            }

+            if (!empty($userTopSideMenuApps) && !$isForced) {
+                $topSideMenuApps = $userTopSideMenuApps;
+            }
+
            $userTargetBlankMode = $this->config->getUserValueInt($this->user, 'target-blank-mode', '1');
            $userTargetBlankApps = $this->config->getUserValueArray($this->user, 'target-blank-apps', '[]');

@@ -152,10 +158,12 @@ class JsController extends Controller
            'hide-when-no-apps' => $this->config->getAppValueBool('hide-when-no-apps', '0'),
            'loader-enabled' => $this->config->getAppValueBool('loader-enabled', '1'),
            'always-displayed' => $this->config->getAppValueBool('always-displayed', '0'),
+            'side-with-categories' => $this->config->getAppValueBool('side-with-categories', '0'),
            'big-menu' => $this->config->getAppValueBool('big-menu', '0'),
            'big-menu-hidden-apps' => $this->config->getAppValueArray('big-menu-hidden-apps', '[]'),
            'avatar' => $avatar,
            'top-menu-apps' => $topMenuApps,
+            'top-side-menu-apps' => $topSideMenuApps,
            'target-blank-apps' => $targetBlankApps,
            'settings' => $settings,
            'logo' => $this->themingDefaults->getLogo(),
@@ -187,9 +187,18 @@ class NavController extends Controller

        usort($items, function ($a, $b) use ($categoriesLabels) {
            foreach ($categoriesLabels as $key => $value) {
+                if ($a['categoryId'] === 'other') {
+                    return -1;
+                }
+
+                if ($b['categoryId'] === 'other') {
+                    return 1;
+                }
+
                if ($a['categoryId'] === $key) {
                    return -1;
                }
+
                if ($b['categoryId'] === $key) {
                    return 1;
                }
@@ -54,6 +54,7 @@ class PersonalSettingController extends Controller

    /**
     * @NoAdminRequired
+     * @NoCSRFRequired
     *
     * @param mixed $name
     * @param mixed $value
@@ -96,7 +97,7 @@ class PersonalSettingController extends Controller
            }
        }

-        if ('top-menu-apps' === $name) {
+        if (in_array($name, ['top-menu-apps', 'top-side-menu-apps'])) {
            $doSave = true;
            $data = json_decode($value, true);

@@ -21,10 +21,27 @@ class AppRepository
     */
    protected $l10nFactory;

-    public function __construct(\OC_App $ocApp, IFactory $l10nFactory)
+    /**
+     * @var ConfigProxy
+     */
+    protected $config;
+
+    /**
+     * @var CategoryRepository
+     */
+    protected $categoryRepository;
+
+    public function __construct(
+        \OC_App $ocApp,
+        IFactory $l10nFactory,
+        ConfigProxy $config,
+        CategoryRepository $categoryRepository
+    )
    {
        $this->ocApp = $ocApp;
        $this->l10nFactory = $l10nFactory;
+        $this->config = $config;
+        $this->categoryRepository = $categoryRepository;
    }

    /**
@@ -35,6 +52,8 @@ class AppRepository
    public function getVisibleApps()
    {
        $navigation = $this->ocApp->getNavigation();
+        $appCategoriesCustom = $this->config->getAppValueArray('apps-categories-custom', '[]');
+        $categories = $this->categoryRepository->getOrderedCategories();
        $apps = $this->ocApp->listAllApps();
        $visibleApps = [];

@@ -74,6 +93,12 @@ class AppRepository
            }
        }

+        foreach ($visibleApps as $id => $app) {
+            if (isset($appCategoriesCustom[$id], $categories[$appCategoriesCustom[$id]])) {
+                $visibleApps[$id]['category'] = [$appCategoriesCustom[$id]];
+            }
+        }
+
        usort($visibleApps, function ($a, $b) {
            return ($a['name'] < $b['name']) ? -1 : 1;
        });
@@ -5,6 +5,7 @@ namespace OCA\SideMenu\Service;
 use OC\App\AppStore\Fetcher\CategoryFetcher;
 use OCA\SideMenu\AppInfo\Application;
 use OCP\IConfig;
+use OCP\IUserSession;
 use OCP\L10N\IFactory;

 /**
@@ -34,16 +35,23 @@ class CategoryRepository
     */
    protected $iConfig;

+    /**
+     * @var IUserSession
+     */
+    protected $userSession;
+
    public function __construct(
        CategoryFetcher $categoryFetcher,
        ConfigProxy $config,
        IConfig $iConfig,
-        IFactory $l10nFactory
+        IFactory $l10nFactory,
+        IUserSession $userSession
    ) {
        $this->categoryFetcher = $categoryFetcher;
        $this->l10nFactory = $l10nFactory;
        $this->config = $config;
        $this->iConfig = $iConfig;
+        $this->userSession = $userSession;
    }

    /**
@@ -56,8 +64,8 @@ class CategoryRepository
        $currentLanguage = substr($this->l10nFactory->findLanguage(), 0, 2);
        $type = $this->config->getAppValue('categories-order-type', 'default');
        $order = $this->config->getAppValueArray('categories-order', '[]');
-
        $categoriesLabels = $this->config->getAppValueArray('cache-categories', '[]');
+        $customCategories = $this->config->getAppValueArray('categories-custom', '[]');

        if (empty($categoriesLabels)) {
            $categoriesLabels = $this->categoryFetcher->get();
@@ -74,6 +82,18 @@ class CategoryRepository
        $categoriesLabels['external_links'] = $this->l10nFactory->get('external')->t('External sites');
        $categoriesLabels['other'] = '';

+        $user = $this->userSession->getUser();
+
+        if ($user) {
+            $lang = $this->iConfig->getUserValue($user->getUid(), 'core', 'lang');
+        } else {
+            $lang = 'en';
+        }
+
+        foreach ($customCategories as $category) {
+            $categoriesLabels[$category['id']] = $category[$lang] ?? $category['en'];
+        }
+
        asort($categoriesLabels);

        if ('custom' === $type) {
@@ -0,0 +1,34 @@
+<?php
+
+namespace OCA\SideMenu\Service;
+
+/**
+ * class Color.
+ *
+ * @author Simon Vieille <simon@deblan.fr>
+ */
+class Color
+{
+    /**
+     * @thanks https://stackoverflow.com/posts/54393956/revision
+     */
+    public function adjustBrightness(string $hexCode, float $adjustPercent): string
+    {
+        $hexCode = ltrim($hexCode, '#');
+
+        if (3 == strlen($hexCode)) {
+            $hexCode = $hexCode[0].$hexCode[0].$hexCode[1].$hexCode[1].$hexCode[2].$hexCode[2];
+        }
+
+        $hexCode = array_map('hexdec', str_split($hexCode, 2));
+
+        foreach ($hexCode as &$color) {
+            $adjustableLimit = $adjustPercent < 0 ? $color : 255 - $color;
+            $adjustAmount = ceil($adjustableLimit * $adjustPercent);
+
+            $color = str_pad(dechex($color + $adjustAmount), 2, '0', STR_PAD_LEFT);
+        }
+
+        return '#'.implode($hexCode);
+    }
+}
@@ -0,0 +1,48 @@
+<?php
+
+namespace OCA\SideMenu\Service;
+
+use OCP\IDBConnection;
+
+/**
+ * class LangRepository.
+ *
+ * @author Simon Vieille <simon@deblan.fr>
+ */
+class LangRepository
+{
+    /**
+     * @var IDBConnection
+     */
+    protected $db;
+
+    public function __construct(IDBConnection $db)
+    {
+        $this->db = $db;
+    }
+
+    public function getUsedLangs(): array
+    {
+        $qb = $this->db->getQueryBuilder();
+
+        $qb->select($qb->createFunction('DISTINCT configvalue'))
+            ->where('configkey=:configkey and appid=:appid and configvalue<>:configvalue')
+            ->setParameters([
+                'configkey' => 'lang',
+                'appid' => 'core',
+                'configvalue' => 'en',
+            ])
+            ->from('preferences')
+        ;
+
+        $stmt = $qb->execute();
+
+        $langs = ['en'];
+
+        foreach ($stmt->fetchAll() as $result) {
+            $langs[] = $result['configvalue'];
+        }
+
+        return $langs;
+    }
+}
@@ -26,6 +26,9 @@ use OCP\AppFramework\Http\TemplateResponse;
 use OCP\IL10N;
 use OCP\ILogger;
 use OCP\Settings\ISettings;
+use OCA\Theming\ThemingDefaults;
+use OCA\SideMenu\Service\Color;
+use OCA\SideMenu\Service\LangRepository;

 class Admin implements ISettings
 {
@@ -54,18 +57,39 @@ class Admin implements ISettings
     */
    private $categoryRepository;

+    /**
+     * @var ThemingDefaults
+     */
+    protected $theming;
+
+    /**
+     * @var Color
+     */
+    protected $color;
+
+    /**
+     * @var LangRepository
+     */
+    protected $langRepository;
+
    public function __construct(
        IL10N $l,
        ILogger $logger,
        ConfigProxy $config,
        AppRepository $appRepository,
-        CategoryRepository $categoryRepository
+        CategoryRepository $categoryRepository,
+        ThemingDefaults $theming,
+        Color $color,
+        LangRepository $langRepository
    ) {
        $this->l = $l;
        $this->logger = $logger;
        $this->config = $config;
        $this->appRepository = $appRepository;
        $this->categoryRepository = $categoryRepository;
+        $this->theming = $theming;
+        $this->color = $color;
+        $this->langRepository = $langRepository;
    }

    /**
@@ -73,35 +97,54 @@ class Admin implements ISettings
     */
    public function getForm()
    {
-        $backgroundColor = $this->config->getAppValue('background-color', '#333333');
-        $backgroundColorTo = $this->config->getAppValue('background-color-to', $backgroundColor);
+        $primaryColor = $this->theming->getColorPrimary();
+        $lightenPrimaryColor = $this->color->adjustBrightness($primaryColor, 0.2);
+        $darkenPrimaryColor = $this->color->adjustBrightness($primaryColor, -0.2);
+        $darkenPrimaryColor2 = $this->color->adjustBrightness($primaryColor, -0.3);
+        $textColor = $this->theming->getTextColorPrimary();

-        $darkModeBackgroundColor = $this->config->getAppValue('dark-mode-background-color', '#333333');
-        $darkModeBackgroundColorTo = $this->config->getAppValue('dark-mode-background-color-to', $darkModeBackgroundColor);
+        $backgroundColor = $this->config->getAppValue('background-color', $darkenPrimaryColor);
+        $backgroundColorTo = $this->config->getAppValue('background-color-to', $darkenPrimaryColor);
+
+        $darkModeBackgroundColor = $this->config->getAppValue('dark-mode-background-color', $darkenPrimaryColor);
+        $darkModeBackgroundColorTo = $this->config->getAppValue('dark-mode-background-color-to', $darkenPrimaryColor);

        $parameters = [
+            'defaults' => [
+                'background-color' => $darkenPrimaryColor,
+                'background-color-to' => $darkenPrimaryColor,
+                'current-app-background-color' => $darkenPrimaryColor2,
+                'text-color' => $textColor,
+                'loader-color' => $lightenPrimaryColor,
+                'dark-mode-background-color' => $darkenPrimaryColor,
+                'dark-mode-background-color-to' => $darkenPrimaryColor,
+                'dark-mode-current-app-background-color' => $darkenPrimaryColor2,
+                'dark-mode-text-color' => $textColor,
+                'dark-mode-loader-color' => $textColor,
+            ],
            'background-color' => $backgroundColor,
            'background-color-to' => $backgroundColorTo,
            'background-color-opacity' => $this->config->getAppValueInt('background-color-opacity', '100'),
-            'current-app-background-color' => $this->config->getAppValue('current-app-background-color', '#444444'),
-            'loader-color' => $this->config->getAppValue('loader-color', '#0e75ac'),
+            'current-app-background-color' => $this->config->getAppValue('current-app-background-color', $darkenPrimaryColor2),
+            'loader-color' => $this->config->getAppValue('loader-color', $lightenPrimaryColor),
            'icon-invert-filter' => $this->config->getAppValueInt('icon-invert-filter', '0'),
            'icon-opacity' => $this->config->getAppValueInt('icon-opacity', '100'),
-            'text-color' => $this->config->getAppValue('text-color', '#FFFFFF'),
+            'text-color' => $this->config->getAppValue('text-color', $textColor),
            'dark-mode-background-color' => $darkModeBackgroundColor,
            'dark-mode-background-color-to' => $darkModeBackgroundColorTo,
            'dark-mode-background-color-opacity' => $this->config->getAppValueInt('dark-mode-background-color-opacity', '100'),
-            'dark-mode-current-app-background-color' => $this->config->getAppValue('dark-mode-current-app-background-color', '#444444'),
-            'dark-mode-loader-color' => $this->config->getAppValue('dark-mode-loader-color', '#cccccc'),
+            'dark-mode-current-app-background-color' => $this->config->getAppValue('dark-mode-current-app-background-color', $darkenPrimaryColor2),
+            'dark-mode-loader-color' => $this->config->getAppValue('dark-mode-loader-color', $textColor),
            'dark-mode-icon-invert-filter' => $this->config->getAppValueInt('dark-mode-icon-invert-filter', '0'),
            'dark-mode-icon-opacity' => $this->config->getAppValueInt('dark-mode-icon-opacity', '100'),
-            'dark-mode-text-color' => $this->config->getAppValue('dark-mode-text-color', '#FFFFFF'),
+            'dark-mode-text-color' => $this->config->getAppValue('dark-mode-text-color', $textColor),
            'dark-mode-opener' => $this->config->getAppValue('dark-mode-opener', 'side-menu-opener'),
            'opener' => $this->config->getAppValue('opener', 'side-menu-opener'),
            'loader-enabled' => $this->config->getAppValue('loader-enabled', '1'),
            'cache' => $this->config->getAppValue('cache', '0'),
            'always-displayed' => $this->config->getAppValue('always-displayed', '0'),
            'big-menu' => $this->config->getAppValue('big-menu', '0'),
+            'side-with-categories' => $this->config->getAppValue('side-with-categories', '0'),
            'big-menu-hidden-apps' => $this->config->getAppValueArray('big-menu-hidden-apps', '[]'),
            'display-logo' => $this->config->getAppValue('display-logo', '1'),
            'add-logo-link' => $this->config->getAppValue('add-logo-link', '1'),
@@ -116,11 +159,15 @@ class Admin implements ISettings
            'force' => $this->config->getAppValue('force', '0'),
            'target-blank-apps' => $this->config->getAppValueArray('target-blank-apps', '[]'),
            'top-menu-apps' => $this->config->getAppValueArray('top-menu-apps', '[]'),
+            'top-side-menu-apps' => $this->config->getAppValueArray('top-side-menu-apps', '[]'),
            'default-enabled' => $this->config->getAppValue('default-enabled', '1'),
+            'apps' => $this->appRepository->getVisibleApps(),
+            'apps-categories-custom' => $this->config->getAppValueArray('apps-categories-custom', '[]'),
            'categories-order-type' => $this->config->getAppValue('categories-order-type', 'default'),
            'categories-order' => $this->config->getAppValueArray('categories-order', '[]'),
-            'apps' => $this->appRepository->getVisibleApps(),
+            'categories-custom' => $this->config->getAppValueArray('categories-custom', '[]'),
            'categories' => $this->categoryRepository->getOrderedCategories(),
+            'langs' => $this->langRepository->getUsedLangs(),
        ];

        return new TemplateResponse(Application::APP_ID, 'settings/admin-form', $parameters, '');
@@ -78,6 +78,7 @@ class Personal implements ISettings
                $this->config->getAppValue('default-enabled', '1')
            ),
            'top-menu-apps' => $this->config->getUserValueArray($user, 'top-menu-apps', '[]'),
+            'top-side-menu-apps' => $this->config->getUserValueArray($user, 'top-side-menu-apps', '[]'),
            'target-blank-mode' => $this->config->getUserValue($user, 'target-blank-mode', '1'),
            'target-blank-apps' => $this->config->getUserValueArray($user, 'target-blank-apps', '[]'),
            'apps' => $this->appRepository->getVisibleApps(),
@@ -19,6 +19,7 @@
 namespace OCA\SideMenu\Settings;

 use OCA\SideMenu\AppInfo\Application;
+use OCA\SideMenu\Service\ConfigProxy;
 use OCP\IL10N;
 use OCP\IURLGenerator;
 use OCP\Settings\IIconSection;
@@ -35,10 +36,16 @@ class PersonalSection implements IIconSection
     */
    private $url;

-    public function __construct(IURLGenerator $url, IL10N $l)
+    /**
+     * @var ConfigProxy
+     */
+    private $configProxy;
+
+    public function __construct(IURLGenerator $url, IL10N $l, ConfigProxy $configProxy)
    {
        $this->url = $url;
        $this->l = $l;
+        $this->configProxy = $configProxy;
    }

    /**
@@ -49,6 +56,10 @@ class PersonalSection implements IIconSection
     */
    public function getID()
    {
+        if ($this->configProxy->getAppValueBool('force', '0')) {
+            return '';
+        }
+
        return Application::APP_ID;
    }

@@ -60,6 +71,10 @@ class PersonalSection implements IIconSection
     */
    public function getName()
    {
+        if ($this->configProxy->getAppValueBool('force', '0')) {
+            return '';
+        }
+
        return $this->l->t(Application::APP_NAME);
    }

@@ -72,6 +87,10 @@ class PersonalSection implements IIconSection
     */
    public function getPriority()
    {
+        if ($this->configProxy->getAppValueBool('force', '0')) {
+            return null;
+        }
+
        return 70;
    }

@@ -2,7 +2,7 @@
 	"license": "agpl",
 	"private": true,
 	"scripts": {
-		"build": "NODE_ENV=production webpack --progress --hide-modules --config webpack.js",
+		"build": "NODE_ENV=production webpack --progress --config webpack.js",
 		"dev": "NODE_ENV=development webpack --progress --config webpack.js",
 		"watch": "NODE_ENV=development webpack --progress --watch --config webpack.js",
 		"lint": "eslint --ext .js,.vue src",
@@ -11,49 +11,49 @@
 		"stylelint:fix": "stylelint src --fix"
 	},
 	"dependencies": {
-		"@nextcloud/axios": "^1.3.2",
-		"@nextcloud/vue": "^1.4.0",
-		"axios": "^0.19.2",
-		"trim": "0.0.1",
+		"@nextcloud/axios": "^1.8.0",
+		"@nextcloud/vue": "^1.5.0",
+		"axios": "^0.24.0",
+		"trim": "^1.0.1",
 		"vue": "^2.6.11"
 	},
 	"browserslist": [
 		"extends @nextcloud/browserslist-config"
 	],
 	"engines": {
-		"node": ">=10.0.0"
+		"node": ">=16.0.0"
 	},
 	"devDependencies": {
 		"@babel/core": "^7.9.0",
 		"@babel/plugin-syntax-dynamic-import": "^7.8.3",
 		"@babel/preset-env": "^7.9.0",
 		"@nextcloud/browserslist-config": "^1.0.0",
+		"@nextcloud/eslint-config": "^8.1.2",
 		"babel-eslint": "^10.1.0",
 		"babel-loader": "^8.1.0",
 		"css-loader": "^3.4.2",
-		"eslint": "^5.16.0",
-		"eslint-config-nextcloud": "0.1.1",
-		"eslint-config-standard": "^12.0.0",
+		"eslint": "^8.0.0",
+		"eslint-config-standard": "^17.0.0",
 		"eslint-import-resolver-webpack": "^0.12.1",
-		"eslint-loader": "^3.0.3",
 		"eslint-plugin-import": "^2.20.0",
 		"eslint-plugin-nextcloud": "^0.3.0",
 		"eslint-plugin-node": "^10.0.0",
-		"eslint-plugin-promise": "^4.2.1",
+		"eslint-plugin-promise": "^6.0.0",
 		"eslint-plugin-standard": "^4.0.1",
-		"eslint-plugin-vue": "^5.2.3",
+		"eslint-plugin-vue": "^9.0.0",
+		"eslint-webpack-plugin": "^3.0.0",
 		"file-loader": "^6.0.0",
-		"node-sass": "^4.13.1",
-		"sass-loader": "^8.0.2",
-		"stylelint": "^8.4.0",
-		"stylelint-config-recommended-scss": "^3.3.0",
-		"stylelint-scss": "^3.16.0",
-		"stylelint-webpack-plugin": "^0.10.5",
+		"sass": "^1.49.9",
+		"sass-loader": "^13.0.2",
+		"stylelint": "^14.0.0",
+		"stylelint-config-recommended-scss": "^7.0.0",
+		"stylelint-scss": "^4.0.0",
+		"stylelint-webpack-plugin": "^3.3.0",
 		"url-loader": "^4.0.0",
 		"vue-loader": "^15.9.1",
 		"vue-template-compiler": "^2.6.11",
-		"webpack": "^4.42.0",
-		"webpack-cli": "^3.3.11",
+		"webpack": "^5.0.0",
+		"webpack-cli": "^4.0.0",
 		"webpack-merge": "^4.2.2",
 		"webpack-node-externals": "^1.7.2"
 	}
@@ -0,0 +1,182 @@
+<!--
+@license GNU AGPL version 3 or any later version
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+-->
+<template>
+    <div>
+        <ul class="side-menu-setting-list">
+            <li v-for="item in values" class="side-menu-setting-list-item" v-on:click="showEditForm(item)">
+                <span v-text="item.en"></span>
+            </li>
+        </ul>
+
+        <Actions>
+	        <ActionButton @click="showAddForm" icon="icon-add"></ActionButton>
+        </Actions>
+
+		<Modal v-if="addForm" @close="hideAddForm">
+			<div class="modal__content">
+                <div v-for="lang in langs">
+                    <span class="lang" v-text="lang"></span>
+                    <input type="text" v-model="newValue[lang]" required>
+                </div>
+
+                <Actions>
+                    <ActionButton @click="saveAdd" icon="icon-checkmark"></ActionButton>
+                </Actions>
+            </div>
+		</Modal>
+
+		<Modal v-if="editForm" @close="hideEditForm">
+			<div class="modal__content">
+                <div v-for="lang in langs">
+                    <span class="lang" v-text="lang"></span>
+                    <input type="text" v-model="editValue[lang]" required>
+                </div>
+
+                <div class="pull-right">
+                    <Actions>
+                        <ActionButton @click="removeEdit" icon="icon-delete"></ActionButton>
+                    </Actions>
+                </div>
+
+                <Actions>
+                    <ActionButton @click="saveEdit" icon="icon-checkmark"></ActionButton>
+                </Actions>
+            </div>
+		</Modal>
+    </div>
+</template>
+
+<style scoped>
+    .modal__content {
+        width: 200px;
+        padding: 10px;
+    }
+
+    .modal__content .lang {
+        width: 60px;
+        display: inline-block;
+        padding: 4px;
+        box-sizing: border-box;
+    }
+
+    .modal__content input[type=text] {
+        width: calc(100% - 85px);
+        display: inline-block;
+        margin: 0;
+    }
+
+    .pull-right {
+        float: right;
+    }
+</style>
+
+<script>
+import Modal from '@nextcloud/vue/dist/Components/Modal'
+import Actions from '@nextcloud/vue/dist/Components/Actions'
+import ActionButton from '@nextcloud/vue/dist/Components/ActionButton'
+
+export default {
+    name: 'AdminCategoriesCustom',
+    components: {
+        Modal,
+        Actions,
+        ActionButton,
+    },
+    data() {
+        return {
+            input: null,
+            values: [],
+            langs: [],
+            addForm: false,
+            editForm: false,
+            newValue: {},
+            editValue: {},
+        }
+    },
+    methods: {
+        init() {
+            this.values = JSON.parse(this.input.value)
+            this.langs = JSON.parse(this.input.getAttribute('data-langs'))
+        },
+        update() {
+            this.input.value = JSON.stringify(this.values)
+        },
+        showAddForm() {
+            this.newValue = {id: 'cat' + Math.random().toString().replace('0.', '')}
+
+            this.addForm = true
+        },
+        showEditForm(value) {
+            this.editValue = {id: value.id}
+
+            for (let i of this.langs) {
+                this.editValue[i] = typeof value[i] !== 'undefined' ? value[i] : ''
+            }
+
+            this.editForm = true
+        },
+        saveAdd() {
+            for (let i of this.langs) {
+                if (!this.newValue[i] || /^\s*$/.test(this.newValue[i])) {
+                    return
+                }
+            }
+
+            this.values.push(this.newValue)
+            this.update()
+            this.hideAddForm()
+            this.newValue = {}
+        },
+        saveEdit() {
+            for (let i of this.langs) {
+                if (!this.editValue[i] || /^\s*$/.test(this.editValue[i])) {
+                    return
+                }
+            }
+
+            for (let i in this.values) {
+                if (this.values[i].id === this.editValue.id) {
+                    this.values[i] = this.editValue
+                }
+            }
+
+            this.update()
+            this.hideEditForm()
+        },
+        removeEdit() {
+            for (let i in this.values) {
+                if (this.values[i].id === this.editValue.id) {
+                    this.values.splice(i, 1);
+                }
+            }
+
+            this.update()
+            this.hideEditForm()
+        },
+        hideAddForm() {
+            this.addForm = false
+        },
+        hideEditForm() {
+            this.editForm = false
+        },
+    },
+    mounted() {
+        this.input = document.querySelector('input[name="categories-custom"]')
+        this.init()
+    }
+}
+</script>
@@ -17,9 +17,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 <template>
    <div v-bind:class="classes">
        <a v-if="link !== null" v-bind:href="link">
-            <img v-bind:src="image">
+            <img v-bind:src="image" alt="Logo">
        </a>
-        <img v-else v-bind:src="image">
+        <img v-else v-bind:src="image" alt="Logo">
    </div>
 </template>

@@ -18,11 +18,9 @@
 import Vue from 'vue'
 import SideMenu from './SideMenu.vue'
 import SideMenuBig from './SideMenuBig.vue'
+import SideMenuWithCategories from './SideMenuWithCategories.vue'

-// Vue.prototype.t = t
 Vue.prototype.OC = OC
-// Vue.prototype.OC = OCP
-

 const mountSideMenuComponent = () => {
    const sideMenuContainer = document.querySelector('#side-menu')
@@ -32,6 +30,8 @@ const mountSideMenuComponent = () => {

        if (sideMenuContainer.getAttribute('data-bigmenu')) {
            component = SideMenuBig
+        } else if(sideMenuContainer.getAttribute('data-sidewithcategories')) {
+            component = SideMenuWithCategories
        } else {
            component = SideMenu
        }
@@ -41,7 +41,7 @@ const mountSideMenuComponent = () => {

        sideMenu.$mount('#side-menu')

-        $('body').trigger('side-menu.ready')
+        document.querySelector('body').dispatchEvent(new CustomEvent('side-menu.ready'))
    } else {
        window.setTimeout(mountSideMenuComponent, 50)
    }
@@ -91,16 +91,16 @@ export default {

            for (let element of links) {
                let href = element.getAttribute('href')
-                var parent = element.parentNode
+                let parent = element.parentNode

                if (!parent) {
                    continue
                }

-                var dataId = parent.getAttribute('data-id')
+                let dataId = parent.getAttribute('data-id')
                dataId = dataId !== null ? dataId : ''

-                if (!parent.classList.contains('app-hidden') && !menuIsHidden) {
+                if (!parent.classList.contains('app-top-side-menu') && !parent.classList.contains('app-hidden') && !menuIsHidden) {
                    continue
                }

@@ -122,13 +122,15 @@ export default {
                        name: trim(element.querySelector('span').innerHTML),
                        icon: svg,
                        active: element.classList.contains('active')
-                    });
+                    })
                }
            }

            (function(apps) {
                window.setTimeout(function() {
-                    jQuery('body').trigger('side-menu.apps', [apps])
+                    document.querySelector('body').dispatchEvent(new CustomEvent('side-menu.apps', {
+                        detail: {apps: apps},
+                    }))
                }, 1000)
            })(this.apps)
        },
@@ -147,7 +149,7 @@ export default {
                    that.logo = config['logo']
                    that.logoLink = config['logo-link']
                    that.settings = config['settings']
-                });
+                })
        },
    },
    mounted() {
@@ -18,7 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
    <li v-bind:class="classes">
        <a v-bind:href="href" :target="target" v-bind:title="label">
            <span class="side-menu-app-icon" v-html="icon"></span>
-            <span class="side-menu-app-text" v-html="label"></span>
+            <span class="side-menu-app-text" v-text="label"></span>
        </a>
    </li>
 </template>
@@ -34,7 +34,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
                <Loader v-if="!items.length" />

                <div class="side-menu-category" v-for="category in items">
-                    <h2 class="side-menu-category-title" v-if="category.name != ''" v-html="category.name"></h2>
+                    <h2 class="side-menu-category-title" v-if="category.name != ''" v-text="category.name"></h2>

                    <ul class="side-menu-apps-list">
                        <SideMenuBigApp
@@ -53,7 +53,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 </template>

 <script>
-import trim from 'trim'
 import axios from 'axios'
 import OpenerButton from './OpenerButton'
 import CloserButton from './CloserButton'
@@ -97,8 +96,10 @@ export default {
                        }
                    }

-                    jQuery('body').trigger('side-menu.apps', [apps])
-                });
+                    document.querySelector('body').dispatchEvent(new CustomEvent('side-menu.apps', {
+                        detail: {apps: apps},
+                    }))
+                })
        },

        retrieveActiveApp() {
@@ -116,7 +117,7 @@ export default {

                    that.targetBlankApps = config['target-blank-apps']
                    that.settings = config['settings']
-                });
+                })
        },
    },
    mounted() {
@@ -17,8 +17,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 <template>
    <li v-bind:class="classes">
        <a v-bind:href="href" :target="target" v-bind:title="label">
-            <img class="side-menu-app-icon" v-bind:src="icon"></span>
-            <span class="side-menu-app-text" v-html="label"></span>
+            <img class="side-menu-app-icon" v-bind:src="icon" v-bind:alt="label" />
+            <span class="side-menu-app-text" v-text="label"></span>
        </a>
    </li>
 </template>
@@ -0,0 +1,127 @@
+<!--
+@license GNU AGPL version 3 or any later version
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+-->
+<template>
+    <div id="side-menu" class="side-menu-with-categories">
+        <div class="side-menu-header">
+            <SettingsButton
+                v-if="settings"
+                v-bind:href="settings.href"
+                v-bind:label="settings.name"
+                v-bind:avatar="settings.avatar"
+            />
+
+            <OpenerButton />
+        </div>
+
+        <div class="side-menu-categories-wrapper">
+            <div class="side-menu-categories">
+                <Loader v-if="!items.length" />
+
+                <div class="side-menu-category" v-for="category in items">
+                    <h2 class="side-menu-category-title" v-if="category.name != ''" v-text="category.name"></h2>
+
+                    <ul class="side-menu-apps-list">
+                        <SideMenuBigApp
+                            v-for="(app, appId) in category.apps"
+                            v-bind:classes="{'side-menu-app': true, 'active': activeApp === appId}"
+                            v-bind:icon="app.icon"
+                            v-bind:label="app.name"
+                            v-bind:href="app.href"
+                            v-bind:target="targetBlankApps.indexOf(appId) !== -1 ? '_blank' : undefined"
+                        />
+                    </ul>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+import axios from 'axios'
+import OpenerButton from './OpenerButton'
+import CloserButton from './CloserButton'
+import SettingsButton from './SettingsButton'
+import Loader from './Loader'
+import SideMenuBigApp from './SideMenuBigApp'
+
+export default {
+    name: 'SideMenuWithCategories',
+    components: {
+        SettingsButton,
+        OpenerButton,
+        CloserButton,
+        Loader,
+        SideMenuBigApp,
+    },
+    data() {
+        return {
+            items: [],
+            activeApp: null,
+            targetBlank: false,
+            targetBlankApps: [],
+            settings: null,
+        }
+    },
+    methods: {
+        retrieveApps() {
+            this.apps = []
+            let that = this
+
+            axios
+                .get(OC.generateUrl('/apps/side_menu/nav/items'))
+                .then(function(response) {
+                    that.items = response.data.items
+
+                    let apps = []
+
+                    for (let category of that.items) {
+                        for (let a in category.apps) {
+                            apps.push(category.apps[a])
+                        }
+                    }
+
+                    document.querySelector('body').dispatchEvent(new CustomEvent('side-menu.apps', {
+                        detail: {apps: apps},
+                    }))
+                })
+        },
+
+        retrieveActiveApp() {
+            let activeAppLink = document.querySelector('#appmenu a.active')
+            this.activeApp = activeAppLink ? activeAppLink.parentNode.getAttribute('data-id') : null
+        },
+
+        retrieveConfig() {
+            let that = this
+
+            axios
+                .get(OC.generateUrl('/apps/side_menu/js/config'))
+                .then(function(response) {
+                    const config = response.data
+
+                    that.targetBlankApps = config['target-blank-apps']
+                    that.settings = config['settings']
+                })
+        },
+    },
+    mounted() {
+        this.retrieveConfig()
+        this.retrieveApps()
+        this.retrieveActiveApp()
+    }
+}
+</script>
@@ -15,15 +15,32 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

+import AdminCategoriesCustom from './AdminCategoriesCustom.vue'
+import Vue from 'vue'
+
+Vue.prototype.OC = window.OC
+Vue.prototype.OCA = window.OCA
+
 let elements = []

-const selector = '#side-menu-message';
+const selector = '#side-menu-message'

 const userConfig = (name, value, callbacks) => {
    const url = OC.generateUrl('/apps/side_menu/personalSetting/valueSet')
+    const formData = []

-    $.post(url, {name: name, value: value}, callbacks.success)
-        .fail(callbacks.error)
+    formData.push('name=' + encodeURIComponent(name))
+    formData.push('value=' + encodeURIComponent(value))
+
+    fetch(url, {
+        method: 'POST',
+        headers: {
+            'Content-Type': 'application/x-www-form-urlencoded',
+        },
+        body: formData.join('&')
+    })
+    .then(callbacks.success)
+    .catch(callbacks.error)
 }

 const appConfig = (name, value, callbacks) => {
@@ -31,23 +48,29 @@ const appConfig = (name, value, callbacks) => {
 }

 const saveSettings = (key) => {
-    const element = elements.get(key)
+    const element = elements[key]
+
+    if (!element) {
+        return
+    }
+
    let value
    let name

-    if (jQuery(element).is('[data-checkbox]')) {
-        name = jQuery(element).attr('data-name')
-        const inputs = jQuery('input[name="' + name + '[]"]:checked')
+    if (element.hasAttribute('data-checkbox')) {
+        name = element.getAttribute('data-name')
        value = []

-        inputs.each((i, v) => {
-            value.push(v.value)
-        })
+        const inputs = document.querySelectorAll('input[name="' + name + '[]"]:checked')
+
+        for (let input of inputs) {
+            value.push(input.value)
+        }

        value = JSON.stringify(value)
    } else {
-        name = jQuery(element).attr('name')
-        value = jQuery(element).val()
+        name = element.getAttribute('name')
+        value = element.value
    }

    const size = elements.length
@@ -56,17 +79,21 @@ const saveSettings = (key) => {
        ++value
    }

+    const progress = document.querySelector('#side-menu-save-progress')
+
+    progress.style.width = '40px';
+    progress.style.marginLeft = '5px';
+
    const callbacks = {
        success: () => {
-            OC.msg.finishedSuccess(
-                selector,
-                t('side_menu', (key + 1) + '/' + size)
-            )
+            const percent = parseInt((key + 1) * 100 / size);
+
+            progress.setAttribute('value', percent)

            if (key < size - 1) {
-                saveSettings(++key)
+                saveSettings(key + 1)
            } else {
-                OC.msg.finishedSuccess(selector, t('side_menu', 'Saved'))
+                location.reload()
            }
        },
        error: () => {
@@ -74,7 +101,7 @@ const saveSettings = (key) => {
        }
    }

-    if (jQuery(element).is('[data-personal]')) {
+    if (element.hasAttribute('data-personal')) {
        userConfig(name, value, callbacks)
    } else {
        appConfig(name, value, callbacks)
@@ -82,83 +109,152 @@ const saveSettings = (key) => {
 }

 const elementToggler = (element) => {
-    jQuery(element).toggle()
+    let display = 'none'
+
+    if (window.getComputedStyle(element).display === 'none') {
+        display = 'block'
+    }
+
+    element.style.display = display
 }

-jQuery(document).ready(() => {
-    elements = jQuery('.side-menu-setting')
+const updateAppsCategoriesCustom = () => {
+    let values = {}

-    jQuery('#side-menu-save').on('click', (event) => {
+    for (let item of document.querySelectorAll('.apps-categories-custom')) {
+        let app = item.getAttribute('data-app')
+        let value = item.value
+
+        if (value) {
+            values[app] = value
+        }
+    }
+
+    document.querySelector('#apps-categories-custom').value = JSON.stringify(values)
+}
+
+document.addEventListener('DOMContentLoaded', () => {
+    $('*[data-toggle="tooltip"]').tooltip();
+
+    if (document.querySelector('#side-menu-categories-custom')) {
+        const View = Vue.extend(AdminCategoriesCustom)
+        const adminCategoriesCustom = new View({})
+
+        adminCategoriesCustom.$mount('#side-menu-categories-custom')
+    }
+
+    elements = document.querySelectorAll('.side-menu-setting')
+
+    document.querySelector('#side-menu-save').addEventListener('click', (event) => {
        event.preventDefault()
        OC.msg.startSaving(selector)

        saveSettings(0)
-    });
-
-    jQuery('.side-menu-display').on('click', (event) => {
-        var target = jQuery(event.target)
-
-        jQuery('.side-menu-display').removeClass('is-active')
-        target.addClass('is-active')
-
-        jQuery('#side-menu-always-displayed').val(target.attr('data-alwaysdiplayed'))
-        jQuery('#side-menu-big-menu').val(target.attr('data-bigmenu'))
    })

-    jQuery('.side-menu-setting-live').on('change', (event) => {
-        var target = jQuery(event.target)
-        var name = target.attr('name')
-        var value = target.val()
+    const resets = document.querySelectorAll('.btn-reset')

-        if ('background-color-opacity' === name) {
-            return $('#side-menu-background-color, #side-menu-background-color-to').trigger('change');
-        } else if ('dark-mode-background-color-opacity' === name) {
-            return $('#side-menu-dark-mode-background-color, #side-menu-dark-mode-background-color-to').trigger('change');
-        }
+    for (let btn of resets) {
+        btn.addEventListener('click', (event) => {
+            const target = event.target
+            const values = JSON.parse(target.getAttribute('data-reset'))

-        if (name === 'opener') {
-            var url = OC.generateUrl(`/apps/side_menu/img/${value}.svg`).replace('/index.php', '')
+            for (let i in values) {
+                document.querySelector(`#${i}`).value = values[i]
+            }
+        })
+    }

-            value = `url(${url})`;
-        }
+    const displays = document.querySelectorAll('.side-menu-display')

-        if (name === 'icon-invert-filter' || name === 'icon-opacity') {
-            value/=100;
-        }
+    for (let display of displays) {
+        display.addEventListener('click', (event) => {
+            const target = event.target

-        if (['dark-mode-background-color', 'dark-mode-background-color-to'].indexOf(name) > -1) {
-            var opacity = parseInt($('#side-menu-dark-mode-background-color-opacity').val() * 255 / 100);
+            for (let d of displays) {
+                d.classList.toggle('is-active', d === display)
+            }

-            value = [value, opacity.toString(16)].join('');
-        } else if (['background-color', 'background-color-to'].indexOf(name) > -1) {
-            var opacity = parseInt($('#side-menu-background-color-opacity').val() * 255 / 100);
+            document.querySelector('#side-menu-always-displayed').value = target.getAttribute('data-alwaysdiplayed')
+            document.querySelector('#side-menu-big-menu').value = target.getAttribute('data-bigmenu')
+            document.querySelector('#side-menu-side-with-categories').value = target.getAttribute('data-sidewithcategories')
+        })
+    }

-            value = [value, opacity.toString(16)].join('');
-        }
+    for (let item of document.querySelectorAll('.apps-categories-custom')) {
+        item.addEventListener('change', (event) => {
+            updateAppsCategoriesCustom()
+        })
+    }

-        document.documentElement.style.setProperty('--side-menu-' + name, value)
+    for (let item of document.querySelectorAll('.side-menu-setting-live')) {
+        item.addEventListener('change', (event) => {
+            const target = event.target
+            const name = target.getAttribute('name')
+
+            let value = target.value
+            let id = null
+
+            if (name === 'background-color-opacity') {
+                id = '#side-menu-background-color, #side-menu-background-color-to'
+            } else if (name === 'dark-mode-background-color-opacity') {
+                id = '#side-menu-dark-mode-background-color, #side-menu-dark-mode-background-color-to'
+            }
+
+            if (id) {
+                document.querySelector(id).dispatchEvent(new CustomEvent('change'))
+
+                return
+            }
+
+            if (name === 'opener') {
+                const url = OC.generateUrl(`/apps/side_menu/img/${value}.svg`).replace('/index.php', '')
+
+                value = `url(${url})`
+            }
+
+            if (name === 'icon-invert-filter' || name === 'icon-opacity') {
+                value/=100
+            }
+
+            if (['dark-mode-background-color', 'dark-mode-background-color-to'].indexOf(name) > -1) {
+                const opacity = parseInt(document.querySelector('#side-menu-dark-mode-background-color-opacity').value * 255 / 100)
+
+                value = [value, opacity.toString(16)].join('')
+            } else if (['background-color', 'background-color-to'].indexOf(name) > -1) {
+                const opacity = parseInt(document.querySelector('#side-menu-background-color-opacity').value * 255 / 100)
+
+                value = [value, opacity.toString(16)].join('')
+            }
+
+            document.documentElement.style.setProperty('--side-menu-' + name, value)
+        })
+    }
+
+    for (let toggler of document.querySelectorAll('.side-menu-toggler')) {
+        toggler.addEventListener('click', (event) => {
+            const target = event.target
+            const element = document.querySelector(target.getAttribute('data-target'))
+
+            elementToggler(element)
+        })
+    }
+
+    sortable('#categories-list .side-menu-setting-list', {
+        placeholderClass: 'side-menu-setting-list-drop'
    })

-    jQuery('.side-menu-toggler').on('click', (event) => {
-        var target = jQuery(event.target)
-        var element = target.attr('data-target')
-
-        elementToggler(element)
-    })
-
-    jQuery("#categories-list .side-menu-setting-list").sortable({
-		forcePlaceholderSize: true,
-		placeholder: 'placeholder',
-		stop: function (event, ui) {
+    try {
+        sortable('#categories-list .side-menu-setting-list')[0].addEventListener('sortstop', (e) => {
            let value = []

-            jQuery('#categories-list .side-menu-setting-list-item').each(function() {
-                value.push(jQuery(this).attr('data-id'))
-            });
+            for (let item of document.querySelectorAll('#categories-list .side-menu-setting-list-item')) {
+                console.log(item.getAttribute('data-id'))
+                value.push(item.getAttribute('data-id'))
+            }

-            value = JSON.stringify(value)
-
-            jQuery('input[name="categories-order"]').val(value)
-		}
-	});
-});
+            document.querySelector('input[name="categories-order"]').value = JSON.stringify(value)
+        })
+    } catch (e) {
+    }
+})
@@ -0,0 +1,92 @@
+"Custom menu": "Uživatelsky určená nabídka"
+"Enable the custom menu": "Zapnout uživatelsky určenou nabídku"
+"No": "Ne"
+"Yes": "Ano"
+"Menu": "Nabídka"
+'Use the shortcut <span class="keyboard-key">Ctrl</span>+<span class="keyboard-key">o</span> to open and to hide the side menu. Use <span class="keyboard-key">tab</span> to navigate.': 'Pro otevření/skrytí postranní nabídky použijte zkratku <span class="keyboard-key">Ctrl</span>+<span class="keyboard-key">O</span> („O“ jako otevřít). Pro pohyb po použijte klávesu <span class="keyboard-key">Tab</span>.'
+"Top menu": "Horní nabídka"
+"Apps that not must be moved in the side menu": "Aplikace, které nepřesouvat do postranní nabídky"
+"If there is no selection then the global configuration is applied.": "Pokud neexistuje žádný výběr, je uplatněno globální nastavení."
+"Experimental": "Experimentální"
+"Save": "Uložit"
+"You like this app and you want to support me?": "Líbí se vám tato aplikace a chcete podpořit její vývoj?"
+"Buy me a coffee ☕": "Kupte mi kafe ☕"
+"Hidden": "Skryté"
+"Small": "Malé"
+"Normal": "Normální"
+"Big": "Velké"
+"Colors": "Barvy"
+"Background color": "Barva pozadí"
+"Background color of current app": "Barva pozadí stávající aplikace"
+"Text color": "Barva textu"
+"Loader": "Nástroj pro načítání"
+"Icon": "Ikona"
+"Same color": "Stejná barva"
+"Opposite color": "Doplňková barva"
+"Transparent": "Průhledné"
+"Opaque": "Neprůhledné"
+"Opener": "Tlačítko pro otevření"
+"Default": "Výchozí"
+"Default (dark)": "Výchozí (tmavé)"
+"Hamburger": "Hamburger"
+"Hamburger (dark)": "Hamburger (tmavé)"
+"Hamburger 2": "Hamburger 2"
+"Hamburger 2 (dark)": "Hamburger 2 (tmavé)"
+"Before the logo": "Před logem"
+"After the logo": "Za logem"
+"Position": "Pozice"
+"Show only the opener (hidden logo)": "Zobrazovat pouze otevírací tlačítko (logo skryto)"
+"Do not display the side menu and the opener if there is no application (eg: public pages).": "Nezobrazovat postranní nabídku a její otevírací tlačítko pokud nejsou dostupné žádné aplikace (např. na veřejných stránkách)."
+"Panel": "Panel"
+"Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": "Otevřít nabídku při najetím ukazatelem na tlačítko nabídky (automaticky vypnuto pro dotykové obrazovky)."
+"Display the big menu": "Zobrazit velkou nabídku"
+"This menu is not compatible with AppOrder.": "Nabídka není kompatibilní s jinou aplikací (doplňkem) „Pořadí aplikací“."
+"Display the logo": "Zobrazit logo"
+"This feature is not compatible with the <code>big menu</code> display.": "Tato funkce není kompatibilní se zobrazením <code>velké nabídky</code>."
+"Icons and texts": "Ikony a texty"
+"Loader enabled": "Načítání zapnuto"
+"Tips": "Tipy"
+"Always displayed": "Vždy zobrazeno"
+"The logo will be hidden when the menu is always displayed.": "Pokud je nabídka zobrazena trvale, logo bude skryto."
+"This is the automatic behavior when the menu is always displayed.": "Toto je automatické chování, kdy je nabídka vždy zobrazena."
+"Not compatible with touch screens.": "Nekompatibilní s dotykovými obrazovkami."
+"Big menu": "Velká nabídka"
+"Live preview": "Živý náhled"
+"Open apps in new tab": "Otevírat aplikace v novém panelu"
+"Use the global setting": "Použít globální nastavení"
+"Use my selection": "Použít můj výběr"
+"Show and hide the list of applications": "Zobrazit/skrýt seznam aplikací"
+"Use the avatar instead of the logo": "Použít namísto loga profilový obrázek uživatele"
+"You do not have permission to change the settings.": "Nemáte oprávnění měnit nastavení."
+"Force this configuration to users": "Vynutit uplatnění těchto nastavení uživatelům"
+"Export the configuration": "Exportovat nastavení"
+"Purge the cache": "Vyprázdnit mezipaměť"
+"Show the link to settings": "Zobrazit odkaz na nastavení"
+"The menu is enabled by default for users": "Nabídka je ve výchozím stavu pro uživatele zapnutá"
+"Except when the configuration is forced.": "S výjimkou, kdy je nastavení vynuceno."
+"Apps that should not be displayed in the menu": "Aplikace, které by neměly být v nabídce zobrazeny"
+"This feature is only compatible with the <code>big menu</code> display.": "Tato funkce je kompatibilní pouze s <code>velkou nabídkou</ code>."
+"The logo is a link to the default app": "Logo je odkaz na výchozí aplikaci"
+"Others": "Ostatní"
+"Categories": "Kategorie"
+"Customize sorting": "Přizpůsobit si řazení"
+"Order by": "Řadit podle"
+"Name": "Název"
+"Customed": "Přizpůsobeno"
+"Show and hide the list of categories": "Zobrazit/skrýt seznam kategorií"
+"This parameters are used when Dark theme or Breeze Dark Theme are enabled.": "Tyto parametry jsou použity v případě, že je zapnutý (Breeze) tmavý motiv vzhledu."
+"Dark mode colors": "Barvy tmavého režimu"
+"With categories": "S kategoriemi"
+"Custom categories": "Vlastní kategorie"
+"Customize application categories": "Přizpůsobte kategorie aplikací"
+"Apps only visible in the top menu": "Aplikace jsou viditelné pouze v horní nabídce "
+"Apps visible in the top and side menus": "Aplikace viditelné v horní a boční nabídce"
+"Reset to default": "Vrátit zpět na výchozí hodnoty"
+"Hidden icon": "Skrytá ikona"
+"Small icon": "Malá ikona"
+"Normal icon": "Normální ikona"
+"Big icon": "Velká ikona"
+"Hidden text": "Skrytý text"
+"Small text": "Malý text"
+"Normal text": "Normální text"
+"Big text": "Velký text"
@@ -1,31 +1,31 @@
 "Custom menu": "Benutzerdefiniertes Menü"
-"Enable the custom menu": "Aktiviere das Benutzerdefiniertes Menü"
+"Enable the custom menu": "Benutzerdefiniertes Menü aktivieren"
 "No": "Nein"
 "Yes": "Ja"
 "Menu": "Menü"
 'Use the shortcut <span class="keyboard-key">Ctrl</span>+<span class="keyboard-key">o</span> to open and to hide the side menu. Use <span class="keyboard-key">tab</span> to navigate.': 'Verwende die Tastenkombination <span class="keyboard-key">Strg</span>+<span class="keyboard-key">o</span>, um das Seitenmenü ein- und auszublenden. Verwende <span class="keyboard-key">tab</span> zum Navigieren.'
-"Top menu": "Hauptmenü"
-"Apps that not must be moved in the side menu": "Apps, die nicht ins Seitenmenü verschoben werden müssen"
+"Top menu": "Obere Navigationsleiste"
+"Apps that not must be moved in the side menu": "Anwendungen, die nicht ins Seitenmenü verschoben werden sollen"
 "If there is no selection then the global configuration is applied.": "Wenn keine Auswahl vorhanden ist, wird die globale Konfiguration angewendet."
 "Experimental": "Experimentell"
 "Save": "Speichern"
-"You like this app and you want to support me?": "Du magst diese App und möchtest mich unterstützen?"
-"Buy me a coffee ☕": "Gib mir einen Kaffee ☕"
-"Hidden": "Versteckt"
+"You like this app and you want to support me?": "Du magst diese Anwendung und möchtest mich unterstützen?"
+"Buy me a coffee ☕": "Gib mir einen Kaffee aus ☕"
+"Hidden": "Ausblenden"
 "Small": "Klein"
 "Normal": "Normal"
 "Big": "Groß"
 "Colors": "Farben"
 "Background color": "Hintergrundfarbe"
-"Background color of current app": "Hintergrundfarbe der aktuellen App"
+"Background color of current app": "Hintergrundfarbe der aktuellen Anwendung"
 "Text color": "Textfarbe"
 "Loader": "Ladestandanzeige"
 "Icon": "Symbol"
 "Same color": "Selbe Farbe"
 "Opposite color": "Gegenfarbe"
 "Transparent": "Transparent"
-"Opaque": "Undurchsichtig"
-"Opener": "Öffner"
+"Opaque": "Nicht transparent"
+"Opener": "Menü-Symbol"
 "Default": "Standard"
 "Default (dark)": "Standard (dunkel)"
 "Hamburger": "Hamburger"
@@ -35,44 +35,58 @@
 "Before the logo": "Vor dem Logo"
 "After the logo": "Nach dem Logo"
 "Position": "Position"
-"Show only the opener (hidden logo)": "Nur den Öffner anzeigen (verstecktes Logo)"
-"Do not display the side menu and the opener if there is no application (eg: public pages).": "Zeige das Seitenmenü und den Öffner nicht an, wenn keine Anwendung vorhanden ist (z.B. bei öffentlichen Seiten)."
+"Show only the opener (hidden logo)": "Nur das Menü-Symbol anzeigen (Logo wird ausgeblendet)"
+"Do not display the side menu and the opener if there is no application (eg: public pages).": "Zeige das Seitenmenü und das Menü-Symbol nicht an, wenn keine Anwendung vorhanden ist (z.B. bei öffentlichen Seiten)."
 "Panel": "Panel"
-"Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": "Öffne das Menü, wenn die Maus über den Öffner bewegt wird (auf Touchscreens automatisch deaktiviert)."
+"Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": "Öffne das Menü, wenn die Maus über das Menü-Symbol bewegt wird (auf Touchscreens automatisch deaktiviert)."
 "Display the big menu": "Großes Menü anzeigen"
-"The big menu is not compatible with AppOrder.": "Das große Menü ist nicht mit AppOrder kompatibel."
+"This menu is not compatible with AppOrder.": "Dieses Menü ist nicht mit <code>AppOrder</code> kompatibel."
 "Display the logo": "Logo anzeigen"
-"This feature is not compatible with the <code>big menu</code> display.": "Diese Funktion ist nicht mit <code>großes Menü</code> kompatibel."
+"This feature is not compatible with the <code>big menu</code> display.": "Diese Funktion ist nicht mit dem <code>großen Menü</code> kompatibel."
 "Icons and texts": "Symbole und Texte"
-"Loader enabled": "Loader aktiviert"
+"Loader enabled": "Ladestandanzeige aktiviert"
 "Tips": "Tipps"
-"Always displayed": "Wird immer angezeigt"
+"Always displayed": "Immer anzeigen"
 "The logo will be hidden when the menu is always displayed.": "Das Logo wird ausgeblendet, wenn das Menü immer angezeigt wird."
 "This is the automatic behavior when the menu is always displayed.": "Dies ist das automatische Verhalten, wenn das Menü immer angezeigt wird."
 "Not compatible with touch screens.": "Nicht kompatibel mit Touchscreens."
 "Big menu": "Großes Menü"
-"Live preview": "Live Vorschau"
-"Open apps in new tab": "Öffne Apps in einem neuen Tab"
+"Live preview": "Live-Vorschau"
+"Open apps in new tab": "Öffne Anwendungen in einem neuen Tab"
 "Use the global setting": "Verwende die globale Einstellung"
 "Use my selection": "Verwende meine Auswahl"
 "Show and hide the list of applications": "Ein- und Ausblenden der Anwendungsliste"
-"Use the avatar instead of the logo": "Verwenden Sie den Avatar anstelle des Logos"
-"You do not have permission to change the settings.": "Sie haben keine Berechtigung zum Ändern der Einstellungen."
-"Force this configuration to users": "Erzwingen Sie diese Konfiguration für Benutzer"
-"Export the configuration": "Exportieren Sie die Konfiguration"
-"Purge the cache": "Leeren Sie den Cache"
-"Show the link to settings": "Zeigen Sie den Link zu den Einstellungen an"
-"The menu is enabled by default for users": "Das Menü ist standardmäßig für Benutzer aktiviert"
-"Except when the configuration is forced.": "Außer wenn die Konfiguration erzwungen wird."
-"Apps that should not be displayed in the menu": "Apps, die nicht im Menü angezeigt werden sollen"
-"This feature is only compatible with the <code>big menu</code> display.": "Kompatibel mit der Anzeige <code> Großes Menü </ code>."
+"Use the avatar instead of the logo": "Avatar anstelle des Logos anzeigen"
+"You do not have permission to change the settings.": "Du hast keine Berechtigung, die Einstellungen dieser Anwendung zu ändern."
+"Force this configuration to users": "Konfiguration für alle Benutzer erzwingen"
+"Export the configuration": "Konfiguration exportieren"
+"Purge the cache": "Cache leeren"
+"Show the link to settings": "Link zu den Einstellungen anzeigen"
+"The menu is enabled by default for users": "Das Menü ist standardmäßig für alle Benutzer aktiviert"
+"Except when the configuration is forced.": "Gilt nicht, wenn die Konfiguration erzwungen wird."
+"Apps that should not be displayed in the menu": "Anwendungen, die nicht im Menü angezeigt werden sollen"
+"This feature is only compatible with the <code>big menu</code> display.": "Kompatibel mit dem <code>großen Menü</code>."
 "The logo is a link to the default app": "Das Logo ist ein Link zur Standard-App"
 "Others": "Andere"
 "Categories": "Kategorien"
 "Customize sorting": "Sortierung anpassen"
 "Order by": "Sortieren nach"
 "Name": "Name"
-"Customed": "Kundenspezifisch"
+"Customed": "Benutzerdefiniert"
 "Show and hide the list of categories": "Liste der Kategorien ein- und ausblenden"
-"This parameters are used when Dark theme or Breeze Dark Theme are enabled.": "Diese Parameter werden verwendet, wenn Dark Theme oder Breeze Dark Theme aktiviert sind."
-"Dark mode colors": "Dunkle Modusfarben"
+"This parameters are used when Dark theme or Breeze Dark Theme are enabled.": "Diese Optionen werden auf <code>Dark Theme</code> oder <code>Breeze Dark Theme</code> angewendet."
+"Dark mode colors": "Farben für den dunklen Modus"
+"With categories": "Mit Kategorien"
+"Custom categories": "Benutzerdefinierte Kategorien"
+"Customize application categories": "Anwendungskategorien anpassen"
+"Apps only visible in the top menu": "Apps nur im oberen Menü sichtbar "
+"Apps visible in the top and side menus": "Apps im oberen und seitlichen Menü sichtbar"
+"Reset to default": "Auf Standard zurücksetzen"
+"Hidden icon": "Verstecktes Symbol"
+"Small icon": "Kleines Symbol"
+"Normal icon": "Normales Symbol"
+"Big icon": "Große Ikone"
+"Hidden text": "Versteckter Text"
+"Small text": "Kleiner Text"
+"Normal text": "Normaler Text"
+"Big text": "Großer Text"
@@ -15,6 +15,14 @@
 "Small": "Petit"
 "Normal": "Normal"
 "Big": "Gros"
+"Hidden icon": "Icône masqué"
+"Small icon": "Petit icône"
+"Normal icon": "Icône normal"
+"Big icon": "Gros icône"
+"Hidden text": "Text masqué"
+"Small text": "Texte petit"
+"Normal text": "Texte normal"
+"Big text": "Gros texte"
 "Colors": "Couleurs"
 "Background color": "Couleur de fond"
 "Background color of current app": "Couleur de fond de l'application en cours"
@@ -40,7 +48,7 @@
 "Panel": "Panneau"
 "Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": "Ouvrir le menu au passage de la souris (automatiquement désactivé sur les écrans tactiles)"
 "Display the big menu": "Afficher le menu large"
-"The big menu is not compatible with AppOrder.": "Le menu large n'est pas compatible avec l'application AppOrder"
+"This menu is not compatible with AppOrder.": "Ce menu n'est pas compatible avec l'application AppOrder"
 "Display the logo": "Afficher le logo"
 "This feature is not compatible with the <code>big menu</code> display.": "Cette fonctionnalité n'est pas compatible avec l'affichage du menu large."
 "Icons and texts": "Icônes et textes"
@@ -76,3 +84,9 @@
 "Show and hide the list of categories": "Afficher et masquer la liste des catégories"
 "This parameters are used when Dark theme or Breeze Dark Theme are enabled.": "Ces paramètres sont utilisés lorsque le thème sombre ou le thème Breeze Dark sont activés."
 "Dark mode colors": "Couleurs du mode sombre"
+"With categories": "Avec les catégories"
+"Custom categories": "Catégories personnalisées"
+"Customize application categories": "Personnaliser les catégories des applications"
+"Apps only visible in the top menu": "Applications visibles uniquement dans le menu supérieur"
+"Apps visible in the top and side menus": "Applications visibles dans le menus supérieur et latéral"
+"Reset to default": "Restaurer les valeurs par défaut"
@@ -40,7 +40,7 @@
 "Panel": "面板"
 "Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": "鼠标悬停时打开菜单 (触摸屏时将自动禁用)"
 "Display the big menu": "显示大型菜单"
-"The big menu is not compatible with AppOrder.": "大型菜单与应用顺序不兼容"
+"This menu is not compatible with AppOrder.": "型菜单与应用顺序不兼容"
 "Display the logo": "显示logo"
 "This feature is not compatible with the <code>big menu<\/code> display.": "此功能与显示<code>大型菜单<\/code>不兼容。"
 "Icons and texts": "图标与文字"
@@ -76,3 +76,17 @@
 "Show and hide the list of categories": "显示或隐藏类别列表"
 "This parameters are used when Dark theme or Breeze Dark Theme are enabled.": "此参数将应用于暗黑主题激活时。"
 "Dark mode colors": "暗黑模式颜色"
+"With categories": "有类别"
+"Custom categories": "自定义类别"
+"Customize application categories": "自定义应用程序类别"
+"Apps only visible in the top menu": "应用程序仅在顶部菜单中可见"
+"Apps visible in the top and side menus": "顶部和侧边菜单中可见的应用程序"
+"Reset to default": "重置为默认设置"
+"Hidden icon": "隐藏图标"
+"Small icon": "小图标"
+"Normal icon": "正常图标"
+"Big icon": "大图标"
+"Hidden text": "隐藏文字"
+"Small text": "小文本"
+"Normal text": "普通文本"
+"Big text": "大文本"
@@ -8,7 +8,7 @@
    <?php endforeach; ?>
 }

-<?php if (empty($_['top-menu-apps'])): ?>
+<?php if (empty($_['top-menu-apps']) && empty($_['top-side-menu-apps'])): ?>
    #appmenu {
        display: none;
    }
@@ -1,21 +1,19 @@
-var alwaysDisplayed = function() {
-    var elements = document.querySelectorAll('*');
-    var fixedElements = []
-
-    for (var i in elements) {
-        var element = elements[i]
+const alwaysDisplayed = function() {
+    const elements = querySelectorAll('*')
+    const fixedElements = []

+    for (let element of elements) {
        if (typeof element !== 'object') {
            continue
        }

-        var position = window.getComputedStyle(element, null).getPropertyValue('position');
+        const position = window.getComputedStyle(element, null).getPropertyValue('position')

        if (position !== 'fixed') {
            continue
        }

-        var id = element.getAttribute('id')
+        const id = element.getAttribute('id')

        if (id === 'header' || id === 'side-menu' || id === 'side-menu-loader') {
            continue
@@ -25,27 +23,41 @@ var alwaysDisplayed = function() {
            continue
        }

-        if (jQuery(element).parents('#side-menu').length) {
+        let elementIsInSideMenu = false
+        let parent = element.parentNode
+
+        while (parent && !elementIsInSideMenu) {
+            try {
+                if  (parent.getAttribute('id') === 'side-menu') {
+                    elementIsInSideMenu = true
+                }
+            } catch (e) {
+            }
+
+            parent = parent.parentNode
+        }
+
+        if (elementIsInSideMenu) {
            continue
        }

        fixedElements.push(element)
    }

-    for (var i in fixedElements) {
-        var element = fixedElements[i]
-        var computedStyle = window.getComputedStyle(element, null)
-        var left = computedStyle.getPropertyValue('left')
-        var right = computedStyle.getPropertyValue('right')
+    for (let i in fixedElements) {
+        const element = fixedElements[i]
+        const computedStyle = window.getComputedStyle(element, null)
+        const left = computedStyle.getPropertyValue('left')
+        const right = computedStyle.getPropertyValue('right')

        if (right !== '0px') {
-            var intValue = parseInt(left.replace('px', ''))
-            element.style.setProperty('transform', 'translateX(' + (intValue + 50) + 'px)')
+            const intValue = parseInt(left.replace('px', '')) + 50
+            element.style.setProperty('transform', 'translateX(' + intValue.toString() + 'px)')
        }
    }
 }

-let content = document.getElementById('content')
+const content = querySelector('#content')

 if (content && content.classList.contains('app-settings')) {
    let loaded = false
@@ -56,7 +68,7 @@ if (content && content.classList.contains('app-settings')) {
    }
    const observer = new MutationObserver(() => {
        if (loaded) {
-            return;
+            return
        }

        const element = content.querySelector('#app-category-your-apps') || content.querySelector('#app-navigation ul')
@@ -1,15 +1,14 @@
-var pageLoader = jQuery('<div id="side-menu-loader">')
-var pageLoaderBar = jQuery('<div id="side-menu-loader-bar">')
+let pageLoader = createElement('div', {id: 'side-menu-loader'})
+let pageLoaderBar = createElement('div', {id: 'side-menu-loader-bar'})

-body.append(pageLoader)
-pageLoader.append(pageLoaderBar)
+pageLoader.appendChild(pageLoaderBar)
+querySelector('body').appendChild(pageLoader)

-var pageLoaderValue = 0
-
-$(window).on('beforeunload', function() {
-    setInterval(function() {
-        pageLoaderBar.width(pageLoaderValue.toString() + '%')
+let pageLoaderValue = 0

+window.addEventListener('beforeunload', () => {
+    setInterval(() => {
+        pageLoaderBar.style.width = pageLoaderValue.toString() + '%'
        pageLoaderValue = Math.min(pageLoaderValue + .2, 100)
    }, 25)
 })
@@ -1,60 +1,91 @@
-var menuCache = null
+let menuCache = null

-var updateTopMenu = function() {
-    var breakpointMobileWidth = 1024
-    var menu = jQuery('#appmenu')
-    var apps = menu.find('li')
-    var minAppsDesktop = 8
-    var usePercentualAppMenuLimit = 0.8
-    var isMobile = jQuery(window).width() < breakpointMobileWidth
-    var lastShownApp = null
-    var appShown = []
-    var moreApps = jQuery('#more-apps')
-    var navigation = jQuery('#navigation')
-    var navigationApps = jQuery('#apps ul')
-    var appCount = null
+const breakpointMobileWidth = 1024
+const usePercentualAppMenuLimit = 0.8
+const minAppsDesktop = 8

-    var currentMenuCache = menu.html() + menu.next().html()
+const handleMenuClick = (e, icon) => {
+    let element = e.target

-    if (currentMenuCache === menuCache) {
+    while (element.tagName !== 'LI') {
+        element = element.parentNode
+    }
+
+    const a = querySelector('a', element)
+
+    if (a.getAttribute('target') !== '_blank' && e.which === 1 && !e.ctrlKey && !e.metaKey) {
+        for (let tag of ['svg', 'div']) {
+            let el = querySelector(tag, element)
+
+            if (el) {
+                el.remove()
+            }
+        }
+
+        const loader = createElement('div', {'class': icon})
+
+        a.insertBefore(loader, querySelector('span', a))
+    }
+}
+
+const updateTopMenu = function() {
+    const isMobile = window.innerWidth < breakpointMobileWidth
+    const menu = querySelector('#appmenu')
+    const moreApps = querySelector('#more-apps')
+    const navigation = querySelector('#navigation')
+    const navigationApps = querySelector('#apps ul')
+
+    let apps = querySelectorAll('li', menu)
+    let lastShownApp = null
+    let appShown = []
+
+    if ((menu.innerHTML + menu.nextSibling.innerHTML) === menuCache) {
        return
    }

-    navigationApps.html('')
+    let navigationAppsHtml = ''

-    apps.each(function(i, app) {
-        var dataId = app.getAttribute('data-id')
+    for (let app of apps) {
+        const dataId = app.getAttribute('data-id')

        if (dataId === null) {
-            return
+            continue
        }

-        if (topMenuApps.indexOf(dataId) === -1) {
+        if (topMenuApps.indexOf(dataId) === -1 && topSideMenuApps.indexOf(dataId) === -1) {
            app.classList.add('hidden')
            app.classList.add('app-hidden')
        } else {
            app.classList.remove('hidden')
            app.classList.add('app-external-site')
+
+            if (topSideMenuApps.indexOf(dataId) !== -1) {
+                app.classList.add('app-top-side-menu')
+            }
+
            appShown.push(app)
-            navigationApps.append(app.outerHTML)
+
+            navigationAppsHtml = navigationAppsHtml + app.outerHTML
        }

        if (targetBlankApps.indexOf(dataId) !== -1) {
-            jQuery(app).children('a').attr('target', '_blank');
+            querySelector('a', app).setAttribute('target', '_blank')
        }
-    })
-
-    var rightHeaderWidth = jQuery('.header-right').outerWidth()
-    var headerWidth = jQuery('header').outerWidth()
-    var availableWidth = headerWidth - jQuery('#nextcloud').outerWidth()
-                            - jQuery('#header .side-menu-opener').outerWidth()
-                            - (rightHeaderWidth > 230 ? rightHeaderWidth : 230)
-
-    if (!isMobile) {
-        availableWidth = availableWidth * usePercentualAppMenuLimit
    }

-    appCount = Math.floor(availableWidth / jQuery('#appmenu li').width())
+    navigationApps.innerHTML = navigationAppsHtml
+
+    const rightHeaderWidth = querySelector('.header-right').offsetWidth
+    const headerWidth = querySelector('header').offsetWidth
+
+    let availableWidth = headerWidth
+
+    availableWidth -= nextcloud.offsetWidth
+    availableWidth -= querySelector('#header .side-menu-opener').offsetWidth
+    availableWidth -= rightHeaderWidth > 230 ? rightHeaderWidth : 230
+    availableWidth *= isMobile ? usePercentualAppMenuLimit : 1
+
+    let appCount = Math.floor(availableWidth / querySelector('#appmenu li:not(.hidden)').offsetWidth)

    if (isMobile && appCount > minAppsDesktop) {
        appCount = minAppsDesktop
@@ -62,111 +93,124 @@ var updateTopMenu = function() {
        appCount = minAppsDesktop
    }

-    if (appCount === 0) {
-        menu.addClass('hidden')
-    }
-
-    menu.removeClass('hidden')
-    menu.css('opacity', 1)
+    menu.style.opacity = 1

    if (appShown.length - 1 - appCount >= 1) {
        appCount--
    }

-    moreApps.find('a').removeClass('active')
+    for (let item of querySelectorAll('a', moreApps)) {
+        item.classList.remove('active')
+    }

-    var k = 0
-    var notInHeader = 0
-    var name
+    let k = 0
+    let notInHeader = 0

-    jQuery(appShown).each(function(i, app) {
-        app = jQuery(app)
-        name = app.data('id')
+    for (let app of appShown) {
+        const name = app.getAttribute('data-id')
+        const li = querySelector('#apps li[data-id=' + name + '].app-external-site')

        if (k < appCount && appCount > 0) {
-            app.removeClass('hidden')
-            lastShownApp = app
+            app.classList.remove('hidden')
+            li.classList.add('in-header')

-            jQuery('#apps li[data-id=' + name + '].app-external-site').addClass('in-header')
+            lastShownApp = app
        } else {
-            app.addClass('hidden')
+            app.classList.add('hidden')
+            li.classList.remove('in-header')
+
            notInHeader++

-            jQuery('#apps li[data-id=' + name + '].app-external-site').removeClass('in-header')
+            const a = querySelector('a', app)

-            if (appCount > 0 && app.children('a').hasClass('active')) {
-                lastShownApp.addClass('hidden')
-                app.removeClass('hidden')
+            if (appCount > 0 && a.classList.contains('active')) {
+                lastShownApp.classList.add('hidden')
+                app.classList.remove('hidden')
                notInHeader++

-                jQuery('#apps li[data-id=' + name + '].app-external-site')
-                    .removeClass('in-header')
-                    .addClass('in-header')
+                li.classList.add('in-header')
            }
        }

        k++
-    })
+    }

-    // Hack for https://github.com/nextcloud/server/blob/23b0b63c213f5b31eecae817ffd4a9e26f6624d0/core/src/components/MainMenu.js#L74-L96
-    menu.undelegate('li:not(#more-apps) > a', 'click')
-    menu.delegate('li:not(#more-apps) > a', 'click', function(e) {
-        var a = $(e.target)
+    // Hack for:
+    // - https://github.com/nextcloud/server/blob/master/core/src/components/MainMenu.js#L97-L119
+    // - https://github.com/nextcloud/server/blob/master/core/src/components/MainMenu.js#L97-L119
+    jQuery(menu).undelegate('li:not(#more-apps) > a', 'click')
+    jQuery(navigation).undelegate('a', 'click')

-        if (!a.is('a')) {
-            a = a.closest('a')
+    const confs = [
+        {
+            items: querySelectorAll('#navigation li'),
+            icon: 'icon-loading-small'
+        },
+        {
+            items: querySelectorAll('li:not(#more-apps)', menu),
+            icon: OCA.Theming && OCA.Theming.inverted ? 'icon-loading-small' : 'icon-loading-small-dark'
+        },
+    ]
+
+    for (let conf of confs) {
+        for (let item of conf.items) {
+            item.addEventListener('click', (e) => {
+                handleMenuClick(e, conf.icon)
+            })
        }
+    }

-        if (a.attr('target') !== '_blank' && e.which === 1 && !e.ctrlKey && !e.metaKey && a.parent('#more-apps').length === 0) {
-            a.find('svg').remove()
-            a.find('div').remove()
-            a.prepend(jQuery('<div/>').addClass(
-                OCA.Theming && OCA.Theming.inverted
-                ? 'icon-loading-small'
-                : 'icon-loading-small-dark'
-            ))
+    for (let app of querySelectorAll('#apps li.app-external-site')) {
+        const appId = app.getAttribute('data-id')

-            window.location.href = a.attr('href')
-        }
-    })
-
-    jQuery('#apps li.app-external-site').each(function(i, app) {
-        app = jQuery(app)
-        var appId = app.attr('data-id')
-
-        if (app.hasClass('in-header')) {
-            app.find('svg').find('defs').remove()
+        if (app.classList.contains('in-header')) {
+            for (let defs of querySelectorAll('svg defs', app)) {
+                defs.remove()
+            }
        } else {
-            var svg = app.find('svg');
+            const svg = querySelector('svg', app)

-            if (svg.find('defs').length > 0) {
-                return;
+            if (querySelectorAll('svg defs', app).length > 0) {
+                continue
            }

-            var defs = `
+            const defs = `
                <defs>
                    <filter id="invertMenuMore-${appId}">
                        <feColorMatrix in="SourceGraphic" type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"></feColorMatrix>
                    </filter>
                </defs>`

-            svg.prepend(defs)
-            svg.find('image').attr('filter', `url(#invertMenuMore-${appId})`)
+            svg.innerHTML = defs + svg.innerHTML

-            var html = svg.get(0).innerHTML.replace(/fecolormatrix/g, 'feColorMatrix');
+            for (let image of querySelectorAll('image', svg)) {
+                image.setAttribute('filter', `url(#invertMenuMore-${appId})`)
+            }

-            svg.html(html)
+            svg.innerHTML = svg.innerHTML.replace(/fecolormatrix/g, 'feColorMatrix')
        }
-    })
-
-    if (notInHeader === 0) {
-        moreApps.hide()
-        navigation.hide()
-    } else {
-        moreApps.show()
    }

-    menuCache = menu.html() + menu.next().html()
+    if (notInHeader === 0) {
+        moreApps.style.display = 'none'
+        navigation.style.display = 'none'
+    } else {
+        moreApps.style.display = 'flex'
+    }
+
+    menuCache = menu.innerHTML + menu.nextSibling.innerHTML
 }

-setInterval(updateTopMenu, 50)
+for (let i = 0; i < 4000; i+= 100) {
+    setTimeout(updateTopMenu, i)
+}
+
+let resizeTimeout = null;
+
+window.addEventListener('resize', () => {
+    if (resizeTimeout !== null) {
+        clearTimeout(resizeTimeout)
+    }
+
+    resizeTimeout = setTimeout(updateTopMenu, 100)
+})
@@ -1,59 +1,114 @@
-(function() {
-    var sideMenuContainer = jQuery('<div id="side-menu-container">')
-    var sideMenuOpener = jQuery('<button class="side-menu-opener"></button>')
-    var sideMenu = jQuery('<div id="side-menu">')
-    var body = jQuery('body')
-    var html = jQuery('html')
-    var isTouchDevice = window.matchMedia("(pointer: coarse)").matches
+<?php

-    <?php if ($_['big-menu']): ?>
-        sideMenu.attr('data-bigmenu', '1')
+$display = 'default';
+
+if ($_['always-displayed']) {
+    $display = 'always-displayed';
+} elseif ($_['big-menu']) {
+    $display = 'big-menu';
+} elseif ($_['side-with-categories']) {
+    $display = 'side-with-categories';
+}
+
+?>
+
+(function() {
+    const querySelector = function(selector, element) {
+        if (element) {
+            return element.querySelector(selector)
+        }
+
+        return document.querySelector(selector)
+    }
+
+    const querySelectorAll = function(selector, element) {
+        if (element) {
+            return element.querySelectorAll(selector)
+        }
+
+        return document.querySelectorAll(selector)
+    }
+
+    const createElement = function(tagName, attributes) {
+        const element = document.createElement(tagName)
+
+        if (typeof attributes === 'object') {
+            for (let i in attributes) {
+                element.setAttribute(i, attributes[i])
+            }
+        }
+
+        return element
+    }
+
+    const sideMenuContainer = createElement('div', {id: 'side-menu-container'})
+    const sideMenuOpener = createElement('button', {'class': 'side-menu-opener'})
+    const sideMenu = createElement('div', {id: 'side-menu'})
+
+    const body = querySelector('body')
+    const html = querySelector('html')
+    const nextcloud = querySelector('#nextcloud')
+
+    const isTouchDevice = window.matchMedia("(pointer: coarse)").matches
+    const targetBlankApps = <?php echo json_encode($_['target-blank-apps']) ?>
+
+    <?php if ($display === 'big-menu'): ?>
+        sideMenu.setAttribute('data-bigmenu', '1')
+    <?php elseif ($display === 'side-with-categories'): ?>
+        sideMenu.setAttribute('data-sidewithcategories', '1')
    <?php endif; ?>

-    var targetBlankApps = <?php echo json_encode($_['target-blank-apps']) ?>;
+    querySelector('body').addEventListener('side-menu.apps', (e) => {
+        const apps = e.detail.apps;

-    body.on('side-menu.apps', function(e, apps) {
        <?php if ($_['hide-when-no-apps']): ?>
-            sideMenu = jQuery('#side-menu')
+            const sideMenu = querySelector('#side-menu')

            if (apps.length === 0) {
-                sideMenu.removeClass('open')
-                sideMenu.addClass('hide')
-                sideMenuOpener.addClass('hide')
+                sideMenu.classList.remove('open')
+                sideMenu.classList.add('hide')
+                sideMenuOpener.classList.add('hide')
            } else {
-                sideMenu.removeClass('hide')
-                sideMenuOpener.removeClass('hide')
+                sideMenu.classList.remove('hide')
+                sideMenuOpener.classList.remove('hide')
            }

-            <?php if ($_['always-displayed'] && !$_['big-menu']): ?>
+            <?php if ($display === 'always-displayed'): ?>
                if (apps.length === 0) {
-                    html.removeClass('side-menu-always-displayed');
+                    html.classList.remove('side-menu-always-displayed')
                } else {
-                    html.addClass('side-menu-always-displayed');
+                    html.classList.add('side-menu-always-displayed')
                }
            <?php endif; ?>
        <?php else: ?>
-            <?php if ($_['always-displayed'] && !$_['big-menu']): ?>
+            <?php if ($display === 'always-displayed'): ?>
                if (apps.length === 0) {
-                    html.removeClass('side-menu-always-displayed');
+                    html.classList.remove('side-menu-always-displayed')
                } else {
-                    html.addClass('side-menu-always-displayed');
+                    html.classList.add('side-menu-always-displayed')
                }
            <?php endif; ?>
        <?php endif; ?>
    })

-    body.on('side-menu.ready', function() {
-        sideMenu = jQuery('#side-menu')
+    body.addEventListener('side-menu.ready', () => {
+        const sideMenu = querySelector('#side-menu')
+        const headerMenuOpener = querySelector('#header .side-menu-opener')
+        const sideMenuOpener = querySelectorAll('#side-menu .side-menu-opener')

-        var headerMenuOpener = jQuery('#header .side-menu-opener')
-        var sideMenuOpener = jQuery('#side-menu .side-menu-opener')
+        if (!headerMenuOpener) {
+            return
+        }

-        sideMenuFocus = function() {
-            var a = sideMenu.find('.side-menu-app.active a')
+        sideMenuFocus = () => {
+            let a = querySelector('.side-menu-app.active a', sideMenu)
+
+            if (!a) {
+                return
+            }

            if (a.length === 0) {
-                a = sideMenu.find('.side-menu-app:first-child a')
+                a = querySelector('.side-menu-app:first-child a', sideMenu)
            }

            if (a.length > 0) {
@@ -61,84 +116,107 @@
            }
        }

-        <?php if ($_['opener-hover'] || ($_['always-displayed'] && !$_['big-menu'])): ?>
-            var sideMenuMouseLeave = function() {
-                sideMenu
-                    .removeClass('open')
-                    .off('mouseleave', sideMenuMouseLeave)
+        <?php if ($_['opener-hover']): ?>
+            const sideMenuMouseLeave = () => {
+                sideMenu.classList.remove('open')
+                sideMenu.removeEventListener('mouseleave', sideMenuMouseLeave)
            }

-            var sideMenuMouseEnter = function() {
-                sideMenu.on('mouseleave', sideMenuMouseLeave)
+            const sideMenuMouseEnter = () => {
+                sideMenu.addEventListener('mouseleave', sideMenuMouseLeave)
            }

-            var sideMenuOpenerMouseEnter = function() {
-                sideMenu
-                    .addClass('open')
-                    .on('mouseenter', sideMenuMouseEnter)
+            const sideMenuOpenerMouseEnter = () => {
+                sideMenu.classList.add('open')
+                sideMenu.addEventListener('mouseenter', sideMenuMouseEnter)

                sideMenuFocus()
            }

            if (!isTouchDevice) {
                <?php if ($_['opener-hover']): ?>
-                    headerMenuOpener.on('mouseenter', sideMenuOpenerMouseEnter)
+                    headerMenuOpener.addEventListener('mouseenter', sideMenuOpenerMouseEnter)

-                    sideMenu.addClass('hide-opener')
+                    sideMenu.classList.add('hide-opener')
                <?php endif ?>

-                sideMenu.on('mouseleave', sideMenuMouseLeave)
-                sideMenu.on('mouseenter', sideMenuOpenerMouseEnter)
+                sideMenu.addEventListener('mouseleave', sideMenuMouseLeave)
+                sideMenu.addEventListener('mouseenter', sideMenuOpenerMouseEnter)
            }
        <?php endif; ?>

-        headerMenuOpener.on('click', function() {
-            sideMenu.addClass('open')
-            sideMenu.find('.side-menu-app.active a').focus()
+        headerMenuOpener.addEventListener('click', () => {
+            sideMenu.classList.add('open')
+
+            const a = querySelector('.side-menu-app.active a', sideMenu)
+
+            if (a !== null) {
+                a.focus()
+            }
+
+            headerMenuOpener.blur()
        })

-        <?php if ($_['always-displayed'] && !$_['big-menu']): ?>
-            sideMenuOpener.on('click', function() {
-                sideMenu.toggleClass('open')
+        for (let opener of sideMenuOpener) {
+            opener.addEventListener('click', () => {
+                <?php if ($display === 'always-displayed'): ?>
+                    sideMenu.classList.toggle('open')
+                <?php else: ?>
+                    sideMenu.classList.remove('open')
+                <?php endif; ?>
            })
-        <?php else: ?>
-            sideMenuOpener.on('click', function() {
-                sideMenu.removeClass('open')
-            })
-        <?php endif; ?>
+        }

-        jQuery(document).keydown(function(e) {
+        document.addEventListener('keydown', (e) => {
            var key = e.key || e.keyCode

            if ((key === 'o' || key === 79) && e.ctrlKey === true) {
                e.preventDefault()

-                sideMenu.toggleClass('open')
+                sideMenu.classList.toggle('open')
                sideMenuFocus()
            }
        })
+
+        const sideMenuObserver = new MutationObserver((e) => {
+            if (body.getAttribute('id') !== 'body-settings') {
+                return
+            }
+
+            body.classList.toggle('body-settings-side-menu', sideMenu.classList.contains('open'))
+        })
+
+        sideMenuObserver.observe(sideMenu, {
+            attributes: true,
+            attributeFilter: ['class'],
+            childList: false,
+            characterData: false
+        })
    })

-    body.append(sideMenuContainer)
-    sideMenuContainer.append(sideMenu)
+    body.appendChild(sideMenuContainer)
+    sideMenuContainer.appendChild(sideMenu)

    <?php if ($_['loader-enabled'] === true): ?>
        <?php require_once __DIR__.'/_loaderEnabled.js'; ?>
    <?php endif; ?>

-    <?php if ($_['opener-position'] === 'before'): ?>
-        sideMenuOpener.insertBefore('#nextcloud')
-    <?php else: ?>
-        sideMenuOpener.insertAfter('#nextcloud')
-    <?php endif; ?>
+    if (nextcloud) {
+        <?php if ($_['opener-position'] === 'before'): ?>
+            nextcloud.parentNode.insertBefore(sideMenuOpener, nextcloud)
+        <?php else: ?>
+            nextcloud.parentNode.insertBefore(sideMenuOpener, nextcloud.nextSibling)
+        <?php endif; ?>
+    }

-    <?php if (!empty($_['top-menu-apps'])): ?>
-        var topMenuApps = <?php echo json_encode($_['top-menu-apps']); ?>;
+    <?php if (!empty($_['top-menu-apps']) || !empty($_['top-side-menu-apps'])): ?>
+        const topMenuApps = <?php echo json_encode($_['top-menu-apps']), "\n"; ?>
+        const topSideMenuApps = <?php echo json_encode($_['top-side-menu-apps']); ?>

        <?php require_once __DIR__.'/_topMenuApps.js'; ?>
    <?php endif; ?>

-    <?php if ($_['always-displayed'] && !$_['big-menu']): ?>
+    <?php if ($display === 'always-displayed'): ?>
        <?php require_once __DIR__.'/_alwaysDisplayed.js'; ?>
    <?php endif; ?>
 })();
@@ -20,6 +20,7 @@ use OCP\IURLGenerator;
 use OCP\IConfig;
 use OCA\SideMenu\AppInfo\Application;

+vendor_script('side_menu', 'html5sortable.min');
 script('side_menu', 'admin');
 style('side_menu', 'admin');

@@ -38,8 +39,9 @@ $choicesSizes = [
    'Big' => 'big',
 ];

+$labelShowHideApps = 'Show and hide the list of applications';
+$labelReset = 'Reset to default';
 ?>
-
 <div id="side-menu-section">
    <div class="section">
        <h2>
@@ -67,6 +69,10 @@ $choicesSizes = [
                        class="side-menu-setting side-menu-setting-live"
                        value="<?php print_unescaped($_['background-color-to']); ?>">

+                        <div class="theme-undo icon icon-history btn-reset" data-toggle="tooltip" data-original-title="<?php echo p($l->t($labelReset)); ?>" data-reset="<?php echo htmlentities(json_encode([
+                            'side-menu-background-color' => $_['defaults']['background-color'],
+                            'side-menu-background-color-to' => $_['defaults']['background-color-to'],
+                        ])) ?>"></div>
                    <div>
                        <em>
                            <?php p($l->t('Transparent')); ?>
@@ -102,6 +108,10 @@ $choicesSizes = [
                        type="color"
                        class="side-menu-setting side-menu-setting-live"
                        value="<?php print_unescaped($_['current-app-background-color']); ?>">
+
+                    <div class="theme-undo icon icon-history btn-reset" data-toggle="tooltip" data-original-title="<?php echo p($l->t($labelReset)); ?>" data-reset="<?php echo htmlentities(json_encode([
+                        'side-menu-current-app-background-color' => $_['defaults']['current-app-background-color'],
+                    ])) ?>"></div>
                </div>
            </div>
        </div>
@@ -118,6 +128,10 @@ $choicesSizes = [
                        type="color"
                        class="side-menu-setting side-menu-setting-live"
                        value="<?php print_unescaped($_['text-color']); ?>">
+
+                    <div class="theme-undo icon icon-history btn-reset" data-toggle="tooltip" data-original-title="<?php echo p($l->t($labelReset)); ?>" data-reset="<?php echo htmlentities(json_encode([
+                        'side-menu-text-color' => $_['defaults']['text-color'],
+                    ])) ?>"></div>
                </div>
            </div>
        </div>
@@ -134,6 +148,10 @@ $choicesSizes = [
                        type="color"
                        class="side-menu-setting"
                        value="<?php print_unescaped($_['loader-color']); ?>">
+
+                    <div class="theme-undo icon icon-history btn-reset" data-toggle="tooltip" data-original-title="<?php echo p($l->t($labelReset)); ?>" data-reset="<?php echo htmlentities(json_encode([
+                        'side-menu-loader-color' => $_['defaults']['loader-color'],
+                    ])) ?>"></div>
                </div>
            </div>
        </div>
@@ -217,7 +235,7 @@ $choicesSizes = [
        </h2>

        <p>
-            <?php p($l->t('This parameters are used when Dark theme or Breeze Dark Theme are enabled.')); ?>
+            <?php echo $l->t('This parameters are used when Dark theme or Breeze Dark Theme are enabled.'); ?>
        </p>

        <div class="side-menu-setting-table">
@@ -227,16 +245,23 @@ $choicesSizes = [
                </div>
                <div class="side-menu-setting-form side-menu-setting-form-long">
                    <input
+                        id="side-menu-dark-mode-background-color"
                        name="dark-mode-background-color"
                        type="color"
                        class="side-menu-setting"
                        value="<?php print_unescaped($_['dark-mode-background-color']); ?>">
                    <input
+                        id="side-menu-dark-mode-background-color-to"
                        name="dark-mode-background-color-to"
                        type="color"
                        class="side-menu-setting"
                        value="<?php print_unescaped($_['dark-mode-background-color-to']); ?>">

+                    <div class="theme-undo icon icon-history btn-reset" data-toggle="tooltip" data-original-title="<?php echo p($l->t($labelReset)); ?>" data-reset="<?php echo htmlentities(json_encode([
+                        'side-menu-dark-mode-background-color' => $_['defaults']['dark-mode-background-color'],
+                        'side-menu-dark-mode-background-color-to' => $_['defaults']['dark-mode-background-color-to'],
+                    ])) ?>"></div>
+
                    <div>
                        <em>
                            <?php p($l->t('Transparent')); ?>
@@ -266,10 +291,15 @@ $choicesSizes = [
                </div>
                <div class="side-menu-setting-form side-menu-setting-form-long">
                    <input
+                        id="side-menu-dark-mode-current-app-background-color"
                        name="dark-mode-current-app-background-color"
                        type="color"
                        class="side-menu-setting"
                        value="<?php print_unescaped($_['dark-mode-current-app-background-color']); ?>">
+
+                    <div class="theme-undo icon icon-history btn-reset" data-toggle="tooltip" data-original-title="<?php echo p($l->t($labelReset)); ?>" data-reset="<?php echo htmlentities(json_encode([
+                        'side-menu-dark-mode-current-app-background-color' => $_['defaults']['dark-mode-current-app-background-color'],
+                    ])) ?>"></div>
                </div>
            </div>
        </div>
@@ -281,10 +311,15 @@ $choicesSizes = [
                </div>
                <div class="side-menu-setting-form side-menu-setting-form-long">
                    <input
+                        id="side-menu-dark-mode-text-color"
                        name="dark-mode-text-color"
                        type="color"
                        class="side-menu-setting"
                        value="<?php print_unescaped($_['dark-mode-text-color']); ?>">
+
+                    <div class="theme-undo icon icon-history btn-reset" data-toggle="tooltip" data-original-title="<?php echo p($l->t($labelReset)); ?>" data-reset="<?php echo htmlentities(json_encode([
+                        'side-menu-dark-mode-text-color' => $_['defaults']['dark-mode-text-color'],
+                    ])) ?>"></div>
                </div>
            </div>
        </div>
@@ -296,10 +331,15 @@ $choicesSizes = [
                </div>
                <div class="side-menu-setting-form side-menu-setting-form-long">
                    <input
+                        id="side-menu-dark-mode-loader-color"
                        name="dark-mode-loader-color"
                        type="color"
                        class="side-menu-setting"
                        value="<?php print_unescaped($_['dark-mode-loader-color']); ?>">
+
+                    <div class="theme-undo icon icon-history btn-reset" data-toggle="tooltip" data-original-title="<?php echo p($l->t($labelReset)); ?>" data-reset="<?php echo htmlentities(json_encode([
+                        'side-menu-dark-mode-loader-color' => $_['defaults']['dark-mode-loader-color'],
+                    ])) ?>"></div>
                </div>
            </div>
        </div>
@@ -441,64 +481,95 @@ $choicesSizes = [
            <?php p($l->t('Panel')); ?>
        </h2>

+        <?php
+            $displays = [
+                'default' => !$_['always-displayed'] && !$_['big-menu'] && !$_['side-with-categories'],
+                'always-displayed' => $_['always-displayed'] && !$_['big-menu'] && !$_['side-with-categories'],
+                'side-with-categories' => $_['side-with-categories'] && !$_['always-displayed'] && !$_['big-menu'],
+                'big-menu' => $_['big-menu'] && !$_['always-displayed'] && !$_['side-with-categories'],
+            ];
+        ?>
+
        <div>
            <label>
                <?php p($l->t('Default')); ?>
            </label>
        </div>
-
-        <?php
-            $displays = [
-                'default' => !$_['always-displayed'] && !$_['big-menu'],
-                'always-displayed' => $_['always-displayed'] && !$_['big-menu'],
-                'big-menu' => $_['big-menu'],
-            ];
-        ?>
-
        <p>
            <img
                class="side-menu-display <?php echo $displays['default'] ? 'is-active' : '' ?>"
                data-alwaysdiplayed="0"
                data-bigmenu="0"
+                data-sidewithcategories="0"
                src="<?php print_unescaped(image_path('side_menu', 'admin/layout-default.svg')); ?>" alt="<?php p($l->t('Default')); ?>">
        </p>

+        <div>
+            <label>
+                <?php p($l->t('With categories')); ?>
+            </label>
+        </div>
+        <p><em><?php echo $l->t('This menu is not compatible with AppOrder.'); ?></em></p>
+        <p>
+            <img
+                class="side-menu-display <?php echo $displays['side-with-categories'] ? 'is-active' : '' ?>"
+                data-alwaysdiplayed="0"
+                data-bigmenu="0"
+                data-sidewithcategories="1"
+                src="<?php print_unescaped(image_path('side_menu', 'admin/layout-side-with-categories.svg')); ?>" alt="<?php p($l->t('With categories')); ?>">
+        </p>
+
        <div>
            <label for="side-menu-opener">
                <?php p($l->t('Big menu')); ?>
            </label>
        </div>
-
-        <p><em><?php p($l->t('The big menu is not compatible with AppOrder.')); ?></em></p>
-
+        <p><em><?php echo $l->t('This menu is not compatible with AppOrder.'); ?></em></p>
        <p>
            <img
                class="side-menu-display <?php echo $displays['big-menu'] ? 'is-active' : '' ?>"
                data-alwaysdiplayed="0"
                data-bigmenu="1"
+                data-sidewithcategories="0"
                src="<?php print_unescaped(image_path('side_menu', 'admin/layout-big-menu.svg')); ?>" alt="<?php p($l->t('Big menu')); ?>">
        </p>

        <div>
            <label for="side-menu-opener">
                <?php p($l->t('Always displayed')); ?>
-                <small><span class="warning"><?php p($l->t('Experimental')); ?></span></small>
            </label>
        </div>
-
        <p><em><?php p($l->t('Not compatible with touch screens.')); ?></em></p>
-
        <p>
            <img
                class="side-menu-display <?php echo $displays['always-displayed'] ? 'is-active' : '' ?>"
                data-alwaysdiplayed="1"
                data-bigmenu="0"
+                data-sidewithcategories="0"
                src="<?php print_unescaped(image_path('side_menu', 'admin/layout-always-displayed.svg')); ?>" alt="<?php p($l->t('Always displayed')); ?>">
        </p>

-        <input type="hidden" class="side-menu-setting" name="always-displayed" id="side-menu-always-displayed" value="<?php echo (int) $_['always-displayed'] ?>">
-        <input type="hidden" class="side-menu-setting" name="big-menu" id="side-menu-big-menu" value="<?php echo (int) $_['big-menu'] ?>">
-
+        <input
+            type="hidden"
+            class="side-menu-setting"
+            name="always-displayed"
+            id="side-menu-always-displayed"
+            value="<?php echo (int) $_['always-displayed'] ?>"
+        >
+        <input
+            type="hidden"
+            class="side-menu-setting"
+            name="big-menu"
+            id="side-menu-big-menu"
+            value="<?php echo (int) $_['big-menu'] ?>"
+        >
+        <input
+            type="hidden"
+            class="side-menu-setting"
+            name="side-with-categories"
+            id="side-menu-side-with-categories"
+            value="<?php echo (int) $_['side-with-categories'] ?>"
+        >
        <br>


@@ -580,7 +651,7 @@ $choicesSizes = [
                </div>
                <div class="side-menu-setting-form">
                    <a class="side-menu-toggler" data-target="#big-menu-hidden-apps" href="#_">
-                        🖱️ <?php p($l->t('Show and hide the list of applications')); ?>
+                        🖱️ <?php p($l->t($labelShowHideApps)); ?>
                    </a>

                    <div class="side-menu-setting" data-name="big-menu-hidden-apps" id="big-menu-hidden-apps" data-checkbox style="display: none">
@@ -628,7 +699,7 @@ $choicesSizes = [
                    <select id="side-menu-size-icon" name="size-icon" class="side-menu-setting">
                        <?php foreach ($choicesSizes as $label => $value): ?>
                            <option value="<?php echo $value ?>" <?php if ($value === $_['size-icon']): ?>selected<?php endif; ?>>
-                                <?php echo $l->t($label);  ?> icon
+                                <?php echo $l->t($label.' icon');  ?>
                            </option>
                        <?php endforeach; ?>
                    </select>
@@ -636,7 +707,7 @@ $choicesSizes = [
                    <select id="side-menu-size-text" name="size-text" class="side-menu-setting">
                        <?php foreach ($choicesSizes as $label => $value): ?>
                            <option value="<?php echo $value ?>" <?php if ($value === $_['size-text']): ?>selected<?php endif; ?>>
-                                <?php echo $l->t($label);  ?> text
+                                <?php echo $l->t($label.' text'); ?>
                            </option>
                        <?php endforeach; ?>
                    </select>
@@ -649,7 +720,7 @@ $choicesSizes = [
                </div>
                <div class="side-menu-setting-form">
                    <a class="side-menu-toggler" data-target="#target-blank-apps" href="#_">
-                        🖱️ <?php p($l->t('Show and hide the list of applications')); ?>
+                        🖱️ <?php p($l->t($labelShowHideApps)); ?>
                    </a>

                    <div class="side-menu-setting" data-name="target-blank-apps" id="target-blank-apps" data-checkbox style="display: none">
@@ -699,11 +770,11 @@ $choicesSizes = [
        <div class="side-menu-setting-table">
            <div class="side-menu-setting-row">
                <div class="side-menu-setting-label">
-                    <?php p($l->t('Apps that not must be moved in the side menu')); ?>
+                    <?php p($l->t('Apps only visible in the top menu')); ?>
                </div>
                <div class="side-menu-setting-form">
                    <a class="side-menu-toggler" data-target="#top-menu-apps" href="#_">
-                        🖱️ <?php p($l->t('Show and hide the list of applications')); ?>
+                        🖱️ <?php p($l->t($labelShowHideApps)); ?>
                    </a>

                    <div class="side-menu-setting" data-name="top-menu-apps" id="top-menu-apps" data-checkbox style="display: none">
@@ -728,6 +799,39 @@ $choicesSizes = [
                </div>
            </div>
        </div>
+
+        <div class="side-menu-setting-table">
+            <div class="side-menu-setting-row">
+                <div class="side-menu-setting-label">
+                    <?php p($l->t('Apps visible in the top and side menus')); ?>
+                </div>
+                <div class="side-menu-setting-form">
+                    <a class="side-menu-toggler" data-target="#top-side-menu-apps" href="#_">
+                        🖱️ <?php p($l->t($labelShowHideApps)); ?>
+                    </a>
+
+                    <div class="side-menu-setting" data-name="top-side-menu-apps" id="top-side-menu-apps" data-checkbox style="display: none">
+                        <ul class="side-menu-setting-list">
+                            <?php foreach ($_['apps'] as $app): ?>
+                                <li class="side-menu-setting-list-item">
+                                    <input
+                                        type="checkbox"
+                                        name="top-side-menu-apps[]"
+                                        value="<?php echo $app['id'] ?>"
+                                        id="top-side-menu-app-<?php echo $app['id'] ?>"
+                                        <?php if (in_array($app['id'], $_['top-side-menu-apps'])): ?>checked<?php endif; ?>
+                                    />
+
+                                    <label for="top-side-menu-app-<?php echo $app['id'] ?>">
+                                        <?php echo p($l->t($app['name'])); ?>
+                                    </label>
+                                </li>
+                            <?php endforeach; ?>
+                        </ul>
+                    </div>
+                </div>
+            </div>
+        </div>
    </div>


@@ -758,6 +862,60 @@ $choicesSizes = [
                </div>
            </div>

+            <div class="side-menu-setting-row">
+                <div class="side-menu-setting-label">
+                    <?php p($l->t('Custom categories')); ?>
+                </div>
+                <div class="side-menu-setting-form">
+                    <input type="hidden" name="categories-custom" class="side-menu-setting" data-langs="<?php echo htmlentities(json_encode($langs)) ?>" value="<?php echo htmlentities(json_encode($_['categories-custom'])) ?>">
+
+                    <div id="side-menu-categories-custom">
+                    </div>
+                </div>
+            </div>
+
+            <div class="side-menu-setting-row">
+                <div class="side-menu-setting-label">
+                    <?php p($l->t('Customize application categories')); ?>
+                </div>
+                <div class="side-menu-setting-form">
+                    <a class="side-menu-toggler" data-target="#apps-categories-custom-list" href="#_">
+                        🖱️ <?php p($l->t($labelShowHideApps)); ?>
+                    </a>
+
+                    <div id="apps-categories-custom-list" style="display: none">
+                        <ul class="side-menu-setting-list">
+                            <?php foreach ($_['apps'] as $app): ?>
+                                <li class="side-menu-setting-list-item">
+                                    <label for="apps-categories-custom-<?php echo $app['id'] ?>">
+                                        <?php echo p($l->t($app['name'])); ?>
+                                    </label>
+
+                                    <br>
+
+                                    <select data-app="<?php echo $app['id'] ?>" class="apps-categories-custom">
+                                        <option value=""></option>
+
+                                        <?php foreach ($_['categories'] as $id => $category): ?>
+                                            <?php if ($category): ?>
+                                                <option
+                                                    value="<?php echo $id ?>"
+                                                    <?php if (($_['apps-categories-custom'][$app['id']] ?? '') === $id): ?>
+                                                        selected
+                                                    <?php endif; ?>
+                                                ><?php echo $category ?></option>
+                                            <?php endif; ?>
+                                        <?php endforeach; ?>
+                                    </select>
+                                </li>
+                            <?php endforeach; ?>
+                        </ul>
+                    </div>
+
+                    <input type="hidden" class="side-menu-setting" id="apps-categories-custom" name="apps-categories-custom" value="<?php echo htmlentities(json_encode($_['apps-categories-custom'])) ?>">
+                </div>
+            </div>
+
            <div class="side-menu-setting-row">
                <div class="side-menu-setting-label">
                    <?php p($l->t('Customize sorting')); ?>
@@ -767,7 +925,7 @@ $choicesSizes = [
                        🖱️ <?php p($l->t('Show and hide the list of categories')); ?>
                    </a>

-                    <div class="side-menu-setting" data-name="categories" id="categories-list" style="display: none">
+                    <div id="categories-list" style="display: none">
                        <ul class="side-menu-setting-list">
                            <?php foreach ($_['categories'] as $key => $label): ?>
                                <li data-id="<?php echo $key; ?>" class="side-menu-setting-list-item">
@@ -838,11 +996,10 @@ $choicesSizes = [
    <div class="section" id="more">
        <button id="side-menu-save" class="btn btn-info">
            <?php p($l->t('Save')); ?>
+            <progress max="100" value="0" id="side-menu-save-progress"></progress>
        </button>

-        <span id="side-menu-message" class="msg"></span>
-
-        <a href="<?php echo $urlGenerator->linkToRoute('side_menu.AdminSetting.exportConfiguration') ?>" target="_blank">
+        <a href="<?php echo $urlGenerator->linkToRoute('side_menu.AdminSetting.exportConfiguration') ?>" target="_blank" rel="noopener">
            <button class="btn btn-primary" >
                <?php p($l->t('Export the configuration')); ?>
            </button>
@@ -860,7 +1017,7 @@ $choicesSizes = [
            <span for="side-menu-opener">
                <?php p($l->t('You like this app and you want to support me?')); ?>

-                <a style="margin-left: 10px" target="_blank" href="https://www.buymeacoffee.com/deblan">
+                <a style="margin-left: 10px" target="_blank" href="https://www.buymeacoffee.com/deblan" rel="noopener">
                    <button>
                        <?php p($l->t('Buy me a coffee ☕')); ?>
                    </button>
@@ -16,6 +16,7 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

+vendor_script('side_menu', 'html5sortable.min');
 script('side_menu', 'admin');
 style('side_menu', 'admin');

@@ -24,9 +25,9 @@ $choicesYesNo = [
    'Yes' => '1',
 ];

+
+$labelShowHideApps = 'Show and hide the list of applications';
 ?>
-
-
 <div id="side-menu-section">
    <?php if ($_['force']): ?>
        <div class="section">
@@ -44,71 +45,73 @@ $choicesYesNo = [
                <?php p($l->t('Menu')); ?>
            </h2>

-
-
-            <div>
-                <label for="side-menu-enabled">
-                    <?php p($l->t('Enable the custom menu')); ?>
-                </label>
-            </div>
-
            <p>
                <em><?php echo $l->t('Use the shortcut <span class="keyboard-key">Ctrl</span>+<span class="keyboard-key">o</span> to open and to hide the side menu. Use <span class="keyboard-key">tab</span> to navigate.'); ?></em>
            </p>

-            <div>
-                <select id="side-menu-enabled" name="enabled" class="side-menu-setting" data-personal>
-                    <?php foreach ($choicesYesNo as $label => $value): ?>
-                        <option value="<?php echo $value ?>" <?php if ($value === $_['enabled']): ?>selected<?php endif; ?>>
-                            <?php echo $l->t($label); ?>
-                        </option>
-                    <?php endforeach; ?>
-                </select>
-            </div>
-
-            <div>
-                <label for="side-menu-target-blank">
-                    <?php p($l->t('Open apps in new tab')); ?>
-                </label>
-            </div>
-
-            <div>
-                <?php $choices = [
-                    'Use the global setting' => '1',
-                    'Use my selection' => '2',
-                ]; ?>
-
-                <select id="side-menu-loader-enabled" name="target-blank-mode" class="side-menu-setting" data-personal>
-                    <?php foreach ($choices as $label => $value): ?>
-                        <option value="<?php echo $value ?>" <?php if ($value === $_['target-blank-mode']): ?>selected<?php endif; ?>>
-                            <?php echo $l->t($label);  ?>
-                        </option>
-                    <?php endforeach; ?>
-                </select>
-            </div>
-
-            <p>
-                <a class="side-menu-toggler" data-target="#target-blank-apps" href="#_">
-                    🖱️ <?php p($l->t('Show and hide the list of applications')); ?>
-                </a>
-            </p>
-
-            <div class="side-menu-setting" data-name="target-blank-apps" id="target-blank-apps" data-personal data-checkbox style="display: none">
-                <?php foreach ($_['apps'] as $app): ?>
-                    <div>
-                        <input
-                            type="checkbox"
-                            name="target-blank-apps[]"
-                            value="<?php echo $app['id'] ?>"
-                            id="target-blank-app-<?php echo $app['id'] ?>"
-                            <?php if (in_array($app['id'], $_['target-blank-apps'])): ?>checked<?php endif; ?>
-                        />
-
-                        <label for="target-blank-app-<?php echo $app['id'] ?>">
-                            <?php echo p($l->t($app['name'])); ?>
-                        </label>
+            <div class="side-menu-setting-table">
+                <div class="side-menu-setting-row">
+                    <div class="side-menu-setting-label">
+                        <?php p($l->t('Enable the custom menu')); ?>
                    </div>
-                <?php endforeach; ?>
+                    <div class="side-menu-setting-form">
+                        <select id="side-menu-enabled" name="enabled" class="side-menu-setting" data-personal>
+                            <?php foreach ($choicesYesNo as $label => $value): ?>
+                                <option value="<?php echo $value ?>" <?php if ($value === $_['enabled']): ?>selected<?php endif; ?>>
+                                    <?php echo $l->t($label); ?>
+                                </option>
+                            <?php endforeach; ?>
+                        </select>
+                    </div>
+                </div>
+            </div>
+
+            <div class="side-menu-setting-table">
+                <div class="side-menu-setting-row">
+                    <div class="side-menu-setting-label">
+                        <?php p($l->t('Open apps in new tab')); ?>
+                    </div>
+                    <div class="side-menu-setting-form">
+                        <?php $choices = [
+                            'Use the global setting' => '1',
+                            'Use my selection' => '2',
+                        ]; ?>
+
+                        <select id="side-menu-loader-enabled" name="target-blank-mode" class="side-menu-setting" data-personal>
+                            <?php foreach ($choices as $label => $value): ?>
+                                <option value="<?php echo $value ?>" <?php if ($value === $_['target-blank-mode']): ?>selected<?php endif; ?>>
+                                    <?php echo $l->t($label);  ?>
+                                </option>
+                            <?php endforeach; ?>
+                        </select>
+
+                        <p>
+                            <a class="side-menu-toggler" data-target="#target-blank-apps" href="#_">
+                                🖱️ <?php p($l->t($labelShowHideApps)); ?>
+                            </a>
+                        </p>
+
+                        <div class="side-menu-setting" data-name="target-blank-apps" id="target-blank-apps" data-personal data-checkbox style="display: none">
+                            <ul class="side-menu-setting-list">
+                                <?php foreach ($_['apps'] as $app): ?>
+                                    <li class="side-menu-setting-list-item">
+                                        <input
+                                            type="checkbox"
+                                            name="target-blank-apps[]"
+                                            value="<?php echo $app['id'] ?>"
+                                            id="target-blank-app-<?php echo $app['id'] ?>"
+                                            <?php if (in_array($app['id'], $_['target-blank-apps'])): ?>checked<?php endif; ?>
+                                        />
+
+                                        <label for="target-blank-app-<?php echo $app['id'] ?>">
+                                            <?php echo p($l->t($app['name'])); ?>
+                                        </label>
+                                    </li>
+                                <?php endforeach; ?>
+                            </ul>
+                        </div>
+                    </div>
+                </div>
            </div>
        </div>

@@ -116,47 +119,95 @@ $choicesYesNo = [
            <h2>
                <?php p($l->t('Top menu')); ?>
            </h2>
-            <div>
-                <label for="side-menu-top-menu-apps">
-                    <?php p($l->t('Apps that not must be moved in the side menu')); ?>
-                </label>
+
+            <div class="side-menu-setting-table">
+                <div class="side-menu-setting-row">
+                    <div class="side-menu-setting-label">
+                        <?php p($l->t('Apps only visible in the top menu')); ?>
+                        <p>
+                            <em>
+                                <?php p($l->t('If there is no selection then the global configuration is applied.')); ?>
+                            </em>
+                        </p>
+                    </div>
+                    <div class="side-menu-setting-form">
+                        <p>
+                            <a class="side-menu-toggler" data-target="#top-menu-apps" href="#_">
+                                🖱️ <?php p($l->t($labelShowHideApps)); ?>
+                            </a>
+                        </p>
+
+                        <div class="side-menu-setting" data-name="top-menu-apps" data-checkbox data-personal id="top-menu-apps" style="display: none">
+                            <ul class="side-menu-setting-list">
+                                <?php foreach ($_['apps'] as $app): ?>
+                                    <li class="side-menu-setting-list-item">
+                                        <input
+                                            type="checkbox"
+                                            name="top-menu-apps[]"
+                                            value="<?php echo $app['id'] ?>"
+                                            id="top-menu-app-<?php echo $app['id'] ?>"
+                                            <?php if (in_array($app['id'], $_['top-menu-apps'])): ?>checked<?php endif; ?>
+                                        />
+
+                                        <label for="top-menu-app-<?php echo $app['id'] ?>">
+                                            <?php echo $app['name'] ?>
+                                        </label>
+                                    </li>
+                                <?php endforeach; ?>
+                            </ul>
+                        </div>
+                    </div>
+                </div>
            </div>

-            <p>
-                <em>
-                    <?php p($l->t('If there is no selection then the global configuration is applied.')); ?>
-                </em>
-            </p>
-
-            <p>
-                <a class="side-menu-toggler" data-target="#top-menu-apps" href="#_">
-                    🖱️ <?php p($l->t('Show and hide the list of applications')); ?>
-                </a>
-            </p>
-
-            <div class="side-menu-setting" data-name="top-menu-apps" data-checkbox data-personal id="top-menu-apps" style="display: none">
-                <?php foreach ($_['apps'] as $app): ?>
-                    <div>
-                        <input
-                            type="checkbox"
-                            name="top-menu-apps[]"
-                            value="<?php echo $app['id'] ?>"
-                            id="top-menu-app-<?php echo $app['id'] ?>"
-                            <?php if (in_array($app['id'], $_['top-menu-apps'])): ?>checked<?php endif; ?>
-                        />
-
-                        <label for="top-menu-app-<?php echo $app['id'] ?>">
-                            <?php echo $app['name'] ?>
-                        </label>
+            <div class="side-menu-setting-table">
+                <div class="side-menu-setting-row">
+                    <div class="side-menu-setting-label">
+                        <?php p($l->t('Apps visible in the top and side menus')); ?>
+                        <p>
+                            <em>
+                                <?php p($l->t('If there is no selection then the global configuration is applied.')); ?>
+                            </em>
+                        </p>
                    </div>
-                <?php endforeach; ?>
+                    <div class="side-menu-setting-form">
+                        <p>
+                            <a class="side-menu-toggler" data-target="#top-side-menu-apps" href="#_">
+                                🖱️ <?php p($l->t($labelShowHideApps)); ?>
+                            </a>
+                        </p>
+
+                        <div class="side-menu-setting" data-name="top-side-menu-apps" data-checkbox data-personal id="top-side-menu-apps" style="display: none">
+                            <ul class="side-menu-setting-list">
+                                <?php foreach ($_['apps'] as $app): ?>
+                                    <li class="side-menu-setting-list-item">
+                                        <input
+                                            type="checkbox"
+                                            name="top-side-menu-apps[]"
+                                            value="<?php echo $app['id'] ?>"
+                                            id="top-side-menu-app-<?php echo $app['id'] ?>"
+                                            <?php if (in_array($app['id'], $_['top-side-menu-apps'])): ?>checked<?php endif; ?>
+                                        />
+
+                                        <label for="top-side-menu-app-<?php echo $app['id'] ?>">
+                                            <?php echo $app['name'] ?>
+                                        </label>
+                                    </li>
+                                <?php endforeach; ?>
+                            </ul>
+                        </div>
+                    </div>
+                </div>
            </div>
        </div>
    <?php endif ?>

    <div class="section">
        <?php if (!$_['force']): ?>
-            <button id="side-menu-save" class="btn btn-primary"><?php p($l->t('Save')); ?></button>
+            <button id="side-menu-save" class="btn btn-info">
+                <?php p($l->t('Save')); ?>
+                <progress max="100" value="0" id="side-menu-save-progress"></progress>
+            </button>

            <span id="side-menu-message" class="msg"></span>

@@ -167,7 +218,7 @@ $choicesYesNo = [
            <span for="side-menu-opener">
                <?php p($l->t('You like this app and you want to support me?')); ?>

-                <a style="margin-left: 10px" target="_blank" href="https://www.buymeacoffee.com/deblan">
+                <a style="margin-left: 10px" target="_blank" href="https://www.buymeacoffee.com/deblan" rel="noopener">
                    <button>
                        <?php p($l->t('Buy me a coffee ☕')); ?>
                    </button>