Merge branch 'develop'

release v1.28.0
2021-10-21 21:43:51 +02:00 · 2021-10-21 21:43:30 +02:00 · 2021-10-21 21:37:40 +02:00 · 2021-10-21 21:37:32 +02:00 · 2021-10-21 20:06:41 +02:00 · 2021-10-21 20:06:17 +02:00
73 changed files with 6778 additions and 535 deletions
@@ -0,0 +1,16 @@
+---
+name: "New feature"
+about: "Use this template if you want to request a feature"
+title: "[FEATURE] "
+labels:
+  - enhancement
+---
+## Feature
+
+### Description
+
+...
+
+### Benefits
+
+...
@@ -0,0 +1,32 @@
+---
+name: "New issue"
+about: "Use this template if you have a bug"
+title: "[BUG] "
+labels:
+  - bug
+---
+## Issue
+
+### Environment
+
+* Custom menu version: 
+* Nextcloud version: 
+* PHP version: 
+* Web server (Nginx, Apache2): 
+* Web browser and version (Firefox 80, Google Chrome 74, etc): 
+
+```
+Insert your configuration here. You can export the configuration using the admin page.
+```
+
+### Steps to reproduce
+
+...
+
+### Observed Results
+
+...
+
+### Expected Results
+
+...
@@ -1,2 +1,6 @@
 /js
 /node_modules
+/l10n/*
+/releases
+/package-lock.json
+!/l10n/.gitkeep
@@ -0,0 +1,283 @@
+## [Unreleased]
+
+## 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
+
+## 1.25.0
+### Added
+- add compatibility with Nextcloud 22
+- add CHANGELOG.md (fix #59)
+- update app icon
+
+## 1.24.0
+### Added
+- add option to define the background opacity (fix #53)
+- add missing translations
+
+## 1.23.1
+### Fixed
+- fix but wih dark mode opener option
+
+## 1.23.0
+### Added
+- add support of dark Theme and Breeze Dark
+- add support of Nextcloud 21
+
+## 1.22.2
+### Fixed
+- fix regression: apps does not open in new tab (fix #55)
+
+## 1.22.1
+### Fixed
+- fix regression: apps does not open in new tab
+
+## 1.22.0
+### Added
+- Add option to sort categories (fix #53)
+- Update admin UI
+
+## 1.21.0
+### Added
+- [FEATURE] Logo in the menu links to main page of installation (#51)
+
+## 1.20.1
+### Fixed
+- Fix translations
+
+## 1.20.0
+### Added
+- [FEATURE] Ability to remove apps from the Big Menu (#49)
+
+## 1.19.1
+### Fixed
+- fix #47: setting for list/grid view in files app flashes and dissapears
+
+## 1.19.0
+### Added
+- add option: the menu is enabled by default for users (fix #46)
+
+## 1.18.0
+### Added
+- add option to show link to settings (fix #44)
+- refactor menus using several components
+
+## 1.17.0
+### Added
+- compliance with the app checker
+- add an action to export the configuration
+- add an action to purge the cache
+
+## 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)
+
+## 1.16.2
+### Fixed
+- fix issue with personal settings when global settings are forced
+
+## 1.16.1
+### Fixed
+- fix #42: add cache to manage failures to access apps.nextcloud.com
+- fix #41: side menu was hover apps list
+
+## 1.16.0
+### Added
+- add an option to force settings to users (fix #38)
+
+## 1.15.0
+### Changed
+- New name
+### Fixed
+- Fix #36: always displayed is not expanding
+
+## 1.14.0
+### Added
+- add an api accessed by components
+- add a config proxy in controllers
+### Fixed
+- fix translations
+
+## 1.13.0
+### Added
+- add an option to display the avatar instead of the logo (fix #34)
+
+## 1.12.3
+### Added
+- add a delay before moving elements (fix #33)
+
+## 1.12.2
+### Fixed
+- fix #30: `Always displayed` menu can not be close using touchscreens
+
+## 1.12.1
+### Fixed
+- fix typo
+- fix translations
+
+## 1.12.0
+### Fixed
+- fix #30: administrators and users can select what apps must be opened in new tab
+- fix typo
+
+## 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
+
+## 1.10.0
+### Added
+- add images to select the display of the menu
+- add live preview
+- update translations
+- update app info
+
+## 1.9.3
+### Fixed
+- fix regression with logo display
+
+## 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)
+
+## 1.8.6
+### Added
+- add translations: `fr` and `de`
+- improve and publish the `Makefile`
+- update documentation
+
+## 1.8.5
+### Fixed
+- fix #28: menu items invisible after 1.8.4
+
+## 1.8.4
+### Fixed
+- fix #27: disable side menu on public pages - broken in 1.8.3
+
+## 1.8.3
+### Fixed
+- fix alphabetic order of apps (#26)
+
+## 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)
+
+## 1.8.1
+### Fixed
+- fix issue with links
+- fix missing l10n files
+
+## 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
+
+## 1.8.0-rc2
+
+## 1.7.0
+### Added
+- add a loader when the page is unloading
+- add compatibility with Nextcloud 19
+
+## 1.6.3
+### Fixed
+- fix #20: add a shortcut to open and to hide the menu
+
+## 1.6.2
+### Fixed
+- fix #19: add a cache to limit flashes
+
+## 1.6.1
+### Fixed
+- fix #19: add a hack to show external sites in the top menu with navigation
+
+## 1.6.0
+### Added
+- Add a page of personal settings
+- Add an option to disable the side menu as user
+- Refactoring of javascripts
+
+## 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
+
+## 1.4.1
+### Added
+- Rendering  harmonization with browsers
+### Fixed
+- FIX #15: make menu start after icon
+
+## 1.4.0
+### Fixed
+- Fix #12: add an option to hide the opener and the panel when there is no application
+
+## 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
+
+## 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
+
+## 1.3.2
+### Fixed
+- FIX #9: opener icon not visible with multiple apps_paths
+
+## 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)
+
+## 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
+
+## 1.2.4
+### Fixed
+- FIX #7: Opener icon not visible in Safari
+
@@ -1,33 +0,0 @@
-## Feature
-
-### Description
-
-...
-
-### Benefits
-
-...
-
---
-
-## Issue
-
-### Environment
-
-* Side menu version: ...
-* PHP version: ...
-* Web server (Nginx, Apache2): ...
-
-### Steps to reproduce
-
-* ...
-* ...
-* ...
-
-### Observed Results
-
-...
-
-### Expected Results
-
-...
@@ -0,0 +1,24 @@
+npm-build:
+	npm run build
+
+npm-watch:
+	npm run watch
+
+.ONESHELL:
+release: npm-build translations
+	if [ -z "$$VERSION" ]; then
+		echo "VERSION required"
+		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
+	zip -r side_menu_v$$VERSION.zip side_menu
+	tar cvzf side_menu_v$$VERSION.tar.gz side_menu
+	rm -fr side_menu
+	openssl dgst -sha512 -sign $$HOME/.nextcloud/certificates/side_menu.key side_menu_v$$VERSION.tar.gz | openssl base64 > side_menu_v$$VERSION.sig
+
+translations:
+	php bin/generate_l10n.php
@@ -1,46 +1,47 @@
-🤙 Nextcloud app / Side menu 🎨
+🤙 Nextcloud app / Custom menu 🎨
 ===============================

-Side menu allows you to modify the position of the main menu by creating a panel on the left of the interface.
+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.
+
 This application is rather suitable for instances that activate a lot of applications.

-Comptatible with AppOrder.
+You can customize colors depending of the theme (Dark theme and Breeze Dark). Comptatible with AppOrder.

-Installation
+* [Installation and upgrade](#installation-and-upgrade)
+* [How to contribute?](#how-to-contribute)
+* [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)
+
+Requirements
 ------------

-Side menu is availabe from the app store.
+* PHP >= 7.3
+* App `theming` enabled

-If you want to install it from source: go to https://gitnet.fr/deblan/side_menu/releases and download the last release (side_menu_vX.Y.Z.zip).
+Installation and upgrade
+------------------------

-Copy the archive to your Nextcloud server.
+Custom menu is available from the app store.
+
+```
+$ cd /path/to/nextcloud
+$ php occ app:install side_menu
+```
+
+If you want to install it from source, go to https://gitnet.fr/deblan/side_menu/releases and copy the link to the last release (side_menu_vX.Y.Z.tar.gz). Then:

 ```
 $ cd /path/to/nextcloud/apps
-$ unzip -d side_menu /path/to/side_menu_vX.Y.Z.zip
+$ curl -sS https://gitnet.fr/attachments/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx | tar xvfz -
 ```

-Upgrade
-------
+Administrators can edit many settings using the administration page.

-Side menu can be upgraded from the app store.
-
-If you want to install it from source: go to https://gitnet.fr/deblan/side_menu/releases and download the last release (side_menu_vX.Y.Z.zip).
-
-Copy the archive to your Nextcloud server.
-
-```
-$ cd /path/to/nextcloud/apps
-$ rm -frv side_menu
-$ unzip -d side_menu /path/to/side_menu_vX.Y.Z.zip
-```
-
-![](https://upload.deblan.org/u/2020-03/5e7fab2b.jpg)
-
-![](https://upload.deblan.org/u/2020-03/5e81b219.jpg)
-
-![](https://upload.deblan.org/u/2020-04/5ea68025.png)
+Users can disable the menu using the page of personal settings.

+Use the shortcut `Ctrl`+`o` to open and to hide the side menu. Use `tab` to navigate.

 How to contribute?
 ------------------
@@ -54,6 +55,6 @@ If you are a developer:
 * go to `apps/` and clone your repository
 * go to `apps/side_menu` and run `npm install`

-Build javascripts using `webpack --config ./webpack.js` (add `-w` to build them in real time).
+Build javascripts using `make npm-build` (or `make npm-watch` to build them in real time).

 Then commit and create a pull request.
@@ -1,62 +1,10 @@
 <?php

-/**
- * @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/>.
- */
+use OCA\SideMenu\AppInfo\Application;

-namespace OCA\SideMenu\Appinfo;
+$app = new Application();

-use OC\Security\CSP\ContentSecurityPolicy;
-use OCP\Util;
-
-$config = \OC::$server->getConfig();
-$cspnm = \OC::$server->getContentSecurityPolicyNonceManager();
-
-
-Util::addScript('side_menu', 'sideMenu');
-Util::addStyle('side_menu', 'sideMenu');
-
-$stylesheet = \OC::$server->getURLGenerator()->linkToRoute(
-    'side_menu.Css.stylesheet',
-    [
-        'v' => $config->getAppValue('side_menu', 'cache', '0'),
-    ]
-);
-
-$script = \OC::$server->getURLGenerator()->linkToRoute(
-    'side_menu.Js.script',
-    [
-        'v' => $config->getAppValue('side_menu', 'cache', '0'),
-    ]
-);
-
-Util::addHeader(
-    'link',
-    [
-        'href' => $stylesheet,
-        'rel' => 'stylesheet'
-    ],
-    ''
-);
-
-Util::addHeader(
-    'script',
-    [
-        'src' => $script,
-		'nonce' => $cspnm->getNonce(),
-    ],
-    ''
-);
+if ($app->isEnabled()) {
+    $app->registerAssets();
+    $app->registerServices();
+}
@@ -1,32 +1,58 @@
 <?xml version="1.0"?>
-<info>
+<info xmlns:xsi= "http://www.w3.org/2001/XMLSchema-instance"
+      xsi:noNamespaceSchemaLocation="https://apps.nextcloud.com/schema/apps/info.xsd">
    <id>side_menu</id>
-    <name>Side menu</name>
-    <summary>Move the top menu to the left side.</summary>
-    <description><![CDATA[Side menu allows you to modify the position of the main menu by creating a panel on the left of the interface.
+    <name>Custom menu</name>
+    <summary>Modify the display of the menu.</summary>
+    <description><![CDATA[Custom menu 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.
+
 This application is rather suitable for instances that activate a lot of applications.

-Comptatible with AppOrder.
+Use the shortcut `Ctrl`+`o` to open and to hide the side menu. Use `tab` to navigate.

-You can report a bug or request a feature by opening an issue
+You can customize colors depending of the theme (Dark theme and Breeze Dark). Comptatible with AppOrder.

+You can report a bug or request a feature by opening an issue.
+
+Requirements:
+
+* PHP >= 7.3
+* App `theming` enabled
+
+If you like this application and if you want to support the development:
+
+* [Buy me a coffee](https://www.buymeacoffee.com/deblan)
+* [Donate with liberapay](https://liberapay.com/deblan)
+* [Leave a comment](https://apps.nextcloud.com/apps/side_menu#comments)
 ]]></description>
+    <version>1.28.0</version>
    <licence>agpl</licence>
-    <author mail="dev+sidemenu@deblan.fr" homepage="https://www.deblan.io/">Simon Vieille</author>
-    <version>1.3.4</version>
+    <author mail="contact@deblan.fr" homepage="https://www.deblan.io/">Simon Vieille</author>
    <namespace>SideMenu</namespace>
+    <documentation>
+        <admin>https://gitnet.fr/deblan/side_menu/src/branch/master/README.md</admin>
+        <developer>https://gitnet.fr/deblan/side_menu/src/branch/master/README.md</developer>
+    </documentation>
    <category>customization</category>
    <website>https://gitnet.fr/deblan/side_menu</website>
+    <discussion>https://matrix.to/#/!TFPucDATKODpHNVAtu:neutralnetwork.org?via=neutralnetwork.org</discussion>
    <bugs>https://gitnet.fr/deblan/side_menu/issues</bugs>
    <repository type="git">https://gitnet.fr/deblan/side_menu</repository>
-    <screenshot>https://upload.deblan.org/u/2020-03/5e7fab2b.jpg</screenshot>
-    <screenshot>https://upload.deblan.org/u/2020-03/5e81b219.jpg</screenshot>
-    <screenshot>https://upload.deblan.org/u/2020-04/5ea68025.png</screenshot>
+    <screenshot>https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/nc19_default_menu.png</screenshot>
+    <screenshot>https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/admin_settings.png</screenshot>
+    <screenshot>https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/n19_big_menu.png</screenshot>
+    <screenshot>https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/nc18_menu_always_displayed.png</screenshot>
+    <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="18"/>
+        <nextcloud min-version="18" max-version="22"/>
+        <php min-version="7.3"/>
    </dependencies>
-	<settings>
-		<admin>OCA\SideMenu\Settings\Admin</admin>
-		<admin-section>OCA\SideMenu\Settings\Section</admin-section>
-	</settings>
+    <settings>
+        <admin>OCA\SideMenu\Settings\Admin</admin>
+        <admin-section>OCA\SideMenu\Settings\AdminSection</admin-section>
+        <personal>OCA\SideMenu\Settings\Personal</personal>
+        <personal-section>OCA\SideMenu\Settings\PersonalSection</personal-section>
+    </settings>
 </info>
@@ -19,7 +19,12 @@

 return [
    'routes' => [
-		['name' => 'Css#stylesheet', 'url' => '/css/stylesheet', 'verb' => 'GET'],
-		['name' => 'Js#script', 'url' => '/js/script', 'verb' => 'GET'],
+        ['name' => 'Css#stylesheet', 'url' => '/css/stylesheet', 'verb' => 'GET'],
+        ['name' => 'Js#script', 'url' => '/js/script', 'verb' => 'GET'],
+        ['name' => 'Js#config', 'url' => '/js/config', 'verb' => 'GET'],
+        ['name' => 'Nav#items', 'url' => '/nav/items', 'verb' => 'GET'],
+        ['name' => 'PersonalSetting#valueSet', 'url' => '/personalSetting/valueSet', 'verb' => 'POST'],
+        ['name' => 'AdminSetting#removeCache', 'url' => '/admin/cache/remove', 'verb' => 'GET'],
+        ['name' => 'AdminSetting#exportConfiguration', 'url' => '/admin/config/export', 'verb' => 'GET'],
    ],
 ];
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Generates l10n files using Yaml.
+ *
+ * Usage:
+ *   php bin/generate_l10n.php
+ */
+
+function generateJsContent($translations)
+{
+    $json = json_encode($translations, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE);
+
+    return <<< EOF
+OC.L10N.register("side_menu", {$json}, "nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;");
+EOF;
+}
+
+function generateJsonContent($translations)
+{
+    $datas = [
+        'translations' => $translations,
+        'pluralForm' => 'nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;',
+    ];
+
+    return json_encode(
+        $datas,
+        JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE
+    );
+}
+
+chdir(__DIR__.'/../');
+
+foreach (glob('src/l10n/fixtures/*.yaml') as $file) {
+    $lang = str_replace('.yaml', '', basename($file));
+    $translations = yaml_parse(file_get_contents($file));
+
+    file_put_contents('l10n/'.$lang.'.js', generateJsContent($translations));
+    file_put_contents('l10n/'.$lang.'.json', generateJsonContent($translations));
+}
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Imports a json configuration into a sqlite database.
+ *
+ * Usage:
+ *   php bin/import_config.php /path/to/config.json /path/to/owncloud.db
+ */
+
+$configFile = $argv[1];
+$databaseFile = $argv[2];
+
+$content = file_get_contents($configFile);
+$config = json_decode($content, true);
+
+$pdo = new \Pdo(sprintf('sqlite:%s', $databaseFile));
+$stmt = $pdo->prepare('UPDATE oc_appconfig SET configvalue=:value WHERE configkey=:key and appid=:appId');
+
+foreach ($config as $key => $value) {
+    $stmt->execute([
+        'appId' => 'side_menu',
+        'key' => $key,
+        'value' => $value,
+    ]);
+}
@@ -20,6 +20,102 @@
    margin: 10px 0 10px 0;
 }

+#side-menu-section input[type="checkbox"] {
+    vertical-align: middle;
+}
+
+#side-menu-section input[type="range"] {
+    vertical-align: middle;
+}
+
 #side-menu-section select {
    margin: 10px 0 10px 0;
 }
+
+.keyboard-key {
+    padding: 1px 9px;
+    margin: 0 2px;
+    background: #eee;
+    border: 1px solid #aaa;
+    color: #555;
+    border-radius: 3px;
+}
+
+.side-menu-display {
+    padding: 10px;
+    border: 2px solid transparent;
+    max-width: 100%;
+    cursor: pointer;
+}
+
+.side-menu-display.is-active {
+    border: 2px solid #91cb7f;
+}
+
+.info {
+    margin-top: 8px;
+    padding: 5px;
+    background: #91cb7f;
+    color: #fff;
+    border-radius: var(--border-radius);
+}
+
+#side-menu-section h2 small {
+    font-size: 11px;
+    font-weight: normal;
+}
+
+.side-menu-toggler {
+    cursor: pointer;
+}
+
+.side-menu-setting-list {
+    margin: 10px 4px 4px 0px;
+}
+
+.side-menu-setting-list-item {
+    padding: 5px 10px;
+    border: 1px solid var(--color-border-dark);
+    max-width: 300px;
+    margin: -1px 0 0 0;
+    cursor: pointer;
+}
+
+.side-menu-setting.arrow {
+    color: #ccc;
+    padding-right: 5px;
+}
+
+.side-menu-setting-list-item input {
+    min-height: auto;
+    margin-top: -1px;
+}
+
+
+.side-menu-setting-table {
+    display: table;
+    width: 100%;
+}
+
+.side-menu-setting-row {
+    display: table;
+}
+
+.side-menu-setting-label {
+    display: table-cell;
+    width: 400px;
+    padding-right: 20px;
+}
+
+.side-menu-setting-form {
+    display: table-cell;
+    width: 300px;
+}
+
+.side-menu-setting-label-short {
+    width: 300px;
+}
+
+.side-menu-setting-form-long {
+    width: 400px;
+}
@@ -15,10 +15,6 @@
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

-#appmenu, #appmenu + nav {
-    display: none;
-}
-
 #side-menu {
    position: fixed;
    top: 0;
@@ -41,6 +37,34 @@
    margin-left: 5px;
 }

+.side-menu-settings {
+    margin-right: 9px;
+    margin-top: 2px;
+    float: right;
+    line-height: 34px;
+    height: 28px;
+    display: none;
+}
+
+.side-menu-settings a {
+    color: var(--side-menu-text-color, #fff);
+    display: block;
+    padding: 4px 7px;
+}
+
+.side-menu-settings:hover a, .side-menu-settings a:active, .side-menu-settings a:focus {
+    background: var(--side-menu-current-app-background-color, #444);
+}
+
+.side-menu-settings img {
+    vertical-align: bottom;
+    margin-left: 3px;
+}
+
+#side-menu.open .side-menu-settings {
+    display: block;
+}
+
 .side-menu-opener {
    background: var(--side-menu-opener, url('../img/side-menu-opener.svg'));
    height: 40px;
@@ -49,10 +73,15 @@
    border: 0;
 }

-#side-menu.hide-opener .side-menu-opener {
+.side-menu-closer {
+    background: url('../img/side-menu-opener-closer.svg');
    display: none;
 }

+#side-menu.hide-opener .side-menu-opener, .side-menu-opener.hide, #side-menu.hide {
+    display: none !important;
+}
+
 .side-menu-apps-list {
    height: calc(100vh - 150px);
    z-index: 2200;
@@ -65,9 +94,19 @@

 .side-menu-app-icon {
    width: 20px;
-    vertical-align: middle;
+    vertical-align: top;
    margin-right: 10px;
-    padding-top: 3px;
+    filter: invert(var(--side-menu-icon-invert-filter, 0%));
+    opacity: var(--side-menu-icon-opacity, 1);
+}
+
+.side-menu-app-icon svg {
+    vertical-align: middle;
+    margin-top: -3px;
+}
+
+.side-menu-app-icon .app-icon-notification {
+    display: none;
 }

 .side-menu-app a {
@@ -80,7 +119,7 @@
    white-space: nowrap;
 }

-.side-menu-app a:hover, .side-menu-app.active a {
+.side-menu-app a:hover, .side-menu-app.active, .side-menu-app a:focus {
    background: var(--side-menu-current-app-background-color, #444);
 }

@@ -107,3 +146,172 @@
 #side-menu.hide-opener .side-menu-logo {
    margin-top: 20px;
 }
+
+#side-menu-loader {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    z-index: 3001;
+}
+
+#side-menu-loader-bar {
+    height: 4px;
+    background: var(--side-menu-loader-color, #0e75ac);
+    width: 0;
+    transition-property: width;
+}
+
+#side-menu.side-menu-big, #side-menu.side-menu-with-categories {
+    max-width: 100%;
+    height: auto;
+}
+
+.side-menu-big .side-menu-header, .side-menu-with-categories .side-menu-header {
+    height: auto;
+}
+
+.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-with-categories .side-menu-app a {
+    padding: 7px 0 7px 7px;
+}
+
+.side-menu-categories-wrapper {
+    padding-bottom: 70px;
+}
+
+.side-menu-categories {
+    max-height: calc(100vh - 50px);
+    overflow: auto;
+    position: relative;
+    top: 50px;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: center;
+    padding: 0 10% 0 10%;
+}
+
+.side-menu-category {
+    padding: 10px 20px;
+    flex: 1 1 auto;
+}
+
+.side-menu-category-title {
+    padding-left: 10px;
+    color: var(--side-menu-text-color, #fff);
+}
+
+.side-menu-loader {
+    text-align: center;
+}
+
+.side-menu-loader svg {
+    width: 38px;
+    margin: auto;
+    stroke: var(--side-menu-text-color, #fff);
+}
+
+.side-menu-with-categories .side-menu-app-icon, .side-menu-big .side-menu-app-icon {
+    vertical-align: middle;
+    margin-top: -2px;
+}
+
+.side-menu-always-displayed #header,
+.side-menu-always-displayed body {
+    width: calc(100% - 50px) !important;
+}
+
+.side-menu-always-displayed body {
+    position: absolute;
+    left: 50px;
+}
+
+.side-menu-always-displayed #side-menu {
+    display: block;
+}
+
+.side-menu-always-displayed .side-menu-apps-list {
+    height: calc(100vh - 49px);
+    top: 49px;
+}
+
+.side-menu-always-displayed #side-menu,
+.side-menu-always-displayed .side-menu-header,
+.side-menu-always-displayed .side-menu-apps-list {
+    width: 50px;
+}
+
+.side-menu-always-displayed #side-menu .side-menu-app-text,
+.side-menu-always-displayed #header .side-menu-opener,
+.side-menu-always-displayed .side-menu-logo {
+    display: none;
+}
+
+.side-menu-always-displayed #side-menu .side-menu-header {
+    height: 49px;
+}
+
+.side-menu-always-displayed #side-menu.open,
+.side-menu-always-displayed #side-menu.open .side-menu-apps-list,
+.side-menu-always-displayed #side-menu.open .side-menu-header {
+    width: 100%;
+}
+
+.side-menu-always-displayed #side-menu.open .side-menu-app-text {
+    display: inline;
+}
+
+.side-menu-always-displayed .app-navigation--close {
+    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;
+}
+
+@media screen and (max-width: 1024px) {
+    #side-menu.side-menu-big {
+        max-width: 290px;
+    }
+
+    .side-menu-categories {
+        display: block;
+        padding: 0;
+    }
+
+    .side-menu-category {
+        padding: 10px 0;
+    }
+
+    #side-menu.side-menu-big {
+        height: 100vh;
+    }
+}
+
+@media screen and (min-width: 1024px) {
+    .side-menu-closer {
+        display: block;
+        float: right;
+        margin-right: 9px;
+    }
+
+    .side-menu-big .side-menu-header {
+        max-width: 100%;
+    }
+}
@@ -0,0 +1,27 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="571.907" height="156.921" viewBox="0 0 151.317 41.519">
+  <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.71v41.16H.18z"/>
+  <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.71v5.062H.18z"/>
+  <path style="marker:none" color="#000" overflow="visible" fill="#4d4d4d" stroke="#b3b3b3" stroke-width=".359" stroke-linecap="square" paint-order="fill markers stroke" d="M.18.18h6.128v41.16H.18z"/>
+  <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.496 1.034h3.496V4.39H1.496z"/>
+  <path style="marker:none" color="#000" overflow="visible" fill="#e6e6e6" stroke="#ccc" stroke-width=".359" stroke-linecap="square" paint-order="fill markers stroke" d="M2.297 7.455H4.19v1.81H2.297zM2.297 10.997H4.19v1.81H2.297zM2.297 14.404H4.19v1.81H2.297zM2.297 17.946H4.19v1.81H2.297zM2.297 21.353H4.19v1.81H2.297zM2.297 24.895H4.19v1.81H2.297zM2.297 28.302H4.19v1.81H2.297zM2.297 31.844H4.19v1.81H2.297zM7.136 1.034h6.102V4.39H7.136z"/>
+  <g fill="#b3b3b3" stroke="#ccc" fill-rule="evenodd" stroke-width="1.465" stroke-linecap="round">
+    <path d="M24.44 21.35l5.056-5.056M23.3 29.835l18.15-18.151M36.267 25.225l3.585-3.586"/>
+  </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="M62.865.18h58.532v41.16H62.865z"/>
+  <path style="marker:none" color="#000" overflow="visible" fill="#f9f9f9" stroke="#ccc" stroke-width=".359" stroke-linecap="square" paint-order="fill markers stroke" d="M62.865.18h58.532v5.062H62.865z"/>
+  <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.865.18h58.532v41.16H62.865z"/>
+  <g fill="#b3b3b3" stroke="#ccc" fill-rule="evenodd" stroke-width="1.465" stroke-linecap="round">
+    <path d="M84.197 21.35l5.055-5.056M83.056 29.835l18.152-18.151M96.024 25.225l3.585-3.586"/>
+  </g>
+  <g color="#000" stroke-width=".359" stroke-linecap="square">
+    <path style="marker:none" overflow="visible" fill="#4d4d4d" stroke="#b3b3b3" paint-order="fill markers stroke" d="M62.866.18h20.829v41.16h-20.83z"/>
+    <path style="marker:none" overflow="visible" fill="#666" stroke="#ccc" paint-order="fill markers stroke" d="M64.044 1.034h3.496V4.39h-3.496z"/>
+    <path style="marker:none" overflow="visible" fill="#e6e6e6" stroke="#ccc" paint-order="fill markers stroke" d="M64.578 8.076h1.893v1.81h-1.893zM67.507 8.407H79.97v1.148H67.507zM64.578 11.617h1.893v1.81h-1.893zM67.507 11.948h10.592v1.148H67.507zM64.578 15.025h1.893v1.81h-1.893zM67.507 15.356h12.997v1.148H67.507zM64.578 18.566h1.893v1.81h-1.893zM67.507 18.897h7.585v1.148h-7.585zM64.578 21.974h1.893v1.81h-1.893zM67.507 22.305h11.46v1.148h-11.46zM64.578 25.515h1.893v1.81h-1.893zM67.507 25.846h9.322v1.148h-9.322zM64.578 28.923h1.893v1.81h-1.893zM67.507 29.254h11.126v1.148H67.507zM64.578 32.464h1.893v1.81h-1.893zM67.507 32.795H80.37v1.148H67.507z"/>
+  </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.856.18h25.281v41.16h-25.28z"/>
+  <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.856.18h25.257v5.062h-25.257z"/>
+  <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.856.18h25.257v41.16h-25.257z"/>
+  <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.856.18h20.83v41.16h-20.83z"/>
+  <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"/>
+  <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.568 8.076h1.893v1.81h-1.893zM130.497 8.407h12.463v1.148h-12.463zM127.568 11.617h1.893v1.81h-1.893zM130.497 11.948h10.592v1.148h-10.592zM127.568 15.025h1.893v1.81h-1.893zM130.497 15.356h12.997v1.148h-12.997zM127.568 18.566h1.893v1.81h-1.893zM130.497 18.897h7.585v1.148h-7.585zM127.568 21.974h1.893v1.81h-1.893zM130.497 22.305h11.46v1.148h-11.46zM127.568 25.515h1.893v1.81h-1.893zM130.497 25.846h9.322v1.148h-9.322zM127.568 28.923h1.893v1.81h-1.893zM130.497 29.254h11.126v1.148h-11.126zM127.568 32.464h1.893v1.81h-1.893zM130.497 32.795h12.863v1.148h-12.863z"/>
+</svg>
@@ -0,0 +1,30 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="571.907" height="156.921" viewBox="0 0 151.317 41.519">
+  <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"/>
+  <g fill="#b3b3b3" stroke="#ccc" fill-rule="evenodd" stroke-width="1.465" stroke-linecap="round">
+    <path d="M84.066 21.35l5.055-5.056M82.925 29.835l18.152-18.151M95.893 25.225l3.585-3.586"/>
+  </g>
+  <path style="marker:none" color="#000" overflow="visible" fill="#4d4d4d" stroke="#b3b3b3" stroke-width=".359" stroke-linecap="square" paint-order="fill markers stroke" d="M62.735.18h58.532v25.123H62.735z"/>
+  <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"/>
+  <path style="marker:none" color="#000" overflow="visible" fill="#666" stroke="#ccc" stroke-width=".359" stroke-linecap="square" paint-order="fill markers stroke" d="M63.738 1.034h3.496V4.39h-3.496z"/>
+  <g stroke-width=".401" color="#000" fill="#e6e6e6" stroke="#ccc" stroke-linecap="square">
+    <path style="marker:none" overflow="visible" paint-order="fill markers stroke" d="M38.862 110.138h1.893v1.81h-1.893zM41.792 110.469h12.463v1.148H41.792zM38.862 113.679h1.893v1.81h-1.893zM41.792 114.01h10.592v1.148H41.792zM38.862 117.087h1.893v1.81h-1.893zM41.792 117.418h12.997v1.148H41.792zM38.862 120.628h1.893v1.81h-1.893zM41.792 120.959h7.585v1.148h-7.585z" transform="matrix(.89632 0 0 .8943 38.412 -87.8)"/>
+  </g>
+  <g stroke-width=".401" color="#000" fill="#e6e6e6" stroke="#ccc" stroke-linecap="square">
+    <path style="marker:none" overflow="visible" paint-order="fill markers stroke" d="M65.723 110.272h1.893v1.81h-1.893zM68.652 110.602h11.46v1.148h-11.46zM65.723 113.813h1.893v1.81h-1.893zM68.652 114.144h9.322v1.148h-9.322zM65.723 117.221h1.893v1.81h-1.893zM68.652 117.551h11.126v1.148H68.652zM65.723 120.762h1.893v1.81h-1.893zM68.652 121.093h12.863v1.148H68.652z" transform="matrix(.89632 0 0 .8943 34.262 -87.919)"/>
+  </g>
+  <path style="marker:none" color="#000" overflow="visible" fill="#666" stroke="#ccc" stroke-width=".359" stroke-linecap="square" paint-order="fill markers stroke" d="M116.257 1.034h3.496V4.39h-3.496z"/>
+  <path style="marker:none" color="#000" overflow="visible" fill="#e6e6e6" stroke="#ccc" stroke-width=".359" stroke-linecap="square" paint-order="fill markers stroke" d="M72.715 6.186h11.518v1.148H72.715zM92.452 6.186h9.344v1.148h-9.344z"/>
+  <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"/>
+  <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"/>
+  <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"/>
+  <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"/>
+  <g fill="#b3b3b3" stroke="#ccc" fill-rule="evenodd" stroke-width="1.465" stroke-linecap="round">
+    <path d="M21.51 21.35l5.056-5.056M20.37 29.835L38.52 11.684M33.337 25.225l3.586-3.586"/>
+  </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"/>
+  <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"/>
+  <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"/>
+  <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"/>
+  <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"/>
+  <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"/>
+</svg>
@@ -0,0 +1,24 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="571.907" height="156.921" viewBox="0 0 151.317 41.519">
+  <path style="marker:none" color="#000" overflow="visible" fill="#fff" stroke="#b3b3b3" stroke-width=".359" stroke-linecap="square" paint-order="fill markers stroke" d="M62.735.18h58.532v41.16H62.735zM.18.18h58.532v41.16H.18z"/>
+  <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"/>
+  <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"/>
+  <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"/>
+  <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"/>
+  <g fill="#b3b3b3" stroke="#ccc" fill-rule="evenodd" stroke-width="1.465" stroke-linecap="round">
+    <path d="M21.51 21.35l5.056-5.056M20.37 29.835L38.52 11.684M33.337 25.225l3.586-3.586"/>
+  </g>
+  <path style="marker:none" color="#000" overflow="visible" fill="#f9f9f9" stroke="#ccc" stroke-width=".359" stroke-linecap="square" paint-order="fill markers stroke" d="M62.735.18h58.532v5.063H62.735z"/>
+  <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"/>
+  <g fill="#b3b3b3" stroke="#ccc" fill-rule="evenodd" stroke-width="1.465" stroke-linecap="round">
+    <path d="M84.066 21.35l5.055-5.056M82.925 29.835l18.152-18.151M95.893 25.225l3.585-3.586"/>
+  </g>
+  <path style="marker:none" color="#000" overflow="visible" fill="#4d4d4d" stroke="#b3b3b3" stroke-width=".359" stroke-linecap="square" paint-order="fill markers stroke" d="M62.735.18h20.829v41.16h-20.83z"/>
+  <path style="marker:none" color="#000" overflow="visible" fill="#666" stroke="#ccc" stroke-width=".359" stroke-linecap="square" paint-order="fill markers stroke" d="M63.912 1.034h3.496V4.39h-3.496z"/>
+  <path style="marker:none" color="#000" overflow="visible" fill="#e6e6e6" stroke="#ccc" stroke-width=".359" stroke-linecap="square" paint-order="fill markers stroke" d="M64.447 8.076h1.893v1.81h-1.893zM67.376 8.407h12.463v1.148H67.376zM64.447 11.617h1.893v1.81h-1.893zM67.376 11.948h10.592v1.148H67.376zM64.447 15.025h1.893v1.81h-1.893zM67.376 15.356h12.997v1.148H67.376zM64.447 18.566h1.893v1.81h-1.893zM67.376 18.897h7.585v1.148h-7.585zM64.447 21.974h1.893v1.81h-1.893zM67.376 22.305h11.46v1.148h-11.46zM64.447 25.515h1.893v1.81h-1.893zM67.376 25.846h9.322v1.148h-9.322zM64.447 28.923h1.893v1.81h-1.893zM67.376 29.254h11.126v1.148H67.376zM64.447 32.464h1.893v1.81h-1.893zM67.376 32.795h12.863v1.148H67.376z"/>
+  <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"/>
+  <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"/>
+  <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"/>
+  <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"/>
+  <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"/>
+  <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 8.076h1.893v1.81h-1.893zM130.498 8.407h12.463v1.148h-12.463zM127.569 11.617h1.893v1.81h-1.893zM130.498 11.948h10.592v1.148h-10.592zM127.569 15.025h1.893v1.81h-1.893zM130.498 15.356h12.997v1.148h-12.997zM127.569 18.566h1.893v1.81h-1.893zM130.498 18.897h7.585v1.148h-7.585zM127.569 21.974h1.893v1.81h-1.893zM130.498 22.305h11.46v1.148h-11.46zM127.569 25.515h1.893v1.81h-1.893zM130.498 25.846h9.322v1.148h-9.322zM127.569 28.923h1.893v1.81h-1.893zM130.498 29.254h11.126v1.148h-11.126zM127.569 32.464h1.893v1.81h-1.893zM130.498 32.795h12.863v1.148h-12.863z"/>
+</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>
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="145.889" height="145.889" viewBox="0 0 38.6 38.6"><g transform="translate(-59.172 -91.92)" stroke="#000" fill="none"><path d="M66.595 111.162h9.997M66.595 103.805h11.4m-11.4 14.714h11.4" stroke-width="3.165"/><rect width="34.535" height="34.535" x="61.205" y="93.952" overflow="visible" rx="5.481" ry="5.481" style="marker:none" color="#000" stroke-width="4.065" stroke-linecap="round" paint-order="fill markers stroke"/></g></svg>
@@ -0,0 +1,17 @@
+<!-- By Sam Herbert (@sherb), for everyone. More @ http://goo.gl/7AJzbL -->
+<svg width="38" height="38" viewBox="0 0 38 38" xmlns="http://www.w3.org/2000/svg" stroke="#fff">
+    <g fill="none" fill-rule="evenodd">
+        <g transform="translate(1 1)" stroke-width="2">
+            <circle stroke-opacity=".5" cx="18" cy="18" r="18"/>
+            <path d="M36 18c0-9.94-8.06-18-18-18">
+                <animateTransform
+                    attributeName="transform"
+                    type="rotate"
+                    from="0 18 18"
+                    to="360 18 18"
+                    dur="1s"
+                    repeatCount="indefinite"/>
+            </path>
+        </g>
+    </g>
+</svg>
@@ -0,0 +1,6 @@
+<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>
@@ -0,0 +1,173 @@
+<?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>
@@ -0,0 +1,102 @@
+<?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>
@@ -1,6 +1,101 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 10.583 10.583">
-  <rect overflow="visible" style="marker:none" 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"/>
-  <rect overflow="visible" style="marker:none" 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"/>
-  <rect overflow="visible" style="marker:none" 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"/>
-  <path style="marker:none" 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"/>
+<?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>
@@ -0,0 +1,92 @@
+<?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>
@@ -1,7 +1,91 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 10.583 10.583">
-  <g color="#000" fill="#fff" fill-opacity=".855" transform="translate(0 -286.417)">
-    <rect ry=".545" rx="0" y="288.816" x="2.516" height="1.451" width="5.551" style="marker:none" overflow="visible" paint-order="stroke markers fill"/>
-    <rect ry=".545" rx="0" y="290.973" x="2.516" height="1.451" width="5.551" style="marker:none" overflow="visible" paint-order="stroke markers fill"/>
-    <rect ry=".545" rx="0" y="293.15" x="2.516" height="1.451" width="5.551" style="marker:none" overflow="visible" paint-order="stroke markers fill"/>
+<?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>
@@ -1,19 +1,172 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 10.583 10.583">
-  <g transform="translate(.3 -286.074)" fill="#fff" color="#000" fill-opacity=".855">
-    <rect ry="0" rx="0" y="288.474" x="4.266" height="1.451" width="1.451" style="marker:none" overflow="visible" paint-order="stroke markers fill"/>
-    <g transform="translate(-.13)">
-      <rect style="marker:none" width="1.451" height="1.451" x="6.445" y="288.474" rx="0" ry="0" overflow="visible" paint-order="stroke markers fill"/>
-      <rect style="marker:none" width="1.451" height="1.451" x="2.345" y="288.474" rx="0" ry="0" overflow="visible" paint-order="stroke markers fill"/>
+<?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" overflow="visible" paint-order="stroke markers fill"/>
-    <g transform="translate(-.13 2.157)">
-      <rect style="marker:none" width="1.451" height="1.451" x="6.445" y="288.474" rx="0" ry="0" overflow="visible" paint-order="stroke markers fill"/>
-      <rect style="marker:none" width="1.451" height="1.451" x="2.345" y="288.474" rx="0" ry="0" overflow="visible" paint-order="stroke markers fill"/>
+    <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" overflow="visible" paint-order="stroke markers fill"/>
-    <g transform="translate(-.13 4.334)">
-      <rect style="marker:none" width="1.451" height="1.451" x="6.445" y="288.474" rx="0" ry="0" overflow="visible" paint-order="stroke markers fill"/>
-      <rect style="marker:none" width="1.451" height="1.451" x="2.345" y="288.474" rx="0" ry="0" overflow="visible" paint-order="stroke markers fill"/>
+    <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>
@@ -0,0 +1,137 @@
+<?php
+
+namespace OCA\SideMenu\AppInfo;
+
+use OC;
+use OC\Security\CSP\ContentSecurityPolicyNonceManager;
+use OC\User\User;
+use OCA\SideMenu\Service\AppRepository;
+use OCA\SideMenu\Service\CategoryRepository;
+use OCA\SideMenu\Service\ConfigProxy;
+use OCP\AppFramework\App;
+use OCP\IUserSession;
+use OCP\Util;
+use Psr\Container\ContainerInterface;
+
+/**
+ * class Application.
+ *
+ * @author Simon Vieille <simon@deblan.fr>
+ */
+class Application extends App
+{
+    public const APP_ID = 'side_menu';
+
+    public const APP_NAME = 'Custom menu';
+    /**
+     * @var OC\AllConfig
+     */
+    protected $config;
+
+    /**
+     * @var ContentSecurityPolicyNonceManager
+     */
+    protected $cspnm;
+
+    /**
+     * @var User
+     */
+    protected $user;
+
+    /**
+     * {@inheritdoc}
+     */
+    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
+    {
+        $enabled = true;
+        $isForced = (bool) $this->config->getAppValue(self::APP_ID, 'force', '0');
+
+        if (null !== $this->user && !$isForced) {
+            $enabled = (bool) $this->config->getUserValue(
+                $this->user->getUid(),
+                self::APP_ID,
+                'enabled',
+                $this->config->getAppValue(
+                    self::APP_ID,
+                    'default-enabled',
+                    '1'
+                )
+            );
+        }
+
+        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()
+    {
+        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',
+            ],
+            ''
+        );
+
+        Util::addHeader(
+            'script',
+            [
+                'src' => $script,
+                'nonce' => $this->cspnm->getNonce(),
+            ],
+            ''
+        );
+    }
+}
@@ -0,0 +1,92 @@
+<?php
+/**
+ * @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/>.
+ */
+
+namespace OCA\SideMenu\Controller;
+
+use OCA\SideMenu\AppInfo\Application;
+use OCP\AppFramework\Controller;
+use OCP\AppFramework\Http\DataDownloadResponse;
+use OCP\AppFramework\Http\RedirectResponse;
+use OCP\AppFramework\Http\Response;
+use OCP\IConfig;
+use OCP\IRequest;
+use OCP\IURLGenerator;
+
+class AdminSettingController extends Controller
+{
+    /**
+     * @var IConfig
+     */
+    protected $config;
+
+    /**
+     * @var IURLGenerator
+     */
+    protected $urlGenerator;
+
+    public function __construct($appName, IRequest $request, IConfig $config, IURLGenerator $urlGenerator)
+    {
+        parent::__construct($appName, $request);
+
+        $this->config = $config;
+        $this->urlGenerator = $urlGenerator;
+    }
+
+    /**
+     * @NoCSRFRequired
+     *
+     * @return RedirectResponse
+     */
+    public function removeCache()
+    {
+        $this->config->setAppValue(Application::APP_ID, 'cache-categories', '[]');
+
+        return new RedirectResponse($this->urlGenerator->linkToRoute('settings.AdminSettings.index', [
+            'section' => Application::APP_ID,
+        ]).'#more');
+    }
+
+    /**
+     * @NoCSRFRequired
+     *
+     * @return Response
+     */
+    public function exportConfiguration()
+    {
+        $keys = $this->config->getAppKeys(Application::APP_ID);
+        $config = [];
+        $excludedKeys = [
+            'cache',
+            'cache-categories',
+        ];
+
+        foreach ($keys as $key) {
+            if (in_array($key, $excludedKeys)) {
+                continue;
+            }
+
+            $config[$key] = $this->config->getAppValue(Application::APP_ID, $key);
+        }
+
+        return new DataDownloadResponse(
+            json_encode($config, JSON_PRETTY_PRINT),
+            'config.json',
+            'text/json'
+        );
+    }
+}
@@ -18,27 +18,33 @@

 namespace OCA\SideMenu\Controller;

+use OC;
+use OC\User\User;
+use OCA\SideMenu\AppInfo\Application;
+use OCA\SideMenu\Service\ConfigProxy;
 use OCP\AppFramework\Controller;
-use OCP\AppFramework\Http\TemplateResponse;
 use OCP\AppFramework\Http\Response;
-use OCP\IConfig;
+use OCP\AppFramework\Http\TemplateResponse;
 use OCP\IRequest;
+use OCP\IUserSession;

 class CssController extends Controller
 {
-
-    /** @var \OCP\IConfig */
+    /**
+     * @var ConfigProxy
+     */
    protected $config;

    /**
-     * @param string $appName
-     * @param IRequest $request
-     * @param IConfig $config
+     * @var User
     */
-    public function __construct($appName, IRequest $request, IConfig $config)
+    protected $user;
+
+    public function __construct(string $appName, IRequest $request, ConfigProxy $config)
    {
        parent::__construct($appName, $request);

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

@@ -51,26 +57,85 @@ class CssController extends Controller
     */
    public function stylesheet()
    {
-        $backgroundColor = $this->config->getAppValue('side_menu', 'background-color', '#333333');
-        $backgroundColorTo = $this->config->getAppValue('side_menu', 'background-color-to', $backgroundColor);
-
-        $parameters = [
-            'vars' => [
-                'background-color' => $backgroundColor,
-                'background-color-to' => $backgroundColorTo,
-                'current-app-background-color' => $this->config->getAppValue('side_menu', 'current-app-background-color', '#444444'),
-                'text-color' => $this->config->getAppValue('side_menu', 'text-color', '#FFFFFF'),
-                'opener' => $this->config->getAppValue('side_menu', 'opener', 'side-menu-opener'),
-            ],
-            'display-logo' => (bool) $this->config->getAppValue('side_menu', 'display-logo', 1),
-            'opener-only' => (bool) $this->config->getAppValue('side_menu', 'opener-only', 0),
-            'size-icon' => $this->config->getAppValue('side_menu', 'size-icon', 'normal'),
-            'size-text' => $this->config->getAppValue('side_menu', 'size-text', 'normal'),
-        ];
-
-        $response = new TemplateResponse('side_menu', 'css/stylesheet', $parameters, 'blank');
+        $response = new TemplateResponse(Application::APP_ID, 'css/stylesheet', $this->getConfig(), 'blank');
        $response->addHeader('Content-Type', 'text/css');

        return $response;
    }
+
+    protected function getConfig(): array
+    {
+        $isForced = $this->config->getAppValueBool('force', '0');
+        $topMenuApps = $this->config->getAppValueArray('top-menu-apps', '[]');
+
+        $isAccessibilityAppEnabled = $this->config->getAppValueBool('enabled', '0', 'accessibility');
+        $isBreezeDarkAppEnabled = $this->config->getAppValueBool('enabled', '0', 'breezedark');
+        $isBreezeDarkGlobalEnabled = $this->config->getAppValueBool('theme_enabled', '0', 'breezedark');
+
+        if ($this->user) {
+            $userTopMenuApps = $this->config->getUserValueArray($this->user, 'top-menu-apps', '[]');
+
+            if (!empty($userTopMenuApps) && !$isForced) {
+                $topMenuApps = $userTopMenuApps;
+            }
+
+            $isDarkThemeUserEnabled = $this->config->getUserValue($this->user, 'theme', '', 'accessibility') === 'dark';
+            $isBreezeDarkUserEnabled = $this->config->getUserValue($this->user, 'theme_enabled', '', 'breezedark');
+
+            $isBreezeDarkUserEnabled = $isBreezeDarkUserEnabled === '1' || ($isBreezeDarkGlobalEnabled && $isBreezeDarkUserEnabled === '');
+        } else {
+            $isDarkThemeUserEnabled = false;
+            $isBreezeDarkUserEnabled = false;
+        }
+
+        $isDarkMode = ($isAccessibilityAppEnabled && $isDarkThemeUserEnabled) || ($isBreezeDarkAppEnabled && $isBreezeDarkUserEnabled);
+
+        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');
+            $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');
+            $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');
+
+            $backgroundOpacity = dechex($this->config->getAppValueInt('background-color-opacity', '100') * 255 / 100);
+        }
+
+        $backgroundColor .= $backgroundOpacity;
+        $backgroundColorTo .= $backgroundOpacity;
+
+        return [
+            'vars' => [
+                'background-color' => $backgroundColor,
+                'background-color-to' => $backgroundColorTo,
+                'current-app-background-color' => $currentAppBackgroundColor,
+                'loader-color' => $loaderColor,
+                'text-color' => $textColor,
+                'opener' => $opener,
+                'icon-invert-filter' => $iconInvertFilter,
+                'icon-opacity' => $iconOpacity,
+            ],
+            'display-logo' => $this->config->getAppValueBool('display-logo', '1'),
+            'opener-only' => $this->config->getAppValueBool('opener-only', '0'),
+            'external-sites-in-top-menu' => $this->config->getAppValueBool('external-sites-in-top-menu', '0'),
+            'size-icon' => $this->config->getAppValue('size-icon', 'normal'),
+            'size-text' => $this->config->getAppValue('size-text', 'normal'),
+            'always-displayed' => $this->config->getAppValueBool('always-displayed', '0'),
+            'big-menu' => $this->config->getAppValueBool('big-menu', '0'),
+            'top-menu-apps' => $topMenuApps,
+        ];
+    }
 }
@@ -18,47 +18,149 @@

 namespace OCA\SideMenu\Controller;

+use OC;
+use OC\User\User;
+use OCA\SideMenu\AppInfo\Application;
+use OCA\SideMenu\Service\ConfigProxy;
+use OCA\Theming\ThemingDefaults;
 use OCP\AppFramework\Controller;
+use OCP\AppFramework\Http\JSONResponse;
 use OCP\AppFramework\Http\TemplateResponse;
-use OCP\AppFramework\Http\Response;
-use OCP\IConfig;
 use OCP\IRequest;
+use OCP\IUserSession;
+use OCP\L10N\IFactory;

 class JsController extends Controller
 {
-
-    /** @var \OCP\IConfig */
+    /**
+     * @var ConfigProxy
+     */
    protected $config;

    /**
-     * @param string $appName
-     * @param IRequest $request
-     * @param IConfig $config
+     * @var User
     */
-    public function __construct($appName, IRequest $request, IConfig $config)
-    {
+    protected $user;
+
+    /**
+     * @var ThemingDefaults
+     */
+    protected $themingDefaults;
+
+    /**
+     * @var IFactory
+     */
+    protected $l10nFactory;
+
+    public function __construct(
+        string $appName,
+        IRequest $request,
+        ConfigProxy $config,
+        ThemingDefaults $themingDefaults,
+        IFactory $l10nFactory
+    ) {
        parent::__construct($appName, $request);

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

    /**
     * @NoAdminRequired
     * @NoCSRFRequired
     * @PublicPage
-     *
-     * @return Response
     */
-    public function script()
+    public function script(): TemplateResponse
    {
-        $parameters = [
-            'opener-position' => $this->config->getAppValue('side_menu', 'opener-position', 'before'),
-            'opener-hover' => (bool) $this->config->getAppValue('side_menu', 'opener-hover', '0'),
-        ];
-
-        $response = new TemplateResponse('side_menu', 'js/script', $parameters, 'blank');
+        $response = new TemplateResponse(Application::APP_ID, 'js/script', $this->getConfig(), 'blank');
        $response->addHeader('Content-Type', 'text/javascript');

        return $response;
    }
+
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     * @PublicPage
+     */
+    public function config(): JSONResponse
+    {
+        return new JSONResponse($this->getConfig());
+    }
+
+    protected function getConfig(): array
+    {
+        $topMenuApps = $this->config->getAppValueArray('top-menu-apps', '[]');
+        $targetBlankApps = $this->config->getAppValueArray('target-blank-apps', '[]');
+        $useAvatar = $this->config->getAppValueBool('use-avatar', '0');
+        $isForced = $this->config->getAppValueBool('force', '0');
+        $addLogoLink = $this->config->getAppValueBool('add-logo-link', '1');
+        $avatar = null;
+        $settings = null;
+
+        if ($this->user) {
+            $userTopMenuApps = $this->config->getUserValueArray($this->user, 'top-menu-apps', '[]');
+
+            if (!empty($userTopMenuApps) && !$isForced) {
+                $topMenuApps = $userTopMenuApps;
+            }
+
+            $userTargetBlankMode = $this->config->getUserValueInt($this->user, 'target-blank-mode', '1');
+            $userTargetBlankApps = $this->config->getUserValueArray($this->user, 'target-blank-apps', '[]');
+
+            if (2 === $userTargetBlankMode && !$isForced) {
+                $targetBlankApps = $userTargetBlankApps;
+            }
+
+            $isAvatarSet = OC::$server->getAvatarManager()->getAvatar($this->user->getUid())->exists();
+
+            if ($useAvatar && $isAvatarSet) {
+                $avatar = OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', [
+                    'userId' => $this->user->getUid(),
+                    'size' => 128,
+                    'v' => $this->config->getUserValueInt($this->user, 'avatar', 'version', 0),
+                ]);
+            }
+
+            if ($this->config->getAppValueBool('show-settings', '0')) {
+                $settingsNav = OC::$server->getNavigationManager()->getAll('settings');
+
+                if (isset($settingsNav['settings'])) {
+                    $settings = [
+                        'href' => $settingsNav['settings']['href'],
+                        'name' => $settingsNav['settings']['name'],
+                        'avatar' => OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', [
+                            'userId' => $this->user->getUid(),
+                            'size' => 32,
+                            'v' => $this->config->getUserValueInt($this->user, 'avatar', 'version', 0),
+                        ]),
+                    ];
+                }
+            }
+        }
+
+        $indexUrl = OC::$server->getURLGenerator()->linkTo('', 'index.php');
+
+        return [
+            'opener-position' => $this->config->getAppValue('opener-position', 'before'),
+            'opener-hover' => $this->config->getAppValueBool('opener-hover', '0'),
+            'external-sites-in-top-menu' => $this->config->getAppValueBool('external-sites-in-top-menu', '0'),
+            'force-light-icon' => $this->config->getAppValueBool('force-light-icon', '0'),
+            '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,
+            'target-blank-apps' => $targetBlankApps,
+            'settings' => $settings,
+            'logo' => $this->themingDefaults->getLogo(),
+            'logo-link' => $addLogoLink ? $indexUrl : null,
+        ];
+    }
 }
@@ -0,0 +1,205 @@
+<?php
+/**
+ * @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/>.
+ */
+
+namespace OCA\SideMenu\Controller;
+
+use OC;
+use OC\App\AppStore\Fetcher\CategoryFetcher;
+use OC\URLGenerator;
+use OCA\SideMenu\Service\AppRepository;
+use OCA\SideMenu\Service\CategoryRepository;
+use OCA\SideMenu\Service\ConfigProxy;
+use OCP\AppFramework\Controller;
+use OCP\AppFramework\Http\JSONResponse;
+use OCP\IRequest;
+use OCP\IUserSession;
+use OCP\L10N\IFactory;
+
+class NavController extends Controller
+{
+    /**
+     * @var ConfigProxy
+     */
+    protected $config;
+
+    /**
+     * @var AppRepository
+     */
+    protected $appRepository;
+
+    /**
+     * @var IFactory
+     */
+    protected $l10nFactory;
+
+    /**
+     * @var CategoryFetcher
+     */
+    protected $categoryFetcher;
+
+    /**
+     * @var URLGenerator
+     */
+    protected $router;
+
+    public function __construct(
+        string $appName,
+        IRequest $request,
+        ConfigProxy $config,
+        AppRepository $appRepository,
+        CategoryRepository $categoryRepository,
+        URLGenerator $router,
+        IFactory $l10nFactory
+    ) {
+        parent::__construct($appName, $request);
+
+        $this->config = $config;
+        $this->appRepository = $appRepository;
+        $this->categoryRepository = $categoryRepository;
+        $this->l10nFactory = $l10nFactory;
+        $this->router = $router;
+    }
+
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     * @PublicPage
+     *
+     * @return JSONResponse
+     */
+    public function items()
+    {
+        $user = OC::$server[IUserSession::class]->getUser();
+        $items = [];
+
+        if (!$user) {
+            return new JSONResponse([
+                'items' => $items,
+            ]);
+        }
+
+        $apps = $this->appRepository->getVisibleApps();
+        $categoriesLabels = $this->categoryRepository->getOrderedCategories();
+        $hiddenApps = $this->config->getAppValueArray('big-menu-hidden-apps', '[]');
+        $isForced = $this->config->getAppValueBool('force', '0');
+        $topMenuApps = $this->config->getAppValueArray('top-menu-apps', '[]');
+        $userTopMenuApps = $this->config->getUserValueArray($user, 'top-menu-apps', '[]');
+        $appsCategories = [];
+        $categoriesAppsCount = [];
+
+        if (!$isForced && !empty($userTopMenuApps)) {
+            $topMenuApps = $userTopMenuApps;
+        }
+
+        foreach ($apps as $app) {
+            if (in_array($app['id'], $topMenuApps)) {
+                continue;
+            }
+
+            if (in_array($app['id'], $hiddenApps)) {
+                continue;
+            }
+
+            $categories = (array) $app['category'];
+            $appsCategories[$app['id']] = [];
+
+            if (empty($categories)) {
+                $categories = ['other'];
+            }
+
+            foreach ($categories as $category) {
+                if (!isset($items[$category])) {
+                    $items[$category] = [
+                        'name' => $categoriesLabels[$category] ?? $category,
+                        'categoryId' => $category,
+                        'apps' => [],
+                    ];
+                }
+
+                if (!isset($categoriesAppsCount[$category])) {
+                    $categoriesAppsCount[$category] = 0;
+                }
+
+                ++$categoriesAppsCount[$category];
+
+                $appsCategories[$app['id']][] = $category;
+
+                $items[$category]['apps'][$app['id']] = [
+                    'name' => $app['name'],
+                    'href' => $app['href'],
+                    'icon' => $app['icon'],
+                ];
+            }
+        }
+
+        arsort($categoriesAppsCount);
+
+        $keys = array_keys($categoriesAppsCount);
+
+        foreach ($appsCategories as $app => $appCategories) {
+            $smallerIndex = count($categoriesAppsCount) - 1;
+
+            foreach ($appCategories as $appCategory) {
+                $appKey = array_keys($keys, $appCategory)[0];
+
+                if ($appKey < $smallerIndex) {
+                    $smallerIndex = $appKey;
+                }
+            }
+
+            $category = $keys[$smallerIndex];
+
+            foreach ($items as $itemCategory => $value) {
+                if ($itemCategory !== $category && isset($value['apps'][$app])) {
+                    unset($items[$itemCategory]['apps'][$app]);
+
+                    if (empty($items[$itemCategory]['apps'])) {
+                        unset($items[$itemCategory]);
+                    }
+                }
+            }
+        }
+
+        foreach ($items as $category => $value) {
+            if (empty($items[$category]['apps'])) {
+                unset($items[$category]);
+            } else {
+                uasort($items[$category]['apps'], function ($a, $b) {
+                    return ($a['name'] < $b['name']) ? -1 : 1;
+                });
+            }
+        }
+
+        usort($items, function ($a, $b) use ($categoriesLabels) {
+            foreach ($categoriesLabels as $key => $value) {
+                if ($a['categoryId'] === $key) {
+                    return -1;
+                }
+                if ($b['categoryId'] === $key) {
+                    return 1;
+                }
+            }
+
+            return 0;
+        });
+
+        return new JSONResponse([
+            'items' => $items,
+        ]);
+    }
+}
@@ -0,0 +1,129 @@
+<?php
+/**
+ * @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/>.
+ */
+
+namespace OCA\SideMenu\Controller;
+
+use OCA\SideMenu\AppInfo\Application;
+use OCA\SideMenu\Service\ConfigProxy;
+use OCP\AppFramework\Controller;
+use OCP\AppFramework\Http\Response;
+use OCP\IConfig;
+use OCP\IRequest;
+use OCP\IUserSession;
+
+class PersonalSettingController extends Controller
+{
+    /**
+     * @var IConfig
+     */
+    protected $config;
+
+    /**
+     * @var ConfigProxy
+     */
+    protected $configProxy;
+
+    /**
+     * @var IUserSession
+     */
+    protected $userSession;
+
+    public function __construct($appName, IRequest $request, IConfig $config, ConfigProxy $configProxy, IUserSession $userSession)
+    {
+        parent::__construct($appName, $request);
+
+        $this->config = $config;
+        $this->configProxy = $configProxy;
+        $this->userSession = $userSession;
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * @param mixed $name
+     * @param mixed $value
+     *
+     * @return Response
+     */
+    public function valueSet($name, $value)
+    {
+        $doSave = false;
+        $user = $this->userSession->getUser();
+
+        if ('enabled' === $name) {
+            $doSave = true;
+
+            if (!in_array($value, ['0', '1'])) {
+                $value = '1';
+            }
+        }
+
+        if ('target-blank-mode' === $name) {
+            $doSave = true;
+
+            if (!in_array($value, ['1', '2'])) {
+                $value = '1';
+            }
+        }
+
+        if ('target-blank-apps' === $name) {
+            $doSave = true;
+            $data = json_decode($value, true);
+
+            if (!is_array($data)) {
+                $doSave = false;
+            } else {
+                foreach ($data as $v) {
+                    if (!is_string($v)) {
+                        $doSave = false;
+                    }
+                }
+            }
+        }
+
+        if ('top-menu-apps' === $name) {
+            $doSave = true;
+            $data = json_decode($value, true);
+
+            if (!is_array($data)) {
+                $doSave = false;
+            } else {
+                foreach ($data as $v) {
+                    if (!is_string($v)) {
+                        $doSave = false;
+                    }
+                }
+            }
+        }
+
+        if ($this->configProxy->getAppValueBool('force', '0')) {
+            $doSave = false;
+        }
+
+        if ($doSave) {
+            $this->config->setUserValue($user->getUid(), Application::APP_ID, $name, $value);
+
+            return [
+                'name' => $name,
+                'value' => $value,
+            ];
+        }
+
+        return [];
+    }
+}
@@ -0,0 +1,83 @@
+<?php
+
+namespace OCA\SideMenu\Service;
+
+use OCP\L10N\IFactory;
+
+/**
+ * class AppRepository.
+ *
+ * @author Simon Vieille <simon@deblan.fr>
+ */
+class AppRepository
+{
+    /**
+     * @var \OC_App
+     */
+    protected $ocApp;
+
+    /**
+     * @var IFactory
+     */
+    protected $l10nFactory;
+
+    public function __construct(\OC_App $ocApp, IFactory $l10nFactory)
+    {
+        $this->ocApp = $ocApp;
+        $this->l10nFactory = $l10nFactory;
+    }
+
+    /**
+     * Retrieves visibles apps.
+     *
+     * @return array
+     */
+    public function getVisibleApps()
+    {
+        $navigation = $this->ocApp->getNavigation();
+        $apps = $this->ocApp->listAllApps();
+        $visibleApps = [];
+
+        foreach ($apps as $app) {
+            $id = $app['id'];
+
+            foreach ([$app['id'], $app['id'].'_index'] as $id) {
+                if (isset($navigation[$id])) {
+                    $app['name'] = $this->l10nFactory->get($id)->t($app['name']);
+                    $app['href'] = $navigation[$id]['href'];
+                    $app['icon'] = $navigation[$id]['icon'];
+
+                    $visibleApps[$id] = $app;
+                }
+            }
+        }
+
+        foreach ($navigation as $app) {
+            if ('external_index' === substr($app['id'], 0, 14)) {
+                $visibleApps[$app['id']] = [
+                    'id' => $app['id'],
+                    'name' => $this->l10nFactory->get($app['id'])->t($app['name']),
+                    'href' => $app['href'],
+                    'icon' => $app['icon'],
+                    'category' => [
+                        'external_links',
+                    ],
+                ];
+            } elseif ('files' === $app['id']) {
+                $visibleApps[$app['id']] = [
+                    'id' => $app['id'],
+                    'name' => $this->l10nFactory->get($app['id'])->t($app['name']),
+                    'href' => $app['href'],
+                    'icon' => $app['icon'],
+                    'category' => [],
+                ];
+            }
+        }
+
+        usort($visibleApps, function ($a, $b) {
+            return ($a['name'] < $b['name']) ? -1 : 1;
+        });
+
+        return $visibleApps;
+    }
+}
@@ -0,0 +1,99 @@
+<?php
+
+namespace OCA\SideMenu\Service;
+
+use OC\App\AppStore\Fetcher\CategoryFetcher;
+use OCA\SideMenu\AppInfo\Application;
+use OCP\IConfig;
+use OCP\L10N\IFactory;
+
+/**
+ * class CategoryRepository.
+ *
+ * @author Simon Vieille <simon@deblan.fr>
+ */
+class CategoryRepository
+{
+    /**
+     * @var CategoryFetcher
+     */
+    protected $categoryFetcher;
+
+    /**
+     * @var IFactory
+     */
+    protected $l10nFactory;
+
+    /**
+     * @var ConfigProxy
+     */
+    protected $config;
+
+    /**
+     * @var IConfig
+     */
+    protected $iConfig;
+
+    public function __construct(
+        CategoryFetcher $categoryFetcher,
+        ConfigProxy $config,
+        IConfig $iConfig,
+        IFactory $l10nFactory
+    ) {
+        $this->categoryFetcher = $categoryFetcher;
+        $this->l10nFactory = $l10nFactory;
+        $this->config = $config;
+        $this->iConfig = $iConfig;
+    }
+
+    /**
+     * Retrieves categories.
+     *
+     * @return array
+     */
+    public function getOrderedCategories()
+    {
+        $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', '[]');
+
+        if (empty($categoriesLabels)) {
+            $categoriesLabels = $this->categoryFetcher->get();
+
+            $this->iConfig->setAppValue(Application::APP_ID, 'cache-categories', json_encode($categoriesLabels));
+        }
+
+        foreach ($categoriesLabels as $k => $category) {
+            $categoriesLabels[$category['id']] = $category['translations'][$currentLanguage]['name'] ?? $category['translations']['en']['name'];
+
+            unset($categoriesLabels[$k]);
+        }
+
+        $categoriesLabels['external_links'] = $this->l10nFactory->get('external')->t('External sites');
+        $categoriesLabels['other'] = '';
+
+        asort($categoriesLabels);
+
+        if ('custom' === $type) {
+            $ordered = [];
+
+            foreach ($order as $id) {
+                if (isset($categoriesLabels[$id])) {
+                    $ordered[$id] = $categoriesLabels[$id];
+                }
+            }
+
+            foreach ($categoriesLabels as $id => $value) {
+                if (!isset($ordered[$id])) {
+                    $ordered[$id] = $value;
+                }
+            }
+
+            $categoriesLabels = $ordered;
+        }
+
+        return $categoriesLabels;
+    }
+}
@@ -0,0 +1,69 @@
+<?php
+
+namespace OCA\SideMenu\Service;
+
+use OC\User\User;
+use OCA\SideMenu\AppInfo\Application;
+use OCP\IConfig;
+
+/**
+ * class Config.
+ *
+ * @author Simon Vieille <simon@deblan.fr>
+ */
+class ConfigProxy
+{
+    /**
+     * @var IConfig
+     */
+    protected $config;
+
+    public function __construct(IConfig $config)
+    {
+        $this->config = $config;
+    }
+
+    public function getAppValue(string $name, string $default, $appId = null): string
+    {
+        return (string) $this->config->getAppValue($appId ?? Application::APP_ID, $name, $default);
+    }
+
+    public function getUserValue(User $user, string $name, string $default, $appId = null): string
+    {
+        return (string) $this->config->getUserValue($user->getUid(), $appId ?? Application::APP_ID, $name, $default);
+    }
+
+    public function getAppValueBool(string $name, string $default, $appId = null): bool
+    {
+        return (bool) $this->getAppValue($name, $default, $appId);
+    }
+
+    public function getAppValueArray(string $name, string $default, $appId = null): array
+    {
+        return (array) json_decode($this->getAppValue($name, $default, $appId), true);
+    }
+
+    public function getAppValueInt(string $name, string $default, $appId = null): int
+    {
+        return (int) $this->getAppValue($name, $default, $appId);
+    }
+
+    public function getUserValueBool(User $user, string $name, string $default, $appId = null): bool
+    {
+        return (bool) str_replace(
+            ['yes', 'no'],
+            ['1', '0'],
+            $this->getUserValue($user, $name, $default, $appId)
+        );
+    }
+
+    public function getUserValueArray(User $user, string $name, string $default, $appId = null): array
+    {
+        return (array) json_decode($this->getUserValue($user, $name, $default, $appId), true);
+    }
+
+    public function getUserValueInt(User $user, string $name, string $default, $appId = null): int
+    {
+        return (int) $this->getUserValue($user, $name, $default, $appId);
+    }
+}
@@ -18,28 +18,54 @@

 namespace OCA\SideMenu\Settings;

+use OCA\SideMenu\AppInfo\Application;
+use OCA\SideMenu\Service\AppRepository;
+use OCA\SideMenu\Service\CategoryRepository;
+use OCA\SideMenu\Service\ConfigProxy;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\IL10N;
 use OCP\ILogger;
 use OCP\Settings\ISettings;
-use OCP\IConfig;

 class Admin implements ISettings
 {
-    /** @var IL10N */
+    /**
+     * @var IL10N
+     */
    private $l;

-    /** @var ILogger */
+    /**
+     * @var ILogger
+     */
    private $logger;

-    /** @var IConfig */
+    /**
+     * @var ConfigProxy
+     */
    private $config;

-    public function __construct(IL10N $l, ILogger $logger, IConfig $config)
-    {
+    /**
+     * @var AppRepository
+     */
+    private $appRepository;
+
+    /**
+     * @var CategoryRepository
+     */
+    private $categoryRepository;
+
+    public function __construct(
+        IL10N $l,
+        ILogger $logger,
+        ConfigProxy $config,
+        AppRepository $appRepository,
+        CategoryRepository $categoryRepository
+    ) {
        $this->l = $l;
        $this->logger = $logger;
        $this->config = $config;
+        $this->appRepository = $appRepository;
+        $this->categoryRepository = $categoryRepository;
    }

    /**
@@ -47,25 +73,58 @@ class Admin implements ISettings
     */
    public function getForm()
    {
-        $backgroundColor = $this->config->getAppValue('side_menu', 'background-color', '#333333');
-        $backgroundColorTo = $this->config->getAppValue('side_menu', 'background-color-to', $backgroundColor);
+        $backgroundColor = $this->config->getAppValue('background-color', '#333333');
+        $backgroundColorTo = $this->config->getAppValue('background-color-to', $backgroundColor);
+
+        $darkModeBackgroundColor = $this->config->getAppValue('dark-mode-background-color', '#333333');
+        $darkModeBackgroundColorTo = $this->config->getAppValue('dark-mode-background-color-to', $darkModeBackgroundColor);

        $parameters = [
            'background-color' => $backgroundColor,
            'background-color-to' => $backgroundColorTo,
-            'current-app-background-color' => $this->config->getAppValue('side_menu', 'current-app-background-color', '#444444'),
-            'text-color' => $this->config->getAppValue('side_menu', 'text-color', '#FFFFFF'),
-            'cache' => $this->config->getAppValue('side_menu', 'cache', '0'),
-            'opener' => $this->config->getAppValue('side_menu', 'opener', 'side-menu-opener'),
-            'display-logo' => $this->config->getAppValue('side_menu', 'display-logo', '1'),
-            'opener-position' => $this->config->getAppValue('side_menu', 'opener-position', 'before'),
-            'opener-hover' => $this->config->getAppValue('side_menu', 'opener-hover', '0'),
-            'opener-only' => $this->config->getAppValue('side_menu', 'opener-only', '0'),
-            'size-icon' => $this->config->getAppValue('side_menu', 'size-icon', 'normal'),
-            'size-text' => $this->config->getAppValue('side_menu', 'size-text', 'normal'),
+            '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'),
+            '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'),
+            '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-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-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'),
+            'use-avatar' => $this->config->getAppValue('use-avatar', '0'),
+            'opener-position' => $this->config->getAppValue('opener-position', 'before'),
+            'opener-hover' => $this->config->getAppValue('opener-hover', '0'),
+            'opener-only' => $this->config->getAppValue('opener-only', '0'),
+            'show-settings' => $this->config->getAppValue('show-settings', '0'),
+            'hide-when-no-apps' => $this->config->getAppValue('hide-when-no-apps', '0'),
+            'size-icon' => $this->config->getAppValue('size-icon', 'normal'),
+            'size-text' => $this->config->getAppValue('size-text', 'normal'),
+            'force' => $this->config->getAppValue('force', '0'),
+            'target-blank-apps' => $this->config->getAppValueArray('target-blank-apps', '[]'),
+            'top-menu-apps' => $this->config->getAppValueArray('top-menu-apps', '[]'),
+            'default-enabled' => $this->config->getAppValue('default-enabled', '1'),
+            'categories-order-type' => $this->config->getAppValue('categories-order-type', 'default'),
+            'categories-order' => $this->config->getAppValueArray('categories-order', '[]'),
+            'apps' => $this->appRepository->getVisibleApps(),
+            'categories' => $this->categoryRepository->getOrderedCategories(),
        ];

-        return new TemplateResponse('side_menu', 'settings/admin-form', $parameters, '');
+        return new TemplateResponse(Application::APP_ID, 'settings/admin-form', $parameters, '');
    }

    /**
@@ -73,13 +132,13 @@ class Admin implements ISettings
     */
    public function getSection()
    {
-        return 'side_menu';
+        return Application::APP_ID;
    }

    /**
     * @return int whether the form should be rather on the top or bottom of
-     * the admin section. The forms are arranged in ascending order of the
-     * priority values. It is required to return a value between 0 and 100.
+     *             the admin section. The forms are arranged in ascending order of the
+     *             priority values. It is required to return a value between 0 and 100.
     *
     * E.g.: 70
     */
@@ -18,22 +18,23 @@

 namespace OCA\SideMenu\Settings;

+use OCA\SideMenu\AppInfo\Application;
 use OCP\IL10N;
 use OCP\IURLGenerator;
 use OCP\Settings\IIconSection;

-class Section implements IIconSection
+class AdminSection implements IIconSection
 {
-    /** @var IL10N */
+    /**
+     * @var IL10N
+     */
    private $l;

-    /** @var IURLGenerator */
+    /**
+     * @var IURLGenerator
+     */
    private $url;

-    /**
-     * @param IURLGenerator $url
-     * @param IL10N $l
-     */
    public function __construct(IURLGenerator $url, IL10N $l)
    {
        $this->url = $url;
@@ -42,13 +43,13 @@ class Section implements IIconSection

    /**
     * returns the ID of the section. It is supposed to be a lower case string,
-     * e.g. 'ldap'
+     * e.g. 'ldap'.
     *
     * @returns string
     */
    public function getID()
    {
-        return 'side_menu';
+        return Application::APP_ID;
    }

    /**
@@ -59,13 +60,13 @@ class Section implements IIconSection
     */
    public function getName()
    {
-        return $this->l->t('Side menu');
+        return $this->l->t(Application::APP_NAME);
    }

    /**
     * @return int whether the form should be rather on the top or bottom of
-     * the settings navigation. The sections are arranged in ascending order of
-     * the priority values. It is required to return a value between 0 and 99.
+     *             the settings navigation. The sections are arranged in ascending order of
+     *             the priority values. It is required to return a value between 0 and 99.
     *
     * E.g.: 70
     */
@@ -79,6 +80,6 @@ class Section implements IIconSection
     */
    public function getIcon()
    {
-        return $this->url->imagePath('theming', 'app-dark.svg');
+        return $this->url->imagePath(Application::APP_ID, 'icon.svg');
    }
 }
@@ -0,0 +1,108 @@
+<?php
+/**
+ * @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/>.
+ */
+
+namespace OCA\SideMenu\Settings;
+
+use OCA\SideMenu\AppInfo\Application;
+use OCA\SideMenu\Service\AppRepository;
+use OCA\SideMenu\Service\ConfigProxy;
+use OCP\AppFramework\Http\TemplateResponse;
+use OCP\IL10N;
+use OCP\ILogger;
+use OCP\IUserSession;
+use OCP\Settings\ISettings;
+
+class Personal implements ISettings
+{
+    /**
+     * @var IL10N
+     */
+    private $l;
+
+    /**
+     * @var ILogger
+     */
+    private $logger;
+
+    /**
+     * @var ConfigProxy
+     */
+    private $config;
+
+    /**
+     * @var IUserSession
+     */
+    private $userSession;
+
+    /**
+     * @var AppRepository
+     */
+    private $appRepository;
+
+    public function __construct(IL10N $l, ILogger $logger, ConfigProxy $config, IUserSession $userSession, AppRepository $appRepository)
+    {
+        $this->l = $l;
+        $this->logger = $logger;
+        $this->config = $config;
+        $this->userSession = $userSession;
+        $this->appRepository = $appRepository;
+    }
+
+    /**
+     * @return TemplateResponse
+     */
+    public function getForm()
+    {
+        $user = $this->userSession->getUser();
+
+        $parameters = [
+            'force' => $this->config->getAppValueBool('force', '0'),
+            'enabled' => $this->config->getUserValue(
+                $user,
+                'enabled',
+                $this->config->getAppValue('default-enabled', '1')
+            ),
+            'top-menu-apps' => $this->config->getUserValueArray($user, 'top-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(),
+        ];
+
+        return new TemplateResponse(Application::APP_ID, 'settings/personal-form', $parameters, '');
+    }
+
+    /**
+     * @return string the section ID, e.g. 'sharing'
+     */
+    public function getSection()
+    {
+        return Application::APP_ID;
+    }
+
+    /**
+     * @return int whether the form should be rather on the top or bottom of
+     *             the admin section. The forms are arranged in ascending order of the
+     *             priority values. It is required to return a value between 0 and 100.
+     *
+     * E.g.: 70
+     */
+    public function getPriority()
+    {
+        return 70;
+    }
+}
@@ -0,0 +1,104 @@
+<?php
+/**
+ * @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/>.
+ */
+
+namespace OCA\SideMenu\Settings;
+
+use OCA\SideMenu\AppInfo\Application;
+use OCA\SideMenu\Service\ConfigProxy;
+use OCP\IL10N;
+use OCP\IURLGenerator;
+use OCP\Settings\IIconSection;
+
+class PersonalSection implements IIconSection
+{
+    /**
+     * @var IL10N
+     */
+    private $l;
+
+    /**
+     * @var IURLGenerator
+     */
+    private $url;
+
+    /**
+     * @var ConfigProxy
+     */
+    private $configProxy;
+
+    public function __construct(IURLGenerator $url, IL10N $l, ConfigProxy $configProxy)
+    {
+        $this->url = $url;
+        $this->l = $l;
+        $this->configProxy = $configProxy;
+    }
+
+    /**
+     * returns the ID of the section. It is supposed to be a lower case string,
+     * e.g. 'ldap'.
+     *
+     * @returns string
+     */
+    public function getID()
+    {
+        if ($this->configProxy->getAppValueBool('force', '0')) {
+            return '';
+        }
+
+        return Application::APP_ID;
+    }
+
+    /**
+     * returns the translated name as it should be displayed, e.g. 'LDAP / AD
+     * integration'. Use the L10N service to translate it.
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        if ($this->configProxy->getAppValueBool('force', '0')) {
+            return '';
+        }
+
+        return $this->l->t(Application::APP_NAME);
+    }
+
+    /**
+     * @return int whether the form should be rather on the top or bottom of
+     *             the settings navigation. The sections are arranged in ascending order of
+     *             the priority values. It is required to return a value between 0 and 99.
+     *
+     * E.g.: 70
+     */
+    public function getPriority()
+    {
+        if ($this->configProxy->getAppValueBool('force', '0')) {
+            return null;
+        }
+
+        return 70;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getIcon()
+    {
+        return $this->url->imagePath(Application::APP_ID, 'icon.svg');
+    }
+}
@@ -13,6 +13,8 @@
 	"dependencies": {
 		"@nextcloud/axios": "^1.3.2",
 		"@nextcloud/vue": "^1.4.0",
+		"axios": "^0.19.2",
+		"trim": "0.0.1",
 		"vue": "^2.6.11"
 	},
 	"browserslist": [
@@ -0,0 +1,25 @@
+<!--
+@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>
+    <button class="side-menu-opener side-menu-closer"></button>
+</template>
+
+<script>
+export default {
+    name: 'CloserButton',
+}
+</script>
@@ -0,0 +1,42 @@
+<!--
+@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 class="side-menu-loader">
+        <svg width="38" height="38" viewBox="0 0 38 38" xmlns="http://www.w3.org/2000/svg">
+            <g fill="none" fill-rule="evenodd">
+                <g transform="translate(1 1)" stroke-width="2">
+                    <circle stroke-opacity=".5" cx="18" cy="18" r="18"/>
+                    <path d="M36 18c0-9.94-8.06-18-18-18">
+                        <animateTransform
+                            attributeName="transform"
+                            type="rotate"
+                            from="0 18 18"
+                            to="360 18 18"
+                            dur="1s"
+                            repeatCount="indefinite"/>
+                    </path>
+                </g>
+            </g>
+        </svg>
+    </div>
+</template>
+
+<script>
+export default {
+    name: 'Loader',
+}
+</script>
@@ -0,0 +1,44 @@
+<!--
+@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 v-bind:class="classes">
+        <a v-if="link !== null" v-bind:href="link">
+            <img v-bind:src="image">
+        </a>
+        <img v-else v-bind:src="image">
+    </div>
+</template>
+
+<script>
+export default {
+    name: 'Logo',
+    props: {
+        image: {
+            type: String,
+            required: true
+        },
+        link: {
+            type: String,
+            required: false
+        },
+        classes: {
+            type: Object,
+            required: true
+        },
+    },
+}
+</script>
@@ -0,0 +1,25 @@
+<!--
+@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>
+    <button class="side-menu-opener"></button>
+</template>
+
+<script>
+export default {
+    name: 'OpenerButton',
+}
+</script>
@@ -0,0 +1,47 @@
+<!--
+@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 class="side-menu-settings">
+        <a v-bind:href="href">
+            {{ label }}
+
+            <span class="avatardiv avatardiv-shown">
+                <img v-bind:src="avatar" v-bind:alt="name" v-bind:title="name">
+            </span>
+        </a>
+    </div>
+</template>
+
+<script>
+export default {
+    name: 'SettingsButton',
+    props: {
+        label: {
+            type: String,
+            required: true
+        },
+        href: {
+            type: String,
+            required: true
+        },
+        avatar: {
+            type: String,
+            required: true
+        },
+    },
+}
+</script>
@@ -17,19 +17,30 @@

 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 View = Vue.extend(SideMenu)
-const sideMenu = new View({})
+Vue.prototype.OC = OC

 const mountSideMenuComponent = () => {
    const sideMenuContainer = document.querySelector('#side-menu')

    if (sideMenuContainer) {
+        let component
+
+        if (sideMenuContainer.getAttribute('data-bigmenu')) {
+            component = SideMenuBig
+        } else if(sideMenuContainer.getAttribute('data-sidewithcategories')) {
+            component = SideMenuWithCategories
+        } else {
+            component = SideMenu
+        }
+
+        const View = Vue.extend(component)
+        const sideMenu = new View({})
+
        sideMenu.$mount('#side-menu')
+
        $('body').trigger('side-menu.ready')
    } else {
        window.setTimeout(mountSideMenuComponent, 50)
@@ -17,80 +17,149 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 <template>
    <div id="side-menu">
        <div class="side-menu-header">
-            <button class="side-menu-opener"></button>
+            <SettingsButton
+                v-if="settings"
+                v-bind:href="settings.href"
+                v-bind:label="settings.name"
+                v-bind:avatar="settings.avatar" />

-            <div v-if="logo" class="side-menu-logo">
-                <img v-bind:src="logo">
-            </div>
+            <OpenerButton />
+
+            <Logo
+                v-if="!avatar && logo" v-bind:classes="{'side-menu-logo': true, 'avatardiv': false}"
+                v-bind:image="logo"
+                v-bind:link="logoLink"
+            />
+
+            <Logo
+                v-if="avatar" v-bind:classes="{'side-menu-logo': true, 'avatardiv': true}"
+                v-bind:image="avatar"
+                v-bind:link="logoLink"
+            />
        </div>

        <ul class="side-menu-apps-list">
-            <li v-for="app in apps" v-bind:class="{'side-menu-app': true, 'active': app.active}">
-                <a v-bind:href="app.href">
-                     <span class="side-menu-app-icon" v-html="app.icon"></span>
-                     <span class="side-menu-app-text" v-html="app.name"></span>
-                </a>
-            </li>
+            <SideMenuApp
+                v-for="app in apps"
+                v-bind:classes="{'side-menu-app': true, 'active': app.active}"
+                v-bind:icon="app.icon"
+                v-bind:label="app.name"
+                v-bind:href="app.href"
+                v-bind:target="targetBlankApps.indexOf(app.id) !== -1 ? '_blank' : undefined"
+            />
        </ul>
    </div>
 </template>

 <script>
+import trim from 'trim'
+import axios from 'axios'
+import OpenerButton from './OpenerButton'
+import SettingsButton from './SettingsButton'
+import SideMenuApp from './SideMenuApp'
+import Logo from './Logo'
+
 export default {
    name: 'SideMenu',
+    components: {
+        SettingsButton,
+        OpenerButton,
+        SideMenuApp,
+        Logo,
+    },
    data() {
        return {
            apps: [],
-            logo: null
+            logo: null,
+            logoLink: null,
+            avatar: null,
+            forceLightIcon: false,
+            targetBlankApps: [],
+            settings: null,
        }
    },
    methods: {
        retrieveApps() {
-            this.apps = [];
-            const links = document.querySelectorAll('#appmenu a');
+            this.apps = []
+            const links = document.querySelectorAll('#appmenu a')
+            const menu = document.querySelector('#appmenu')
+            let menuIsHidden = true
+
+            if (menu) {
+                menuIsHidden = window.getComputedStyle(menu, null).getPropertyValue('display') === 'none'
+            }

            for (let element of links) {
                let href = element.getAttribute('href')
+                var parent = element.parentNode
+
+                if (!parent) {
+                    continue
+                }
+
+                var dataId = parent.getAttribute('data-id')
+                dataId = dataId !== null ? dataId : ''
+
+                if (!parent.classList.contains('app-hidden') && !menuIsHidden) {
+                    continue
+                }

                if (href !== '#') {
                    let svg = element.querySelector('svg').outerHTML

-                    svg = svg.replace(/(height|width)="20"/, '')
+                    svg = svg
+                        .replace(/(height|width)="20"/, '')
+                        .replace('id="invertMenuMain', 'id="invertSideMenu')
+                        .replace('url(#invertMenuMain', 'url(#invertSideMenu')
+
+                    if (this.forceLightIcon) {
+                        svg = svg.replace(/filter="url[^"]+"/, '')
+                    }

                    this.apps.push({
+                        id: dataId,
                        href: href,
-                        name: element.querySelector('span').innerHTML,
+                        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])
+                }, 1000)
+            })(this.apps)
        },
-        retrieveLogo() {
-            const ncLogo = document.querySelector('#nextcloud .logo')

-            if (ncLogo) {
-                const url = window.getComputedStyle(ncLogo, null)
-                    .getPropertyValue('background-image')
-                    .replace('url("', '')
-                    .replace('")', '')
+        retrieveConfig() {
+            let that = this

-                if (url && url !== 'none') {
-                    this.logo = url
-                }
-            }
+            axios
+                .get(OC.generateUrl('/apps/side_menu/js/config'))
+                .then(function(response) {
+                    const config = response.data
+
+                    that.targetBlankApps = config['target-blank-apps']
+                    that.forceLightIcon = config['force-light-icon']
+                    that.avatar = config['avatar']
+                    that.logo = config['logo']
+                    that.logoLink = config['logo-link']
+                    that.settings = config['settings']
+                });
        },
    },
-    created() {
-        this.retrieveApps();
-        this.retrieveLogo();
+    mounted() {
+        this.retrieveConfig()
+        this.retrieveApps()

        const menu = document.querySelector('#appmenu')

        if (menu) {
-            const config = {attributes: true, childList: true, subtree: true};
-            const observer = new MutationObserver(this.retrieveApps);
-            observer.observe(menu, config);
+            const config = {attributes: true, childList: true, subtree: true}
+            const observer = new MutationObserver(this.retrieveApps)
+            observer.observe(menu, config)
        }
    }
 }
@@ -0,0 +1,52 @@
+<!--
+@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>
+    <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>
+        </a>
+    </li>
+</template>
+
+<script>
+export default {
+    name: 'SideMenuApp',
+    props: {
+        label: {
+            type: String,
+            required: true
+        },
+        icon: {
+            type: String,
+            required: true
+        },
+        href: {
+            type: String,
+            required: true
+        },
+        classes: {
+            type: Object,
+            required: true
+        },
+        target: {
+            type: String,
+            required: false
+        },
+    },
+}
+</script>
@@ -0,0 +1,128 @@
+<!--
+@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-big">
+        <div class="side-menu-header">
+            <CloserButton />
+
+            <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-html="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 trim from 'trim'
+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: 'SideMenuBig',
+    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])
+                        }
+                    }
+
+                    jQuery('body').trigger('side-menu.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>
@@ -0,0 +1,52 @@
+<!--
+@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>
+    <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>
+        </a>
+    </li>
+</template>
+
+<script>
+export default {
+    name: 'SideMenuBigApp',
+    props: {
+        label: {
+            type: String,
+            required: true
+        },
+        icon: {
+            type: String,
+            required: true
+        },
+        href: {
+            type: String,
+            required: true
+        },
+        classes: {
+            type: Object,
+            required: true
+        },
+        target: {
+            type: String,
+            required: false
+        },
+    },
+}
+</script>
@@ -0,0 +1,126 @@
+<!--
+@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-html="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 trim from 'trim'
+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])
+                        }
+                    }
+
+                    jQuery('body').trigger('side-menu.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,34 +15,48 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-const elements = [
-    'side-menu-background-color',
-    'side-menu-background-color-to',
-    'side-menu-current-app-background-color',
-    'side-menu-text-color',
-    'side-menu-opener',
-    'side-menu-opener-position',
-    'side-menu-opener-hover',
-    'side-menu-opener-only',
-    'side-menu-display-logo',
-    'side-menu-size-icon',
-    'side-menu-size-text',
-    'side-menu-cache',
-];
+let elements = []

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

-const saveSettings = (key) => {
-    const element = elements[key]
-    const name = $('#' + element).attr('name')
-    let value = $('#' + element).val()
-    const size = elements.length
+const userConfig = (name, value, callbacks) => {
+    const url = OC.generateUrl('/apps/side_menu/personalSetting/valueSet')

-    if (element === 'side-menu-cache') {
-        value++
+    $.post(url, {name: name, value: value}, callbacks.success)
+        .fail(callbacks.error)
+}
+
+const appConfig = (name, value, callbacks) => {
+    OCP.AppConfig.setValue('side_menu', name, value, callbacks)
+}
+
+const saveSettings = (key) => {
+    const element = elements.get(key)
+    let value
+    let name
+
+    if (jQuery(element).is('[data-checkbox]')) {
+        name = jQuery(element).attr('data-name')
+        const inputs = jQuery('input[name="' + name + '[]"]:checked')
+        value = []
+
+        inputs.each((i, v) => {
+            value.push(v.value)
+        })
+
+        value = JSON.stringify(value)
+    } else {
+        name = jQuery(element).attr('name')
+        value = jQuery(element).val()
    }

-    OCP.AppConfig.setValue('side_menu', name, value, {
+    const size = elements.length
+
+    if (name === 'cache') {
+        ++value
+    }
+
+    const callbacks = {
        success: () => {
            OC.msg.finishedSuccess(
                selector,
@@ -58,14 +72,94 @@ const saveSettings = (key) => {
        error: () => {
            OC.msg.finishedError(selector, t('side_menu', 'Error while saving "' + element + '"'))
        }
-    });
+    }
+
+    if (jQuery(element).is('[data-personal]')) {
+        userConfig(name, value, callbacks)
+    } else {
+        appConfig(name, value, callbacks)
+    }
 }

-$(document).ready(() => {
-    $('#side-menu-save').on('click', (event) => {
+const elementToggler = (element) => {
+    jQuery(element).toggle()
+}
+
+jQuery(document).ready(() => {
+    elements = jQuery('.side-menu-setting')
+
+    jQuery('#side-menu-save').on('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-side-with-categories').val(target.attr('data-sidewithcategories'))
+    })
+
+    jQuery('.side-menu-setting-live').on('change', (event) => {
+        var target = jQuery(event.target)
+        var name = target.attr('name')
+        var value = target.val()
+
+        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');
+        }
+
+        if (name === 'opener') {
+            var 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) {
+            var opacity = parseInt($('#side-menu-dark-mode-background-color-opacity').val() * 255 / 100);
+
+            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);
+
+            value = [value, opacity.toString(16)].join('');
+        }
+
+        document.documentElement.style.setProperty('--side-menu-' + name, value)
+    })
+
+    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) {
+            let value = []
+
+            jQuery('#categories-list .side-menu-setting-list-item').each(function() {
+                value.push(jQuery(this).attr('data-id'))
+            });
+
+            value = JSON.stringify(value)
+
+            jQuery('input[name="categories-order"]').val(value)
+		}
+	});
 });
@@ -0,0 +1,79 @@
+"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>. Pro pohyb po použijte klávesu <span class="keyboard-key">tab</span>.'
+"Top menu": "Hlavní 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 zapnutá pro uživatele"
+"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"
@@ -0,0 +1,79 @@
+"Custom menu": "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": "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 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 Anwendung"
+"Text color": "Textfarbe"
+"Loader": "Ladestandanzeige"
+"Icon": "Symbol"
+"Same color": "Selbe Farbe"
+"Opposite color": "Gegenfarbe"
+"Transparent": "Transparent"
+"Opaque": "Nicht transparent"
+"Opener": "Menü-Symbol"
+"Default": "Standard"
+"Default (dark)": "Standard (dunkel)"
+"Hamburger": "Hamburger"
+"Hamburger (dark)": "Hamburger (dunkel)"
+"Hamburger 2": "Hamburger 2"
+"Hamburger 2 (dark)": "Hamburger 2 (dunkel)"
+"Before the logo": "Vor dem Logo"
+"After the logo": "Nach dem Logo"
+"Position": "Position"
+"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 das Menü-Symbol bewegt wird (auf Touchscreens automatisch deaktiviert)."
+"Display the big menu": "Großes Menü anzeigen"
+"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 dem <code>großen Menü</code> kompatibel."
+"Icons and texts": "Symbole und Texte"
+"Loader enabled": "Ladestandanzeige aktiviert"
+"Tips": "Tipps"
+"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 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": "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": "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 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"
@@ -0,0 +1,79 @@
+"Custom menu": "Menu personnalisé"
+"Enable the custom menu": "Activer le menu personnalisé"
+"No": "Non"
+"Yes": "Oui"
+"Menu": "Menu"
+'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.': 'Utiliser le raccourcis clavier <span class="keyboard-key">Ctrl</span>+<span class="keyboard-key">o</span> pour ouvrir et fermer le menu latéral. Utiliser <span class="keyboard-key">tab</span> pour naviguer.'
+"Top menu": "Menu supérieur"
+"Apps that not must be moved in the side menu": "Les applications qui ne doivent pas être affichées dans le menu latéral"
+"If there is no selection then the global configuration is applied.": "Si il n'y a aucune sélection alors la configuration globale sera appliquée"
+"Experimental": "Expérimental"
+"Save": "Sauvegarder"
+"You like this app and you want to support me?": "Vous aimer cette application et vous souhaitez m'aider ?"
+"Buy me a coffee ☕": "Offrez moi un café ☕"
+"Hidden": "Caché"
+"Small": "Petit"
+"Normal": "Normal"
+"Big": "Gros"
+"Colors": "Couleurs"
+"Background color": "Couleur de fond"
+"Background color of current app": "Couleur de fond de l'application en cours"
+"Text color": "Couleur du texte"
+"Loader": "Indicateur de chargement"
+"Icon": "Icône"
+"Same color": "Même couleur"
+"Opposite color": "Couleur opposée"
+"Transparent": "Transparent"
+"Opaque": "Opaque"
+"Opener": "Bouton d'ouverture"
+"Default": "Par défaut"
+"Default (dark)": "Par défaut (sombre)"
+"Hamburger": "Hamburger"
+"Hamburger (dark)": "Hamburger (sombre)"
+"Hamburger 2": "Hamburger 2"
+"Hamburger 2 (dark)": "Hamburger 2 (sombre)"
+"Before the logo": "Avant le logo"
+"After the logo": "Après le logo"
+"Position": "Position"
+"Show only the opener (hidden logo)": "Afficher uniquement le bouton d'ouverture (masquer le logo)"
+"Do not display the side menu and the opener if there is no application (eg: public pages).": "Ne pas afficher le menu latéral et le bouton d'ouverture s'il n'y a aucune application (exemple : page publiques)."
+"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"
+"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"
+"Loader enabled": "Activation de l'indicateur de chargement"
+"Tips": "Astuces"
+"Always displayed": "Toujours affiché"
+"The logo will be hidden when the menu is always displayed.": "Le logo sera masque si le menu est toujours affiché."
+"This is the automatic behavior when the menu is always displayed.": "C'est le comportement automatique lorsque le menu est toujours affiché."
+"Not compatible with touch screens.": "Incompatible avec les écrans tactiles."
+"Big menu": "Menu large"
+"Live preview": "Aperçu en direct"
+"Open apps in new tab": "Ouvrir les applications dans un nouvel onglet"
+"Use the global setting": "Utiliser la configuration globale"
+"Use my selection": "Utiliser ma sélection"
+"Show and hide the list of applications": "Afficher et masquer la liste des applications"
+"Use the avatar instead of the logo": "Utiliser l'avatar à la place du logo"
+"You do not have permission to change the settings.": "Vous n'avez pas la permission de changer les paramètres."
+"Force this configuration to users": "Forcer cette configuration aux utilisateurs"
+"Export the configuration": "Exporter la configuration"
+"Purge the cache": "Purger le cache"
+"Show the link to settings": "Afficher le lien vers les paramètres"
+"The menu is enabled by default for users": "Le menu est activé par défaut pour les utilisateurs"
+"Except when the configuration is forced.": "Sauf lorsque la configuration est forcée."
+"Apps that should not be displayed in the menu": "Applications qui ne doivent pas être affichées dans le menu"
+"This feature is only compatible with the <code>big menu</code> display.": "Compatible avec l'affichage <code>Menu large</code>."
+"The logo is a link to the default app": "Le logo est un lien vers l'application par défaut"
+"Others": "Autres"
+"Categories": "Catégories"
+"Customize sorting": "Personnaliser le tri"
+"Order by": "Trier par"
+"Name": "Nom"
+"Customed": "Personnalisé"
+"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"
@@ -0,0 +1,79 @@
+"Custom menu": "自定义菜单"
+"Enable the custom menu": "激活自定义菜单"
+"No": "取消"
+"Yes": "确定"
+"Menu": "菜单"
+"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.": "使用快捷键 <span class=\"keyboard-key\">Ctrl<\/span>+<span class=\"keyboard-key\">o<\/span> 打开或隐藏侧边栏菜单。使用<span class=\"keyboard-key\">tab<\/span> 来导航。"
+"Top menu": "顶部菜单"
+"Apps that not must be moved in the side menu": "禁止在侧边栏菜单移动的应用"
+"If there is no selection then the global configuration is applied.": "如不选择，将应用全局设定。"
+"Experimental": "实验性"
+"Save": "保存"
+"You like this app and you want to support me?": "喜欢本应用并支持我一下？"
+"Buy me a coffee ☕": "赏一杯咖啡 ☕ 给我"
+"Hidden": "隐藏"
+"Small": "小型"
+"Normal": "标准"
+"Big": "大型"
+"Colors": "颜色"
+"Background color": "背景颜色"
+"Background color of current app": "当前应用的背景色"
+"Text color": "文字颜色"
+"Loader": "菜单指示器"
+"Icon": "图标"
+"Same color": "相同颜色"
+"Opposite color": "相反颜色"
+"Transparent": "透明"
+"Opaque": "不透明"
+"Opener": "容器"
+"Default": "默认"
+"Default (dark)": "默认(深色)"
+"Hamburger": "Hamburger"
+"Hamburger (dark)": "Hamburger (深色)"
+"Hamburger 2": "Hamburger 2"
+"Hamburger 2 (dark)": "Hamburger 2 (深色)"
+"Before the logo": "在logo前"
+"After the logo": "在logo后"
+"Position": "位置"
+"Show only the opener (hidden logo)": "只显示容器 (隐藏logo)"
+"Do not display the side menu and the opener if there is no application (eg: public pages).": "N如果没有应用，不显示侧边栏菜单和容器 (例如 : 公共页面)。"
+"Panel": "面板"
+"Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": "鼠标悬停时打开菜单 (触摸屏时将自动禁用)"
+"Display the big menu": "显示大型菜单"
+"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": "图标与文字"
+"Loader enabled": "菜单指示器已激活"
+"Tips": "技巧"
+"Always displayed": "一直显示"
+"The logo will be hidden when the menu is always displayed.": "一直显示菜单时logo将被隐藏。"
+"This is the automatic behavior when the menu is always displayed.": "一直显示菜单时的自动动作。"
+"Not compatible with touch screens.": "与触屏不兼容。"
+"Big menu": "大型菜单"
+"Live preview": "实时预览"
+"Open apps in new tab": "在新标签中打开应用"
+"Use the global setting": "使用全局设定"
+"Use my selection": "使用自定义设定"
+"Show and hide the list of applications": "显示或隐藏应用列表"
+"Use the avatar instead of the logo": "使用头像代替logo"
+"You do not have permission to change the settings.": "没有更改设置的权限。"
+"Force this configuration to users": "强制用户使用此设置"
+"Export the configuration": "导出设置"
+"Purge the cache": "清除缓存"
+"Show the link to settings": "显示设置链接"
+"The menu is enabled by default for users": "用户的默认菜单已激活"
+"Except when the configuration is forced.": "除非设置被强制使用。"
+"Apps that should not be displayed in the menu": "禁止在菜单中显示的应用"
+"This feature is only compatible with the <code>big menu<\/code> display.": "此功能只和<code>大型菜单<\/code>兼容。"
+"The logo is a link to the default app": "logo链接到默认应用"
+"Others": "其他"
+"Categories": "类别"
+"Customize sorting": "自定义顺序"
+"Order by": "排序规则"
+"Name": "名称"
+"Customed": "自定义"
+"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": "有类别"
@@ -8,13 +8,27 @@
    <?php endforeach; ?>
 }

-<?php if ($_['opener-only'] === true): ?>
+<?php if (empty($_['top-menu-apps'])): ?>
+    #appmenu {
+        display: none;
+    }
+
+    #appmenu + nav {
+        display: none;
+    }
+<?php else: ?>
+    .app-hidden {
+        opacity: 0;
+    }
+<?php endif; ?>
+
+<?php if ($_['opener-only']): ?>
    #nextcloud {
        display: none;
    }
 <?php endif; ?>

-<?php if ($_['display-logo'] === false): ?>
+<?php if (!$_['display-logo']): ?>
    .side-menu-logo {
        display: none;
    }
@@ -24,17 +38,12 @@
    }

    .side-menu-apps-list {
-        height: calc(100vh - 60px);
-        top: 60px;
+        height: calc(100vh - 49px);
+        top: 49px;
    }

    #side-menu.hide-opener .side-menu-header {
-        display: none;
-    }
-
-    #side-menu.hide-opener .side-menu-apps-list {
-        height: calc(100vh);
-        top: 0;
+        visibility: hidden;
    }

    <?php if ($_['size-text'] === 'hidden'): ?>
@@ -48,9 +57,9 @@

        #side-menu .side-menu-opener {
            <?php if ($_['size-icon'] === 'big'): ?>
-                margin-left: 6px;
+                margin-left: 1px;
            <?php else: ?>
-                margin-left: 4px;
+                margin-left: 0px;
            <?php endif; ?>
        }
    <?php endif; ?>
@@ -65,16 +74,31 @@
        width: 15px;
        height: 15px;
    }
+
+    img.side-menu-app-icon {
+        width: 15px;
+        height: 15px;
+    }
 <?php elseif ($_['size-icon'] === 'normal'): ?>
    .side-menu-app-icon svg {
        width: 20px;
        height: 20px;
    }
+
+    img.side-menu-app-icon {
+        width: 20px;
+        height: 20px;
+    }
 <?php elseif ($_['size-icon'] === 'big'): ?>
    .side-menu-app-icon svg {
        width: 23px;
        height: 23px;
    }
+
+    img.side-menu-app-icon {
+        width: 23px;
+        height: 23px;
+    }
 <?php endif; ?>

 <?php if ($_['size-text'] === 'hidden'): ?>
@@ -0,0 +1,74 @@
+var alwaysDisplayed = function() {
+    var elements = document.querySelectorAll('*');
+    var fixedElements = []
+
+    for (var i in elements) {
+        var element = elements[i]
+
+        if (typeof element !== 'object') {
+            continue
+        }
+
+        var position = window.getComputedStyle(element, null).getPropertyValue('position');
+
+        if (position !== 'fixed') {
+            continue
+        }
+
+        var id = element.getAttribute('id')
+
+        if (id === 'header' || id === 'side-menu' || id === 'side-menu-loader') {
+            continue
+        }
+
+        if (element.classList.contains('oc-dialog')) {
+            continue
+        }
+
+        if (jQuery(element).parents('#side-menu').length) {
+            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')
+
+        if (right !== '0px') {
+            var intValue = parseInt(left.replace('px', ''))
+            element.style.setProperty('transform', 'translateX(' + (intValue + 50) + 'px)')
+        }
+    }
+}
+
+let content = document.getElementById('content')
+
+if (content && content.classList.contains('app-settings')) {
+    let loaded = false
+    const config = {
+        attributes: false,
+        childList: true,
+        subtree: true
+    }
+    const observer = new MutationObserver(() => {
+        if (loaded) {
+            return;
+        }
+
+        const element = content.querySelector('#app-category-your-apps') || content.querySelector('#app-navigation ul')
+
+        if (element) {
+            loaded = true
+
+            alwaysDisplayed()
+        }
+    })
+
+    observer.observe(content, config)
+} else {
+    window.setTimeout(alwaysDisplayed, 200)
+}
@@ -0,0 +1,15 @@
+var pageLoader = jQuery('<div id="side-menu-loader">')
+var pageLoaderBar = jQuery('<div id="side-menu-loader-bar">')
+
+body.append(pageLoader)
+pageLoader.append(pageLoaderBar)
+
+var pageLoaderValue = 0
+
+$(window).on('beforeunload', function() {
+    setInterval(function() {
+        pageLoaderBar.width(pageLoaderValue.toString() + '%')
+
+        pageLoaderValue = Math.min(pageLoaderValue + .2, 100)
+    }, 25)
+})
@@ -0,0 +1,172 @@
+var 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
+
+    var currentMenuCache = menu.html() + menu.next().html()
+
+    if (currentMenuCache === menuCache) {
+        return
+    }
+
+    navigationApps.html('')
+
+    apps.each(function(i, app) {
+        var dataId = app.getAttribute('data-id')
+
+        if (dataId === null) {
+            return
+        }
+
+        if (topMenuApps.indexOf(dataId) === -1) {
+            app.classList.add('hidden')
+            app.classList.add('app-hidden')
+        } else {
+            app.classList.remove('hidden')
+            app.classList.add('app-external-site')
+            appShown.push(app)
+            navigationApps.append(app.outerHTML)
+        }
+
+        if (targetBlankApps.indexOf(dataId) !== -1) {
+            jQuery(app).children('a').attr('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())
+
+    if (isMobile && appCount > minAppsDesktop) {
+        appCount = minAppsDesktop
+    } else if (!isMobile && appCount < minAppsDesktop) {
+        appCount = minAppsDesktop
+    }
+
+    if (appCount === 0) {
+        menu.addClass('hidden')
+    }
+
+    menu.removeClass('hidden')
+    menu.css('opacity', 1)
+
+    if (appShown.length - 1 - appCount >= 1) {
+        appCount--
+    }
+
+    moreApps.find('a').removeClass('active')
+
+    var k = 0
+    var notInHeader = 0
+    var name
+
+    jQuery(appShown).each(function(i, app) {
+        app = jQuery(app)
+        name = app.data('id')
+
+        if (k < appCount && appCount > 0) {
+            app.removeClass('hidden')
+            lastShownApp = app
+
+            jQuery('#apps li[data-id=' + name + '].app-external-site').addClass('in-header')
+        } else {
+            app.addClass('hidden')
+            notInHeader++
+
+            jQuery('#apps li[data-id=' + name + '].app-external-site').removeClass('in-header')
+
+            if (appCount > 0 && app.children('a').hasClass('active')) {
+                lastShownApp.addClass('hidden')
+                app.removeClass('hidden')
+                notInHeader++
+
+                jQuery('#apps li[data-id=' + name + '].app-external-site')
+                    .removeClass('in-header')
+                    .addClass('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)
+
+        if (!a.is('a')) {
+            a = a.closest('a')
+        }
+
+        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'
+            ))
+
+            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()
+        } else {
+            var svg = app.find('svg');
+
+            if (svg.find('defs').length > 0) {
+                return;
+            }
+
+            var 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})`)
+
+            var html = svg.get(0).innerHTML.replace(/fecolormatrix/g, 'feColorMatrix');
+
+            svg.html(html)
+        }
+    })
+
+    if (notInHeader === 0) {
+        moreApps.hide()
+        navigation.hide()
+    } else {
+        moreApps.show()
+    }
+
+    menuCache = menu.html() + menu.next().html()
+}
+
+setInterval(updateTopMenu, 50)
@@ -1,28 +1,83 @@
+<?php
+
+$display = 'default';
+
+if ($_['always-displayed']) {
+    $display = 'always-displayed';
+} elseif ($_['big-menu']) {
+    $display = 'big-menu';
+} elseif ($_['side-with-categories']) {
+    $display = 'side-with-categories';
+}
+
+?>
+
 (function() {
-    var sideMenuContainer = $('<div id="side-menu-container">')
-    var sideMenuOpener = $('<button class="side-menu-opener"></button>')
-    var sideMenu = $('<div id="side-menu">')
-    var body = $('body')
-
-    body.append(sideMenuContainer)
-
-    sideMenuContainer.append(sideMenu)
-
-    <?php if ($_['opener-position'] === 'before'): ?>
-        sideMenuOpener.insertBefore('#nextcloud')
-    <?php else: ?>
-        sideMenuOpener.insertAfter('#nextcloud')
-    <?php endif; ?>
-
+    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 if ($display === 'big-menu'): ?>
+        sideMenu.attr('data-bigmenu', '1')
+    <?php elseif ($display === 'side-with-categories'): ?>
+        sideMenu.attr('data-sidewithcategories', '1')
+    <?php endif; ?>
+
+    var targetBlankApps = <?php echo json_encode($_['target-blank-apps']) ?>;
+
+    body.on('side-menu.apps', function(e, apps) {
+        <?php if ($_['hide-when-no-apps']): ?>
+            sideMenu = jQuery('#side-menu')
+
+            if (apps.length === 0) {
+                sideMenu.removeClass('open')
+                sideMenu.addClass('hide')
+                sideMenuOpener.addClass('hide')
+            } else {
+                sideMenu.removeClass('hide')
+                sideMenuOpener.removeClass('hide')
+            }
+
+            <?php if ($display === 'always-displayed'): ?>
+                if (apps.length === 0) {
+                    html.removeClass('side-menu-always-displayed');
+                } else {
+                    html.addClass('side-menu-always-displayed');
+                }
+            <?php endif; ?>
+        <?php else: ?>
+            <?php if ($display === 'always-displayed'): ?>
+                if (apps.length === 0) {
+                    html.removeClass('side-menu-always-displayed');
+                } else {
+                    html.addClass('side-menu-always-displayed');
+                }
+            <?php endif; ?>
+        <?php endif; ?>
+    })
+
    body.on('side-menu.ready', function() {
-        sideMenu = $('#side-menu')
+        sideMenu = jQuery('#side-menu')

-        var headerMenuOpener = $('#header .side-menu-opener')
-        var sideMenuOpener = $('#side-menu .side-menu-opener')
+        var headerMenuOpener = jQuery('#header .side-menu-opener')
+        var sideMenuOpener = jQuery('#side-menu .side-menu-opener')

-        <?php if ($_['opener-hover']): ?>
+        sideMenuFocus = function() {
+            var a = sideMenu.find('.side-menu-app.active a')
+
+            if (a.length === 0) {
+                a = sideMenu.find('.side-menu-app:first-child a')
+            }
+
+            if (a.length > 0) {
+                a.focus()
+            }
+        }
+
+        <?php if ($_['opener-hover'] || $display === 'always-displayed'): ?>
            var sideMenuMouseLeave = function() {
                sideMenu
                    .removeClass('open')
@@ -37,21 +92,69 @@
                sideMenu
                    .addClass('open')
                    .on('mouseenter', sideMenuMouseEnter)
+
+                sideMenuFocus()
            }

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

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

        headerMenuOpener.on('click', function() {
-            sideMenu.addClass('open');
+            sideMenu.addClass('open')
+            sideMenu.find('.side-menu-app.active a').focus()
        })

-        sideMenuOpener.on('click', function() {
-            sideMenu.removeClass('open');
+        <?php if ($display === 'always-displayed'): ?>
+            sideMenuOpener.on('click', function() {
+                sideMenu.toggleClass('open')
+            })
+        <?php else: ?>
+            sideMenuOpener.on('click', function() {
+                sideMenu.removeClass('open')
+            })
+        <?php endif; ?>
+
+        jQuery(document).keydown(function(e) {
+            var key = e.key || e.keyCode
+
+            if ((key === 'o' || key === 79) && e.ctrlKey === true) {
+                e.preventDefault()
+
+                sideMenu.toggleClass('open')
+                sideMenuFocus()
+            }
        })
    })
+
+    body.append(sideMenuContainer)
+    sideMenuContainer.append(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; ?>
+
+    <?php if (!empty($_['top-menu-apps'])): ?>
+        var topMenuApps = <?php echo json_encode($_['top-menu-apps']); ?>;
+
+        <?php require_once __DIR__.'/_topMenuApps.js'; ?>
+    <?php endif; ?>
+
+    <?php if ($display === 'always-displayed'): ?>
+        <?php require_once __DIR__.'/_alwaysDisplayed.js'; ?>
+    <?php endif; ?>
 })();
@@ -0,0 +1,178 @@
+<?php
+/**
+ * @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/>.
+ */
+
+script('side_menu', 'admin');
+style('side_menu', 'admin');
+
+$choicesYesNo = [
+    'No' => '0',
+    'Yes' => '1',
+];
+
+?>
+
+
+<div id="side-menu-section">
+    <?php if ($_['force']): ?>
+        <div class="section">
+            <h2>
+                <?php p($l->t('Menu')); ?>
+            </h2>
+
+            <p>
+                <em><?php echo $l->t('You do not have permission to change the settings.'); ?></em>
+            </p>
+        </div>
+    <?php else: ?>
+        <div class="section">
+            <h2>
+                <?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>
+                <?php endforeach; ?>
+            </div>
+        </div>
+
+        <div class="section">
+            <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>
+
+            <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>
+                <?php endforeach; ?>
+            </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>
+
+            <span id="side-menu-message" class="msg"></span>
+
+            <div style="height: 30px"></div>
+        <?php endif ?>
+
+        <div>
+            <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">
+                    <button>
+                        <?php p($l->t('Buy me a coffee ☕')); ?>
+                    </button>
+                </a>
+            </span>
+        </div>
+    </div>
+</div>
@@ -3,51 +3,51 @@ const { VueLoaderPlugin } = require('vue-loader')
 const StyleLintPlugin = require('stylelint-webpack-plugin')

 module.exports = {
-	entry: {
-		'admin': path.join(__dirname, 'src', 'admin.js'),
-		'sideMenu': path.join(__dirname, 'src', 'SideMenu.js'),
-	},
-	output: {
-		path: path.resolve(__dirname, './js'),
-		publicPath: '/js',
-		filename: '[name].js?v=[hash]',
-		chunkFilename: 'chunks/[name]-[hash].js',
-	},
-	module: {
-		rules: [
-			{
-				test: /\.css$/,
-				use: ['vue-style-loader', 'css-loader'],
-			},
-			{
-				test: /\.scss$/,
-				use: ['vue-style-loader', 'css-loader', 'sass-loader'],
-			},
-			{
-				test: /\.vue$/,
-				loader: 'vue-loader',
-			},
-			{
-				test: /\.js$/,
-				loader: 'babel-loader',
-				exclude: /node_modules/,
-			},
-			{
-				test: /\.(png|jpg|gif|svg)$/,
-				loader: 'url-loader',
-				options: {
-					name: '[name].[ext]?[hash]',
-					limit: 8192,
-				},
-			},
-		],
-	},
-	plugins: [
-		new VueLoaderPlugin(),
-		new StyleLintPlugin(),
-	],
-	resolve: {
-		extensions: ['*', '.js', '.vue'],
-		symlinks: false,
-	},
+    entry: {
+        'admin': path.join(__dirname, 'src', 'admin.js'),
+        'sideMenu': path.join(__dirname, 'src', 'SideMenu.js'),
+    },
+    output: {
+        path: path.resolve(__dirname, './js'),
+        publicPath: '/js',
+        filename: '[name].js?v=[hash]',
+        chunkFilename: 'chunks/[name]-[hash].js',
+    },
+    module: {
+        rules: [
+            {
+                test: /\.css$/,
+                use: ['vue-style-loader', 'css-loader'],
+            },
+            {
+                test: /\.scss$/,
+                use: ['vue-style-loader', 'css-loader', 'sass-loader'],
+            },
+            {
+                test: /\.vue$/,
+                loader: 'vue-loader',
+            },
+            {
+                test: /\.js$/,
+                loader: 'babel-loader',
+                exclude: /node_modules/,
+            },
+            {
+                test: /\.(png|jpg|gif|svg)$/,
+                loader: 'url-loader',
+                options: {
+                    name: '[name].[ext]?[hash]',
+                    limit: 8192,
+                },
+            },
+        ],
+    },
+    plugins: [
+        new VueLoaderPlugin(),
+        new StyleLintPlugin(),
+    ],
+    resolve: {
+        extensions: ['*', '.js', '.vue'],
+        symlinks: false,
+    },
 }
				`@@ -0,0 +1 @@`
				`<svg xmlns="http://www.w3.org/2000/svg" width="145.889" height="145.889" viewBox="0 0 38.6 38.6"><g transform="translate(-59.172 -91.92)" stroke="#000" fill="none"><path d="M66.595 111.162h9.997M66.595 103.805h11.4m-11.4 14.714h11.4" stroke-width="3.165"/><rect width="34.535" height="34.535" x="61.205" y="93.952" overflow="visible" rx="5.481" ry="5.481" style="marker:none" color="#000" stroke-width="4.065" stroke-linecap="round" paint-order="fill markers stroke"/></g></svg>`