diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 00000000..9ce55da3
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,4 @@
+
+.git
+.github
+dist/appimage-raw/build
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..e61fe601
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,3 @@
+# Shell scripts and AppImage entry points must always use LF line endings
+dist/appimage/*.sh text eol=lf
+dist/appimage/AppRun text eol=lf
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 5d3cdf23..152b8020 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -19,9 +19,9 @@ A clear and concise description of what you expected to happen.
 **Screenshots**
 If applicable, add screenshots to help explain your problem.
 
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Version [e.g. 22]
+**Environment (please complete the following information):**
+ - OS: [e.g. Ubuntu 19.04, Fedora 31 or Arch]
+ - Ásbrú Version [e.g. 6.1.1 or 6.2.0 or loki]
 
 **Additional context**
 Add any other context about the problem here.
diff --git a/.github/no-response.yml b/.github/no-response.yml
deleted file mode 100644
index c1b4c58f..00000000
--- a/.github/no-response.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-# Configuration for probot-no-response - https://github.com/probot/no-response
-#
-# # Number of days of inactivity before an Issue is closed for lack of response
-daysUntilClose: 10
-# Label requiring a response
-responseRequiredLabel: "awaiting feedback"
-# Comment to post when closing an Issue for lack of response. Set to `false` to disable
-closeComment: >
-  This issue has been automatically closed because there has been no response
-  to our request for more information from the original author. With only the
-  information that is currently in the issue, we don't have enough information
-  to take action. Please reach out if you have or find the answers we need so
-  that we can investigate further.
diff --git a/.github/workflows/build-loki.yml b/.github/workflows/build-loki.yml
new file mode 100644
index 00000000..b48fd79f
--- /dev/null
+++ b/.github/workflows/build-loki.yml
@@ -0,0 +1,16 @@
+name: Build Loki Packages
+
+on:
+  push:
+    branches: [ loki ]
+
+jobs:
+  build-test:
+    uses: ./.github/workflows/package-build.yml
+    with:
+      cloudsmith_dest: loki
+      packagecloud_repo: loki
+    secrets:
+      CLOUDSMITH_API_KEY: ${{ secrets.CLOUDSMITH_API_KEY }}
+      PACKAGECLOUD_USER: ${{ secrets.PACKAGECLOUD_USER }}
+      PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
new file mode 100644
index 00000000..759badaf
--- /dev/null
+++ b/.github/workflows/build-release.yml
@@ -0,0 +1,72 @@
+name: Build Release Packages
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  build-test:
+    uses: ./.github/workflows/package-build.yml
+    with:
+      cloudsmith_dest: release
+      packagecloud_repo: asbru-cm
+    secrets:
+      CLOUDSMITH_API_KEY: ${{ secrets.CLOUDSMITH_API_KEY }}
+      PACKAGECLOUD_USER: ${{ secrets.PACKAGECLOUD_USER }}
+      PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
+
+  build-appimage:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Build AppImage Docker image
+        run: docker build --tag=asbru-cm-appimage-maker --file=dist/appimage/Dockerfile .
+
+      - name: Run AppImage builder
+        run: |
+          CIDFILE=$(mktemp -u)
+          docker run --cidfile "$CIDFILE" --privileged=true -i asbru-cm-appimage-maker /bin/bash \
+            < dist/appimage/container_make_appimage.sh
+          docker cp "$(cat "$CIDFILE"):/Asbru-CM.AppImage" "Asbru-CM-${{ github.ref_name }}.AppImage"
+          docker rm "$(cat "$CIDFILE")"
+          chmod a+x "Asbru-CM-${{ github.ref_name }}.AppImage"
+
+      - name: Upload AppImage artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: appimage
+          path: "Asbru-CM-${{ github.ref_name }}.AppImage"
+
+  publish-release:
+    needs: [build-test, build-appimage]
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - name: Download all artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: artifacts/
+
+      - name: Collect and rename release packages
+        run: |
+          find artifacts/ -mindepth 2 -maxdepth 2 -type f | while read -r file; do
+            dir=$(basename "$(dirname "$file")")
+            filename=$(basename "$file")
+            ext="${filename##*.}"
+            base="${filename%.*}"
+            case "$filename" in
+              *.deb)  mv "$file" "artifacts/${base}_${dir}.${ext}" ;;
+              *.rpm)  mv "$file" "artifacts/${base}_${dir}.${ext}" ;;
+              *.AppImage) mv "$file" "artifacts/$filename" ;;
+            esac
+          done
+
+      - name: Attach artifacts to GitHub Release
+        uses: softprops/action-gh-release@v2
+        with:
+          files: artifacts/*
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/build-snapshots.yml b/.github/workflows/build-snapshots.yml
new file mode 100644
index 00000000..5bc2ede1
--- /dev/null
+++ b/.github/workflows/build-snapshots.yml
@@ -0,0 +1,82 @@
+name: Build Snapshot/Master Packages
+
+on:
+  push:
+    branches: [ master ]
+
+jobs:
+  build-test:
+    uses: ./.github/workflows/package-build.yml
+    with:
+      cloudsmith_dest: snapshots
+      packagecloud_repo: snapshots
+    secrets:
+      CLOUDSMITH_API_KEY: ${{ secrets.CLOUDSMITH_API_KEY }}
+      PACKAGECLOUD_USER: ${{ secrets.PACKAGECLOUD_USER }}
+      PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
+
+  build-appimage:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Build AppImage Docker image
+        run: docker build --tag=asbru-cm-appimage-maker --file=dist/appimage/Dockerfile .
+
+      - name: Run AppImage builder
+        run: |
+          CIDFILE=$(mktemp -u)
+          docker run --cidfile "$CIDFILE" --privileged=true -i asbru-cm-appimage-maker /bin/bash \
+            < dist/appimage/container_make_appimage.sh
+          docker cp "$(cat "$CIDFILE"):/Asbru-CM.AppImage" Asbru-CM-snapshot.AppImage
+          docker rm "$(cat "$CIDFILE")"
+          chmod a+x Asbru-CM-snapshot.AppImage
+
+      - name: Upload AppImage artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: appimage
+          path: Asbru-CM-snapshot.AppImage
+
+  publish-snapshot-release:
+    needs: [build-test, build-appimage]
+    if: ${{ always() && needs.build-test.result == 'success' }}
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - name: Download all artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: artifacts/
+
+      - name: Delete old snapshot release
+        run: |
+          gh release delete snapshot --yes --cleanup-tag --repo "$GITHUB_REPOSITORY" || \
+            echo "No existing snapshot release to delete (or delete failed — continuing)."
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Collect and rename release packages
+        run: |
+          find artifacts/ -mindepth 2 -maxdepth 2 -type f | while read -r file; do
+            dir=$(basename "$(dirname "$file")")
+            filename=$(basename "$file")
+            ext="${filename##*.}"
+            base="${filename%.*}"
+            case "$filename" in
+              *.deb)  mv "$file" "artifacts/${base}_${dir}.${ext}" ;;
+              *.rpm)  mv "$file" "artifacts/${base}_${dir}.${ext}" ;;
+              *.AppImage) mv "$file" "artifacts/$filename" ;;
+            esac
+          done
+
+      - name: Update snapshot release
+        uses: softprops/action-gh-release@v2
+        with:
+          tag_name: snapshot
+          name: "Snapshot Build"
+          prerelease: true
+          files: artifacts/*
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
new file mode 100644
index 00000000..552fa058
--- /dev/null
+++ b/.github/workflows/build-test.yml
@@ -0,0 +1,16 @@
+name: Build Test Packages
+
+on:
+  push:
+    branches: [ build-test ]
+
+jobs:
+  build-test:
+    uses: ./.github/workflows/package-build.yml
+    with:
+      cloudsmith_dest: test
+      packagecloud_repo: test
+    secrets:
+      CLOUDSMITH_API_KEY: ${{ secrets.CLOUDSMITH_API_KEY }}
+      PACKAGECLOUD_USER: ${{ secrets.PACKAGECLOUD_USER }}
+      PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
new file mode 100644
index 00000000..7818a46b
--- /dev/null
+++ b/.github/workflows/docs.yml
@@ -0,0 +1,92 @@
+name: Build & Deploy Docs
+
+on:
+  push:
+    branches: [ master, build-test ]
+  workflow_dispatch:
+
+jobs:
+  docs:
+    runs-on: ubuntu-latest
+
+    env:
+      CHANGELOG_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.1'
+
+      - name: Install changelog generator
+        run: |
+          gem install rack -v 1.6.4
+          gem install github_changelog_generator
+
+      - name: Generate Changelog
+        run: |
+          github_changelog_generator \
+            --release-branch master \
+            --user asbru-cm \
+            --project asbru-cm \
+            --output doc/General/Changelog.md \
+            --no-unreleased
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.11'
+
+      - name: Install MkDocs dependencies
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install \
+          "mkdocs>=1.5,<2.0" \
+          "mkdocs-material>=9.5,<10" \
+          "pymdown-extensions>=10,<11"
+
+      - name: Prepare docs repo (test vs prod)
+        env:
+          GITHUB_API_KEY: ${{ secrets.DOCS_GITHUB_API_KEY }}
+        run: |
+          if [ -z "${GITHUB_API_KEY}" ]; then
+            echo "GITHUB_API_KEY not set please check DOCS_GITHUB_API_KEY secret"
+            exit 1
+          fi
+          
+          if [ "${GITHUB_REF}" = "refs/heads/build-test" ]; then
+            GH_REPO="@github.com/asbru-cm-docs/asbrucm-docs-test.github.io.git"
+          else
+            GH_REPO="@github.com/asbru-cm-docs/asbrucm-docs.github.io.git"
+          fi
+          
+          FULL_REPO="https://${GITHUB_API_KEY}${GH_REPO}"
+          
+          rm -rf out
+          mkdir -p out
+          cd out
+          
+          git init
+          git remote add origin "$FULL_REPO"
+          git fetch origin || true
+          git config user.name "asbrucm-docs"
+          git config user.email "actions@asbru-cm.net"
+          
+          git checkout master
+
+      - name: Build MkDocs site
+        run: |
+          mkdocs build --clean
+
+      - name: Commit & Push docs
+        run: |
+          cd out
+          git add -A .
+          git commit -m "GH-Pages update by GitHub Actions after $GITHUB_SHA" || echo "Nothing to commit"
+          git push origin master
+
diff --git a/.github/workflows/no-response-bot.yml b/.github/workflows/no-response-bot.yml
new file mode 100644
index 00000000..f222eb9f
--- /dev/null
+++ b/.github/workflows/no-response-bot.yml
@@ -0,0 +1,33 @@
+name: No Response Bot
+
+# Note: both `issue_comment` and `scheduled` event types are required for this Action to work properly.
+on:
+  issue_comment:
+    types: [created]
+  schedule:
+    # Schedule for five minutes after the hour, every 6 hours
+    - cron: '5 */6 * * *'
+
+# By specifying the access of one of the scopes, all of those that are not specified are set to 'none'.
+permissions:
+  issues: write
+
+jobs:
+  noResponse:
+    runs-on: ubuntu-latest
+    if: ${{ github.repository == 'asbru-cm/asbru-cm' }}
+    steps:
+      - uses: godofredoc/no-response@0ce2dc0e63e1c7d2b87752ceed091f6d32c9df09
+        with:
+          token: ${{ github.token }}
+          # Comment to post when closing an Issue for lack of response. Set to `false` to disable
+          closeComment: >
+            This issue has been automatically closed because there has been no response
+            to our request for more information from the original author. With only the
+            information that is currently in the issue, we don't have enough information
+            to take action. Please reach out if you have or find the answers we need so
+            that we can investigate further.
+          # Number of days of inactivity before an issue is closed for lack of response.
+          daysUntilClose: 10
+          # Label requiring a response.
+          responseRequiredLabel: "awaiting feedback"
diff --git a/.github/workflows/package-build.yml b/.github/workflows/package-build.yml
new file mode 100644
index 00000000..6caa42e1
--- /dev/null
+++ b/.github/workflows/package-build.yml
@@ -0,0 +1,252 @@
+name: Package Build (Reusable)
+
+on:
+  workflow_call:
+    inputs:
+      cloudsmith_dest:
+        description: "Cloudsmith repo path (test/snapshots/loki/release)"
+        required: true
+        type: string
+      packagecloud_repo:
+        description: "Packagecloud repository name"
+        required: true
+        type: string
+    secrets:
+      CLOUDSMITH_API_KEY:
+        required: false
+      PACKAGECLOUD_USER:
+        required: false
+      PACKAGECLOUD_TOKEN:
+        required: false
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+        # Debian (supported)
+        - os: debian
+          dist: bullseye
+          package: deb
+          docker_repo: ""
+          docker_image: ""
+          repack_deb: ""
+
+        - os: debian
+          dist: bookworm
+          package: deb
+          docker_repo: ""
+          docker_image: ""
+          repack_deb: ""
+
+        - os: debian
+          dist: trixie
+          package: deb
+          docker_repo: "asbru/asbru-cm"
+          docker_image: ""
+          repack_deb: ""
+
+        # Ubuntu (LTS)
+        - os: ubuntu
+          dist: jammy
+          package: deb
+          docker_repo: ""
+          docker_image: ""
+          repack_deb: "yes"
+
+        - os: ubuntu
+          dist: noble
+          package: deb
+          docker_repo: "asbru/asbru-cm"
+          docker_image: ""
+          repack_deb: "yes"
+
+        - os: ubuntu
+          dist: resolute
+          package: deb
+          docker_repo: "asbru/asbru-cm"
+          docker_image: ""
+          repack_deb: "yes"
+
+        # Enterprise Linux
+        - os: el
+          dist: "8"
+          package: rpm
+          docker_repo: ""
+          docker_image: ""
+          repack_deb: ""
+
+        #AlmaLinux 9 (EL 9 build)
+        - os: almalinux
+          dist: "9"
+          package: rpm
+
+          # Fedora
+        - os: fedora
+          dist: "43"
+          package: rpm
+          docker_repo: "asbru/asbru-cm"
+          docker_image: ""
+          repack_deb: ""
+
+          # Fedora
+        - os: fedora
+          dist: "44"
+          package: rpm
+          docker_repo: "asbru/asbru-cm"
+          docker_image: ""
+          repack_deb: ""
+
+        # Linux Mint (21)
+        - os: linuxmint
+          dist: vanessa
+          package: deb
+          docker_repo: ""
+          docker_image: "ubuntu-jammy"
+          repack_deb: ""
+
+        - os: linuxmint
+          dist: wilma
+          package: deb
+          docker_repo: ""
+          docker_image: "ubuntu-noble"
+          repack_deb: ""
+
+        # Pop!_OS (22.04)
+        - os: pop
+          dist: jammy
+          package: deb
+          docker_repo: ""
+          docker_image: "ubuntu-jammy"
+          repack_deb: "yes"
+
+    env:
+      PRODUCT: "asbru-cm"
+      OS: ${{ matrix.os }}
+      DIST: ${{ matrix.dist }}
+      PACKAGE: ${{ matrix.package }}
+      DOCKER_REPO: ${{ matrix.docker_repo }}
+      DOCKER_IMAGE: ${{ matrix.docker_image }}
+      REPACK_DEB: ${{ matrix.repack_deb }}
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Install build dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y \
+            git devscripts debhelper quilt \
+            python3 python3-pip python3-setuptools gpgv
+          python3 -m pip install --user --upgrade cloudsmith-cli
+          echo "$HOME/.local/bin" >> "$GITHUB_PATH"
+
+      - name: Make build script executable
+        run: chmod +x ci/build_package.sh
+
+      - name: Build packages
+        run: ci/build_package.sh
+
+      - name: Upload build artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: "${{ matrix.os }}-${{ matrix.dist }}-${{ matrix.package }}"
+          path: build/*
+
+      # Cloudsmith Upload (CLI)
+      - name: Upload to Cloudsmith
+        env:
+          CLOUDSMITH_API_KEY: ${{ secrets.CLOUDSMITH_API_KEY }}
+        run: |
+          set -euo pipefail
+
+          if [ -z "${CLOUDSMITH_API_KEY:-}" ]; then
+            echo "CLOUDSMITH_API_KEY not set – skipping Cloudsmith upload."
+            exit 0
+          fi
+
+          DEST="${{ inputs.cloudsmith_dest }}"
+
+          echo "Uploading to Cloudsmith: asbru-cm/${DEST}/${OS}/${DIST}"
+          shopt -s nullglob
+
+          for file in build/*.${PACKAGE}; do
+            echo "Pushing $file..."
+            cloudsmith push "${PACKAGE}" "asbru-cm/${DEST}/${OS}/${DIST}" "$file"
+          done
+
+          if [ "${PACKAGE}" = "deb" ]; then
+            for dsc in build/*.dsc; do
+              echo "Pushing source package $dsc..."
+              cloudsmith push "${PACKAGE}" \
+                "asbru-cm/${DEST}/${OS}/${DIST}" \
+                "$dsc" \
+                --sources-file build/*.debian.tar.*
+            done
+          fi
+
+      # Packagecloud Upload
+      - name: Upload .deb to Packagecloud
+        continue-on-error: true
+        if: ${{ env.PACKAGE == 'deb' }}
+        uses: computology/packagecloud-github-action@v0.8
+        env:
+          PACKAGECLOUD_USER: ${{ secrets.PACKAGECLOUD_USER }}
+          PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
+        with:
+          package-name: build/*.deb
+          packagecloud-username: ${{ env.PACKAGECLOUD_USER }}
+          packagecloud-reponame: ${{ inputs.packagecloud_repo }}
+          packagecloud-distro: "${{ env.OS }}/${{ env.DIST }}"
+          packagecloud-token: ${{ env.PACKAGECLOUD_TOKEN }}
+
+      - name: Upload .rpm to Packagecloud
+        continue-on-error: true
+        if: ${{ env.PACKAGE == 'rpm' }}
+        uses: computology/packagecloud-github-action@v0.8
+        env:
+          PACKAGECLOUD_USER: ${{ secrets.PACKAGECLOUD_USER }}
+          PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
+        with:
+          package-name: build/*.rpm
+          packagecloud-username: ${{ env.PACKAGECLOUD_USER }}
+          packagecloud-reponame: ${{ inputs.packagecloud_repo }}
+          packagecloud-distro: "${{ env.OS }}/${{ env.DIST }}"
+          packagecloud-token: ${{ env.PACKAGECLOUD_TOKEN }}
+
+      - name: Upload .dsc to Packagecloud
+        continue-on-error: true
+        if: ${{ env.PACKAGE == 'deb' }}
+        uses: computology/packagecloud-github-action@v0.8
+        env:
+          PACKAGECLOUD_USER: ${{ secrets.PACKAGECLOUD_USER }}
+          PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
+        with:
+          package-name: build/*.dsc
+          packagecloud-username: ${{ env.PACKAGECLOUD_USER }}
+          packagecloud-reponame: ${{ inputs.packagecloud_repo }}
+          packagecloud-distro: "${{ env.OS }}/${{ env.DIST }}"
+          packagecloud-token: ${{ env.PACKAGECLOUD_TOKEN }}
+
+      - name: Prune old Packagecloud packages
+        if: ${{ inputs.packagecloud_repo != '' && inputs.packagecloud_repo != 'release' }}
+        env:
+          PACKAGECLOUD_USER: ${{ secrets.PACKAGECLOUD_USER }}
+          PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
+        run: |
+          python -m pip install -r ./packpack/tools/requirements.txt
+
+          # deb-Pakete aufräumen
+          python ./packpack/tools/packagecloud prune \
+            "${PACKAGECLOUD_USER}/${{ inputs.packagecloud_repo }}" \
+            deb "${OS}" "${DIST}" --keep 5 || true
+
+          # rpm-Pakete aufräumen
+          python ./packpack/tools/packagecloud prune \
+            "${PACKAGECLOUD_USER}/${{ inputs.packagecloud_repo }}" \
+            rpm "${OS}" "${DIST}" --keep 5 || true
+
diff --git a/.gitignore b/.gitignore
index f24ec169..c6f3e637 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 *.*~
 lib/lib
 lib/res
+/out
diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 00000000..13566b81
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 59770c55..00000000
--- a/.travis.yml
+++ /dev/null
@@ -1,69 +0,0 @@
-sudo: required
-language: perl
-services:
-        - docker
-env:
-  global:
-    - CHANGELOG_NAME=Asbru-CM Team
-    - CHANGELOG_EMAIL=contact@asbru-cm.net
-    - PRODUCT=asbru-cm
-  matrix:
-    - OS=debian DIST=jessie PACKAGE=deb
-    - OS=debian DIST=stretch PACKAGE=deb
-    - OS=debian DIST=buster PACKAGE=deb
-    - OS=ubuntu DIST=xenial PACKAGE=deb
-    - OS=ubuntu DIST=bionic PACKAGE=deb
-    - OS=ubuntu DIST=disco PACKAGE=deb DOCKER_REPO=asbru/asbru-cm
-    - OS=ubuntu DIST=eoan PACKAGE=deb
-    - OS=fedora DIST=29 PACKAGE=rpm
-    - OS=fedora DIST=30 PACKAGE=rpm
-    - OS=fedora DIST=31 PACKAGE=rpm
-    - OS=el DIST=7 PACKAGE=rpm
-    - OS=el DIST=8 PACKAGE=rpm
-    - OS=linuxmint DIST=sonya PACKAGE=deb DOCKER_IMAGE=debian-stretch
-    - OS=linuxmint DIST=sylvia PACKAGE=deb DOCKER_IMAGE=debian-stretch
-    - OS=linuxmint DIST=tara PACKAGE=deb DOCKER_IMAGE=ubuntu-bionic
-    - OS=linuxmint DIST=tessa PACKAGE=deb DOCKER_IMAGE=ubuntu-bionic
-    - OS=linuxmint DIST=tina PACKAGE=deb DOCKER_IMAGE=ubuntu-bionic
-    - OS=linuxmint DIST=tricia PACKAGE=deb DOCKER_IMAGE=ubuntu-bionic
-install:
-    - sudo apt-get update
-    - sudo apt-get install git devscripts debhelper quilt
-script: ./build.sh
-deploy:
-  - provider: packagecloud
-    skip_cleanup: true
-    repository: snapshots
-    username: ${PACKAGECLOUD_USER}
-    token: ${PACKAGECLOUD_TOKEN}
-    dist: ${OS}/${DIST}
-    package_glob: "build/*.{deb,rpm,dsc}"
-    on:
-      branch: master
-  - provider: packagecloud
-    skip_cleanup: true
-    repository: asbru-cm
-    username: ${PACKAGECLOUD_USER}
-    token: ${PACKAGECLOUD_TOKEN}
-    dist: ${OS}/${DIST}
-    package_glob: "build/*.{deb,rpm,dsc}"
-    on:
-      tags: true
-  - provider: packagecloud
-    skip_cleanup: true
-    repository: loki
-    username: ${PACKAGECLOUD_USER}
-    token: ${PACKAGECLOUD_TOKEN}
-    dist: ${OS}/${DIST}
-    package_glob: "build/*.{deb,rpm,dsc}"
-    on:
-      branch: loki
-
-
-after_deploy:
-  # Prune old packages from packagecloud. The last 5 should be enough.
-  - pip install -r ./packpack/tools/requirements.txt
-  - python ./packpack/tools/packagecloud prune ${PACKAGECLOUD_USER}/snapshots deb ${OS} ${DIST} --keep 5
-  - python ./packpack/tools/packagecloud prune ${PACKAGECLOUD_USER}/snapshots rpm ${OS} ${DIST} --keep 5
-  - python ./packpack/tools/packagecloud prune ${PACKAGECLOUD_USER}/loki deb ${OS} ${DIST} --keep 5
-  - python ./packpack/tools/packagecloud prune ${PACKAGECLOUD_USER}/loki rpm ${OS} ${DIST} --keep 5
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f0aaadf2..bb7ab750 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,506 +1 @@
-# Changelog
-
-## [6.1.0rc1](https://github.com/asbru-cm/asbru-cm/tree/6.1.0rc1) (2020-03-01)
-
-[Full Changelog](https://github.com/asbru-cm/asbru-cm/compare/6.0.4...6.1.0rc1)
-
-**Implemented enhancements:**
-
-- Add support for the "jump host" functionality of SSH [\#67](https://github.com/asbru-cm/asbru-cm/issues/67)
-
-**Fixed bugs:**
-
-- UTF8 characters not showing properly [\#423](https://github.com/asbru-cm/asbru-cm/issues/423)
-- asbru-cm 6.1.0 rc1 on EL7 does not start [\#417](https://github.com/asbru-cm/asbru-cm/issues/417)
-- ssh port number field too small [\#410](https://github.com/asbru-cm/asbru-cm/issues/410)
-
-**Closed issues:**
-
-- Installation fails in Arch or Manjaro [\#427](https://github.com/asbru-cm/asbru-cm/issues/427)
-- 6.1.0 rc1 SSH saved connections icon \(EL7\) [\#418](https://github.com/asbru-cm/asbru-cm/issues/418)
-- Debian/Ubuntu 16.04 - Error during installation of package due to unmet dependencies [\#405](https://github.com/asbru-cm/asbru-cm/issues/405)
-- Please add support to KeePass 2 Database File [\#400](https://github.com/asbru-cm/asbru-cm/issues/400)
-- Remove Net::Proxy, replace with ssh option parameters [\#323](https://github.com/asbru-cm/asbru-cm/issues/323)
-
-**Merged pull requests:**
-
-- Vncrdpsocksproxy [\#404](https://github.com/asbru-cm/asbru-cm/pull/404) ([hanspr](https://github.com/hanspr))
-- show hidden connection list on info tab selected [\#401](https://github.com/asbru-cm/asbru-cm/pull/401) ([hanspr](https://github.com/hanspr))
-- Find bug266 [\#398](https://github.com/asbru-cm/asbru-cm/pull/398) ([hanspr](https://github.com/hanspr))
-- Fix focus [\#396](https://github.com/asbru-cm/asbru-cm/pull/396) ([hanspr](https://github.com/hanspr))
-- URGENT REGRESSION MISSING KEY FILE [\#394](https://github.com/asbru-cm/asbru-cm/pull/394) ([hanspr](https://github.com/hanspr))
-- Treeview 2 [\#392](https://github.com/asbru-cm/asbru-cm/pull/392) ([hanspr](https://github.com/hanspr))
-- Cluster windows [\#390](https://github.com/asbru-cm/asbru-cm/pull/390) ([hanspr](https://github.com/hanspr))
-- Fix372 2 [\#388](https://github.com/asbru-cm/asbru-cm/pull/388) ([hanspr](https://github.com/hanspr))
-- Proxyvncrdp1 [\#384](https://github.com/asbru-cm/asbru-cm/pull/384) ([hanspr](https://github.com/hanspr))
-- Fixcompact [\#383](https://github.com/asbru-cm/asbru-cm/pull/383) ([hanspr](https://github.com/hanspr))
-- Fix373 [\#377](https://github.com/asbru-cm/asbru-cm/pull/377) ([hanspr](https://github.com/hanspr))
-- Fix372 [\#376](https://github.com/asbru-cm/asbru-cm/pull/376) ([hanspr](https://github.com/hanspr))
-- Handlepipechar [\#375](https://github.com/asbru-cm/asbru-cm/pull/375) ([hanspr](https://github.com/hanspr))
-- Portforward2 [\#371](https://github.com/asbru-cm/asbru-cm/pull/371) ([hanspr](https://github.com/hanspr))
-- Portforward improvement [\#370](https://github.com/asbru-cm/asbru-cm/pull/370) ([hanspr](https://github.com/hanspr))
-- Rdpvnc [\#368](https://github.com/asbru-cm/asbru-cm/pull/368) ([hanspr](https://github.com/hanspr))
-- Moveproxyssh [\#367](https://github.com/asbru-cm/asbru-cm/pull/367) ([hanspr](https://github.com/hanspr))
-- Transientwindows [\#365](https://github.com/asbru-cm/asbru-cm/pull/365) ([hanspr](https://github.com/hanspr))
-- Fix359 [\#362](https://github.com/asbru-cm/asbru-cm/pull/362) ([hanspr](https://github.com/hanspr))
-- Transparency1 [\#360](https://github.com/asbru-cm/asbru-cm/pull/360) ([hanspr](https://github.com/hanspr))
-- Fix67 2 [\#357](https://github.com/asbru-cm/asbru-cm/pull/357) ([hanspr](https://github.com/hanspr))
-- Fix67 1 [\#356](https://github.com/asbru-cm/asbru-cm/pull/356) ([hanspr](https://github.com/hanspr))
-- Fix323 improvements [\#348](https://github.com/asbru-cm/asbru-cm/pull/348) ([hanspr](https://github.com/hanspr))
-- Fix211 [\#339](https://github.com/asbru-cm/asbru-cm/pull/339) ([hanspr](https://github.com/hanspr))
-- Fix208 [\#338](https://github.com/asbru-cm/asbru-cm/pull/338) ([hanspr](https://github.com/hanspr))
-- Fix210 [\#337](https://github.com/asbru-cm/asbru-cm/pull/337) ([hanspr](https://github.com/hanspr))
-- Netproxy remove [\#336](https://github.com/asbru-cm/asbru-cm/pull/336) ([hanspr](https://github.com/hanspr))
-- Fix323 FOR TESTING [\#335](https://github.com/asbru-cm/asbru-cm/pull/335) ([hanspr](https://github.com/hanspr))
-
-## [6.0.4](https://github.com/asbru-cm/asbru-cm/tree/6.0.4) (2020-02-04)
-
-[Full Changelog](https://github.com/asbru-cm/asbru-cm/compare/6.0.3...6.0.4)
-
-**Implemented enhancements:**
-
-- ssh compression activated by change of other options [\#359](https://github.com/asbru-cm/asbru-cm/issues/359)
-- \(Snapshot Version 6\) Folder appearance [\#306](https://github.com/asbru-cm/asbru-cm/issues/306)
-
-**Fixed bugs:**
-
-- Asbru 6.0.2 does not save text in 'info tab' [\#372](https://github.com/asbru-cm/asbru-cm/issues/372)
-
-**Closed issues:**
-
-- Help with expect regex for this system [\#387](https://github.com/asbru-cm/asbru-cm/issues/387)
-- Indentation problem [\#385](https://github.com/asbru-cm/asbru-cm/issues/385)
-- Proposal to replace OSSP::uuid dependency for Data::UUID [\#374](https://github.com/asbru-cm/asbru-cm/issues/374)
-- Some servers disconnected when using clusters [\#373](https://github.com/asbru-cm/asbru-cm/issues/373)
-- 6.0.2: Select-by-word characters not functioning [\#363](https://github.com/asbru-cm/asbru-cm/issues/363)
-- Please correct Debian dependencies entry in wiki [\#361](https://github.com/asbru-cm/asbru-cm/issues/361)
-- \[gtk3\] VTE transparency [\#207](https://github.com/asbru-cm/asbru-cm/issues/207)
-
-**Merged pull requests:**
-
-- fix find bug [\#399](https://github.com/asbru-cm/asbru-cm/pull/399) ([hanspr](https://github.com/hanspr))
-- Treeview master [\#393](https://github.com/asbru-cm/asbru-cm/pull/393) ([hanspr](https://github.com/hanspr))
-- improved restart logic on exit, removed sleep [\#389](https://github.com/asbru-cm/asbru-cm/pull/389) ([hanspr](https://github.com/hanspr))
-- retry on timeout [\#380](https://github.com/asbru-cm/asbru-cm/pull/380) ([hanspr](https://github.com/hanspr))
-
-## [6.0.3](https://github.com/asbru-cm/asbru-cm/tree/6.0.3) (2020-01-17)
-
-[Full Changelog](https://github.com/asbru-cm/asbru-cm/compare/6.0.2...6.0.3)
-
-**Implemented enhancements:**
-
-- Port asbru\_from\_superputty.py to python3 [\#355](https://github.com/asbru-cm/asbru-cm/issues/355)
-- Invalid scroll position in KDE \(gtk3\) [\#303](https://github.com/asbru-cm/asbru-cm/issues/303)
-
-**Fixed bugs:**
-
-- Question: Is there a dependency on Python 2? [\#354](https://github.com/asbru-cm/asbru-cm/issues/354)
-
-**Closed issues:**
-
-- libnet-proxy-perl dependency old and deprecated [\#218](https://github.com/asbru-cm/asbru-cm/issues/218)
-
-## [6.0.2](https://github.com/asbru-cm/asbru-cm/tree/6.0.2) (2020-01-11)
-
-[Full Changelog](https://github.com/asbru-cm/asbru-cm/compare/6.0.1...6.0.2)
-
-**Implemented enhancements:**
-
-- Reverse button order to "Cancel" "OK"? [\#229](https://github.com/asbru-cm/asbru-cm/issues/229)
-- asbru for centos [\#60](https://github.com/asbru-cm/asbru-cm/issues/60)
-- Icons and some buttons are small on 4K display [\#55](https://github.com/asbru-cm/asbru-cm/issues/55)
-
-**Fixed bugs:**
-
-- Host key verification throws script error [\#344](https://github.com/asbru-cm/asbru-cm/issues/344)
-- local command automated username error. [\#341](https://github.com/asbru-cm/asbru-cm/issues/341)
-- RDP keyboard stops to work [\#331](https://github.com/asbru-cm/asbru-cm/issues/331)
-- Remote commands in Cluster connections   [\#304](https://github.com/asbru-cm/asbru-cm/issues/304)
-- SSH connection via SOCKS proxy not working [\#280](https://github.com/asbru-cm/asbru-cm/issues/280)
-- Crash when re-attaching window [\#70](https://github.com/asbru-cm/asbru-cm/issues/70)
-
-**Closed issues:**
-
-- Terminals Tabbed Window fails in Compact Window Layout [\#352](https://github.com/asbru-cm/asbru-cm/issues/352)
-- Keepass does not work in latest [\#343](https://github.com/asbru-cm/asbru-cm/issues/343)
-- asbru-cm.spec - another similar minor issue [\#333](https://github.com/asbru-cm/asbru-cm/issues/333)
-- asbru-cm.spec file - minor correction [\#332](https://github.com/asbru-cm/asbru-cm/issues/332)
-- Resizing left menu section doesn't repaint the console properly [\#310](https://github.com/asbru-cm/asbru-cm/issues/310)
-- 2FA under Authentication options [\#300](https://github.com/asbru-cm/asbru-cm/issues/300)
-- \[gtk3\] VTE history of commands [\#211](https://github.com/asbru-cm/asbru-cm/issues/211)
-- \[gtk3\] VTE bold is bright option [\#210](https://github.com/asbru-cm/asbru-cm/issues/210)
-- \[gtk3\] VTE visible bell [\#208](https://github.com/asbru-cm/asbru-cm/issues/208)
-- \[gtk3\] VTE: Remove or rework "Term Emulation" [\#206](https://github.com/asbru-cm/asbru-cm/issues/206)
-
-**Merged pull requests:**
-
-- fix343 [\#350](https://github.com/asbru-cm/asbru-cm/pull/350) ([hanspr](https://github.com/hanspr))
-- fix \#341 [\#347](https://github.com/asbru-cm/asbru-cm/pull/347) ([hanspr](https://github.com/hanspr))
-- fix \#344 [\#346](https://github.com/asbru-cm/asbru-cm/pull/346) ([hanspr](https://github.com/hanspr))
-- fixed regression tabbed terminals [\#334](https://github.com/asbru-cm/asbru-cm/pull/334) ([hanspr](https://github.com/hanspr))
-
-## [6.0.1](https://github.com/asbru-cm/asbru-cm/tree/6.0.1) (2020-01-04)
-
-[Full Changelog](https://github.com/asbru-cm/asbru-cm/compare/6.0.0...6.0.1)
-
-**Implemented enhancements:**
-
-- Password is visible on the taskbar tooltip for RDP session \(xfreerdp\) [\#328](https://github.com/asbru-cm/asbru-cm/issues/328)
-
-**Fixed bugs:**
-
-- Asbru-cm doesn't start anymore after upgrading to 6.0 [\#329](https://github.com/asbru-cm/asbru-cm/issues/329)
-- Click on re-attached tab, open an empty window [\#327](https://github.com/asbru-cm/asbru-cm/issues/327)
-
-**Closed issues:**
-
-- Dropping support for legacy distributions [\#325](https://github.com/asbru-cm/asbru-cm/issues/325)
-
-## [6.0.0](https://github.com/asbru-cm/asbru-cm/tree/6.0.0) (2020-01-02)
-
-[Full Changelog](https://github.com/asbru-cm/asbru-cm/compare/5.2.1...6.0.0)
-
-**Implemented enhancements:**
-
-- Can not install on LinuxMint/tricia [\#321](https://github.com/asbru-cm/asbru-cm/issues/321)
-- \[gtk3\] GtkDialog mapped without a transient parent [\#312](https://github.com/asbru-cm/asbru-cm/issues/312)
-- Copy password from another connection defined in the Connections List [\#295](https://github.com/asbru-cm/asbru-cm/issues/295)
-- Double click on tab to restart [\#281](https://github.com/asbru-cm/asbru-cm/issues/281)
-- gtk3 Minimalist Main Window [\#262](https://github.com/asbru-cm/asbru-cm/issues/262)
-- Disable ssh's X forwarding by default [\#247](https://github.com/asbru-cm/asbru-cm/issues/247)
-- not found asbru-cm deb from repository [\#237](https://github.com/asbru-cm/asbru-cm/issues/237)
-- Automatic Keyboard Focus [\#148](https://github.com/asbru-cm/asbru-cm/issues/148)
-- More compact server-list tree [\#133](https://github.com/asbru-cm/asbru-cm/issues/133)
-- Garbage characters in shell logfiles [\#132](https://github.com/asbru-cm/asbru-cm/issues/132)
-- Flatpak support [\#83](https://github.com/asbru-cm/asbru-cm/issues/83)
-- Add feature to see RDP connection log \(especially errors\) directly in asbru-cm [\#76](https://github.com/asbru-cm/asbru-cm/issues/76)
-- Right-click on connection-tree changes selection [\#51](https://github.com/asbru-cm/asbru-cm/issues/51)
-- Renaming a cloned connection can be confusing [\#37](https://github.com/asbru-cm/asbru-cm/issues/37)
-
-**Fixed bugs:**
-
-- Some regressions in gtk3 [\#317](https://github.com/asbru-cm/asbru-cm/issues/317)
-- RPM packaging issue: res directory is in incorrect path [\#302](https://github.com/asbru-cm/asbru-cm/issues/302)
-- VNC connection status is not parsed properly \(always "connecting"\) [\#301](https://github.com/asbru-cm/asbru-cm/issues/301)
-- Cannot change proxy settings [\#291](https://github.com/asbru-cm/asbru-cm/issues/291)
-- Can not input username more than 14 symbols on Proxy tab [\#288](https://github.com/asbru-cm/asbru-cm/issues/288)
-- Terminals not closing on el7 [\#269](https://github.com/asbru-cm/asbru-cm/issues/269)
-- \[gtk3\] It doesn't close, the windows [\#259](https://github.com/asbru-cm/asbru-cm/issues/259)
-- Removing a local/remote command/macro might remove another one [\#252](https://github.com/asbru-cm/asbru-cm/issues/252)
-- asbru-cm gtk3 rpm missing file [\#250](https://github.com/asbru-cm/asbru-cm/issues/250)
-- Latest asbru-cm 6.0 builds not working on RHEL 7.7 [\#240](https://github.com/asbru-cm/asbru-cm/issues/240)
-- \<-= DISCONNECTED \(PRESS \<ENTER\> TO RECONNECT\)  issue in gtk3 [\#232](https://github.com/asbru-cm/asbru-cm/issues/232)
-- \[gtk3\] VNC connection \(in embed mode\) does not work properly [\#199](https://github.com/asbru-cm/asbru-cm/issues/199)
-- Deleting one cluster deletes all [\#180](https://github.com/asbru-cm/asbru-cm/issues/180)
-- VNC options empty: Can't call method "\_buildGUI" on an undefined value [\#178](https://github.com/asbru-cm/asbru-cm/issues/178)
-- Right mouse click on tab title stop working [\#169](https://github.com/asbru-cm/asbru-cm/issues/169)
-- Cannot interact with multiple selections in Connection list [\#168](https://github.com/asbru-cm/asbru-cm/issues/168)
-- ncurses: showing applications in ncurses is looking very ugly [\#143](https://github.com/asbru-cm/asbru-cm/issues/143)
-- Cluster explode: window sizes and placement are incorrect [\#98](https://github.com/asbru-cm/asbru-cm/issues/98)
-- "Retab" button in PCC causes asbru-cm to crash [\#52](https://github.com/asbru-cm/asbru-cm/issues/52)
-- Pasting long passwords into password prompt doesn't always work [\#49](https://github.com/asbru-cm/asbru-cm/issues/49)
-- starting asbru-cm a second time leads to segfault [\#23](https://github.com/asbru-cm/asbru-cm/issues/23)
-- Guessing the hostname with \<ctrl\>+\<shift\>+\<g\> doesn't work with zsh [\#9](https://github.com/asbru-cm/asbru-cm/issues/9)
-- Errors while opening local shell should not be shown as messages of the remote session [\#4](https://github.com/asbru-cm/asbru-cm/issues/4)
-
-**Closed issues:**
-
-- \[gtk3\] alt-e does not open connection editor [\#314](https://github.com/asbru-cm/asbru-cm/issues/314)
-- GTK3 about size of preference [\#293](https://github.com/asbru-cm/asbru-cm/issues/293)
-- Manual password required [\#283](https://github.com/asbru-cm/asbru-cm/issues/283)
-- Unable to Install GTK2 or GTK3 versions on Centos 7.6 [\#274](https://github.com/asbru-cm/asbru-cm/issues/274)
-- Placement of the context menu after right click the asbru-cm tray icon \(on EL7\) [\#273](https://github.com/asbru-cm/asbru-cm/issues/273)
-- gtk3 version not running on debian 10, xfce4 [\#272](https://github.com/asbru-cm/asbru-cm/issues/272)
-- \[gtk3\] Remove termcap [\#271](https://github.com/asbru-cm/asbru-cm/issues/271)
-- Move all encoding to utf8 [\#268](https://github.com/asbru-cm/asbru-cm/issues/268)
-- Find option shows lots of weird characters [\#266](https://github.com/asbru-cm/asbru-cm/issues/266)
-- asbru crashed, config file empty [\#265](https://github.com/asbru-cm/asbru-cm/issues/265)
-- \[GTK3\] Typing text not replicated on cluster windows  [\#261](https://github.com/asbru-cm/asbru-cm/issues/261)
-- vteFeedChild [\#256](https://github.com/asbru-cm/asbru-cm/issues/256)
-- \[gtk3\] Faulty link in license dialog [\#251](https://github.com/asbru-cm/asbru-cm/issues/251)
-- gtk3 Favourites [\#245](https://github.com/asbru-cm/asbru-cm/issues/245)
-- Full width banner [\#233](https://github.com/asbru-cm/asbru-cm/issues/233)
-- SSH options: clashing local port wipes out previous entries [\#179](https://github.com/asbru-cm/asbru-cm/issues/179)
-
-**Merged pull requests:**
-
-- added execute cluster commit on confirmed if confirmation was required [\#324](https://github.com/asbru-cm/asbru-cm/pull/324) ([hanspr](https://github.com/hanspr))
-- added cluster commit, \#304 [\#322](https://github.com/asbru-cm/asbru-cm/pull/322) ([hanspr](https://github.com/hanspr))
-- fixed regression removing unless from eq to ne [\#320](https://github.com/asbru-cm/asbru-cm/pull/320) ([hanspr](https://github.com/hanspr))
-- Fix spelling in banner of "Power Cluster Controller" [\#319](https://github.com/asbru-cm/asbru-cm/pull/319) ([merikz](https://github.com/merikz))
-- revised unless statements, caused regressions [\#318](https://github.com/asbru-cm/asbru-cm/pull/318) ([hanspr](https://github.com/hanspr))
-- \[gtk3\] regression from removal of "unless" \(fixes \#314\) [\#315](https://github.com/asbru-cm/asbru-cm/pull/315) ([merikz](https://github.com/merikz))
-- Remove GTK-Message:GtkDialog mapped without a transient parent. \(\#312\) [\#313](https://github.com/asbru-cm/asbru-cm/pull/313) ([merikz](https://github.com/merikz))
-- added feature \#295 copy password, passphrase from terminal, connections [\#298](https://github.com/asbru-cm/asbru-cm/pull/298) ([hanspr](https://github.com/hanspr))
-- Shrink preferences [\#296](https://github.com/asbru-cm/asbru-cm/pull/296) ([hanspr](https://github.com/hanspr))
-- Fix layout [\#292](https://github.com/asbru-cm/asbru-cm/pull/292) ([hanspr](https://github.com/hanspr))
-- Fix229 [\#290](https://github.com/asbru-cm/asbru-cm/pull/290) ([hanspr](https://github.com/hanspr))
-- Fix288 [\#289](https://github.com/asbru-cm/asbru-cm/pull/289) ([hanspr](https://github.com/hanspr))
-- Fix232 [\#287](https://github.com/asbru-cm/asbru-cm/pull/287) ([hanspr](https://github.com/hanspr))
-- Add layouts [\#286](https://github.com/asbru-cm/asbru-cm/pull/286) ([hanspr](https://github.com/hanspr))
-- Fix179 [\#284](https://github.com/asbru-cm/asbru-cm/pull/284) ([hanspr](https://github.com/hanspr))
-- Automatically create configuration backups [\#279](https://github.com/asbru-cm/asbru-cm/pull/279) ([hanspr](https://github.com/hanspr))
-- Proposal Export debug information [\#278](https://github.com/asbru-cm/asbru-cm/pull/278) ([hanspr](https://github.com/hanspr))
-- removed depresiated method in gtk3, fixed render problem with \<\>, fix… [\#277](https://github.com/asbru-cm/asbru-cm/pull/277) ([hanspr](https://github.com/hanspr))
-- Fix regression [\#276](https://github.com/asbru-cm/asbru-cm/pull/276) ([hanspr](https://github.com/hanspr))
-- Utf8 migration [\#275](https://github.com/asbru-cm/asbru-cm/pull/275) ([hanspr](https://github.com/hanspr))
-- Menu icons [\#260](https://github.com/asbru-cm/asbru-cm/pull/260) ([hanspr](https://github.com/hanspr))
-- Add pcc tray menu [\#258](https://github.com/asbru-cm/asbru-cm/pull/258) ([hanspr](https://github.com/hanspr))
-- Fix mouse on cluster [\#257](https://github.com/asbru-cm/asbru-cm/pull/257) ([hanspr](https://github.com/hanspr))
-- fix copy with mouse selection gets lost sometimes [\#255](https://github.com/asbru-cm/asbru-cm/pull/255) ([hanspr](https://github.com/hanspr))
-- better window placement on explode [\#254](https://github.com/asbru-cm/asbru-cm/pull/254) ([hanspr](https://github.com/hanspr))
-- Utf8 test \(\#133\) [\#253](https://github.com/asbru-cm/asbru-cm/pull/253) ([hanspr](https://github.com/hanspr))
-- Fix \#168 [\#249](https://github.com/asbru-cm/asbru-cm/pull/249) ([hanspr](https://github.com/hanspr))
-- Gtk3 Save sessions popup menu [\#244](https://github.com/asbru-cm/asbru-cm/pull/244) ([hanspr](https://github.com/hanspr))
-- Gtk3 changed configdir to config-dir [\#241](https://github.com/asbru-cm/asbru-cm/pull/241) ([hanspr](https://github.com/hanspr))
-- Gtk3 Add global configuration settings [\#238](https://github.com/asbru-cm/asbru-cm/pull/238) ([hanspr](https://github.com/hanspr))
-- Gtk3format Large cosmetic change [\#236](https://github.com/asbru-cm/asbru-cm/pull/236) ([hanspr](https://github.com/hanspr))
-- Gtk3format. PACUtils.pm coding standard [\#235](https://github.com/asbru-cm/asbru-cm/pull/235) ([hanspr](https://github.com/hanspr))
-- Gtk3format, format, coding standard and documentation [\#231](https://github.com/asbru-cm/asbru-cm/pull/231) ([hanspr](https://github.com/hanspr))
-- Gtk3format PACTerminal.pm [\#228](https://github.com/asbru-cm/asbru-cm/pull/228) ([hanspr](https://github.com/hanspr))
-- Gtk3format PACMain [\#225](https://github.com/asbru-cm/asbru-cm/pull/225) ([hanspr](https://github.com/hanspr))
-- Gtk3format asbru-cm [\#224](https://github.com/asbru-cm/asbru-cm/pull/224) ([hanspr](https://github.com/hanspr))
-- CODING STANDARDt added [\#221](https://github.com/asbru-cm/asbru-cm/pull/221) ([hanspr](https://github.com/hanspr))
-- Gtk3 Fixes and proposed improvements [\#213](https://github.com/asbru-cm/asbru-cm/pull/213) ([hanspr](https://github.com/hanspr))
-
-## [5.2.1](https://github.com/asbru-cm/asbru-cm/tree/5.2.1) (2019-10-26)
-
-[Full Changelog](https://github.com/asbru-cm/asbru-cm/compare/5.2.0...5.2.1)
-
-**Implemented enhancements:**
-
-- \[gtk3\] reformat code request [\#217](https://github.com/asbru-cm/asbru-cm/issues/217)
-- PNG screenshots [\#194](https://github.com/asbru-cm/asbru-cm/issues/194)
-- Port to GTK3 and new VTE [\#176](https://github.com/asbru-cm/asbru-cm/issues/176)
-- RSA authentication on MOSH protocol [\#173](https://github.com/asbru-cm/asbru-cm/issues/173)
-- Highlight search results in terminal [\#172](https://github.com/asbru-cm/asbru-cm/issues/172)
-- Installation on Linux Mint 19.2 Tina does not work [\#166](https://github.com/asbru-cm/asbru-cm/issues/166)
-- Open duplicated connection just after current active tab [\#165](https://github.com/asbru-cm/asbru-cm/issues/165)
-- Relocate "Set keyboard focus" button to gain a piece of screen in embedded tabs [\#160](https://github.com/asbru-cm/asbru-cm/issues/160)
-- Add a free textbox to pass custom options in xfreerdp [\#158](https://github.com/asbru-cm/asbru-cm/issues/158)
-- Paste current connection password button [\#152](https://github.com/asbru-cm/asbru-cm/issues/152)
-- SSH authenticity of host issue [\#145](https://github.com/asbru-cm/asbru-cm/issues/145)
-- Debian experimental \(buster\) removed libgnome2... [\#114](https://github.com/asbru-cm/asbru-cm/issues/114)
-- Installing on fedora not working [\#106](https://github.com/asbru-cm/asbru-cm/issues/106)
-- Unable to install on Linux Mint 19 \(LTS Release\) [\#96](https://github.com/asbru-cm/asbru-cm/issues/96)
-- Debian - build libgnome2-vte-perl need additional dependency [\#93](https://github.com/asbru-cm/asbru-cm/issues/93)
-- \[rdesktop\] Exhance parameters for rdesktop \(or any other client\) [\#81](https://github.com/asbru-cm/asbru-cm/issues/81)
-- 'Start a shell upon startup' does not start a shell on startup [\#79](https://github.com/asbru-cm/asbru-cm/issues/79)
-
-**Fixed bugs:**
-
-- \[gtk3\] Can not type passprhasse, wrong terminal focus, can not login to any server [\#204](https://github.com/asbru-cm/asbru-cm/issues/204)
-- "split" misspelled [\#177](https://github.com/asbru-cm/asbru-cm/issues/177)
-- Size of embedded xfreerdp [\#153](https://github.com/asbru-cm/asbru-cm/issues/153)
-- Cant start SSH session since last update \(missing PACUtils.pm\) on Fedora [\#147](https://github.com/asbru-cm/asbru-cm/issues/147)
-- New windows will not get focus [\#142](https://github.com/asbru-cm/asbru-cm/issues/142)
-- App freezes when connecting after saving/editing connection [\#139](https://github.com/asbru-cm/asbru-cm/issues/139)
-- Forced password change on logon closes connection [\#138](https://github.com/asbru-cm/asbru-cm/issues/138)
-- Cluster Controller - Uninitialized value \(Expect.pm\) [\#134](https://github.com/asbru-cm/asbru-cm/issues/134)
-
-**Closed issues:**
-
-- Warnings when renaming a connection [\#243](https://github.com/asbru-cm/asbru-cm/issues/243)
-- gtk3 utf8 encoding terminal names [\#242](https://github.com/asbru-cm/asbru-cm/issues/242)
-- \[gtk3\] Update xfreerdp dependency \(if possible\) [\#239](https://github.com/asbru-cm/asbru-cm/issues/239)
-- Draw text on the banner as real text [\#234](https://github.com/asbru-cm/asbru-cm/issues/234)
-- \(pac\_conn:22985\): Gtk-WARNING  [\#227](https://github.com/asbru-cm/asbru-cm/issues/227)
-- \[gtk3\] gtkSocket: only works under X11 [\#226](https://github.com/asbru-cm/asbru-cm/issues/226)
-- KDE Neon compatibility [\#220](https://github.com/asbru-cm/asbru-cm/issues/220)
-- \[gtk3\] Windows close on vertical resize [\#216](https://github.com/asbru-cm/asbru-cm/issues/216)
-- \[gtk3\] Splash screen progress bar height [\#215](https://github.com/asbru-cm/asbru-cm/issues/215)
-- ubuntu 19.10 support please [\#214](https://github.com/asbru-cm/asbru-cm/issues/214)
-- \[gtk3\] Big GTK2 leftover cleanup [\#212](https://github.com/asbru-cm/asbru-cm/issues/212)
-- \[gtk3\] VTE right-click [\#209](https://github.com/asbru-cm/asbru-cm/issues/209)
-- \[gtk3\] Clusters sync input no longer works [\#205](https://github.com/asbru-cm/asbru-cm/issues/205)
-- \[gtk3\]  Asbru crashes if you inactivate option "Put Terminals y Tabs" [\#203](https://github.com/asbru-cm/asbru-cm/issues/203)
-- \[gtk3\] Typelib file for namespace 'Wnck', version '3.0' not found [\#202](https://github.com/asbru-cm/asbru-cm/issues/202)
-- Not installable on Debian Sid [\#201](https://github.com/asbru-cm/asbru-cm/issues/201)
-- Suspicious pipe chars in regexps [\#197](https://github.com/asbru-cm/asbru-cm/issues/197)
-- \[gtk3\] Local shell colors not remembered [\#196](https://github.com/asbru-cm/asbru-cm/issues/196)
-- \[gtk3\] Set VTE's cwd via proper API [\#195](https://github.com/asbru-cm/asbru-cm/issues/195)
-- \[gtk3\] feed\_child: passed too many parameters [\#193](https://github.com/asbru-cm/asbru-cm/issues/193)
-- \[gtk3\] Searching in the terminal doesn't work [\#192](https://github.com/asbru-cm/asbru-cm/issues/192)
-- \[gtk3\] New shortcuts shown that don't work [\#191](https://github.com/asbru-cm/asbru-cm/issues/191)
-- \[gtk3\] "Connection UUID" text entry too large [\#190](https://github.com/asbru-cm/asbru-cm/issues/190)
-- \[gtk3\] Wrong label for Proxy Configuration [\#189](https://github.com/asbru-cm/asbru-cm/issues/189)
-- \[gtk3\] Broken screenshot viewer [\#188](https://github.com/asbru-cm/asbru-cm/issues/188)
-- Launching a second Ásbrú crashes the first one [\#187](https://github.com/asbru-cm/asbru-cm/issues/187)
-- \[gtk3\] Can't launch group [\#186](https://github.com/asbru-cm/asbru-cm/issues/186)
-- \[gtk3\] Narrow input fields [\#185](https://github.com/asbru-cm/asbru-cm/issues/185)
-- \[gtk3\] No statistics for groups [\#184](https://github.com/asbru-cm/asbru-cm/issues/184)
-- Reports two more nodes [\#183](https://github.com/asbru-cm/asbru-cm/issues/183)
-- Readonly mode doesn't work [\#181](https://github.com/asbru-cm/asbru-cm/issues/181)
-- How can I load a PuTTy \(.ppk\) private key into an ssh connection? [\#161](https://github.com/asbru-cm/asbru-cm/issues/161)
-- Common Router characters do not behave correctly \(TAB, CTRL-a, CTRL-e, UP-Arrow\) [\#141](https://github.com/asbru-cm/asbru-cm/issues/141)
-- Snap support [\#97](https://github.com/asbru-cm/asbru-cm/issues/97)
-- Error prevents RDP session from starting [\#57](https://github.com/asbru-cm/asbru-cm/issues/57)
-
-**Merged pull requests:**
-
-- Enabled RSA Authentication via MOSH protocol [\#174](https://github.com/asbru-cm/asbru-cm/pull/174) ([bitchecker](https://github.com/bitchecker))
-- Improving RDP methods [\#163](https://github.com/asbru-cm/asbru-cm/pull/163) ([figue](https://github.com/figue))
-- GUI: down 'Set keyboard focus' button to bottombox to gain a piece of… [\#162](https://github.com/asbru-cm/asbru-cm/pull/162) ([figue](https://github.com/figue))
--  Method rdesktop: add 32 bpp  [\#159](https://github.com/asbru-cm/asbru-cm/pull/159) ([figue](https://github.com/figue))
-- Method xfreerdp: add 32 bpp [\#157](https://github.com/asbru-cm/asbru-cm/pull/157) ([figue](https://github.com/figue))
-- Add dynamic resolution and X11::GUITest method to calculate embed window size properly [\#155](https://github.com/asbru-cm/asbru-cm/pull/155) ([figue](https://github.com/figue))
-
-## [5.2.0](https://github.com/asbru-cm/asbru-cm/tree/5.2.0) (2019-04-19)
-
-[Full Changelog](https://github.com/asbru-cm/asbru-cm/compare/5.1.0...5.2.0)
-
-**Implemented enhancements:**
-
-- Ubuntu 19.04 - uninstallable [\#140](https://github.com/asbru-cm/asbru-cm/issues/140)
-- FreeBSD port [\#119](https://github.com/asbru-cm/asbru-cm/issues/119)
-- Changing shortcuts for COPY and PASTE commands [\#115](https://github.com/asbru-cm/asbru-cm/issues/115)
-- Missing dependencies on \(k\)ubuntu 18.10 [\#113](https://github.com/asbru-cm/asbru-cm/issues/113)
-- Retrieve terminal method inside scripts [\#105](https://github.com/asbru-cm/asbru-cm/issues/105)
-- FreeBSD login [\#104](https://github.com/asbru-cm/asbru-cm/issues/104)
-- make the "Info" tab always visible. [\#100](https://github.com/asbru-cm/asbru-cm/issues/100)
-- Make it possible to close the Info tab [\#92](https://github.com/asbru-cm/asbru-cm/issues/92)
-- Missing dependency in .deb package [\#90](https://github.com/asbru-cm/asbru-cm/issues/90)
-- Add support for bionic [\#66](https://github.com/asbru-cm/asbru-cm/issues/66)
-
-**Fixed bugs:**
-
-- App closes/crashes [\#135](https://github.com/asbru-cm/asbru-cm/issues/135)
-- Perl script when connection is launched executes multiple times [\#128](https://github.com/asbru-cm/asbru-cm/issues/128)
-- Asbru-CM should save its main window position [\#123](https://github.com/asbru-cm/asbru-cm/issues/123)
-- SHIFT+CTRL+V / SHIFT+CTRL+C seems not working [\#122](https://github.com/asbru-cm/asbru-cm/issues/122)
-- tab switching / focus issue [\#120](https://github.com/asbru-cm/asbru-cm/issues/120)
-- problem in \(Cisco\) ssh session [\#87](https://github.com/asbru-cm/asbru-cm/issues/87)
-
-**Closed issues:**
-
-- Wrong tooltip for Session log numbers [\#131](https://github.com/asbru-cm/asbru-cm/issues/131)
-- Button for saythanks.io [\#126](https://github.com/asbru-cm/asbru-cm/issues/126)
-- No colors and long wait for shell when connecting to mikrotik routers [\#125](https://github.com/asbru-cm/asbru-cm/issues/125)
-- Executing whit sshrc method [\#118](https://github.com/asbru-cm/asbru-cm/issues/118)
-- Why not a Mac osx version or port??? [\#116](https://github.com/asbru-cm/asbru-cm/issues/116)
-- It doesnt connect [\#111](https://github.com/asbru-cm/asbru-cm/issues/111)
-- Connection " is of type ", which is not supported.... [\#91](https://github.com/asbru-cm/asbru-cm/issues/91)
-- zssh support [\#88](https://github.com/asbru-cm/asbru-cm/issues/88)
-
-**Merged pull requests:**
-
-- update split panes separator handling [\#124](https://github.com/asbru-cm/asbru-cm/pull/124) ([syco](https://github.com/syco))
-- Add option to change main window title with terminal title. [\#103](https://github.com/asbru-cm/asbru-cm/pull/103) ([kak-tus](https://github.com/kak-tus))
-
-## [5.1.0](https://github.com/asbru-cm/asbru-cm/tree/5.1.0) (2018-07-23)
-
-[Full Changelog](https://github.com/asbru-cm/asbru-cm/compare/5.0.0...5.1.0)
-
-**Implemented enhancements:**
-
-- Show button bar when hidden [\#89](https://github.com/asbru-cm/asbru-cm/issues/89)
-- Adding new codenames in repository for Linux Mint \(18.x\) [\#63](https://github.com/asbru-cm/asbru-cm/issues/63)
-- Add a "Close disconnected tabs" option to tab-bar-rightclick-menu [\#59](https://github.com/asbru-cm/asbru-cm/issues/59)
-- Auto-save by default [\#44](https://github.com/asbru-cm/asbru-cm/issues/44)
-- asbru-cm could not be installed in Redhat Enterprise Linux/CentOS 7 [\#30](https://github.com/asbru-cm/asbru-cm/issues/30)
-- rpm spec file [\#24](https://github.com/asbru-cm/asbru-cm/issues/24)
-
-**Fixed bugs:**
-
-- Crash \(Delete connection\) [\#78](https://github.com/asbru-cm/asbru-cm/issues/78)
-- rdp connection over xfreerdp doesn't work with special characters in  password [\#75](https://github.com/asbru-cm/asbru-cm/issues/75)
-- Connections Tree Panel reopenes when you switch tabs [\#58](https://github.com/asbru-cm/asbru-cm/issues/58)
-- RPM package installs /asbru-cm in root [\#47](https://github.com/asbru-cm/asbru-cm/issues/47)
-- desktop file is not installed to correct location [\#22](https://github.com/asbru-cm/asbru-cm/issues/22)
--  Canceling user input dialogs for expect produces an error message [\#10](https://github.com/asbru-cm/asbru-cm/issues/10)
-
-**Closed issues:**
-
-- Merging of two yaml configurations asbru-cm \(for wiki\) [\#85](https://github.com/asbru-cm/asbru-cm/issues/85)
-- Fedora 27/28: Permission denied opening ssh/rdp [\#84](https://github.com/asbru-cm/asbru-cm/issues/84)
-- Split horizontal/vertical reversed [\#71](https://github.com/asbru-cm/asbru-cm/issues/71)
-- Problem auto connect password [\#61](https://github.com/asbru-cm/asbru-cm/issues/61)
-- 256 color support [\#54](https://github.com/asbru-cm/asbru-cm/issues/54)
-- Mass-Import from a csv File [\#48](https://github.com/asbru-cm/asbru-cm/issues/48)
-- Add a way to force a reconnect [\#46](https://github.com/asbru-cm/asbru-cm/issues/46)
-- Opening a new connection maximizes the window [\#42](https://github.com/asbru-cm/asbru-cm/issues/42)
-- Focus on connections can change and not be apparent why [\#38](https://github.com/asbru-cm/asbru-cm/issues/38)
-- Export or import connections in .ssh/config [\#31](https://github.com/asbru-cm/asbru-cm/issues/31)
-- ansible install script [\#20](https://github.com/asbru-cm/asbru-cm/issues/20)
-
-**Merged pull requests:**
-
-- Tweaks for more vertical terminal space [\#86](https://github.com/asbru-cm/asbru-cm/pull/86) ([lukefor](https://github.com/lukefor))
-- 201804 split fix2 [\#80](https://github.com/asbru-cm/asbru-cm/pull/80) ([basos9](https://github.com/basos9))
-- Fix append group name semantics \(append instead of prepend\) [\#77](https://github.com/asbru-cm/asbru-cm/pull/77) ([basos9](https://github.com/basos9))
-- Removed deprecated "have" function [\#64](https://github.com/asbru-cm/asbru-cm/pull/64) ([daugustin](https://github.com/daugustin))
-- Don't swallow key-accelerators which are not used by asbru [\#53](https://github.com/asbru-cm/asbru-cm/pull/53) ([nomike](https://github.com/nomike))
-
-## [5.0.0](https://github.com/asbru-cm/asbru-cm/tree/5.0.0) (2017-12-29)
-
-[Full Changelog](https://github.com/asbru-cm/asbru-cm/compare/5.0.0-RC4...5.0.0)
-
-**Implemented enhancements:**
-
-- Superputty to Asbru [\#39](https://github.com/asbru-cm/asbru-cm/issues/39)
-- Bad repository generated by asbru.sh on ubuntu [\#21](https://github.com/asbru-cm/asbru-cm/issues/21)
-- Request - Link binary to something in $PATH [\#15](https://github.com/asbru-cm/asbru-cm/issues/15)
-
-**Fixed bugs:**
-
-- Renaming node adds - [\#36](https://github.com/asbru-cm/asbru-cm/issues/36)
-- Duplicated options strings on SSH Advanced options tab [\#19](https://github.com/asbru-cm/asbru-cm/issues/19)
-- segfault on exit like good old pac [\#18](https://github.com/asbru-cm/asbru-cm/issues/18)
-
-**Closed issues:**
-
-- Session disconected after sucessful login and interactive menu showed [\#35](https://github.com/asbru-cm/asbru-cm/issues/35)
-- User Variables does not work [\#28](https://github.com/asbru-cm/asbru-cm/issues/28)
-- variable not allowed to be undef where GtkTreePath is wanted at /opt/asbru/lib/PACMain.pm line 986. [\#5](https://github.com/asbru-cm/asbru-cm/issues/5)
-
-**Merged pull requests:**
-
-- Adding script to convert SuperPutty Sessions.xml file to Asbru-cm yam… [\#40](https://github.com/asbru-cm/asbru-cm/pull/40) ([sonicepk](https://github.com/sonicepk))
-- New style of packaging [\#33](https://github.com/asbru-cm/asbru-cm/pull/33) ([KlaasT](https://github.com/KlaasT))
-- Debian automatic building [\#32](https://github.com/asbru-cm/asbru-cm/pull/32) ([KlaasT](https://github.com/KlaasT))
-- \[Bugfix\] - User variables doesn't work [\#29](https://github.com/asbru-cm/asbru-cm/pull/29) ([merikz](https://github.com/merikz))
-- \[Usability\] Add tooltip to "Edit" -\> "Expect" when disabled [\#26](https://github.com/asbru-cm/asbru-cm/pull/26) ([merikz](https://github.com/merikz))
--   add Arch/Manjaro instruction and some fix for this distributives [\#25](https://github.com/asbru-cm/asbru-cm/pull/25) ([beliys](https://github.com/beliys))
-
-## [5.0.0-RC4](https://github.com/asbru-cm/asbru-cm/tree/5.0.0-RC4) (2017-11-12)
-
-[Full Changelog](https://github.com/asbru-cm/asbru-cm/compare/5.0.0-RC3...5.0.0-RC4)
-
-**Implemented enhancements:**
-
-- bracketed paste mode [\#12](https://github.com/asbru-cm/asbru-cm/issues/12)
-
-**Fixed bugs:**
-
-- Colors are not initialized correctly [\#7](https://github.com/asbru-cm/asbru-cm/issues/7)
-- Starting an entry from the connections tree maximizes the progam window [\#6](https://github.com/asbru-cm/asbru-cm/issues/6)
-
-**Closed issues:**
-
-- color [\#13](https://github.com/asbru-cm/asbru-cm/issues/13)
-- Detached windows still use a logo variant of PAC [\#11](https://github.com/asbru-cm/asbru-cm/issues/11)
-
-## [5.0.0-RC3](https://github.com/asbru-cm/asbru-cm/tree/5.0.0-RC3) (2017-10-30)
-
-[Full Changelog](https://github.com/asbru-cm/asbru-cm/compare/5.0.0-RC2...5.0.0-RC3)
-
-**Implemented enhancements:**
-
-- libgnome2-vte-perl\_0.11-1\_amd64.deb could not be installed on ubuntu 17.10 \(artful\) [\#3](https://github.com/asbru-cm/asbru-cm/issues/3)
-- No packages for Ubuntu [\#2](https://github.com/asbru-cm/asbru-cm/issues/2)
-
-**Closed issues:**
-
-- Add screenshots [\#1](https://github.com/asbru-cm/asbru-cm/issues/1)
-
-## [5.0.0-RC2](https://github.com/asbru-cm/asbru-cm/tree/5.0.0-RC2) (2017-09-23)
-
-[Full Changelog](https://github.com/asbru-cm/asbru-cm/compare/5.0.0-RC1...5.0.0-RC2)
-
-## [5.0.0-RC1](https://github.com/asbru-cm/asbru-cm/tree/5.0.0-RC1) (2017-09-20)
-
-[Full Changelog](https://github.com/asbru-cm/asbru-cm/compare/430f98894f3724a8996f9be647d01490df4c97a4...5.0.0-RC1)
-
-
-
-\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*
+Please find our changelog on our [docs](https://docs.asbru-cm.net/General/Changelog/) site.
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 1541e9b0..e5ad458a 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -1,46 +1 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at coc@asbru-cm.net. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
-
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/
+Check our code of conduct at our [docs](https://docs.asbru-cm.net/Contributing/CODE_OF_CONDUCT/) site.
diff --git a/CODING_STANDARD.md b/CODING_STANDARD.md
index fc6f2564..ae551559 100644
--- a/CODING_STANDARD.md
+++ b/CODING_STANDARD.md
@@ -1,135 +1 @@
-# Coding Standard
-
-This coding standard consists of recommendations when contributing to the Ásbrú Connection Manager project.  Recommendations are meant to provide guidance that, when followed, should improve the safety, reliability, and security of the project.
-
-## Coding guidelines
-
-* Use spaces as indentation (no tabs).
-* Use 4 spaces per indentation level.
-* No trailing white space.
-* Explicit if statements:
-  - No use of:
-    - `unless`
-    - reversed if `next if $true;`
-    - non explicit conditional expressions
-      - `($a) && ($b) and print "do this if both variables are true";`
-* Ternary operator for assigment is allowed as long as the code does not obfuscate.
-  - `my $value = ($exists) ? $exists : 1;`
-* Use of strings with interpolation.
-  - Example: `$CNF_DIR = "$ENV{'HOME'}/.config/pac";`
-* Nested parenthesis should be together unless you feel that a separation makes code more readable.
-* All conditional blocks, Loops must be on different lines, even if it is one statement in the block.
-* Local variables should be declared at the beginning of a function block, and if they are not initialized, they could be declared as one line.
-    * `my ($var1, $var2, $var3);`
-    * Avoid declaring them in the middle of the block, unless is going to be used as a temporary variable inside an inner block.
-* Rules might be bent from time to time, when brings something valuable to the code over formatting.
-* Function naming
-    * Use camel case, example : myLongNameFunction
-    * Add an undersocore to local function names : _myPrivateFunction
-
-## Documentation guidelines
-
-* At the end of each script the `__END__` marker should be added
-  - This marker will tell the compiler to stop processing the file from that point onward.
-  - Allowing to write extensive documentation without being processed by the compiler.
-* After the end marker, documentation can be added in pod format, to allow perldoc to format and present information on the screen or to export to other formats.
-
-### Basic pod (Plain Old Documentation)
-
-**Common Sections**, as found in all CPAN documentation
-
-* **NAME** module or script name, a dash and a short description.
-* SYNOPSIS shows example usage.
-* **DESCRIPTION** long description of what the module does and lists functions.
-* **BUGS or CAVEATS** about bugs or issues the user should know about.
-* ACKNOWLEDGEMENTS thank bug fixers, testers and your parents.
-* COPYRIGHT or LICENSE copyright restrictions.
-* AVAILABILITY Where to download from
-* AUTHOR who made it.
-
-The bold sections should be the minimum to Document. Other sections already exist in the repository or could not apply to this particular project.
-
-### Pod markup summary
-
-**This is a reduced set**, if anyone is interested on the full description, follow this reference: https://perldoc.perl.org/perlpod.html
-
-```pod
-=encoding utf8
-
-=head1 NAME
-
-There are 4 header level 1..4
-
-Pod will indent each section,
-as in many markup languages, two or more lines together are printed as a single line.
-
-=head2
-
-Always leave a blank line before and after each pod tag,
-log lines can be split into consecutive lines.
-
-Indent one level with a tab to document code and create a verbatim sections where each line is printed separately.
-
-    sub myFunction {
-        print "Something";
-    }
-
-```
-
-Basic styles not all available in terminal
-```pod
-B<bold text>
-I<Italic text, shown as underline text in terminal>
-C<code text>
-B<tags can be I<nested>>
-```
-
-**Example pod file in asbru-cm**
-
-```
-__END___
-=encoding utf8
-
-=head1 NAME
-
-asbru-cm
-
-=head1 SYNOPSYS
-
-asbru-cm [options]
-
-B<Options>
-
-    --help : show this message
-    --no-backup : do no create alternative config files as a backup (faster shutdown)
-    --start-shell : start a local terminal
-    --password=<pwd> : automatically logon with given password without prompting user
-    --start-uuid=<uuid>[:<cluster] : start connection in cluster (if given)
-    --edit-uuid=<uuid> : edit connection
-    --dump-uuid=<uuid> : dump data for given connection
-    --scripts : open scripts window
-    --start-script=<script> : start given script
-    --preferences : open global preferences dialog
-    --quick-conn : open the Quick Connect dialog on startup
-    --list-uuids : list existing connections/groups and their UUIDs
-    --no-splash : no splash screen on startup
-    --iconified : go to tray once started
-    --readonly : start in read only mode (no config changes allowed)
-
-=head1 DESCRIPTION
-
-=head2 Global Variables
-
-I<$CFG_DIR>    Setup your configuration directory here.
-
-You may run different versions of Ásbru and each have different configuration settings and connections.
-
-=head2 Functions
-
-C<sub config_migration> (no parameters) (no return values)
-
-Function normally empty unless there is a migration of the configuration files.
-
-```
-
-**See result executing** `perldoc asbru-cm`
+Check our coding standards at our [docs](https://docs.asbru-cm.net/Contributing/CODING_STANDARD) site.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index a0bd24ee..72506f58 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,7 +1,7 @@
 # Contributing
 
 Thanks for reading this document and showing your interest in contributing to this project.
-Contributing is very easy however we have some very basic rules whe kindly ask to follow.
+Contributing is very easy however we have some very basic rules we kindly ask to follow.
 
 When contributing to this repository, please first discuss the change you wish to make via issue.
 This ensures that everybody can see what you are actually working on and will prevent unnecessary work for everybody.
@@ -9,6 +9,7 @@ This ensures that everybody can see what you are actually working on and will pr
 Please note we have a code of conduct, please follow it in all your interactions with the project.
 
 ## Contributor Agreement
+
 By contributing code to Ásbrú Connection Manager, you assert that:
 
 * You have the rights to include the code, either as its original author, or due to it being released to you under a compatible license.
diff --git a/NEWS.md b/NEWS.md
index 932e0a0b..aba474ae 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,6 +1,143 @@
 # NEWS
+
 Here you can find important news on the project
 
+## 04.04.2026
+
+After almost 4 years we are happy to release version 6.4.1 of Ásbrú Connection Manager.
+
+The main point of this release is to port the application to new major distributions and deprecate older ones.
+
+## 13.11.2022
+
+We are pleased to announce a new version (6.4.0) of Ásbrú Connection Manager that brings some new important features:
+
+- Support for AppImage ([#804](https://github.com/asbru-cm/asbru-cm/issues/804))
+- Add "postpend" command ([#850](https://github.com/asbru-cm/asbru-cm/issues/850))
+- Support vendor configuration ([#860](https://github.com/asbru-cm/asbru-cm/pull/860))
+- Add SSH option that create random SOCKS tunnel on connection startup ([#771](https://github.com/asbru-cm/asbru-cm/issues/771))
+
+And other improvements or bugfixes:
+
+- Sort open connections alphabetically in the "Goto Tabs" submenu ([#962](https://github.com/asbru-cm/asbru-cm/issues/962))
+- Support configuration directory to be in a smb/cifs shared directory ([#909](https://github.com/asbru-cm/asbru-cm/issues/909))
+- Programatically send string only when Idle ([#902](https://github.com/asbru-cm/asbru-cm/pull/902))
+- Show nicer warning when a tunnel has already be open in another terminal ([#862](https://github.com/asbru-cm/asbru-cm/pull/863))
+- Rearrange authentication user/password and manual mode ([#788](https://github.com/asbru-cm/asbru-cm/issues/788))
+- Improve display of keybindings ([#787](https://github.com/asbru-cm/asbru-cm/issues/787))
+- Improve show/hide connections list behaviour ([#786](https://github.com/asbru-cm/asbru-cm/issues/786))
+- Show better error message when KeePassXC lookup fails ([#770](https://github.com/asbru-cm/asbru-cm/issues/770))
+- Support for Crypt::CBC 3.04 ([#816](https://github.com/asbru-cm/asbru-cm/issues/816))
+- Display local port when showing jump server command line ([#982](https://github.com/asbru-cm/asbru-cm/issues/982))
+- Accept 0 as port number for Jump Server ([#888](https://github.com/asbru-cm/asbru-cm/issues/888))
+- Fix tray icon ([#870](https://github.com/asbru-cm/asbru-cm/issues/870))
+- Allow multiple copy/paste of the same node, with mouse ([#729](https://github.com/asbru-cm/asbru-cm/issues/729))
+- Fix read of KeePass file in a folder with cyrillic letter ([#859](https://github.com/asbru-cm/asbru-cm/issues/859))
+- Do not reset connection list when removing an element from a cluster ([#862](https://github.com/asbru-cm/asbru-cm/pull/862))
+
+Please share this information so we can get even more contributors to continue our efforts making Ásbrú Connection Manager even better !
+
+## 21.05.2022
+
+We are pleased to announce a bug fix release (6.3.3) of Ásbrú Connection Manager that addresses several issues:
+
+- Closing one tab in cluster disconnects whole cluster ([#634](https://github.com/asbru-cm/asbru-cm/pull/634))
+- Power Cluster Controller (PCC) can't close multiple exploded tabs ([#791](https://github.com/asbru-cm/asbru-cm/pull/791))
+- Error when using an entry of a KeePass database with a pipe ("|") on title ([#794](https://github.com/asbru-cm/asbru-cm/pull/794))
+- KeepassXC password exposed on asbru-cm local shell terminal ([#801](https://github.com/asbru-cm/asbru-cm/pull/801))
+- Add support for PubkeyAcceptedKeyTypes option ([#853](https://github.com/asbru-cm/asbru-cm/pull/853))
+- Can't close tab after doing split-unsplit ([#871](https://github.com/asbru-cm/asbru-cm/pull/871))
+- SFTP via jumphost to target with private key instead of password doesn't work ([#913](https://github.com/asbru-cm/asbru-cm/pull/913))
+- Settings password set if dialogs canceled ([#922](https://github.com/asbru-cm/asbru-cm/pull/922))
+- Support for KeepassXC 2.7.0 (and above) ([#924](https://github.com/asbru-cm/asbru-cm/pull/924))
+
+Please share this information so we can get even more contributors to continue our efforts making Ásbrú Connection Manager even better !
+
+## 27.02.2021
+
+We are pleased to announce a bug fix release (6.3.2) of Ásbrú Connection Manager that addresses several issues:
+
+- Better install instructions for Pacman-based distribution ([#784](https://github.com/asbru-cm/asbru-cm/pull/784))
+- Blank window when starting iconified ([#783](https://github.com/asbru-cm/asbru-cm/issues/783))
+- Install issue on older Debian-based distribution ([#782](https://github.com/asbru-cm/asbru-cm/issues/782))
+
+Please share this information so we can get even more contributors to continue our efforts making Ásbrú Connection Manager even better !
+
+## 22.02.2021
+
+We are pleased to announce a bug fix release (6.3.1) of Ásbrú Connection Manager that addresses several minor issues:
+
+- Maximized connections list in compact layout ([#778](https://github.com/asbru-cm/asbru-cm/issues/778))
+- Issues when using a configuration directory that contains a space ([#777](https://github.com/asbru-cm/asbru-cm/issues/777))
+- Do not depend on nmap but ncat ([#776](https://github.com/asbru-cm/asbru-cm/issues/776))
+- Explode/ReTab in Power Cluster Controller ([#775](https://github.com/asbru-cm/asbru-cm/issues/775))
+- Empty clusters view on startup ([#753](https://github.com/asbru-cm/asbru-cm/issues/753))
+
+Please share this information so we can get even more contributors to continue our efforts making Ásbrú Connection Manager even better !
+
+## 16.02.2021
+
+We are pleased to announce a new version (6.3.0) of Ásbrú Connection Manager that brings some new important features:
+
+- Support for custom key bindings (fixes [#556](https://github.com/asbru-cm/asbru-cm/issues/556) [#285](https://github.com/asbru-cm/asbru-cm/issues/285) [#43](https://github.com/asbru-cm/asbru-cm/issues/43) [#590](https://github.com/asbru-cm/asbru-cm/issues/590) [#543](https://github.com/asbru-cm/asbru-cm/issues/543))
+- Start all connections of a selected group ([#534](https://github.com/asbru-cm/asbru-cm/issues/534))
+- Use KeePass for Host and IP of jump and proxy server ([#470](https://github.com/asbru-cm/asbru-cm/issues/470))
+- Support for drag and drop connections into groups ([#167](https://github.com/asbru-cm/asbru-cm/issues/167))
+- Support for default port in SSH connections ([#754](https://github.com/asbru-cm/asbru-cm/issues/754))
+- Support for infinite scrollback ([#739](https://github.com/asbru-cm/asbru-cm/issues/739))
+
+And other improvements or bugfixes:
+
+- Improve jump server and mosh support (fixes [#470](https://github.com/asbru-cm/asbru-cm/issues/470) [#490](https://github.com/asbru-cm/asbru-cm/issues/490) [#424](https://github.com/asbru-cm/asbru-cm/issues/424))
+- Ensure focus is set on terminal when right-clicking on it ([#604](https://github.com/asbru-cm/asbru-cm/issues/604))
+- Add option to print timestamp in session logs ([#603](https://github.com/asbru-cm/asbru-cm/issues/603))
+- Set focus to RDP terminals when entering the embed window ([#148](https://github.com/asbru-cm/asbru-cm/issues/148), [#638](https://github.com/asbru-cm/asbru-cm/issues/638))
+- Support KeePass in global network settings ([#639](https://github.com/asbru-cm/asbru-cm/issues/639))
+- Align buttons and layout in the "info" tab
+- Toggle display when entering/leaving the connections list when on the info tab ([#683](https://github.com/asbru-cm/asbru-cm/issues/683))
+- Fix regression when cleaning up terminal escape sequences
+- Process right clicks correctly when several nodes are selected ([#617](https://github.com/asbru-cm/asbru-cm/issues/617))
+- Fix panel refresh when terminal method is changed
+- Fix exception when closing a failed remote desktop connection
+- Can't enter User / Password for new SSH-Connection using generic command ([#735](https://github.com/asbru-cm/asbru-cm/issues/735))
+
+Please share this information so we can get even more contributors to continue our efforts making Ásbrú Connection Manager even better !
+
+## 07.11.2020
+
+We are pleased to announce a bug fix release (6.2.2) of Ásbrú Connection Manager that addresses several issues.
+
+Most important to note is the move from Packagecloud to Cloudsmith for several reasons. We will be keeping the Packagecloud repository alive for some time. However new OS releases will only be published to Cloudsmith.
+
+Please check our [Installinstructions](https://docs.asbru-cm.net) for information on the new repositories.
+
+## 06.06.2020
+
+We are pleased to announce a bug fix release (6.2.1) of Ásbrú Connection Manager that addresses the following issues:
+
+- Fix edit of generic commands - [#625](https://github.com/asbru-cm/asbru-cm/issues/625)
+- Resolve KeePass connection password when pasted with shortcut key - [#627](https://github.com/asbru-cm/asbru-cm/issues/627)
+- Escape VNC password properly - [#641](https://github.com/asbru-cm/asbru-cm/issues/641)
+
+Please share this information so we can get even more contributors to continue our efforts making Ásbrú Connection Manager even better !
+
+## 15.05.2020
+
+We are pleased to announce a new version (6.2.0) of Ásbrú Connection Manager that brings some new important features:
+
+- Review KeePass database file support (now based on [keepassxc-cli](https://keepassxc.org/))
+- Add 4 themes (default, color, dark, system)
+- Support for your own custom themes
+- Add access to online help (https://docs.asbru-cm.net)
+- Migrate legacy `.config/pac` configuration directory to `.config/asbru`
+- Improve user interface
+- Support for terminal zoom in/out
+- Support copy/paste in "Get command line" dialog
+- Improve anonymized export
+- Many other minor bug fixes & enhancements
+
+Please share this information so we can get even more contributors to continue our efforts making Ásbrú Connection Manager even better !
+
 ## 15.02.2020
 
 Dear testers,
@@ -19,5 +156,6 @@ Attention: please make sure you have a safe copy of your configuration directory
 Thanks and happy testing.
 
 ## 16.12.2019
+
 * We are disabling the el-test repository. In future you will find the rpms for el7 and el8 in the main packagecloud repostory asbru-cm/asbru-cm
 * gtk3 branch has been merged into master therefore we are disabling snapshot generation from the gtk3 branch.
diff --git a/README.md b/README.md
index c1d48d07..645ad231 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,12 @@
 # Ásbrú Connection Manager
 
-[![Travis][travis-badge]][travis-url]
+[![Build & Deploy Docs](https://github.com/asbru-cm/asbru-cm/actions/workflows/docs.yml/badge.svg)](https://github.com/asbru-cm/asbru-cm/actions/workflows/docs.yml)
+[![Build Snapshot/Master Packages](https://github.com/asbru-cm/asbru-cm/actions/workflows/build-snapshots.yml/badge.svg)](https://github.com/asbru-cm/asbru-cm/actions/workflows/build-snapshots.yml)
 [![License][license-badge]][license-url]
 [![RPM Packages][rpm-badge]][rpm-url]
 [![Debian Packages][deb-badge]][deb-url]
 [![Liberapay][liberapay-badge]][liberapay-url]
+[![Donate Bitcoins][bitcoin-badge]][bitcoin-url]
 
 [<img src="https://www.asbru-cm.net/assets/img/asbru-logo-200.png" align="right" width="200px" height="200px" />](https://asbru-cm.net)
 
@@ -23,7 +25,7 @@
   - chain multiple SSH connections
   - automate tunnels creation
   - with line-send delay capabilities
-- [KeePassX](https://www.keepassx.org/) integration
+- [KeePassXC](https://keepassxc.org/) integration
 - Ability to connect to machines through a Proxy server
 - Cluster connections
 - Tabbed/Windowed terminals
@@ -37,52 +39,77 @@
 
 ### Installation
 
-We recommend installing Ásbrú Connection Manager using our latest pre-built packages hosted on [packagecould.io](https://packagecloud.io/).
+We recommend installing Ásbrú Connection Manager using our latest pre-built packages hosted on [cloudsmith.io](https://cloudsmith.io/).
 
 To do so, execute the following commands:
 
 - Debian / Ubuntu
 
   ````
-  $ curl -s https://packagecloud.io/install/repositories/asbru-cm/asbru-cm/script.deb.sh | sudo bash
-  $ sudo apt-get install asbru-cm
+  curl -1sLf 'https://dl.cloudsmith.io/public/asbru-cm/release/cfg/setup/bash.deb.sh' | sudo -E bash
+  sudo apt-get install asbru-cm
   ````
 
 - Fedora
 
   ````
-  $ curl -s https://packagecloud.io/install/repositories/asbru-cm/asbru-cm/script.rpm.sh | sudo bash
-  $ sudo dnf install asbru-cm
+  curl -1sLf 'https://dl.cloudsmith.io/public/asbru-cm/release/cfg/setup/bash.rpm.sh' | sudo -E bash
+  sudo dnf install asbru-cm
   ````
 
-- Arch / Manjaro
+- Pacman-based (e.g. Arch Linux, Manjaro)
+
+  ````
+  git clone https://aur.archlinux.org/asbru-cm-git.git && cd asbru-cm-git
+  makepkg -si
+  ````
+  
+- MX Linux
 
+  Ásbrú Connection Manager can be installed through the MX Package Installer under the Test Repo tab
+  or by enabling the Test Repo and running
   ````
-  yaourt -S asbru-cm-git
+  sudo apt-get install asbru-cm
   ````
+  
+- Windows
+
+  - Windows 10 Build 19044 and later, or Windows 11
+ 
+    See https://learn.microsoft.com/en-us/windows/wsl/tutorials/gui-apps
+
+    tl;dr:
+    
+    1. Install or update WSL.
+    2. Follow the installation instructions for Ubuntu above.
+    3. Ásbrú Connection Manager will then be available in the start menu.
+
+  - Windows 10 before Build 19044, or running older WSL
 
-Once installed on your system, type ````/opt/asbru/asbru```` in your terminal.
+    It is possible to run Asbru-CM on Windows 10 by enabling WSL and using the application [Asbru-CM Runner](https://github.com/SegiH/Asbru-CM-Runner). If you do not have [WSLG](https://github.com/microsoft/wslg) support, you will need to install [Xming](http://www.straightrunning.com/XmingNotes/). The GitHub page for [Asbru-CM Runner](https://github.com/SegiH/Asbru-CM-Runner) has detailed instructions on how to do this and allows you to run Asbru-CM on Windows 10 without a console window open in the background.
+  
+Once installed on your system, type ````asbru-cm```` in your terminal.
 
 ### Testing new features
 
 Our master and the snapshots are being kept as stable as possible. New features for new major releases are being developed inside the "loki" branch.
 
-Beware that Loki can sometimes behave in a malicious manner to you. You might think of "sid"
+Beware that [Loki](https://en.wikipedia.org/wiki/Loki) can sometimes behave in an unexpected manner to you.  This is somehow the same concept as the "[Debian sid](https://www.debian.org/releases/sid/)" release.
 
 You are welcome to contribute and test by checking out "loki" or by installing our builds.
 
+If you do not wish to run third party scripts on your systems, you can always access manual install instructions at https://cloudsmith.io/~asbru-cm/repos/loki/setup/
+
 - Debian / Ubuntu
 
   ````
-  $ curl -s https://packagecloud.io/install/repositories/asbru-cm/loki/script.deb.sh | sudo bash
-  $ sudo apt-get install asbru-cm
+   curl -1sLf 'https://dl.cloudsmith.io/public/asbru-cm/loki/cfg/setup/bash.deb.sh' | sudo -E bash
   ````
 
 - Fedora
 
   ````
-  $ curl -s https://packagecloud.io/install/repositories/asbru-cm/loki/script.rpm.sh | sudo bash
-  $ sudo dnf install asbru-cm
+   curl -1sLf 'https://dl.cloudsmith.io/public/asbru-cm/loki/cfg/setup/bash.rpm.sh' | sudo -E bash
   ````
 
 
@@ -123,18 +150,28 @@ If you want to contribute to Ásbrú Connection Manager, first check out the [is
 
 Before contributing, please review our [contributing doc](https://github.com/asbru-cm/asbru-cm/blob/master/CONTRIBUTING.md) for info on how to make feature requests and bear in mind that we adhere to the [Contributor Covenant code of conduct](https://github.com/asbru-cm/asbru-cm/blob/master/CODE_OF_CONDUCT.md).
 
+### Financial support
+
+If you like Ásbrú Connection Manager, you may also consider supporting the project financially by donating on <a title="Donate Liberapay" href="https://liberapay.com/asbru-cm/donate">Liberapay</a> or by donating to one of <a href="https://docs.asbru-cm.net/Contributing/Financial_Contribution/">our cryptocurrency addresses</a>.
+
 ### License
 
 Ásbrú Connection Manager is licensed under the GNU General Public License version 3 <http://www.gnu.org/licenses/gpl-3.0.html>.  A full copy of the license can be found in the [LICENSE](https://github.com/asbru-cm/asbru-cm/blob/master/LICENSE) file.
 
+### Sponsors
+
+<a title="Cloudflare" href="https://cloudflare.com/"><img height="105" width="230" alt="Cloudflare" src="https://www.cloudflare.com/img/logo-web-badges/cf-logo-on-white-bg.svg" /></a>
+
 ### Packages
 
-The repositories for our RPM and DEB builds are thankfully sponsored by [packagecloud](https://packagecloud.io/). A great thanks to them.
+The repositories for our RPM and DEB builds are thankfully sponsored by [packagecloud](https://packagecloud.io/) and [Cloudsmith](https://cloudsmith.io). A great thanks to them.
 
 <a title="Private Maven, RPM, DEB, PyPi and RubyGem Repository" href="https://packagecloud.io/"><img height="46" width="158" alt="Private Maven, RPM, DEB, PyPi and RubyGem Repository" src="https://packagecloud.io/images/packagecloud-badge.png" /></a>
 
-[travis-badge]: https://travis-ci.org/asbru-cm/asbru-cm.svg?branch=master
-[travis-url]: https://travis-ci.org/asbru-cm/asbru-cm
+<a href="https://cloudsmith.com/"><img height="46" widht="158" alt="Fast, secure development and distribution. Universal, web-scale package management" src="https://www.asbru-cm.net/assets/img/misc/cloudsmith-logo-color.png" /></a>
+
+[travis-badge]: https://api.travis-ci.com/asbru-cm/asbru-cm.svg?branch=master
+[travis-url]: https://app.travis-ci.com/github/asbru-cm/asbru-cm
 [license-badge]: https://img.shields.io/badge/License-GPL--3-blue.svg?style=flat
 [license-url]: LICENSE
 [deb-badge]: https://img.shields.io/badge/Packages-Debian-blue.svg?style=flat
@@ -143,3 +180,5 @@ The repositories for our RPM and DEB builds are thankfully sponsored by [package
 [rpm-url]: https://packagecloud.io/asbru-cm/asbru-cm?filter=rpms
 [liberapay-badge]: http://img.shields.io/liberapay/patrons/asbru-cm.svg?logo=liberapay
 [liberapay-url]: https://liberapay.com/asbru-cm/donate
+[bitcoin-badge]: https://img.shields.io/badge/bitcoin-19ZsvCafwRCwQSPcvfzgyiHD3Viptb4F45-D28138.svg?style=flat-square
+[bitcoin-url]: https://blockchain.info/address/19ZsvCafwRCwQSPcvfzgyiHD3Viptb4F45 
diff --git a/asbru-cm b/asbru-cm
index 01e42a93..3933df5e 100755
--- a/asbru-cm
+++ b/asbru-cm
@@ -3,7 +3,7 @@
 ###############################################################################
 # This file is part of Ásbrú Connection Manager
 #
-# Copyright (C) 2017-2020 Ásbrú Connection Manager team (https://asbru-cm.net)
+# Copyright (C) 2017-2021 Ásbrú Connection Manager team (https://asbru-cm.net)
 # Copyright (C) 2010-2016 David Torrejón Vaquerizas
 #
 # Ásbrú Connection Manager is free software: you can redistribute it and/or
@@ -34,7 +34,8 @@ BEGIN {
         print "Usage: $0 [options]\n";
         print "Options:\n";
         print "\t--help : show this message\n";
-        print "\t--config-dir=path : absolute '/path' or relative 'path' to ~/.config/\n";
+        print "\t--config-dir=path : absolute '/path' or relative 'path' to ~/.config for Ásbrú configuration files/\n";
+        print "\t--temp-dir=path : path to store temporary socket files (default is system temporary directory)\n";
         print "\t--no-backup : do no create alternative config files as a backup (faster shutdown)\n";
         print "\t--start-shell : start a local terminal\n";
         print "\t--password=<pwd> : automatically logon with given password without prompting user\n";
@@ -49,6 +50,7 @@ BEGIN {
         print "\t--no-splash : no splash screen on startup\n";
         print "\t--iconified : go to tray once started\n";
         print "\t--readonly : start in read only mode (no config changes allowed)\n";
+        print "\t--verbose : display more debugging information\n";
         print "\n";
         print "See 'man asbru' for additional information.\n";
         print "\n";
@@ -67,6 +69,8 @@ BEGIN {
                 # Relative path to ~./config
                 $ENV{"ASBRU_CFG"} = "$ENV{'HOME'}/.config/$path";
             }
+        } elsif ($arg =~ /^-{1,2}temp-dir=\s*(.+)$/i) {
+            $ENV{"ASBRU_TMP"} = $1;
         } elsif ($arg !~ /-{1,2}[\w\-]+/i) {
             print STDERR "INFO: bad start up parameter $arg\n";
         }
@@ -75,11 +79,17 @@ BEGIN {
         ###################################################################
         # DEFAULT CONFIG DIR SHOULD BE DEFINED HERE
         ###################################################################
-        $ENV{"ASBRU_CFG"} = "$ENV{'HOME'}/.config/pac";
+        $ENV{"ASBRU_CFG"} = "$ENV{'HOME'}/.config/asbru";
     }
     # Workaround to unexpected SSH disconnections due to wrong handling of the WINCH event in some Gnome versions
     # See https://www.perlmonks.org/?node_id=11109454
     delete $ENV{'GTK_OVERLAY_SCROLLING'};
+
+    # Ensure ASBRU_ENV_FOR_EXTERNAL is defined
+    # (it should be defined when running inside AppImage, otherwise must remain empty)
+    if (!defined($ENV{'ASBRU_ENV_FOR_EXTERNAL'})) {
+        $ENV{'ASBRU_ENV_FOR_EXTERNAL'} = "";
+    }
 }
 
 ###################################################################
@@ -91,6 +101,7 @@ use File::Copy;
 use YAML qw (LoadFile);
 use PACMain;
 use PACUtils qw (_appName);
+use File::Temp qw (tempdir);
 
 # Standard
 use strict;
@@ -101,14 +112,17 @@ use warnings;
 
 ###################################################################
 # START: Define GLOBAL variables
-our $CFG_FILE_NAME  = "pac.yml";
+our $CFG_FILE_NAME  = "asbru.yml";
 our $INIT_CFG_FILE  = "$RealBin/res/$CFG_FILE_NAME";
 our $CFG_DIR        = $ENV{"ASBRU_CFG"};
-our $CFG_DIR_OLD    = "";
+our $CFG_DIR_OLD    = "$ENV{'HOME'}/.config/pac";
+our $CFG_FILE_OLD   = "pac.yml";
 our $CFG_FILE       = "$CFG_DIR/$CFG_FILE_NAME";
 our $BACKUP_DIR     = "bak";
 our $APP_NAME       = PACUtils::_appName();
+our $ASBRU_LANG     = 'en_US.UTF-8'; # no i18n support yet
 our $ASBRU;
+our $VERBOSE        = 0;
 # END: Define GLOBAL variables
 ###################################################################
 
@@ -117,15 +131,27 @@ our $ASBRU;
 # START: MAIN program
 # Load PACMain now, so it can read the global $CFG_DIR
 print "INFO: $APP_NAME ($Script) started with PID $$\n";
+$ENV{'VERBOSE'} = 0;
+
+foreach my $arg (@ARGV) {
+    if ($arg =~ /-{1,2}verbose/) {
+        $VERBOSE = 1;
+        $ENV{'VERBOSE'} = 1;
+    }
+}
+
+# Detect language
+print STDERR "INFO: Language detected : $ENV{'LANG'}, forcing to ${ASBRU_LANG}\n";
+$ENV{'LANG'} = $ASBRU_LANG;
 
 # Check for Unity's systray-whitelist presence of 'asbru'
-my $wl = `gsettings get com.canonical.Unity.Panel systray-whitelist 2>/dev/null`;
+my $wl = `$ENV{'ASBRU_ENV_FOR_EXTERNAL'} gsettings get com.canonical.Unity.Panel systray-whitelist 2>/dev/null`;
 chomp $wl;
 
 if (($? eq 0) && (!grep(/'asbru'/, $wl))) {
     print "INFO: Adding 'asbru' to Unity's 'systray-whitelist'\n";
     $wl =~ s/'\s*]/', 'asbru']/;
-    `gsettings set com.canonical.Unity.Panel systray-whitelist "$wl"`;
+    `$ENV{'ASBRU_ENV_FOR_EXTERNAL'} gsettings set com.canonical.Unity.Panel systray-whitelist "$wl"`;
 }
 
 # Set up configuration directories
@@ -136,17 +162,30 @@ if (!-d "$ENV{'HOME'}/.config") {
 }
 
 # Code for future configuration migrations when needed
-if (($CFG_DIR_OLD) && ($CFG_DIR_OLD ne $CFG_DIR)) {
-    config_migration($CFG_DIR_OLD,$CFG_DIR);
+if ($CFG_DIR ne $CFG_DIR_OLD && -e $CFG_DIR_OLD && !-e $CFG_DIR && $CFG_DIR =~ /\/asbru$/) {
+    # Production user data
+    if ($VERBOSE) {
+        print "INFO: Migration of default directory\n";
+    }
+    config_migration($CFG_DIR_OLD, $CFG_DIR);
+} elsif (-e "$CFG_DIR/$CFG_FILE_OLD") {
+    # Alternate configuration directory
+    $CFG_DIR_OLD = "$CFG_DIR.migration";
+    if ($VERBOSE) {
+        print "INFO: Migration of alternate directory\n";
+    }
+    system "$ENV{'ASBRU_ENV_FOR_EXTERNAL'} rm -Rf \"$CFG_DIR_OLD\"";
+    system "$ENV{'ASBRU_ENV_FOR_EXTERNAL'} mv -f \"$CFG_DIR\" \"$CFG_DIR.migration\"";
+    config_migration($CFG_DIR_OLD, $CFG_DIR);
 }
 
-# Create Asbru config dir if necessary
+# Create Ásbrú configuration directory (if necessary)
 if (!-d $CFG_DIR) {
     mkdir($CFG_DIR);
 }
 
 # Create all subdirectories
-foreach my $subdir ('autostart','screenshots','session_logs','scripts','sockets','tmp','bak') {
+foreach my $subdir ('autostart','screenshots','session_logs','scripts','tmp','bak') {
     if (!-d "$CFG_DIR/$subdir") {
         mkdir("$CFG_DIR/$subdir");
     }
@@ -159,6 +198,18 @@ for (my $n = 1; $n < 5; $n++) {
     }
 }
 
+# Default directory for temporary socket files
+if (!defined($ENV{"ASBRU_TMP"})) {
+    $ENV{"ASBRU_TMP"} = File::Temp::tempdir('asbru-cm-XXXX', TMPDIR => 1, CLEANUP => 1);
+}
+if (!-d $ENV{"ASBRU_TMP"}) {
+    mkdir($ENV{"ASBRU_TMP"});
+}
+if ($VERBOSE) {
+    print "INFO: Path for temporary socket files: " . $ENV{"ASBRU_TMP"} . "\n";
+}
+
+# Detect desktop
 getDesktopEnvironment();
 
 # Check if configuration is valid
@@ -170,39 +221,51 @@ if (!($ASBRU = PACMain -> new(@ARGV))) {
     exit 0
 }
 
-$ASBRU->start;
+$ASBRU->start();
 
 print "INFO: Finished $APP_NAME ($Script) (PID:$$)...\n";
 exit 0;
 
 # Implemented when necessary
-sub config_migration {
-    my ($old_dir,$new_dir) = @_;
 
-    return 0;
+sub config_migration {
+    my ($old_dir, $new_dir) = @_;
+    my $PATH = "$RealBin/";
+    my $status;
+
+    if (-e "$PATH/utils/pac2asbru.pl") {
+        if ($status = system($^X, "$PATH/utils/pac2asbru.pl", $old_dir, $new_dir, $VERBOSE)) {
+            print "INFO: Migration aborted or errors occured, execute with --verbose to see more information ($status)\n";
+            exit 0;
+        }
+    } else {
+        print "ERROR: Missing migration script $PATH/utils/pac2asbru.pl ; please check your installation.\n";
+        exit 0;
+    }
 }
 
 sub getDesktopEnvironment {
     my $c;
     # An attempt to find desktop environment
-    foreach my $d ('gnome-shell','cinnamon','lxde','xfce') {
-        $c = `pgrep -c '$d'`;
-        chop $c;
-        #print STDERR "TEST: pgrep -c '$d' = $c\n";
-        if ($c) {
+    foreach my $d ('gnome-shell','cinnamon','lxde','xfce','unity') {
+        $c = `$ENV{'ASBRU_ENV_FOR_EXTERNAL'} ps -eo 'comm=' | grep '$d' | wc -l`;
+        if ($c + 0) {
             $ENV{'ASBRU_DESKTOP'} = $d;
             last;
         }
     }
-    if ($ENV{'XDG_SESSION_DESKTOP'} eq 'xubuntu') {
-        $ENV{'ASBRU_DESKTOP'} .= ':xubuntu';
-    }
     if (!$ENV{'ASBRU_DESKTOP'}) {
         $ENV{'ASBRU_DESKTOP'} = 'other';
     } elsif ($ENV{'ASBRU_DESKTOP'} eq 'gnome-shell') {
         # Test to see it has the unite extension installed
-        if (-e "$ENV{'HOME'}/.local/share/gnome-shell/extensions/unite\@hardpixel.eu") {
-            $ENV{'ASBRU_DESKTOP'} .= '-withtray';
+        if (defined $ENV{'XDG_SESSION_DESKTOP'}) {
+            $ENV{'ASBRU_DESKTOP'} .= ":$ENV{'XDG_SESSION_DESKTOP'}";
+        }
+        foreach my $extension ('unite@hardpixel.eu', 'top-icons@gnome-shell-extensions.gcampax.github.com', 'appindicatorsupport@rgcjonas.gmail.com') {
+            if (-e "$ENV{'HOME'}/.local/share/gnome-shell/extensions/$extension" || -e "/usr/share/gnome-shell/extensions/$extension") {
+                $ENV{'ASBRU_DESKTOP'} .= '-withtray';
+                last;
+            }
         }
     }
     print STDERR "INFO: Desktop environment detected : $ENV{'ASBRU_DESKTOP'}\n";
@@ -211,7 +274,7 @@ sub getDesktopEnvironment {
 sub CheckConfigurationFile {
     use POSIX qw(strftime);
 
-    my $nfreeze = "$CFG_DIR/pac.nfreeze";
+    my $nfreeze = "$CFG_DIR/asbru.nfreeze";
     my $now = strftime "%Y%m%d%H%M%S", localtime;
     my $BACKUP_CFG_FILE  = "$CFG_DIR/$BACKUP_DIR/$CFG_FILE_NAME";
     my $MAX_BACKUP_FILES = 10;
@@ -240,12 +303,12 @@ sub CheckConfigurationFile {
             };
             if (!$@ && $cfg) {
                 print "INFO: Found valid file $CFG_FILE_NAME.$n, recovering...\n";
-                system "mv -f $CFG_FILE $BACKUP_CFG_FILE.$now.bad";
-                system "cp -fp $BACKUP_CFG_FILE.$n $CFG_FILE";
+                system "$ENV{'ASBRU_ENV_FOR_EXTERNAL'} mv -f \"$CFG_FILE\" \"$BACKUP_CFG_FILE.$now.bad\"";
+                system "$ENV{'ASBRU_ENV_FOR_EXTERNAL'} cp -fp \"$BACKUP_CFG_FILE.$n\" \"$CFG_FILE\"";
                 $OK = 1;
                 last;
             } else {
-                system "mv -f $BACKUP_CFG_FILE.$n $BACKUP_CFG_FILE.$n.$now.bad";
+                system "$ENV{'ASBRU_ENV_FOR_EXTERNAL'} mv -f \"$BACKUP_CFG_FILE.$n\" \"$BACKUP_CFG_FILE.$n.$now.bad\"";
             }
         }
         if (!$OK) {
@@ -262,12 +325,24 @@ sub CheckConfigurationFile {
         for (my $n=$MAX_BACKUP_FILES-1; $n > 0; $n--) {
             my $p = $n-1; # previous
             if (-e "$BACKUP_CFG_FILE.$p") {
-                system "cp -fp $BACKUP_CFG_FILE.$p $BACKUP_CFG_FILE.$n";
+                system "$ENV{'ASBRU_ENV_FOR_EXTERNAL'} cp -fp \"$BACKUP_CFG_FILE.$p\" \"$BACKUP_CFG_FILE.$n\"";
             }
         }
     }
     # Save current known configuration
-    system "cp -fp $CFG_FILE $BACKUP_CFG_FILE.0";
+    system "$ENV{'ASBRU_ENV_FOR_EXTERNAL'} cp -fp \"$CFG_FILE\" \"$BACKUP_CFG_FILE.0\"";
+}
+
+sub _wPopUP {
+    my ($type, $title, $msg) = @_;
+    my $PATH = "$RealBin";
+
+    $msg =~ s/\t//mg;
+    $msg =~ s/^ +//mg;
+    $msg =~ s/\n/&cr;/g;
+    $msg =~ s/\"/&dquot;/g;
+    $msg =~ s/\'/&squot;/g;
+    return `'$^X' $PATH/utils/asbru_confirm.pl '$type' '$title' '$msg' `;
 }
 
 END {
diff --git a/build.sh b/build.sh
index 91e1f902..7a4a0d21 100755
--- a/build.sh
+++ b/build.sh
@@ -1,21 +1,37 @@
 #!/bin/bash
 
+PRODUCT=${PRODUCT:-asbru-cm}
+
 if [ -z "$TRAVIS_TAG" ]; then
-	eval "$(egrep -o 'APPVERSION.*=.*' lib/PACUtils.pm | tr -d '[:space:]')"
-	export VERSION=$APPVERSION~$(date +"%s");
-	echo "No Travis Tag set. We are using a timestamp in seconds: ${VERSION}"
+  eval "$(egrep -o 'APPVERSION.*=.*' lib/PACUtils.pm | tr -d '[:space:]')"
+  export VERSION=$APPVERSION~$(date +"%s");
+  echo "No Travis Tag set. We are using a timestamp in seconds: ${VERSION}"
 else
-	export VERSION=$TRAVIS_TAG
-	echo "Our version will be the tag ${VERSION}"
+  export VERSION=$TRAVIS_TAG
+  echo "Our version will be the tag ${VERSION}"
 fi
 
 cp -r dist/${PACKAGE}/* .
 
 if [ "${SCRIPT}" == "make_debian.sh" ]; then
-	mkdir build
-	./make_debian.sh
-	cp *.{deb,tar.xz,dsc,build,changes} build/
+  mkdir build
+  ./make_debian.sh
+  cp *.{deb,tar.xz,dsc,build,changes} build/
 else
-	git clone https://github.com/packpack/packpack.git packpack
-	sudo ./packpack/packpack
+  git clone https://github.com/packpack/packpack.git packpack
+  ./packpack/packpack
+fi
+
+if [ "${PACKAGE}" == "deb" ] && [ "${REPACK_DEB}" == "yes" ] ; then
+  DEBFILE=${PRODUCT}_${VERSION}-1_all.deb
+  DEBFILE_OLD=$(basename ${DEBFILE} .deb).deb.old
+  echo "Repacking debian file [${DEBFILE}] to have XY format."
+  pushd build
+  mv ${DEBFILE} ${DEBFILE_OLD}
+  dpkg-deb -x ${DEBFILE_OLD} tmp
+  dpkg-deb -e ${DEBFILE_OLD} tmp/DEBIAN
+  dpkg-deb -b tmp ${DEBFILE}
+  rm -rf tmp
+  popd
 fi
+
diff --git a/ci/build_package.sh b/ci/build_package.sh
new file mode 100644
index 00000000..bbb126d6
--- /dev/null
+++ b/ci/build_package.sh
@@ -0,0 +1,76 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+PRODUCT=${PRODUCT:-asbru-cm}
+
+if [ "${GITHUB_REF_TYPE:-}" = "tag" ] && [ -n "${GITHUB_REF_NAME:-}" ]; then
+  RAW_TAG="${GITHUB_REF_NAME}"
+  RAW_VERSION="${RAW_TAG#v}"
+  CHANNEL="release"
+  echo "Detected tag build. RAW_VERSION=${RAW_VERSION}, CHANNEL=${CHANNEL}"
+else
+  eval "$(egrep -o 'APPVERSION.*=.*' lib/PACUtils.pm | tr -d '[:space:]')"
+  SHORT_SHA="$(git rev-parse --short HEAD)"
+  BRANCH_NAME="${GITHUB_REF_NAME:-build}"
+  RAW_VERSION="${APPVERSION}+${BRANCH_NAME}.${SHORT_SHA}"
+  CHANNEL="${BRANCH_NAME}"
+  echo "Detected branch build. RAW_VERSION=${RAW_VERSION}, CHANNEL=${CHANNEL}"
+fi
+
+SAFE_VERSION="$(printf '%s' "${RAW_VERSION}" | tr '[:upper:]' '[:lower:]')"
+SAFE_VERSION="$(printf '%s' "${SAFE_VERSION}" | tr '-' '.')"
+SAFE_VERSION="$(printf '%s' "${SAFE_VERSION}" | sed 's/[^0-9a-z.+~]/./g')"
+
+export VERSION="${SAFE_VERSION}"
+
+echo "Final VERSION (for packaging): ${VERSION}"
+echo "PACKAGE=${PACKAGE:-unset}, OS=${OS:-unset}, DIST=${DIST:-unset}"
+
+
+cp -r "dist/${PACKAGE}/"* .
+
+mkdir -p build
+
+echo "Preparing packpack..."
+if [ ! -d "./packpack" ]; then
+  git clone https://github.com/packpack/packpack.git packpack
+fi
+
+if [ "${PACKAGE}" = "deb" ]; then
+  echo "Building Debian package for ${OS}/${DIST}..."
+  ./packpack/packpack
+elif [ "${PACKAGE}" = "rpm" ]; then
+  echo "Building RPM package for ${OS}/${DIST}..."
+  ./packpack/packpack
+else
+  echo "Unknown PACKAGE=${PACKAGE}. Expected 'deb' or 'rpm'."
+  exit 1
+fi
+
+
+if [ "${PACKAGE}" = "deb" ] && [ "${REPACK_DEB:-}" = "yes" ] ; then
+  DEBFILE="${PRODUCT}_${VERSION}-1_all.deb"
+  DEBFILE_OLD="$(basename "${DEBFILE}" .deb).deb.old"
+
+  echo "Repacking debian file [${DEBFILE}] to have XY format."
+
+  pushd build >/dev/null
+
+  if [ ! -f "${DEBFILE}" ]; then
+    echo "Expected deb file ${DEBFILE} not found in ./build. Available files:"
+    ls -la
+    popd >/dev/null
+    exit 1
+  fi
+
+  mv "${DEBFILE}" "${DEBFILE_OLD}"
+  dpkg-deb -x "${DEBFILE_OLD}" tmp
+  dpkg-deb -e "${DEBFILE_OLD}" tmp/DEBIAN
+  dpkg-deb -b tmp "${DEBFILE}"
+  rm -rf tmp
+
+  popd >/dev/null
+fi
+
+echo "Build done. Artifacts in ./build:"
+ls -la build || true
diff --git a/dist/appimage/.gitignore b/dist/appimage/.gitignore
new file mode 100644
index 00000000..8e38ac0f
--- /dev/null
+++ b/dist/appimage/.gitignore
@@ -0,0 +1,2 @@
+
+build
diff --git a/dist/appimage/AppRun b/dist/appimage/AppRun
new file mode 100644
index 00000000..3294279d
--- /dev/null
+++ b/dist/appimage/AppRun
@@ -0,0 +1,38 @@
+#!/bin/sh
+
+getCompressedEnv() {
+    echo "LD_LIBRARY_PATH='${LD_LIBRARY_PATH}' PERL5LIB='${PERL5LIB}' GI_TYPELIB_PATH='${GI_TYPELIB_PATH}' XDG_DATA_DIRS='${XDG_DATA_DIRS}' XDG_CONFIG_DIRS='${XDG_CONFIG_DIRS}' GTK_PATH='${GTK_PATH}' GTK_EXE_PREFIX='${GTK_EXE_PREFIX}' GTK_DATA_PREFIX='${GTK_DATA_PREFIX}' GTK_EXE_PREFIX='${GTK_EXE_PREFIX}' GDK_PIXBUF_MODULE_FILE='${GDK_PIXBUF_MODULE_FILE}' GTK_IM_MODULE='${GTK_IM_MODULE}' GTK_IM_MODULE_FILE='${GTK_IM_MODULE_FILE}' PANGO_LIBDIR='${PANGO_LIBDIR}'"
+}
+
+export ASBRU_ENV_FOR_EXTERNAL="$(getCompressedEnv)"
+
+export ASBRU_IS_APPIMAGE="1"
+
+export LD_LIBRARY_PATH="${APPDIR}/usr/lib:${APPDIR}/usr/local/lib:${APPDIR}/usr/local/share:${APPDIR}/lib:${APPDIR}/usr/lib/perl5/core_perl/CORE/"
+
+export PERL5LIB="${APPDIR}/usr/local/lib/perl5/site_perl:${APPDIR}/usr/local/share/perl5/site_perl:${APPDIR}/usr/lib/perl5/vendor_perl:${APPDIR}/usr/share/perl5/vendor_perl:${APPDIR}/usr/lib/perl5/core_perl:${APPDIR}/usr/share/perl5/core_perl"
+
+export GI_TYPELIB_PATH="${APPDIR}/usr/lib/girepository-1.0"
+
+export XDG_DATA_DIRS="${APPDIR}/usr/local/share/:${APPDIR}/usr/share/"
+export XDG_CONFIG_DIRS="${APPDIR}/etc/xdg"
+
+export GTK_PATH="${APPDIR}/usr/lib/gtk-3.0"
+export GTK_EXE_PREFIX="${APPDIR}/usr"
+export GTK_DATA_PREFIX="${APPDIR}/usr"
+
+export GDK_PIXBUF_MODULEDIR="${APPDIR}/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders"
+export GDK_PIXBUF_MODULE_FILE="${APPDIR}/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"
+
+export GTK_IM_MODULE="${APPDIR}/usr/lib/gtk-3.0/3.0.0/immodules"
+export GTK_IM_MODULE_FILE="${APPDIR}/usr/lib/gtk-3.0/3.0.0/immodules.cache"
+
+export PANGO_LIBDIR="${APPDIR}/usr/lib"
+
+export GIO_MODULE_DIR="${APPDIR}/usr/lib/gio/modules"
+
+export ASBRU_ENV_FOR_INTERNAL="$(getCompressedEnv)"
+
+cd "${APPDIR}" || exit 1
+
+exec "${APPDIR}/usr/bin/perl" "${APPDIR}/opt/asbru-cm/asbru-cm" $@
diff --git a/dist/appimage/Dockerfile b/dist/appimage/Dockerfile
new file mode 100644
index 00000000..bc1cdeb1
--- /dev/null
+++ b/dist/appimage/Dockerfile
@@ -0,0 +1,117 @@
+# This Dockerfile should be ran from the project's root directory as context path.
+
+FROM alpine:3.20 AS base
+
+WORKDIR /
+
+# Checkout application here
+FROM base AS checkout
+COPY . /opt/asbru-cm
+RUN rm -rf /opt/asbru-cm/.git /opt/asbru-cm/.github /opt/asbru-cm/doc /opt/asbru-cm/scripts
+
+# Common dependencies for both building and running the application
+FROM base AS common
+RUN apk --no-cache add \
+    # Perls
+    perl perl-socket6 perl-yaml perl-crypt-cbc perl-glib perl-crypt-rijndael perl-xml-parser perl-io-tty perl-hash-merge-simple \
+    # Libs
+    libffi pango gtk+3.0 libcanberra-gtk3 gdk-pixbuf librsvg libwnck3 libx11 libxt libxtst dbus-x11 libuuid gobject-introspection \
+    # Binaries (with libs maybe)
+    busybox-extras openssl openssh-client lftp vte3 expect bash \
+    # Icons
+    adwaita-icon-theme \
+    # Virtual
+    --virtual common-packages-step
+
+# Compiler toolchain and dev libs get installed here
+FROM common AS builder
+RUN apk --no-cache add \
+    # Compiler Toolchain
+    gcc g++ musl-dev make \
+    # Dev Libs
+    perl-dev libx11-dev libffi-dev pango-dev openssl-dev libxt-dev libxtst-dev gobject-introspection-dev \
+    # Virtual
+    --virtual builder-packages-step
+
+# Pull dependencies here from base image, from cache, to avoid re-pulls during development as much as possible
+FROM base AS manual-dependency-puller
+RUN apk --no-cache add wget
+# OSSP's own FTP (ftp.ossp.org) is offline. Pull from a community mirror, with a fallback,
+RUN cd /tmp && ( \
+        wget --tries=3 --timeout=30 -O ossp-uuid-1.6.2.tar.gz \
+            https://distfiles.macports.org/ossp-uuid/uuid-1.6.2.tar.gz \
+        || wget --tries=3 --timeout=30 -O ossp-uuid-1.6.2.tar.gz \
+            https://ftp.netbsd.org/pub/pkgsrc/distfiles/uuid-1.6.2.tar.gz \
+    )
+RUN cd /tmp && wget --tries=3 --timeout=30 \
+    https://cpan.metacpan.org/authors/id/C/CR/CRAZYDJ/Net-ARP-1.0.11.tgz
+
+# Build manual Perl modules here
+FROM builder AS perl-builder
+# Pull dependencies from manual puller
+COPY --from=manual-dependency-puller /tmp/. /tmp
+# Manually compile and install OSSP UUID (no perl package available in APK as of writing)
+RUN cd /tmp && tar -zxvf /tmp/ossp-uuid-1.6.2.tar.gz && cd uuid-1.6.2/ && ./configure && make && make install && cd perl && perl Makefile.PL && make && make install && rm -rf ossp-uuid-1.6.2.tar.gz uuid-1.6.2
+# Manually compile and install Net::ARP with source patch sed
+RUN cd /tmp && tar -zxvf Net-ARP-1.0.11.tgz && cd Net-ARP-1.0.11 && sed -i 's/__THROW//g' arp.h && perl Makefile.PL && make && make install && rm -rf Net-ARP-1.0.11.tgz Net-ARP-1.0.11
+
+# Install Perl modules from CPAN here
+FROM perl-builder AS cpan-installer
+# Install dependencies from CPAN
+RUN apk --no-cache add perl-app-cpanminus --virtual cpanm-installer-packages-step
+# Pinned Dependencies with no tests (tests fail, at least on Alpine, even with all libs setup)
+RUN cpanm --notest --install RURBAN/Net-Ping-2.74.tar.gz
+# No-test dependencies (tests fail on Alpine)
+RUN cpanm --notest --install Glib::Object::Introspection
+# No-test dependencies (tests fail, at least on Alpine, even with all libs setup)
+RUN cpanm --notest --install Net::Proxy
+# Testable dependencies
+RUN cpanm --install IO::Stty
+RUN cpanm --install Glib::IO
+RUN cpanm --install Cairo
+RUN cpanm --install Cairo::GObject
+RUN cpanm --install X11::GUITest
+RUN cpanm --install Crypt::Blowfish
+RUN cpanm --install Pango
+RUN cpanm --install Gtk3
+RUN cpanm --install Gtk3::SimpleList
+RUN cpanm --install Expect
+RUN cpanm --install App::Info::Lib::OSSPUUID
+RUN cpanm --install Data::UUID
+
+# Remove as much build-only dependencies as possible
+FROM cpan-installer AS stripped-builder
+RUN apk --no-cache del cpanm-installer-packages-step builder-packages-step
+
+# Copy built libs, merging with common libs.
+FROM common AS merged-buildlibs
+COPY --from=stripped-builder /lib/. /lib/
+COPY --from=stripped-builder /usr/lib/. /usr/lib/
+COPY --from=stripped-builder /usr/local/lib/. /usr/local/lib/
+COPY --from=stripped-builder /usr/local/share/. /usr/local/share/
+COPY --from=stripped-builder /usr/share/. /usr/share/
+COPY --from=stripped-builder /etc/. /etc/
+
+# Install some needed stuff for AppImage packaging
+FROM common AS appimage-tools
+RUN wget "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage" && \
+    chmod +x "appimagetool-x86_64.AppImage"
+RUN apk add fuse file appstream dos2unix patchelf
+FROM appimage-tools AS appimage-assembler
+
+# Create appimage dir
+RUN mkdir -p /var/appimage-dir
+
+# Copy built libs.
+COPY --from=merged-buildlibs /lib/. /var/appimage-dir/lib/
+COPY --from=merged-buildlibs /usr/lib/. /var/appimage-dir/usr/lib/
+COPY --from=merged-buildlibs /usr/local/lib/. /var/appimage-dir/usr/local/lib/
+COPY --from=merged-buildlibs /usr/local/share/. /var/appimage-dir/usr/local/share/
+COPY --from=merged-buildlibs /usr/share/. /var/appimage-dir/usr/share/
+COPY --from=merged-buildlibs /etc/xdg/. /var/appimage-dir/etc/xdg/
+
+# Copy Bins
+COPY --from=merged-buildlibs /usr/bin/. /var/appimage-dir/usr/bin
+
+# Copy tree checkout
+COPY --from=checkout /opt/asbru-cm/. /var/appimage-dir/opt/asbru-cm/
diff --git a/dist/appimage/container_make_appimage.sh b/dist/appimage/container_make_appimage.sh
new file mode 100644
index 00000000..b7e5cb3a
--- /dev/null
+++ b/dist/appimage/container_make_appimage.sh
@@ -0,0 +1,45 @@
+#!/bin/bash
+
+# http://redsymbol.net/articles/unofficial-bash-strict-mode/ ;)
+set -euo pipefail
+IFS=$'\n\t'
+
+# Too much output can't hurt, it's Bash.
+set -x
+
+USE_APPSTREAM="${USE_APPSTREAM-0}"
+
+ln -s ./opt/asbru-cm/res/asbru-cm.desktop /var/appimage-dir/asbru-cm.desktop
+ln -s ./opt/asbru-cm/res/asbru-logo.svg /var/appimage-dir/asbru-cm.svg
+ln -s ./opt/asbru-cm/res/asbru-logo-256.png /var/appimage-dir/.DirIcon
+ln -s ./opt/asbru-cm/dist/appimage/AppRun /var/appimage-dir/AppRun
+
+chmod a+x /var/appimage-dir/AppRun
+
+dos2unix /var/appimage-dir/opt/asbru-cm/res/asbru-cm.desktop /var/appimage-dir/opt/asbru-cm/res/asbru-logo.svg /var/appimage-dir/opt/asbru-cm/dist/appimage/AppRun
+
+if [[ "${USE_APPSTREAM}" -eq 1 ]]; then
+
+    dos2unix /var/appimage-dir/opt/asbru-cm/res/org.asbru.cm.appdata.xml
+
+    mkdir -p /var/appimage-dir/usr/share/metainfo/
+
+    cp -a /var/appimage-dir/opt/asbru-cm/res/org.asbru.cm.appdata.xml /var/appimage-dir/usr/share/metainfo/org.asbru.cm.appdata.xml
+    cp -a /var/appimage-dir/opt/asbru-cm/res/org.asbru.cm.appdata.xml /usr/share/metainfo/org.asbru.cm.appdata.xml
+
+fi
+
+for binfile in /var/appimage-dir/usr/bin/*; do
+    filequery="$(file "${binfile}")"
+    if [[ "${filequery}" == *"ld-musl-x86_64.so.1"* ]]; then
+        echo "patching ELF header for file ${binfile}"
+        patchelf ${binfile} --set-interpreter "./lib/ld-musl-x86_64.so.1"
+    fi
+done
+
+/usr/bin/gtk-query-immodules-3.0 > /var/appimage-dir/usr/lib/gtk-3.0/3.0.0/immodules.cache
+sed -i 's@/usr/lib/@./usr/lib/@g' /var/appimage-dir/usr/lib/gtk-3.0/3.0.0/immodules.cache
+
+sed -i 's@/usr/lib/@./usr/lib/@g' /var/appimage-dir/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
+
+ARCH=x86_64 APPIMAGE_EXTRACT_AND_RUN=1 LD_LIBRARY_PATH="/usr/glibc-compat/lib64:/usr/glibc-compat/lib" /appimagetool-x86_64.AppImage /var/appimage-dir Asbru-CM.AppImage
diff --git a/dist/appimage/make_appimage.sh b/dist/appimage/make_appimage.sh
new file mode 100644
index 00000000..99b84e76
--- /dev/null
+++ b/dist/appimage/make_appimage.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+# This file should be ran from the project's root directory as cwd.
+
+SCRIPT_DIR="$(dirname "$(readlink -f "$0")")"
+
+# http://redsymbol.net/articles/unofficial-bash-strict-mode/ ;)
+set -euo pipefail
+IFS=$'\n\t'
+
+# Too much output can't hurt, it's Bash.
+set -x
+
+docker build --tag=asbru-cm-appimage-maker --file=dist/appimage/Dockerfile .
+
+mkdir -p "${SCRIPT_DIR}/build"
+
+CIDFILE_PATH="${SCRIPT_DIR}/build/appimage-maker.cid"
+
+rm -f "${CIDFILE_PATH}"
+
+docker run --cidfile "${CIDFILE_PATH}" --privileged=true -i asbru-cm-appimage-maker /bin/bash < "${SCRIPT_DIR}/container_make_appimage.sh"
+
+CONTAINER_ID="$(cat "${CIDFILE_PATH}")"
+rm -f "${CIDFILE_PATH}"
+
+APPIMAGE_DESTINATION="${SCRIPT_DIR}/build/Asbru-CM.AppImage"
+
+rm -f "${APPIMAGE_DESTINATION}"
+docker cp "${CONTAINER_ID}:/Asbru-CM.AppImage" "${APPIMAGE_DESTINATION}"
+
+docker rm "${CONTAINER_ID}"
+
+chmod a+x "${APPIMAGE_DESTINATION}"
diff --git a/dist/deb/debian/changelog b/dist/deb/debian/changelog
index d0b5f6a3..466ab1aa 100644
--- a/dist/deb/debian/changelog
+++ b/dist/deb/debian/changelog
@@ -1,3 +1,82 @@
+asbru-cm (6.4.1-1) stable; urgency=medium
+
+  * Upstream 6.4.1
+
+ -- Ásbrú Project Team <contact@asbru-cm.net>  Sat, 04 Apr 2026 20:00:00 +0200
+
+asbru-cm (6.4.0-1) stable; urgency=medium
+
+  * Upstream 6.4.0
+
+ -- Ásbrú Project Team <contact@asbru-cm.net>  Sun, 13 Nov 2022 22:00:00 +0100
+
+asbru-cm (6.3.3-1) stable; urgency=medium
+
+  * Upstream 6.3.3
+
+ -- Ásbrú Project Team <contact@asbru-cm.net>  Sat, 21 May 2022 10:00:00 +0100
+
+asbru-cm (6.3.2-1) stable; urgency=medium
+
+  * Upstream 6.3.2
+
+ -- Ásbrú Project Team <contact@asbru-cm.net>  Sat, 27 Feb 2021 10:00:00 +0100
+
+asbru-cm (6.3.1-1) stable; urgency=medium
+
+  * Upstream 6.3.1
+
+ -- Ásbrú Project Team <contact@asbru-cm.net>  Mon, 22 Feb 2021 23:00:00 +0100
+
+asbru-cm (6.3.0-1) stable; urgency=medium
+
+  * Upstream 6.3.0
+
+ -- Ásbrú Project Team <contact@asbru-cm.net>  Tue, 16 Feb 2021 15:00:00 +0100
+
+asbru-cm (6.2.2-1) stable; urgency=medium
+
+  * Upstream 6.2.2 release
+  * Moved repositories from Packagecloud to Cloudsmith
+
+ -- Ásbrú Project Team <contact@asbru-cm.net>  Sat, 07 Nov 2020 12:00:00 +0100
+
+asbru-cm (6.2.1-1) stable; urgency=medium
+
+  * Upstream 6.2.1 release
+
+ -- Ásbrú Project Team <contact@asbru-cm.net>  Sat, 06 Jun 2020 21:00:00 +0200
+
+asbru-cm (6.2.0-1) stable; urgency=medium
+
+  * Upstream 6.2.0 release
+
+ -- Ásbrú Project Team <contact@asbru-cm.net> Fri, 15 May 2020 16:00:00 +0200
+
+asbru-cm (6.1.3-1) stable; urgency=medium
+
+  * Upstream 6.1.3 release
+
+ -- Ásbrú Project Team <contact@asbru-cm.net> Tue, 28 Apr 2020 11:00:00 +0200
+
+asbru-cm (6.1.2-1) stable; urgency=medium
+
+  * Upstream 6.1.2 release
+
+ -- Ásbrú Project Team <contact@asbru-cm.net> Sun, 12 Apr 2020 20:00:00 +0200
+
+asbru-cm (6.1.0-1) stable; urgency=medium
+
+  * Upstream 6.1.0 release
+
+ -- Ásbrú Project Team <contact@asbru-cm.net> Fri, 27 Mar 2020 09:00:00 +0200
+
+asbru-cm (6.1.0rc2-1) stable; urgency=medium
+
+  * Upstream 6.1.0rc2 release
+
+ -- Ásbrú Project Team <contact@asbru-cm.net> Sat, 14 Mar 2020 09:00:00 +0200
+
 asbru-cm (6.1.0rc1-1) stable; urgency=medium
 
   * Upstream 6.1.0rc1 release
diff --git a/dist/deb/debian/compat b/dist/deb/debian/compat
index ec635144..f599e28b 100644
--- a/dist/deb/debian/compat
+++ b/dist/deb/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/dist/deb/debian/control b/dist/deb/debian/control
index 521d771d..a4da8f25 100644
--- a/dist/deb/debian/control
+++ b/dist/deb/debian/control
@@ -1,7 +1,7 @@
 Source: asbru-cm
 Section: networking
 Priority: optional
-Maintainer: Klaas Tammling <klaas@tammling.hamburg>
+Maintainer: Ásbrú Project Team <contact@asbru-cm.net>
 Build-Depends: debhelper (>= 9)
 Standards-Version: 3.9.8
 Homepage: https://www.asbru-cm.net
@@ -10,6 +10,9 @@ Vcs-Browser: https://github.com/asbru-cm/asbru-cm.git
 
 Package: asbru-cm
 Architecture: all
-Depends: perl, libvte-2.91-0, libcairo-perl, libglib-perl, libpango-perl, libsocket6-perl, libexpect-perl, libyaml-perl, libcrypt-cbc-perl, libcrypt-blowfish-perl, libgtk3-perl, libnet-arp-perl, libossp-uuid-perl, openssh-client, telnet, ftp, libcrypt-rijndael-perl, libxml-parser-perl, libcanberra-gtk-module, dbus-x11, libx11-guitest-perl, libgtk3-simplelist-perl, gir1.2-wnck-3.0, gir1.2-vte-2.91
+Depends: perl, libvte-2.91-0, libcairo-perl, libglib-perl, libpango-perl, libsocket6-perl, libexpect-perl, libyaml-perl, libcrypt-cbc-perl, libcrypt-blowfish-perl, libgtk3-perl, libnet-arp-perl, libossp-uuid-perl, openssh-client, libcrypt-rijndael-perl, libxml-parser-perl, dbus-x11, libgtk3-simplelist-perl, gir1.2-wnck-3.0, gir1.2-vte-2.91, ncat | nmap
+Recommends: keepassxc
+Suggests: telnet, ftp, freerdp-x11 | rdesktop, tigervnc-viewer | xtightvncviewer, mosh, cu | remote-tty, libx11-guitest-perl, libcanberra-gtk-module
 Description: A free and open-source connection manager
- Ásbrú Connection Manager is a user interface that helps organizing remote terminal sessions and automating repetitive tasks.
+ Ásbrú Connection Manager is a user interface that helps organizing
+ remote terminal sessions and automating repetitive tasks.
diff --git a/dist/deb/debian/copyright b/dist/deb/debian/copyright
index b4fe60b6..5026527e 100644
--- a/dist/deb/debian/copyright
+++ b/dist/deb/debian/copyright
@@ -3,681 +3,19 @@ Upstream-Name: asbru-cm
 Source: https://www.asbru-cm.net
 
 Files: *
-Copyright: 2017 Ásbrú Connection Manager team <contact@asbru-cm.net>
+Copyright: 2017-2026 Ásbrú Connection Manager team <contact@asbru-cm.net>
            2010-2016 David Torrejón Vaquerizas
 License: GPL-3+
-vGNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    {one line to give the program's name and a brief idea of what it does.}
-    Copyright (C) {year}  {name of author}
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU 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 General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    {project}  Copyright (C) {year}  {fullname}
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
 
+License: GPL 3.0
+ These files are free software: you can redistribute them and/or modify them
+ under the terms of the GNU General Public License as published by the Free
+ Software Foundation, version 3.
+ .
+ These files are distributed in the hope that they will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more 
+ details.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ version 3.0 can be found in "/usr/share/common-licenses/GPL-3".
diff --git a/dist/deb/debian/source/format b/dist/deb/debian/source/format
index 163aaf8d..89ae9db8 100644
--- a/dist/deb/debian/source/format
+++ b/dist/deb/debian/source/format
@@ -1 +1 @@
-3.0 (quilt)
+3.0 (native)
diff --git a/dist/deb/debian/source/options b/dist/deb/debian/source/options
new file mode 100644
index 00000000..d5ae1bec
--- /dev/null
+++ b/dist/deb/debian/source/options
@@ -0,0 +1,2 @@
+# Don't store changes on autogenerated files
+extend-diff-ignore = "(^|/)(.*\.changes|.*\.buildinfo)$"
diff --git a/dist/deb/make_debian.sh b/dist/deb/make_debian.sh
index 79e92f30..93754d34 100755
--- a/dist/deb/make_debian.sh
+++ b/dist/deb/make_debian.sh
@@ -29,7 +29,7 @@ tar -xf asbru-cm_$DEBIAN_VERSION.orig.tar
 xz -9 asbru-cm_$DEBIAN_VERSION.orig.tar
 mv asbru-cm_$DEBIAN_VERSION.orig.tar.xz ../
 
-ls -lha
+#ls -lha
 
 if ! [[ -z "$TRAVIS_TAG" ]]; then
 	dch -v "$DEBIAN_VERSION" -D "unstable" -b -m "New automatic GitHub build from snapshot"
@@ -40,8 +40,8 @@ fi
 
 debuild -us -uc
 
-ls -lha
+#ls -lha
 cd ..
-ls -lha
+#ls -lha
 
 echo "All done. Hopefully"                   
diff --git a/dist/rpm/asbru.spec b/dist/rpm/asbru.spec
index e7b27b28..7f037d18 100644
--- a/dist/rpm/asbru.spec
+++ b/dist/rpm/asbru.spec
@@ -8,6 +8,7 @@ License:    GPLv3+
 URL:        https://asbru-cm.net
 Source0:    https://github.com/asbru-cm/asbru-cm/archive/%{version}.tar.gz
 BuildArch:  noarch
+Autoreq:    no
 Requires:   perl
 Requires:   perl(Carp)
 Requires:   perl(Compress::Raw::Zlib)
@@ -44,16 +45,29 @@ Requires:   perl(strict)
 Requires:   perl(utf8)
 Requires:   perl(vars)
 Requires:   perl(warnings)
-Requires:   perl-X11-GUITest
 Requires:   vte291
-Requires:   ftp
-Requires:   telnet
 Requires:   bash
 Requires:   perl-Crypt-CBC
 Requires:   perl-Crypt-Rijndael
 Requires:   perl-IO-Tty
 Requires:   perl-IO-Stty
 Requires:   libwnck3
+Requires:   nmap-ncat
+%if 0%{?el7}
+Requires: telnet
+Requires: ftp
+%else
+Recommends: keepassxc
+Suggests: freerdp or rdesktop
+Suggests: tigervnc or tightvnc
+Suggests: mosh
+Suggests: cu
+Suggests: x3270-x11
+Suggests: tn5250
+Suggests: telnet
+Suggests: ftp
+Suggests: perl-X11-GUITest
+%endif
 BuildRequires: pkgconfig
 BuildRequires: bash-completion
 BuildRequires: desktop-file-utils
@@ -64,11 +78,11 @@ BuildRoot:  %{_topdir}/tmp/%{name}-%{version}-%{release}-root
 
 %prep
 %autosetup -n asbru-cm-%{_github_version} -p1
-sed -ri -e "s|\\\$RealBin[ ]*\.[ ]*'|'%{_datadir}/%{name}/lib|g" lib/pac_conn
-sed -ri -e "s|\\\$RealBin,|'%{_datadir}/%{name}/lib',|g" lib/pac_conn
-sed -ri -e "s|\\\$RealBin/\.\./|%{_datadir}/%{name}/|g" lib/pac_conn
-sed -ri -e "s|\\\$RealBin/|%{_datadir}/%{name}/lib/|g" lib/pac_conn
-find . -type f -exec sed -i \
+sed -ri -e "s|\\\$RealBin[ ]*\.[ ]*'|'%{_datadir}/%{name}/lib|g" lib/asbru_conn
+sed -ri -e "s|\\\$RealBin,|'%{_datadir}/%{name}/lib',|g" lib/asbru_conn
+sed -ri -e "s|\\\$RealBin/\.\./|%{_datadir}/%{name}/|g" lib/asbru_conn
+sed -ri -e "s|\\\$RealBin/|%{_datadir}/%{name}/lib/|g" lib/asbru_conn
+find . -not -path './utils/*' -type f -exec sed -i \
   -e "s|\$RealBin[ ]*\.[ ]*'|'%{_datadir}/%{name}|g" \
   -e 's|"\$RealBin/|"%{_datadir}/%{name}/|g' \
   -e 's|/\.\.\(/\)|\1|' \
@@ -85,13 +99,11 @@ desktop-file-validate res/asbru-cm.desktop
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}/{%{_mandir}/man1,%{_bindir}}
-mkdir -p %{buildroot}/%{_datadir}/{%{name}/{lib,res},applications}
+mkdir -p %{buildroot}/%{_datadir}/{%{name}/{lib,res,utils},applications}
 mkdir -p %{buildroot}/%{_bashcompletiondir}
 mkdir -p %{buildroot}/%{_datadir}/icons/hicolor/{24x24,64x64,256x256,scalable}/apps
 
 install -m 755 asbru-cm %{buildroot}/%{_bindir}/%{name}
-install -m 755 utils/pac_from_mcm.pl %{buildroot}/%{_bindir}/%{name}_from_mcm
-install -m 755 utils/pac_from_putty.pl %{buildroot}/%{_bindir}/%{name}_from_putty
 
 echo Bashcompletion Directory %{_bashcompletiondir}
 
@@ -106,9 +118,10 @@ cp -a res/asbru-logo-256.png %{buildroot}/%{_datadir}/icons/hicolor/256x256/apps
 cp -a res/asbru-logo.svg %{buildroot}/%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
 
 # Copy the remaining resources and libraries
-cp -a res/*.{png,jpg,pl,glade,css,svg} %{buildroot}/%{_datadir}/%{name}/res/
+cp -a res/*.{png,pl,glade,svg} %{buildroot}/%{_datadir}/%{name}/res/
+cp -ar res/themes/ %{buildroot}/%{_datadir}/%{name}/res/
 cp -a lib/* %{buildroot}/%{_datadir}/%{name}/lib/
-
+cp -a utils/*.pl %{buildroot}/%{_datadir}/%{name}/utils/
 
 %files
 %doc README.md
@@ -137,6 +150,33 @@ fi
 
 
 %changelog
+* Sat Apr 04 2026 Ásbrú Project Team <contact@asbru-cm.net> 6.4.1
+- 6.4.1 Release
+* Sun Nov 13 2022 Ásbrú Project Team <contact@asbru-cm.net> 6.4.0
+- 6.4.0 Release
+* Sat May 21 2022 Ásbrú Project Team <contact@asbru-cm.net> 6.3.3
+- 6.3.3 Release
+* Sat Feb 27 2021 Ásbrú Project Team <contact@asbru-cm.net> 6.3.2
+- 6.3.2 Release
+* Mon Feb 22 2021 Ásbrú Project Team <contact@asbru-cm.net> 6.3.1
+- 6.3.1 Release
+* Tue Feb 16 2021 Ásbrú Project Team <contact@asbru-cm.net> 6.3.0
+- 6.3.0 Release
+* Sat Nov 07 2020 Ásbrú Project Team <contact@asbru-cm.net> 6.2.2
+- 6.2.2 release
+- Moved repositories from Packagecloud to Cloudsmith
+* Sat Jun 06 2020 Ásbrú Project Team <contact@asbru-cm.net> 6.2.1
+- 6.2.1 release
+* Fri May 15 2020 Ásbrú Project Team <contact@asbru-cm.net> 6.2.0
+- 6.2.0 release
+* Tue Apr 28 2020 Ásbrú Project Team <contact@asbru-cm.net> 6.1.3
+- 6.1.3 release
+* Sun Apr 12 2020 Ásbrú Project Team <contact@asbru-cm.net> 6.1.2
+- 6.1.2 release
+* Fri Mar 27 2020 Ásbrú Project Team <contact@asbru-cm.net> 6.1.0
+- 6.1.0 release
+* Sat Mar 14 2020 Ásbrú Project Team <contact@asbru-cm.net> 6.1.0rc2
+- 6.1.0rc2 release
 * Sun Mar 01 2020 Ásbrú Project Team <contact@asbru-cm.net> 6.1.0rc1
 - 6.1.0rc1 release
 * Tue Feb 04 2020 Ásbrú Project Team <contact@asbru-cm.net> 6.0.4
diff --git a/doc/CNAME b/doc/CNAME
new file mode 100644
index 00000000..2e80b095
--- /dev/null
+++ b/doc/CNAME
@@ -0,0 +1 @@
+docs.asbru-cm.net
diff --git a/doc/Contributing/CODE_OF_CONDUCT.md b/doc/Contributing/CODE_OF_CONDUCT.md
new file mode 100644
index 00000000..1541e9b0
--- /dev/null
+++ b/doc/Contributing/CODE_OF_CONDUCT.md
@@ -0,0 +1,46 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at coc@asbru-cm.net. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/
diff --git a/doc/Contributing/CODING_STANDARD.md b/doc/Contributing/CODING_STANDARD.md
new file mode 100644
index 00000000..fc6f2564
--- /dev/null
+++ b/doc/Contributing/CODING_STANDARD.md
@@ -0,0 +1,135 @@
+# Coding Standard
+
+This coding standard consists of recommendations when contributing to the Ásbrú Connection Manager project.  Recommendations are meant to provide guidance that, when followed, should improve the safety, reliability, and security of the project.
+
+## Coding guidelines
+
+* Use spaces as indentation (no tabs).
+* Use 4 spaces per indentation level.
+* No trailing white space.
+* Explicit if statements:
+  - No use of:
+    - `unless`
+    - reversed if `next if $true;`
+    - non explicit conditional expressions
+      - `($a) && ($b) and print "do this if both variables are true";`
+* Ternary operator for assigment is allowed as long as the code does not obfuscate.
+  - `my $value = ($exists) ? $exists : 1;`
+* Use of strings with interpolation.
+  - Example: `$CNF_DIR = "$ENV{'HOME'}/.config/pac";`
+* Nested parenthesis should be together unless you feel that a separation makes code more readable.
+* All conditional blocks, Loops must be on different lines, even if it is one statement in the block.
+* Local variables should be declared at the beginning of a function block, and if they are not initialized, they could be declared as one line.
+    * `my ($var1, $var2, $var3);`
+    * Avoid declaring them in the middle of the block, unless is going to be used as a temporary variable inside an inner block.
+* Rules might be bent from time to time, when brings something valuable to the code over formatting.
+* Function naming
+    * Use camel case, example : myLongNameFunction
+    * Add an undersocore to local function names : _myPrivateFunction
+
+## Documentation guidelines
+
+* At the end of each script the `__END__` marker should be added
+  - This marker will tell the compiler to stop processing the file from that point onward.
+  - Allowing to write extensive documentation without being processed by the compiler.
+* After the end marker, documentation can be added in pod format, to allow perldoc to format and present information on the screen or to export to other formats.
+
+### Basic pod (Plain Old Documentation)
+
+**Common Sections**, as found in all CPAN documentation
+
+* **NAME** module or script name, a dash and a short description.
+* SYNOPSIS shows example usage.
+* **DESCRIPTION** long description of what the module does and lists functions.
+* **BUGS or CAVEATS** about bugs or issues the user should know about.
+* ACKNOWLEDGEMENTS thank bug fixers, testers and your parents.
+* COPYRIGHT or LICENSE copyright restrictions.
+* AVAILABILITY Where to download from
+* AUTHOR who made it.
+
+The bold sections should be the minimum to Document. Other sections already exist in the repository or could not apply to this particular project.
+
+### Pod markup summary
+
+**This is a reduced set**, if anyone is interested on the full description, follow this reference: https://perldoc.perl.org/perlpod.html
+
+```pod
+=encoding utf8
+
+=head1 NAME
+
+There are 4 header level 1..4
+
+Pod will indent each section,
+as in many markup languages, two or more lines together are printed as a single line.
+
+=head2
+
+Always leave a blank line before and after each pod tag,
+log lines can be split into consecutive lines.
+
+Indent one level with a tab to document code and create a verbatim sections where each line is printed separately.
+
+    sub myFunction {
+        print "Something";
+    }
+
+```
+
+Basic styles not all available in terminal
+```pod
+B<bold text>
+I<Italic text, shown as underline text in terminal>
+C<code text>
+B<tags can be I<nested>>
+```
+
+**Example pod file in asbru-cm**
+
+```
+__END___
+=encoding utf8
+
+=head1 NAME
+
+asbru-cm
+
+=head1 SYNOPSYS
+
+asbru-cm [options]
+
+B<Options>
+
+    --help : show this message
+    --no-backup : do no create alternative config files as a backup (faster shutdown)
+    --start-shell : start a local terminal
+    --password=<pwd> : automatically logon with given password without prompting user
+    --start-uuid=<uuid>[:<cluster] : start connection in cluster (if given)
+    --edit-uuid=<uuid> : edit connection
+    --dump-uuid=<uuid> : dump data for given connection
+    --scripts : open scripts window
+    --start-script=<script> : start given script
+    --preferences : open global preferences dialog
+    --quick-conn : open the Quick Connect dialog on startup
+    --list-uuids : list existing connections/groups and their UUIDs
+    --no-splash : no splash screen on startup
+    --iconified : go to tray once started
+    --readonly : start in read only mode (no config changes allowed)
+
+=head1 DESCRIPTION
+
+=head2 Global Variables
+
+I<$CFG_DIR>    Setup your configuration directory here.
+
+You may run different versions of Ásbru and each have different configuration settings and connections.
+
+=head2 Functions
+
+C<sub config_migration> (no parameters) (no return values)
+
+Function normally empty unless there is a migration of the configuration files.
+
+```
+
+**See result executing** `perldoc asbru-cm`
diff --git a/doc/Contributing/Financial_Contribution.md b/doc/Contributing/Financial_Contribution.md
new file mode 100644
index 00000000..1954bf15
--- /dev/null
+++ b/doc/Contributing/Financial_Contribution.md
@@ -0,0 +1,23 @@
+# Contribute Financially
+
+If you like Ásbrú Connection Manager, you may also consider supporting the project financially.
+
+## Liberapay
+
+[Liberapay](https://liberapay.com) is a way to donate money recurrently to provide a stable crowdfunded basic income to the team, enabling them to keep doing great work that benefits everyone.
+
+Please use the following button to proceed with Liberapay:
+
+<a href="https://liberapay.com/asbru-cm/donate"><img alt="Donate using Liberapay" src="https://liberapay.com/assets/widgets/donate.svg" style="width: 128px;"></a>
+
+Even small or symbolic donation will be greatly appreciated.  You can stop at any time, including after the first donation.
+
+## Cryptocurrencies
+
+The Ásbrú Connection Manager project also accepts donations to the following cryptocurrency wallets:
+
+![Bitcoin](images/bitcoin.svg){: width=48 style="vertical-align:middle; margin-right: 12px;" }<a href="bitcoin:19ZsvCafwRCwQSPcvfzgyiHD3Viptb4F45">19ZsvCafwRCwQSPcvfzgyiHD3Viptb4F45</a>
+
+![Ethereum](images/ethereum.svg){: width=48 style="vertical-align:middle; margin-right: 12px;" }<a href="ethereum:0x0c3bf9C1983d2Fa192d1A78DCF9DC30596E72B98">0x0c3bf9C1983d2Fa192d1A78DCF9DC30596E72B98</a>
+
+![Dash](images/dash.svg){: width=48 style="vertical-align:middle; margin-right: 12px;" }<a href="dash:XqrupWsSeWRJwE9KCAPiaX7YEqnf4ks5pn">XqrupWsSeWRJwE9KCAPiaX7YEqnf4ks5pn</a>
diff --git a/doc/Contributing/images/bitcoin.svg b/doc/Contributing/images/bitcoin.svg
new file mode 100644
index 00000000..b3fd9e3b
--- /dev/null
+++ b/doc/Contributing/images/bitcoin.svg
@@ -0,0 +1,7 @@
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="64" width="64" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<g transform="translate(0.00630876,-0.00301984)">
+<path fill="#f7931a" d="m63.033,39.744c-4.274,17.143-21.637,27.576-38.782,23.301-17.138-4.274-27.571-21.638-23.295-38.78,4.272-17.145,21.635-27.579,38.775-23.305,17.144,4.274,27.576,21.64,23.302,38.784z"/>
+<path fill="#FFF" d="m46.103,27.444c0.637-4.258-2.605-6.547-7.038-8.074l1.438-5.768-3.511-0.875-1.4,5.616c-0.923-0.23-1.871-0.447-2.813-0.662l1.41-5.653-3.509-0.875-1.439,5.766c-0.764-0.174-1.514-0.346-2.242-0.527l0.004-0.018-4.842-1.209-0.934,3.75s2.605,0.597,2.55,0.634c1.422,0.355,1.679,1.296,1.636,2.042l-1.638,6.571c0.098,0.025,0.225,0.061,0.365,0.117-0.117-0.029-0.242-0.061-0.371-0.092l-2.296,9.205c-0.174,0.432-0.615,1.08-1.609,0.834,0.035,0.051-2.552-0.637-2.552-0.637l-1.743,4.019,4.569,1.139c0.85,0.213,1.683,0.436,2.503,0.646l-1.453,5.834,3.507,0.875,1.439-5.772c0.958,0.26,1.888,0.5,2.798,0.726l-1.434,5.745,3.511,0.875,1.453-5.823c5.987,1.133,10.489,0.676,12.384-4.739,1.527-4.36-0.076-6.875-3.226-8.515,2.294-0.529,4.022-2.038,4.483-5.155zm-8.022,11.249c-1.085,4.36-8.426,2.003-10.806,1.412l1.928-7.729c2.38,0.594,10.012,1.77,8.878,6.317zm1.086-11.312c-0.99,3.966-7.1,1.951-9.082,1.457l1.748-7.01c1.982,0.494,8.365,1.416,7.334,5.553z"/>
+</g>
+</svg>
\ No newline at end of file
diff --git a/doc/Contributing/images/dash.svg b/doc/Contributing/images/dash.svg
new file mode 100644
index 00000000..8b4ec94d
--- /dev/null
+++ b/doc/Contributing/images/dash.svg
@@ -0,0 +1,66 @@
+<?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"
+   version="1.0"
+   width="510.39999"
+   height="415.20621"
+   viewBox="0 0 5103.9999 4152.0621"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg39"
+   sodipodi:docname="dash.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata45">
+    <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="defs43" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1671"
+     inkscape:window-height="1087"
+     id="namedview41"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="0.213125"
+     inkscape:cx="785"
+     inkscape:cy="95.006221"
+     inkscape:window-x="0"
+     inkscape:window-y="28"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg39" />
+  <path
+     style="fill:#008de4;stroke:none"
+     inkscape:connector-curvature="0"
+     id="path34"
+     d="m 750,4144 c 0,-5 14,-76 31,-158 17,-82 34,-180 39,-219 4,-38 22,-135 38,-215 17,-80 33,-175 37,-212 l 7,-68 h 951 c 808,0 966,-2 1047,-15 158,-26 267,-55 430,-117 19,-7 59,-27 88,-45 29,-18 56,-33 60,-33 4,0 25,-16 47,-35 22,-19 43,-35 47,-35 4,0 31,-25 60,-57 29,-31 63,-66 76,-78 12,-12 22,-26 22,-31 0,-4 9,-17 19,-28 21,-23 121,-212 121,-230 0,-6 13,-44 30,-83 16,-40 33,-94 38,-120 5,-27 23,-102 40,-168 138,-538 106,-871 -102,-1075 -88,-86 -201,-144 -366,-190 -147,-40 -198,-42 -1197,-49 -535,-4 -976,-10 -979,-14 -7,-6 6,-83 70,-437 19,-102 39,-216 45,-255 5,-38 15,-94 22,-123 l 11,-54 1132,5 c 1214,5 1144,2 1401,58 120,26 167,38 265,74 88,31 246,109 275,134 11,10 28,21 39,25 26,9 163,131 209,186 72,86 93,115 128,175 41,72 100,224 124,320 49,196 49,200 49,505 0,258 -3,311 -22,425 -12,72 -27,162 -32,200 -28,187 -105,472 -177,660 -37,94 -120,283 -133,300 -4,6 -21,35 -38,67 -16,31 -34,62 -41,70 -6,7 -36,51 -67,98 -98,148 -310,371 -428,450 -127,85 -204,132 -276,166 -119,59 -249,114 -266,114 -8,0 -55,13 -103,29 -49,16 -111,32 -138,36 -26,3 -93,13 -148,21 -55,7 -154,18 -220,24 -147,12 -2265,14 -2265,2 z" />
+  <path
+     style="fill:#008de4;stroke:none"
+     inkscape:connector-curvature="0"
+     id="path36"
+     d="m 0,2496 c 0,-45 122,-517 147,-566 68,-137 181,-230 329,-271 78,-21 91,-21 1101,-24 563,-2 1023,0 1023,4 1,21 -85,379 -123,513 -19,68 -91,183 -142,228 -24,21 -73,53 -108,70 -131,65 -79,62 -1204,62 C 96,2512 0,2511 0,2496 Z" />
+</svg>
diff --git a/doc/Contributing/images/ethereum.svg b/doc/Contributing/images/ethereum.svg
new file mode 100644
index 00000000..14407cfc
--- /dev/null
+++ b/doc/Contributing/images/ethereum.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="256px" height="417px" viewBox="0 0 256 417" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="xMidYMid">
+	<g>
+		<polygon fill="#343434" points="127.9611 0 125.1661 9.5 125.1661 285.168 127.9611 287.958 255.9231 212.32"/>
+		<polygon fill="#8C8C8C" points="127.962 0 0 212.32 127.962 287.959 127.962 154.158"/>
+		<polygon fill="#3C3C3B" points="127.9611 312.1866 126.3861 314.1066 126.3861 412.3056 127.9611 416.9066 255.9991 236.5866"/>
+		<polygon fill="#8C8C8C" points="127.962 416.9052 127.962 312.1852 0 236.5852"/>
+		<polygon fill="#141414" points="127.9611 287.9577 255.9211 212.3207 127.9611 154.1587"/>
+		<polygon fill="#393939" points="0.0009 212.3208 127.9609 287.9578 127.9609 154.1588"/>
+	</g>
+</svg>
\ No newline at end of file
diff --git a/doc/Contributing/images/liberapay.svg b/doc/Contributing/images/liberapay.svg
new file mode 100644
index 00000000..23a0df20
--- /dev/null
+++ b/doc/Contributing/images/liberapay.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 80 80"><g transform="matrix(.83012 0 0 .83012-135.4-247.7)"><path d="m259.55 385.57c0 5.145-4.169 9.318-9.318 9.318h-77.74c-5.144 0-9.318-4.174-9.318-9.318v-77.74c0-5.145 4.174-9.318 9.318-9.318h77.74c5.149 0 9.318 4.173 9.318 9.318v77.74" fill="#f6c915"/><g fill="#fff"><path d="m202.45 366.03c-3.104 0-5.541-.405-7.311-1.213-1.77-.809-3.039-1.912-3.803-3.313-.766-1.398-1.137-3-1.115-4.818.021-1.814.272-3.748.754-5.803l8.327-34.817 10.164-1.573-9.114 37.768c-.175.786-.273 1.508-.295 2.163-.023.655.098 1.235.36 1.737.262.504.71.908 1.344 1.213.633.307 1.519.504 2.656.591l-1.967 8.06"/><path d="m239.16 344.33c0 3.19-.525 6.108-1.574 8.753-1.049 2.646-2.503 4.929-4.36 6.852-1.858 1.925-4.087 3.421-6.688 4.491-2.601 1.07-5.432 1.607-8.49 1.607-1.487 0-2.973-.132-4.459-.395l-2.951 11.869h-9.704l10.884-45.37c1.748-.524 3.748-.994 5.999-1.41 2.252-.415 4.689-.622 7.312-.622 2.448 0 4.558.371 6.327 1.114 1.771.743 3.224 1.76 4.361 3.049 1.136 1.29 1.977 2.798 2.523 4.524.546 1.726.82 3.574.82 5.542m-23.802 13.442c.743.175 1.661.262 2.754.262 1.704 0 3.256-.316 4.655-.951 1.398-.633 2.59-1.518 3.574-2.655.982-1.136 1.747-2.501 2.294-4.098.546-1.595.819-3.354.819-5.278 0-1.879-.416-3.475-1.245-4.787-.831-1.311-2.273-1.967-4.327-1.967-1.4 0-2.711.131-3.935.394l-4.589 19.08"/></g></g></svg>
diff --git a/doc/Contributing/index.md b/doc/Contributing/index.md
new file mode 100644
index 00000000..eafbca28
--- /dev/null
+++ b/doc/Contributing/index.md
@@ -0,0 +1,47 @@
+# Contributing
+
+Thanks for reading this document and showing your interest in contributing to this project.
+Contributing is very easy however we have some very basic rules whe kindly ask to follow.
+
+When contributing to this repository, please first discuss the change you wish to make via issue.
+This ensures that everybody can see what you are actually working on and will prevent unnecessary work for everybody.
+
+Please note we have a code of conduct, please follow it in all your interactions with the project.
+
+## Contributor Agreement
+By contributing code to Ásbrú Connection Manager, you assert that:
+
+* You have the rights to include the code, either as its original author, or due to it being released to you under a compatible license.
+* You are not aware of any third party claims on the code, including copyright, patent, trademark, or any other legal claim.
+
+To agree with these assertions, when you submit your first pull request you will be asked after submitting to sign the CLA, you do this by following the link provided in the PR and agreeing to the CLA using your GitHub account.
+
+## Pull Request Process
+
+1. Please ensure to test the work you have done and the build process prior to making the pull request.
+2. If enhancing or changing any interfaces, environment variables or requirements please update the README.md or any other document.
+3. The versioning scheme we use is [SemVer](http://semver.org/).
+
+## Pull request title
+
+Try to be as more descriptive as you can in your Pull Request title.
+
+Particularly if you are submitting a new script or guide, include in the title,
+information about version, OS tested on and any other relevant info.
+
+For example some good titles would be:
+
+[Bugfix] - Fixed connection issue for old SSH versions
+[Doc] - Correct typo in installation docs
+
+## Pull request workflow
+1. You clone the original repo to your github account.
+2. You make changes in cloned repo.
+3. If you made a pull request inside your cloned repo for your changes the best way is 'Squash and Merge' 
+   (avoids your merge commit appear as separate commit in pull request to original repo later)
+4. You create pull request to original repo.
+5. If this is the 1st pull request to the repo the 'CLAassistant' asks you to sign committer agreement.
+6. The pull request appears on the original repo awaiting someone with write access to the repo to merge it.
+
+The detailed info on contributing to someones github repository (easy and with screenshots) is available here: 
+https://guides.github.com/activities/forking/ .
diff --git a/doc/General/AppImagePackaging.md b/doc/General/AppImagePackaging.md
new file mode 100644
index 00000000..0e759fa3
--- /dev/null
+++ b/doc/General/AppImagePackaging.md
@@ -0,0 +1,21 @@
+# AppImage Packaging
+
+Ásbrú can be distributed as an AppImage, with the necessary code for this inside the `dist/appimage-raw` folder. The embedded binaries are currently based on Alpine Linux, which is the base OS for the build. The generated AppImage is quite large but embeds all of the needed Perl and GTK libraries and even libc so it's expected to work on most, if not all, Linux systems.
+
+## Building
+
+To build the AppImage, you will need Docker installed and accessible from your POSIX shell. Then, just cd to the root directory of the project, and run: `./dist/appimage-raw/make_appimage.sh`. It will be available on `./dist/appimage-raw/build`.
+
+## Code Support
+
+Code changes were needed to make the AppImage work independently of the particular system that is running it, since Ásbrú is a complex application which invokes multiple subprocesses and interacts with the OS in various different ways. The reason for each will be documented here for future maintainers' knowledge of the needed adjustments.
+
+### Additional Environment Variables
+
+Some environment variables were created when running as an AppImage so that the code can use them for adjusting the way it runs subprocesses.
+
+The environment variables `ASBRU_ENV_FOR_EXTERNAL` and `ASBRU_ENV_FOR_INTERNAL` contain strings that, when prepended to shell commands, use either the original environment variables (for invoking programs external to the AppImage) or the internal modified environment variables (for invoking programs internal to the AppImage where the invocation is intermediated by a program external to the AppImage).
+
+The environment variable `ASBRU_SUB_CWD` is created in-code and is necessary because using `cd` is no longer a viable approach when supporting AppImages, since the process works by relinking the LD header binaries inside the AppImage to the relative path of the embedded libc implementation, so when creating the `asbru_conn` subprocess, the desired shell directory must be communicated somehow.
+
+Environent variable `ASBRU_IS_APPIMAGE` is also set to `1`, if any future specific checks need to be done.
diff --git a/doc/General/Changelog.md b/doc/General/Changelog.md
new file mode 100644
index 00000000..b6d41386
--- /dev/null
+++ b/doc/General/Changelog.md
@@ -0,0 +1 @@
+This will be generated automatically
diff --git a/doc/General/Installation.md b/doc/General/Installation.md
new file mode 100644
index 00000000..0c3aa5ad
--- /dev/null
+++ b/doc/General/Installation.md
@@ -0,0 +1,283 @@
+# How can I install Ásbrú Connection Manager ?
+
+**Ásbrú Connection Manager** is packaged for a large range of distributions.
+
+We have 3 stages in our release process:
+
+- Master : the greatest and latest stable version
+- Snapshot : the next version to be released (aka the testing area)
+- Loki : our development release with the most advanced features but not considered as stable so it is not recommended for production
+
+Our master and the snapshots are being kept as stable as possible. New features for new major releases are being developed inside the "loki" branch.
+
+Beware that [Loki](https://en.wikipedia.org/wiki/Loki) can sometimes behave in an unexpected manner to you.  This is somehow the same concept as the "[Debian sid](https://www.debian.org/releases/sid/)" release.
+
+If you do not wish to run third party scripts on your system, you are able to find manual install instructions for every repository on: https://cloudsmith.io/~asbru-cm/repos/
+
+## Windows 10
+It is possible to run Asbru-CM on Windows 10 by enabling WSL and using the application [Asbru-CM Runner](https://github.com/SegiH/Asbru-CM-Runner). If you do not have [WSLG](https://github.com/microsoft/wslg) support, you will need to install [Xming](http://www.straightrunning.com/XmingNotes/). The GitHub page for [Asbru-CM Runner](https://github.com/SegiH/Asbru-CM-Runner) has detailed instructions on how to do this and allows you to run Asbru-CM on Windows 10 without a console window open in the background.
+
+## Ubuntu
+**Master release**
+
+To install the latest release on a fresh [Ubuntu](https://www.ubuntu.com/) system, use the following instructions:
+
+```
+sudo apt-add-repository multiverse
+sudo apt install curl
+curl -1sLf 'https://dl.cloudsmith.io/public/asbru-cm/release/cfg/setup/bash.deb.sh' | sudo -E bash
+sudo apt install asbru-cm
+```
+
+**Snapshot release**
+
+To install the latest snapshot for testing, use the following instructions:
+
+```
+sudo apt-add-repository multiverse
+sudo apt install curl
+curl -1sLf 'https://dl.cloudsmith.io/public/asbru-cm/snapshots/cfg/setup/bash.deb.sh' | sudo -E bash
+sudo apt install asbru-cm
+```
+
+**Loki**
+
+To test the latest development package, use the following instructions:
+
+```
+sudo apt-add-repository multiverse
+sudo apt install curl
+curl -1sLf 'https://dl.cloudsmith.io/public/asbru-cm/loki/cfg/setup/bash.deb.sh' | sudo -E bash
+sudo apt install asbru-cm
+```
+
+## Mint
+**Master release**
+
+To install the latest release on a fresh [Mint](https://linuxmint.com/) system, use the following instructions:
+
+```
+sudo apt update
+sudo apt install curl
+curl -1sLf 'https://dl.cloudsmith.io/public/asbru-cm/release/cfg/setup/bash.deb.sh' | sudo -E bash
+sudo apt install asbru-cm
+```
+
+**Snapshot release**
+
+To install the latest snapshot for testing, use the following instructions:
+
+```
+sudo apt update
+sudo apt install curl
+curl -1sLf 'https://dl.cloudsmith.io/public/asbru-cm/snapshots/cfg/setup/bash.deb.sh' | sudo -E bash
+sudo apt install asbru-cm
+```
+
+**Loki**
+
+To test the latest development package, use the following instructions:
+
+```
+sudo apt update
+sudo apt install curl
+curl -1sLf 'https://dl.cloudsmith.io/public/asbru-cm/loki/cfg/setup/bash.deb.sh' | sudo -E bash
+sudo apt install asbru-cm
+```
+
+## Debian
+**Master release**
+
+To install the latest release on a fresh [Debian](https://www.debian.org/) system, use the following instructions:
+
+```
+sudo apt update
+sudo apt install curl
+curl -1sLf 'https://dl.cloudsmith.io/public/asbru-cm/release/cfg/setup/bash.deb.sh' | sudo -E bash
+sudo apt install asbru-cm
+```
+
+**Snapshot release**
+
+To install the latest snapshot for testing, use the following instructions:
+
+```
+sudo apt update
+sudo apt install curl
+curl -1sLf 'https://dl.cloudsmith.io/public/asbru-cm/snapshots/cfg/setup/bash.deb.sh' | sudo -E bash
+sudo apt install asbru-cm
+```
+
+**Loki**
+
+To test the latest development package, use the following instructions:
+
+```
+sudo apt update
+sudo apt install curl
+ curl -1sLf 'https://dl.cloudsmith.io/public/asbru-cm/loki/cfg/setup/bash.deb.sh' | sudo -E bash
+sudo apt install asbru-cm
+```
+
+## Fedora
+**Master release**
+
+To install the latest release on a fresh [Fedora](https://getfedora.org/) system, use the following instructions:
+
+```
+curl -1sLf 'https://dl.cloudsmith.io/public/asbru-cm/release/cfg/setup/bash.rpm.sh' | sudo -E bash
+sudo dnf install asbru-cm
+```
+
+**Snapshot release**
+
+To install the latest snapshot for testing, use the following instructions:
+
+```
+curl -1sLf 'https://dl.cloudsmith.io/public/asbru-cm/snapshots/cfg/setup/bash.rpm.sh' | sudo -E bash
+sudo dnf install asbru-cm
+```
+
+**Loki**
+
+To test the latest development package, use the following instructions:
+
+```
+curl -1sLf 'https://dl.cloudsmith.io/public/asbru-cm/loki/cfg/setup/bash.rpm.sh' | sudo -E bash
+sudo dnf install asbru-cm
+```
+
+## Gentoo
+**Master release**
+
+To install the latest release on a fresh [Gentoo](https://www.gentoo.org/) system, use the following instructions. First install necessary dependencies:
+
+```
+emerge --ask dev-vcs/git
+emerge --ask dev-perl/YAML
+USE="perl" emerge --ask dev-libs/ossp-uuid
+USE="minimal" emerge --ask dev-perl/Type-Tiny-XS
+emerge --ask dev-perl/Crypt-CBC
+emerge --ask dev-perl/Gtk3
+emerge --ask dev-perl/Net-ARP
+emerge --ask dev-perl/Crypt-Blowfish
+emerge --ask dev-perl/Gtk3-SimpleList
+emerge --ask dev-perl/Expect
+```
+
+Because of the [issue](https://github.com/asbru-cm/asbru-cm/issues/816) regarding latest Crypt-CBC, downgrade of that specific package is needed:
+```
+emerge -C dev-perl/Crypt-CBC
+emerge --ask =dev-perl/Crypt-CBC-2.330.0-r2
+```
+
+Finally, clone the repository in convenient place, like ${HOME}/programs/asbru for example:
+```
+mkdir -p ${HOME}/programs/asbru
+git clone https://github.com/asbru-cm/asbru-cm.git ${HOME}/programs/asbru
+```
+
+## Installation of legacy 5.x
+
+If you need to install the legacy v5 version of Ásbrú Connection Manager (using Gtk2 library), the legacy packages are still available.
+
+**Debian / Ubuntu**
+
+```
+curl -s https://packagecloud.io/install/repositories/asbru-cm/v5/script.deb.sh | sudo bash
+sudo apt-get install asbru-cm
+```
+
+**Fedora**
+
+```
+curl -s https://packagecloud.io/install/repositories/asbru-cm/v5/script.rpm.sh | sudo bash
+sudo dnf install asbru-cm
+```
+
+## Manual
+If you don't want to use any of the pre-built package, here are instructions to start Ásbrú Connection Manager from the sources.
+
+### Prerequisites
+
+- Perl 5.22 or above (https://www.perl.org/)
+- VTE 0.48 or above(GNOME Terminal Emulator widget, https://developer.gnome.org/vte/)
+- Perl interface to the GNOME libraries (http://gtk2-perl.sourceforge.net/)
+- OpenSSH client
+- Telnet client
+- FTP client
+
+### Clone repository
+
+```
+$ git clone https://github.com/asbru-cm/asbru-cm.git
+```
+
+### Start application
+
+```
+$ cd asbru-cm
+$ ./asbru-cm
+```
+
+### Additional information for Debian systems
+
+If you are using a Debian-based system, here are the list of dependency package to install:
+
+```
+apt install perl libvte-2.91-0 libcairo-perl libglib-perl libpango-perl libsocket6-perl libexpect-perl libnet-proxy-perl libyaml-perl libcrypt-cbc-perl libcrypt-blowfish-perl libgtk3-perl libnet-arp-perl libossp-uuid-perl openssh-client telnet ftp libcrypt-rijndael-perl libxml-parser-perl libcanberra-gtk-module dbus-x11 libx11-guitest-perl libgtk3-simplelist-perl gir1.2-wnck-3.0 gir1.2-vte-2.91
+```
+
+### Legacy v5.x
+
+For the records, the legacy v5.x version of Ásbrú Connection Manager was based on Gtk2.  Here are the list of packages to install
+
+```
+apt install perl gtk2-engines-pixbuf libvte9 libcairo-perl libgtk2-perl libglib-perl libpango-perl libgnome2-gconf-perl libsocket6-perl libexpect-perl libnet-proxy-perl libyaml-perl libcrypt-cbc-perl libcrypt-blowfish-perl libgtk2-perl libgtk2-gladexml-perl libgtk2-ex-simple-list-perl libnet-arp-perl libossp-uuid-perl openssh-client telnet ftp libcrypt-rijndael-perl libxml-parser-perl libgtk2-unique-perl
+```
+
+**Gnome2::Vte**
+
+0) The VTE dev package is required to get Gnome2::Vte compiled for your environment
+
+```
+sudo apt install libvte-dev
+```
+
+1) Start CPAN shell
+
+```
+perl -MCPAN -e shell
+```
+
+2) The very fist time you start CPAN, it will ask you some questions.  Please chose the best option for your environement, in this example, we will assume the following choices:
+
+```
+Would you like to configure as much as possible automatically?   --> yes
+What approach do you want?   --> sudo
+```
+
+3) In the CPAN shell, install Gnome2::Vte
+
+```
+cpan[1] > install Gnome2::Vte
+```
+
+This will download the latest version (0.11), compile it and install it under ```/usr/local/lib```.
+
+4) Cleaning up:
+
+(those steps are optional, think carefully about your own environment !  This may potentially break your system. **You have been warned**)
+
+If you don't need the development packages anymore:
+
+```
+sudo apt purge libvte-dev
+sudo apt autoremove
+```
+
+If it was the first time you used CPAN and you don't want to keep .cpan configuration, sources, etc.
+
+```
+rm -rf .cpan
+```
diff --git a/doc/General/News.md b/doc/General/News.md
new file mode 100644
index 00000000..175232f6
--- /dev/null
+++ b/doc/General/News.md
@@ -0,0 +1,50 @@
+# What's new about Ásbrú Connection Manager ?
+Here you can find important news on the project
+
+## 12.04.2020
+
+Dear testers,
+
+We are about to merge a change (see [#515](https://github.com/asbru-cm/asbru-cm/pull/515)) that will require your attention as it may have some impact on your working environment.
+
+This change is related to [#182](https://github.com/asbru-cm/asbru-cm/issues/182) and will basically rename the default configuration file from ```~/.config/pac``` to ```~/.config/asbru``` to move forward in the rebranding of the forked application.
+
+As of version 6.2.0, that is under testing in our ["loki" branch](https://github.com/asbru-cm/asbru-cm#testing-new-features), you will be required to migrate your existing configuration to the new file layout.
+
+At application startup, a warning message will give you the opportunity to think twice about it.
+
+We believe we did everything to make this as smooth and transparent as possible.
+
+But what you may want to understand:
+
+* Nothing will be lost
+* A safe copy of your existing configuration will be done to ```~/.config/pac.old```
+* Older versions of Ásbrú will not be able to read that new configuration
+* When starting an old version (6.0 or higher), you can use ```--config-dir ~/.config/pac.old``` to use your old configuration
+* When starting an old version (6.1.x), Ásbrú will propose to downgrade your migrated configuration or recover your old configuration
+* Upgrade and downgrade scripts are available in the ```utils``` directory
+
+Please comme issue [#569](https://github.com/asbru-cm/asbru-cm/issues/569) if you have any concern with this change ; or simply thumb it up if you understand what will happen in the next days and are ready to test this to ensure a proper release of 6.2.0.
+
+Happy Easter testing !
+
+## 15.02.2020
+
+Dear testers,
+
+We have merged the codebase for version 6.1.0 into master. This release will bring some cleanups and a few new features which require testing.
+
+These new features are:
+
+* Support for SOCKS Proxy (for VNC/RDP/SSH/SFTP today) using [ncat](https://nmap.org/ncat/) for advanced cases
+* Support for Jump Host to simplify SSH tunneling for VNC/RDP/SSH connections.
+
+We would be happy if you can test the master snapshots as we would like to release the first official *rc1* build soon.
+
+Attention: please make sure you have a safe copy of your configuration directory (which is ~/.config/pac) by default before proceeding with your tests.
+
+Thanks and happy testing.
+
+## 16.12.2019
+* We are disabling the el-test repository. In future you will find the rpms for el7 and el8 in the main packagecloud repostory asbru-cm/asbru-cm
+* gtk3 branch has been merged into master therefore we are disabling snapshot generation from the gtk3 branch.
diff --git a/doc/General/Redistribution.md b/doc/General/Redistribution.md
new file mode 100644
index 00000000..d486ca73
--- /dev/null
+++ b/doc/General/Redistribution.md
@@ -0,0 +1,24 @@
+# Redistributing Ásbrú Connection Manager
+
+When redistributing Ásbrú Connection Manager (e.g acting as a vendor), you can customize some aspects of it to better accomodate the specific distribution/environment you are distributing it on.
+
+## Customizing Default Configuration
+
+You can override the default options that are loaded on the first start without having to provide a full configuration file, overriding only the options you need to override.
+
+To do this, create a YAML file on path (relative to project root) `vendor/asbru-conf-default-overrides.yml`.
+
+To discourage accidental usage of this pattern, the YAML document must contain the configurations inside the root key `__PAC__EXPORTED__PARTIAL_CONF`.
+
+An example of this file that changes the default fonts to `Ubuntu Mono 12` is as follows:
+
+```yaml
+---
+__PAC__EXPORTED__PARTIAL_CONF:
+  defaults:
+    info font: Ubuntu Mono 12
+    terminal font: Ubuntu Mono 12
+    tree font: Ubuntu Mono 12
+```
+
+Since this file is used as a source before the application's hard-coded default options, you can also use it to store connections or any other configuration which normally resides in the `asbru.yml` configuration file.
diff --git a/doc/General/Upgrade.md b/doc/General/Upgrade.md
new file mode 100644
index 00000000..8f4d8371
--- /dev/null
+++ b/doc/General/Upgrade.md
@@ -0,0 +1,113 @@
+# How do I upgrade or downgrade Ásbrú Connection Manager ?
+
+## Software
+
+### Official packages
+
+If you installed Ásbrú Connection Manager from our packages prepared for most of the popular distributions, you simply need to upgrade or downgrade the package according to the procedure of your favorite distribution.
+
+For Debian-based distributions, it would typically be:
+
+```
+sudo apt-get update
+sudo apt-get install --only-upgrade asbru-cm
+```
+
+to downgrade to a specific version:
+
+```
+sudo apt-get install asbru-cm=6.1.2
+```
+
+to list all past versions available for your distribution, you can typically use:
+
+```
+apt-cache madison asbru-cm
+```
+
+For Fedora-based distributions, it would typically be:
+
+```
+sudo dnf update asbru-cm -y
+```
+
+to downgrade to a specific version:
+
+```
+sudo dnf install asbru-cm-6.0.4-1.fc31
+```
+
+to list all past versions available for your distribution, you can typically use:
+
+```
+dnf --showduplicate list asbru-cm
+```
+
+### Manually from sources
+
+If you installed Ásbrú Connection Manager manually from our git repository, you will need to pull the desired versions to your local copy.
+
+Here is an example to upgrade to version 6.2:
+
+```
+$ cd /path/to/asbru-cm
+$ git fetch --tags
+$ git checkout 6.2.0
+```
+
+To downgrade to a previous version:
+
+```
+$ git checkout 6.1.1
+```
+
+To get back to latest version (that might not be released):
+
+```
+$ git checkout master
+```
+
+## Configuration file
+
+Even if we believe we did everything to avoid data loss, we cannot guarantee the upgrade/downgrade process is 100% safe so before proceeding with any major changes, please make a safe backup copy of your configuration directory (that is by default ```~/.config/asbru```).
+
+### Upgrade/downgrade of configuation file
+
+At startup, **Ásbrú Connection Manager** is proceeding with the necessary steps to upgrade your configuration, and, to some extent, downgrade, files to the currently running version.
+
+### File rename
+
+Please note that some configuration files have been renamed in version 6.2 ; the main directory is now ```~/.config/asbru``` (instead of ```~/.config/pac```).  Files inside the directory have also be renamed (as an example: ```pac.yml``` is now ```asbru.yml```)
+
+Again, at startup, **Ásbrú Connection Manager** will make the necessary changes automatically; a warning message will give you the opportunity to think twice about it:
+
+![Upgrade warning](images/upgrade1.png)
+
+As stated in the message, to minimize risks of data loss, during the upgrade process, a safe copy of your existing configuration will be done to ```~/.config/pac.old```.
+
+### Specific configuration
+
+When starting an old version (6.0 or higher), you can use the option ```--config-dir``` to start with a specific configuration directory (instead of the default one).  Which means you can start from any backup copy, as an example:
+
+```
+asbru-cm --config-dir ~/.config/pac.old
+```
+
+### Downgrade
+
+When starting an old version (6.1.x), Ásbrú will propose to downgrade your migrated configuration:
+
+![Downgrade warning](images/upgrade2.png)
+
+Please note that, as for the upgrade, a copy of your existing configuration will be done before processing with the downgrade.
+
+If you don't want to downgrade your files, you will be offered to create a new configuration directory:
+
+![Downgrade warning](images/upgrade3.png)
+
+### Migration scripts
+
+Upgrade and downgrade scripts are available in the ```utils``` directory, the last versions are:
+
+- Upgrade script: [pac2asbru.pl](https://github.com/asbru-cm/asbru-cm/blob/master/utils/pac2asbru.pl)
+- Downgrade script: [asbru2pac.pl](https://github.com/asbru-cm/asbru-cm/blob/master/utils/asbru2pac.pl)
diff --git a/doc/General/images/upgrade1.png b/doc/General/images/upgrade1.png
new file mode 100644
index 00000000..e53992c2
Binary files /dev/null and b/doc/General/images/upgrade1.png differ
diff --git a/doc/General/images/upgrade2.png b/doc/General/images/upgrade2.png
new file mode 100644
index 00000000..3853ad47
Binary files /dev/null and b/doc/General/images/upgrade2.png differ
diff --git a/doc/General/images/upgrade3.png b/doc/General/images/upgrade3.png
new file mode 100644
index 00000000..ae6ddec9
Binary files /dev/null and b/doc/General/images/upgrade3.png differ
diff --git a/doc/General/sensitive-info-notice.md b/doc/General/sensitive-info-notice.md
new file mode 100644
index 00000000..a880c895
--- /dev/null
+++ b/doc/General/sensitive-info-notice.md
@@ -0,0 +1,17 @@
+## Sensitive information 
+
+### Using 'hidden' flag in GUI
+
+When a user sets a string as 'hidden' in 'EXPECT', then in config or in backups of config (i.e. $HOME/.config/pac/bak/asbru.yml.0) there're strings like '53616c7-omited-848993645' inplace. These strings represent user input encoded, not encrypted.
+
+### GUI password
+
+GUI password does NOT encrypts your config entries - it alters only GUI window & startup - GUI window asks for a password.
+
+There is no real protection of your sensitive data provided by Ásbrú. It is simply encoded but can be decoded easily.
+
+### Keep config files safe (and better use KeePassXC) 
+
+We strongly discourage you from storing any sensitive data in 'EXPECT' fields. And if you do, you should consider the .yml configuration (and the backup copies) with adequate care.
+
+For sensitive data, we recommend to store them into KeePass and retrieve the information you need using the new (6.2) KeePass integration module, see https://docs.asbru-cm.net/Manual/Preferences/KeePassXC/.
diff --git a/doc/Managing/Clusters.md b/doc/Managing/Clusters.md
new file mode 100644
index 00000000..1292a3ef
--- /dev/null
+++ b/doc/Managing/Clusters.md
@@ -0,0 +1,54 @@
+This article has been written by [Hans Peyrot](https://github.com/hanspr)
+
+# Clusters Management
+
+## Why do you need a cluster ?
+
+This is more an admin tool than programmers, you can use it to type common commands to servers that are identical or at least very similar, this allows you to:
+
+* update several servers
+* edit a config file on all of them at the same time
+
+__From a programmer point of view__
+
+As an example, I program remote Raspeberri Pi that are connected to electronic scales, etc. And have a very unique code that is similar across them, but I do not have a development environment because I do not have the interest in buying expensive scales or robot arms, to be able to develop. So I connect to all of them simultaneously, they all have exactly the same code; then I edit the code on one terminal and I'm patching on real time the others. Of course I could work on one and then copy the file to the others, but for small adjustments this has been always more practical.
+
+And there are some other more complicated uses when add to the terminals tunnels, expect, etc. All those tunnels will open simultaneously too.
+
+## Create a cluster
+
+In ```Clusters```, click on the ```Add``` button a provide the name of your new cluster:
+
+![imagen](https://user-images.githubusercontent.com/1572396/67621669-81d8a900-f7d7-11e9-9587-140c838d9f0f.png)
+
+Select the connections from the left list and add them to the cluster using button ```Add to cluster```:
+
+![imagen](https://user-images.githubusercontent.com/1572396/67621672-8ac97a80-f7d7-11e9-9508-3fbdcbf6df83.png)
+
+When done selecting, click the ```OK``` button to save your changes:
+
+![imagen](https://user-images.githubusercontent.com/1572396/67621678-a2086800-f7d7-11e9-996a-39692b22c9fc.png)
+
+The new cluster will be available in the menu or the cluster list on the main window.
+
+![imagen](https://user-images.githubusercontent.com/1572396/67621680-b5b3ce80-f7d7-11e9-85c3-54b9726d5447.png)
+
+# Using an existing cluster
+
+Either from the system bar menu or from the ```Clusters``` menu in the left side bar of Ásbrú Connection Manager, run your cluster:
+
+![imagen](https://user-images.githubusercontent.com/1572396/67621685-c5cbae00-f7d7-11e9-8946-010a863ccf57.png)
+
+This will open all terminals **simultaneously** and link the keyboard to ***all terminals*** in the cluster.
+So anything you write on one will be simultaneously typed in the others.
+
+![imagen](https://user-images.githubusercontent.com/1572396/67621699-fa3f6a00-f7d7-11e9-8bca-1cdde9285516.png)
+
+## Power Cluster Management
+
+The Power Cluster Management (aka PCC), is used on 2 conditions:
+
+* You open several terminals that have no cluster
+  * So you open the PCC and activate, send keys to all open terminals, similar, but terminals are not clustered
+  * Open a cluster and for some reason you loose communication with one of them and that terminal reconnects but is no longer with the cluster.
+* Its main advantage is that you can type a command on a single terminal and is not passed to the others, you use the PCC to pass it to all. With a cluster you can not type a different command on one of them they are tied together.
diff --git a/doc/Managing/Expect.md b/doc/Managing/Expect.md
new file mode 100644
index 00000000..5b4d3858
--- /dev/null
+++ b/doc/Managing/Expect.md
@@ -0,0 +1,123 @@
+This article has been written by [Hans Peyrot](https://github.com/hanspr)
+
+# Introduction to Expect
+
+!!! danger "Executed during the login process only"
+    Expect actions are run only during the login process.
+
+    It helps you to automate a login sequence and a continuous set of actions.
+
+    But they do not work after the complete login sequence ends.
+
+    Ásbrú is not constantly monitoring your typing, so as soon as the login process ends, and the last expect is executed, there will be no more expect detection an execution.
+
+    __You must know how to write regular expressions for this to work properly.__
+
+
+There are several regular expressions in different parts of the General Preferences and Connection Preferences that allows you to control the login sequence.
+
+
+## Introduction to user, password, prompt sequence.
+
+These are the must important configuration regular expressions that will automate your login sequence.
+
+### Global Preferences > Main Options > Advanced Settings
+
+![](images/expect1.png)
+
++ __PASSWORD prompt__: Regular expression that will detect your password prompt
+    - When found will type your terminal password or passphrase for you.
+    - Regex : `(?mi)(pass(word|phrase)|contraseña).*?:\s*$`
++ __USERNAME prompt__: Regular expression that will detect your username prompt
+    - When found will type your terminal username for you.
+    - Regex : `([lL]ogin|[uU]suario|([uU]ser-?)*[nN]ame.*|[uU]ser)\s*:\s*$`
+* __Command prompt__: Regular expression that will detect your command prompt
+    - When found the automated login will pass actions to your configured Expects for the terminal (if there are any configured)
+    - Regex : `[#%\$>]|\:\/\s*$`
+* __Remote host key changed__: Regular expression that will detect when the process detected a change in the remote host key.
+    - When found, the terminal will issue the add and accept sequence and continue.
+    - Regex : `.*ffending .*key in (.+?)\:(\d+).*`
+* __Host-key verification string__: Regular expression that will detect you are connecting to a new server and to accept the remote key automatically.
+    - Regex : `^.+ontinue connecting \(([^/]+)\/([^/]+)(?:[^)]+)?\)\?\s*$`
+* __Press any key to continue__: Regular expression that will detect a press any key to continue and send a new line for you.
+    - Regex : `.*(any key to continue|tecla para continuar).*`
+
+### Terminal Options
+
+You can override some of the previous regular expressions for a particular terminal if they do not work well on a particular connection.
+
+Is recommended to use a terminal override when the expression you want to add is not common to all your connections or it makes your global option fail if you combine them with the more general one.
+
+To override the global options on a certain connection activate the ___Use these personal options___ in your terminal options tab.
+
+![](images/expect2.png)
+
+The meaning of this options are identical to the global options.
+
+### Expect Tab in the terminal configuration
+
+You may add additional expects to your login sequence with this option.
+
+Each expect will be executed in sequence, one by one.
+
+The first one to match will __"send"__ the configured sequence of characters to the terminal.
+
+![](images/expect3.png)
+
+In the example above the sequence would be:
+
++ Wait for a command prompt with the symbol `~`
++ Then send to the terminal : `ssh otherbox`
++ Wait then for a string : `username`
++ Then send :`myuser`
++ Then wait for : `password`
++ Then send the string : `otherboxpass`
+
+This could automate, login to a server, then ssh into another one from this one.
+
+## General sequence of events
+
++ Connection Starts
++ Expect waits for any of the predefined sequence.
+    - Wait for any of: key change, new key, password, username, prompt
++ If we do __not__ get a prompt command or have a timeout during the login process
+    - DISCONNECT
++ If we have a prompt, continue
++ Execute user defined EXPECT until timeout, o no more expects detected.
+
+## Some usual problems.
+
+### When a key fingerprint has changed, the terminal can not connect.
+
+Users that have been using the same configuration file since the original project PAC Manger. Could have out dated regex for the login process.
+
+The issue manifests as :
+
+1. SSH to new host
+2. Wait for the warning with the prompt
+   `Are you sure you want to continue connecting (yes/no/[fingerprint])? yes/no`
+   `Please type 'yes', 'no' or the fingerprint: `
+3. __DISCONNECTED__
+
+Check your configuration regex against the ones published here. Copy paste the ones that look different to update.
+
+[See issue #145](https://github.com/asbru-cm/asbru-cm/issues/145)
+
+### Prompt not detected
+
+In this case you will receive a __DISCONNECTION__ after a successful login sequence.
+
+[See issue #473](https://github.com/asbru-cm/asbru-cm/issues/473#issuecomment-601076625)
+
+In this case the admin at the host decided that the prompt should have this non standard format: `[hostname:userid:/home/userid:]`
+
+So the __prompt regex__ for that particular connection had to be changed to : `:\]\s+$`
+
+!!! tip "Debug your expects"
+    If your expects do not work as expected, then you must debug your regular expressions to understand why did not work.
+
+    In this case activate the option __Expect debug__ in your __Global Settings > Terminal Options > Advanced__
+
+    ![](images/expect4.png)
+
+    When doing this all your commands and the communication will be printed on the terminal. Passwords and other sensitive data will be revealed.
diff --git a/doc/Managing/IncognitoBrowser.md b/doc/Managing/IncognitoBrowser.md
new file mode 100644
index 00000000..52708ccc
--- /dev/null
+++ b/doc/Managing/IncognitoBrowser.md
@@ -0,0 +1,59 @@
+This article has been written by [Gaëtan Frenoy](https://github.com/gfrenoy), inspired by [Alberto Rinaudo](https://github.com/syco).
+
+# Start incognito browser and use SOCKS tunnel
+
+## Create a random SOCKS tunnel
+
+As of version 7.4.0, Ásbrú Connection Manager supports a new option `Create random SOCKS tunnel` that will automatically create a local dynamic port fortward so your local machine will act as a SOCKS server.
+
+![Create Random SOCKS Tunnel Settings](images/incognito-connection-settings.png)
+
+When checking this option, at application startup, the option `-D:<SOCKS5_PORT>` will be added to the command line.  The value of SOCKS5_PORT is chosen randomly and will be available as variable in Ásbrú.
+
+## Why do I need a SOCKS tunnel ?
+
+There are various scenarios but a typical case is illustrated below:
+
+![SSH tunnelling with dynamic port forward](images/incognito-tunnel-illustration.svg)
+
+Your machine is behind a firewall and cannot directly access a target web server.  By tunnelling the request through a local SOCKS server to a remote SSH server that we will emit the same request to the final target web server, your browser is behaving like it has a direct access to that target web server.
+
+## How do I configure this in Ásbrú ?
+
+You can manually configure this in Ásbrú Connection Manager in `SSH Options` > `Dynamic Socks Proxy`:
+
+![Configure Dynmaic SOCKS proxy](images/incognito-ssh-options.png)
+
+When the connection is started, a new SOCKS server will listen on port 7328 of your local address (127.0.0.1) and wait for incoming traffic to be forwarded to the remote host.
+
+As an example, in your browser configuration, you can now setup the network connection to use that SOCKS server:
+
+![Browser Proxy Configuration](images/incognito-browser-proxy-configuration.png)
+
+This is working fine but if you need to use a different remote servers for different types of connections, you will need to configure and remember a different port for each of them.  And if you have many servers, you can also easily make a mistake a pick twice the same ports.  Moreover, the proxy settings of your browser needs to be changed for each connection and if you want to have several connections at the same time, you'll need to run several browsers with different profiles.
+
+It quickly becomes very cumbersome to maintain.
+
+This is where the new `Random SOCKS tunnel` can help !
+
+## Use a random port and local command
+
+As explained above, you can now let Ásbrú creates that SOCKS tunnel for you and pick a random port number that is not yet used on your local computer.
+
+Moreover, you can create a local command that will launch a dedicated browser that is automatically creating a new incognito profile and the random port configured for that connection.
+
+Here is an example:
+
+```
+bash -c 'TMP_HOME="$(mktemp -d)"; HOME="${TMP_HOME}" /usr/bin/chromium-browser --incognito --proxy-server="socks5://localhost:<SOCKS5_PORT>" --proxy-bypass-list="<-loopback>"; rm -Rf "${TMP_HOME}"'
+```
+
+You can add this as a local command in your connection or global settings:
+
+![Create Local Command](images/incognito-local-command.png)
+
+## Let the magic happen
+
+With a right click on your terminal, you now have an option to start a browser, in incognito mode, that will use the SOCKS tunnel created on a random port ... All of this in one click :)
+
+![Start Incognito Browser](images/incognito-start-browser.png)
diff --git a/doc/Managing/JumpServer.md b/doc/Managing/JumpServer.md
new file mode 100644
index 00000000..ae49a78a
--- /dev/null
+++ b/doc/Managing/JumpServer.md
@@ -0,0 +1,57 @@
+This article has been written by [Gaëtan Frenoy](https://github.com/gfrenoy)
+
+# Using a Jump Host
+
+## What is a Jump Host and why should I use it ?
+
+By exposing all options and powerful features of [OpenSSH](https://www.openssh.com/), Ásbrú-CM is able to easily manage a large range of complex network configuration schemes using SSH tunnels[1].
+
+With its new "Jump Host" feature, Ásbrú-CM makes it even easier for the most common case where you cannot reach your final destination because your client is not allowed to go trough a firewall or proxy.
+
+![Client blocked by a firewall](images/jump-host-client-blocked.svg)
+
+This is typically the case when that destination is located into a demilitarized zone (DMZ) of your network and can only be accessed by a few number of gateway hosts, also named "jump hosts".
+
+In that case, you have to first connect to that jump host and, from there, connect to your final destination:
+
+![Client using a jump host manually](images/jump-host-manual.svg)
+
+This can perfectly be achieved by creating two SSH connections.  For the first one, you will create a local port forwarding to your final destination ; and for the second one, you'll target your local port instead of the final destination.
+
+As of version 6.1, this becomes ever easier and you can set this up in a single connection by using the new "Jump host" option.
+
+![Client using a SSH jump host with Ásbrú Connection Manager](images/jump-host-automatic.svg)
+
+## How do I use a Jump Host with Ásbrú Connection Manager ?
+
+In the ```Connection Details``` of your connection, specify the final destination host and how you want to connect to it:
+
+<img src="/Managing/images/jump-host-connection-settings.png" alt="Connection Details" width="640"/>
+
+In the ```Network Settings``` panel, specify the host name and how you want to connect to it:
+
+<img src="/Managing/images/jump-host-network-settings.png" alt="Connection Network Settings" width="640"/>
+
+In the above screenshots, we are assuming you are connecting to the final destination ```destination.example.org``` on port 22 using the default private key and user ```my-user``` through a jump host named ```jump.example.org``` on which we connect on port 22 and using the default private and user ```jump-user```.
+
+## What does Ásbrú Connection Manager behind the scene ?
+
+According to the final destination and your version of OpenSSH, Ásbrú-CM will either:
+- Use the ```ProxyJump``` option of OpenSSH
+- Use [netcat](http://man.openbsd.org/nc.1) and the ```ProxyCommand``` of OpenSSH
+- Create a SSH tunnel and use port forwarding
+
+All of these techniques are described in detail in [this cookbook for OpenSSH proxies and jump hosts](https://en.wikibooks.org/wiki/OpenSSH%2FCookbook%2FProxies_and_Jump_Hosts).
+
+## Limitations
+
+- Jump Host can only be used for the following connection types : SSH, RDP, VNC.
+- Multiple jump hosts are not supported.
+
+## More references
+
+[1] There are plenty of articles on that topics, here is a short selection:
+
+ - [SSH tunnelling explained](https://chamibuddhika.wordpress.com/2012/03/21/ssh-tunnelling-explained/)
+ - [Can someone explain SSH tunnel in a simply way](https://stackoverflow.com/questions/5280827/can-someone-explain-ssh-tunnel-in-a-simple-way)
+ - [How does SSH work](https://www.hostinger.com/tutorials/ssh-tutorial-how-does-ssh-work)
diff --git a/doc/Managing/Templates.md b/doc/Managing/Templates.md
new file mode 100644
index 00000000..f12a74a3
--- /dev/null
+++ b/doc/Managing/Templates.md
@@ -0,0 +1,53 @@
+This article has been written by [Hans Peyrot](https://github.com/hanspr)
+
+# Connection Templates
+
+## How can I create a connection template ?
+
+A recurring question of users is if there is a possibility to have "Templates" for connections so you do not have to reconfigure everything.
+
+Thou the concept of Templates do not exist, it can be implemented very easy by you.
+
+__There are 2 approaches to this problem__
+
+1. All your existing connections are templates
+1. Create a Templates group and add templates of all common connection types that you use.
+
+## Existing Connections are Templates
+
++ Click on any existing connection that has the most similar configuration that you need.
++ `<Ctrl-D>` or right click `Clone`.
++ Edit the new cloned connection and adjust to your new conditions.
++ If the connection has to be available in a different group.
+  - `<Ctrl-X>` Cut the connection node.
+  - Click on group where you want the new node to be.
+  - `<Ctrl-V>` paste the node in the new location.
+
+## Creating Templates Group
+
+Go to your Connection List and Create a new group called "Templates".
+
+1. Create a new connection of the type you need your template.
+1. Named so it gives you an idea of the options that has
+    2. SSH and Xforward.
+    2. SSH and Local Forward.
+1. Fill with generic data.
+1. Set the predefined options that you like to have on all new connections.
+
+![](images/template1.png)
+
+![](images/template2.png)
+
+![](images/template3.png)
+
+![](images/template4.png)
+
+![](images/template5.png)
+
+To use your new templates.
+
++ Click on the template configuration that you need.
++ `<Ctrl-C>` or right click `Copy`.
++ Click on group where you want the new node to be.
++ `<Ctrl-V>` paste the node in the new location.
++ Edit your new node with the real connection data.
diff --git a/doc/Managing/images/expect1.png b/doc/Managing/images/expect1.png
new file mode 100644
index 00000000..37a7615b
Binary files /dev/null and b/doc/Managing/images/expect1.png differ
diff --git a/doc/Managing/images/expect2.png b/doc/Managing/images/expect2.png
new file mode 100644
index 00000000..99dd04d5
Binary files /dev/null and b/doc/Managing/images/expect2.png differ
diff --git a/doc/Managing/images/expect3.png b/doc/Managing/images/expect3.png
new file mode 100644
index 00000000..c3c8f055
Binary files /dev/null and b/doc/Managing/images/expect3.png differ
diff --git a/doc/Managing/images/expect4.png b/doc/Managing/images/expect4.png
new file mode 100644
index 00000000..b65a45b0
Binary files /dev/null and b/doc/Managing/images/expect4.png differ
diff --git a/doc/Managing/images/incognito-browser-proxy-configuration.png b/doc/Managing/images/incognito-browser-proxy-configuration.png
new file mode 100644
index 00000000..b2cfab11
Binary files /dev/null and b/doc/Managing/images/incognito-browser-proxy-configuration.png differ
diff --git a/doc/Managing/images/incognito-connection-settings.png b/doc/Managing/images/incognito-connection-settings.png
new file mode 100644
index 00000000..1d64a856
Binary files /dev/null and b/doc/Managing/images/incognito-connection-settings.png differ
diff --git a/doc/Managing/images/incognito-local-command.png b/doc/Managing/images/incognito-local-command.png
new file mode 100644
index 00000000..729630ed
Binary files /dev/null and b/doc/Managing/images/incognito-local-command.png differ
diff --git a/doc/Managing/images/incognito-ssh-options.png b/doc/Managing/images/incognito-ssh-options.png
new file mode 100644
index 00000000..7854a496
Binary files /dev/null and b/doc/Managing/images/incognito-ssh-options.png differ
diff --git a/doc/Managing/images/incognito-start-browser.png b/doc/Managing/images/incognito-start-browser.png
new file mode 100644
index 00000000..c39be12c
Binary files /dev/null and b/doc/Managing/images/incognito-start-browser.png differ
diff --git a/doc/Managing/images/incognito-tunnel-illustration.svg b/doc/Managing/images/incognito-tunnel-illustration.svg
new file mode 100644
index 00000000..656284e6
--- /dev/null
+++ b/doc/Managing/images/incognito-tunnel-illustration.svg
@@ -0,0 +1,1030 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="220mm"
+   height="45mm"
+   viewBox="0 0 220 45"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="incognito-tunnel-illustration.svg">
+  <defs
+     id="defs2">
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker3754"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path3752"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="scale(-0.6)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Send"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Send"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path2925"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
+         transform="matrix(-0.2,0,0,-0.2,-1.2,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Send"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Send"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path2943"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(-0.3,0,0,-0.3,0.69,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker3298"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path3296"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="scale(-0.6)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Mend"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path2937"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="scale(-0.6)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lend"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path1143"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lend"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path1125"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,-10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lend-8"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path1143-9"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lend-8-6"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path1143-9-8"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <linearGradient
+       id="2">
+      <stop
+         stop-color="#2e3436"
+         id="9" />
+      <stop
+         stop-opacity="0"
+         stop-color="#2e3436"
+         offset="1"
+         id="A" />
+    </linearGradient>
+    <linearGradient
+       id="3">
+      <stop
+         stop-color="#fff"
+         id="B" />
+      <stop
+         stop-opacity="0"
+         stop-color="#fff"
+         offset="1"
+         id="C" />
+    </linearGradient>
+    <linearGradient
+       id="4">
+      <stop
+         stop-opacity="0.8"
+         stop-color="#fff"
+         id="D" />
+      <stop
+         stop-opacity="0"
+         stop-color="#fff"
+         offset="1"
+         id="E" />
+    </linearGradient>
+    <radialGradient
+       gradientTransform="matrix(0.21708208,0,0,0.03549769,97.930273,-26.517959)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#2"
+       id="5"
+       r="12.228"
+       cy="46.616001"
+       cx="20.687" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#4"
+       id="6"
+       y2="44.23"
+       x2="0"
+       y1="4.5500002"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,96.755094,-36.803594)" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#3"
+       id="7"
+       y2="29.688"
+       x2="34.681"
+       y1="-12.905"
+       x1="18.389"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,96.755094,-36.803594)" />
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker3298-2"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path3296-2"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="scale(-0.6)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker3298-7"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path3296-7"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="scale(-0.6)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Mend-6"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path2937-4"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="scale(-0.6)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Mend-6-5"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path2937-4-1"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="scale(-0.6)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Mend-6-5-6"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path2937-4-1-0"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="scale(-0.6)"
+         inkscape:connector-curvature="0" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.979899"
+     inkscape:cx="378.06794"
+     inkscape:cy="217.73725"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="2556"
+     inkscape:window-height="1298"
+     inkscape:window-x="1920"
+     inkscape:window-y="140"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata5">
+    <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>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-55.302032,103.42247)">
+    <path
+       id="path863"
+       d="m 109.88586,-78.340497 q -0.91142,0 -1.56046,-0.649039 -0.64904,-0.649039 -0.64904,-1.560459 v -9.721778 q 0,-0.911417 0.64904,-1.560455 0.64904,-0.649039 1.56046,-0.649039 h 15.02457 q 0.91141,0 1.56045,0.649039 0.64904,0.649038 0.64904,1.560455 v 9.721778 q 0,0.91142 -0.64904,1.560459 -0.64904,0.649039 -1.56045,0.649039 z m -0.4419,-11.931276 v 9.721778 q 0,0.179522 0.13119,0.310714 0.13118,0.131189 0.31071,0.131189 h 15.02457 q 0.17951,0 0.31071,-0.131189 0.13119,-0.131192 0.13119,-0.310714 v -9.721778 q 0,-0.179522 -0.13119,-0.310711 -0.1312,-0.131188 -0.31071,-0.131188 h -15.02457 q -0.17953,0 -0.31071,0.131188 -0.13119,0.131189 -0.13119,0.310711 z m 19.00166,12.815072 h 2.20949 v 1.325699 q 0,0.552372 -0.64904,0.939035 -0.64904,0.386662 -1.56045,0.386662 h -22.09496 q -0.91141,0 -1.56046,-0.386662 -0.64903,-0.386663 -0.64903,-0.939035 v -1.325699 z m -9.94273,1.325699 q 0.22095,0 0.22095,-0.22095 0,-0.220949 -0.22095,-0.220949 h -2.2095 q -0.22095,0 -0.22095,0.220949 0,0.22095 0.22095,0.22095 z"
+       inkscape:connector-curvature="0"
+       style="stroke-width:0.01380934"
+       inkscape:export-xdpi="86"
+       inkscape:export-ydpi="86" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52777767px;line-height:125%;font-family:FreeSans;-inkscape-font-specification:'FreeSans, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.12027877px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="107.0191"
+       y="-68.426857"
+       id="text935"
+       inkscape:export-xdpi="86"
+       inkscape:export-ydpi="86"><tspan
+         sodipodi:role="line"
+         id="tspan989"
+         x="107.0191"
+         y="-68.426857">Source Client</tspan><tspan
+         sodipodi:role="line"
+         id="tspan991"
+         x="107.0191"
+         y="-64.017136">(Ásbrú-CM)</tspan></text>
+    <path
+       id="path922"
+       d="m 186.75234,-76.284933 h 11.88886 v -1.486102 h -11.88886 z m 0,-5.944428 h 11.88886 v -1.486108 h -11.88886 z m 18.20481,5.201377 q 0,-0.464411 -0.32508,-0.789496 -0.32509,-0.325084 -0.7895,-0.325084 -0.46441,0 -0.7895,0.325084 -0.32508,0.325085 -0.32508,0.789496 0,0.464404 0.32508,0.789495 0.32509,0.325085 0.7895,0.325085 0.46441,0 0.7895,-0.325085 0.32508,-0.325091 0.32508,-0.789495 z m -18.20481,-11.145804 h 11.88886 v -1.486102 h -11.88886 z m 18.20481,5.201376 q 0,-0.464411 -0.32508,-0.789495 -0.32509,-0.325085 -0.7895,-0.325085 -0.46441,0 -0.7895,0.325085 -0.32508,0.325084 -0.32508,0.789495 0,0.464405 0.32508,0.789496 0.32509,0.325084 0.7895,0.325084 0.46441,0 0.7895,-0.325084 0.32508,-0.325091 0.32508,-0.789496 z m 0,-5.944427 q 0,-0.464411 -0.32508,-0.789495 -0.32509,-0.325084 -0.7895,-0.325084 -0.46441,0 -0.7895,0.325084 -0.32508,0.325084 -0.32508,0.789495 0,0.464404 0.32508,0.789495 0.32509,0.325085 0.7895,0.325085 0.46441,0 0.7895,-0.325085 0.32508,-0.325091 0.32508,-0.789495 z m 1.11458,9.659696 v 4.458319 h -20.8055 v -4.458319 z m 0,-5.944428 v 4.458319 h -20.8055 v -4.458319 z m 0,-5.944428 v 4.45832 h -20.8055 v -4.45832 z"
+       inkscape:connector-curvature="0"
+       style="stroke-width:0.01161021"
+       inkscape:export-xdpi="86"
+       inkscape:export-ydpi="86" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52777767px;line-height:125%;font-family:FreeSans;-inkscape-font-specification:'FreeSans, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.12027878px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="195.61964"
+       y="-68.469193"
+       id="text935-0"
+       inkscape:export-xdpi="86"
+       inkscape:export-ydpi="86"><tspan
+         sodipodi:role="line"
+         id="tspan993"
+         x="195.61964"
+         y="-68.469193">Remote</tspan><tspan
+         sodipodi:role="line"
+         id="tspan995"
+         x="195.61964"
+         y="-64.059471">SSH server</tspan></text>
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.18505192px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 158.76718,-103.33461 c 0,32.541629 0,32.541629 0,32.541629"
+       id="path1118"
+       inkscape:connector-curvature="0"
+       inkscape:export-xdpi="86"
+       inkscape:export-ydpi="86" />
+    <g
+       id="g1112"
+       transform="matrix(0.5924057,0,0,0.5924057,102.73685,-132.0647)"
+       inkscape:export-xdpi="86"
+       inkscape:export-ydpi="86">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:#080808;stroke-width:0.66145831;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+         d="m 82.926913,73.96654 h 12.82991 c 0.365601,0 0.661458,0.297127 0.661458,0.661458 v 5.110692 c 0,0.365601 -0.295857,0.661458 -0.661458,0.661458 h -12.82991 c -0.365602,0 -0.661459,-0.295857 -0.661459,-0.661458 v -5.110692 c 0,-0.364331 0.295857,-0.661458 0.661459,-0.661458"
+         id="path1244" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:#080808;stroke-width:0.66145831;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+         d="M 97.068892,73.977123 H 109.8988 c 0.3656,0 0.66146,0.295857 0.66146,0.661459 v 5.110691 c 0,0.364331 -0.29586,0.661459 -0.66146,0.661459 H 97.068892 c -0.365602,0 -0.661459,-0.297128 -0.661459,-0.661459 v -5.110691 c 0,-0.365602 0.295857,-0.661459 0.661459,-0.661459"
+         id="path1246" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:#080808;stroke-width:0.66145831;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+         d="m 76.015996,80.393269 h 12.82991 c 0.365602,0 0.661459,0.297127 0.661459,0.661458 v 5.110692 c 0,0.365601 -0.295857,0.661458 -0.661459,0.661458 h -12.82991 c -0.365601,0 -0.661458,-0.295857 -0.661458,-0.661458 v -5.110692 c 0,-0.364331 0.295857,-0.661458 0.661458,-0.661458"
+         id="path1248" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:#080808;stroke-width:0.66145831;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+         d="m 90.157975,80.403852 h 12.829915 c 0.3656,0 0.66145,0.295857 0.66145,0.661459 v 5.110691 c 0,0.364332 -0.29585,0.661459 -0.66145,0.661459 H 90.157975 c -0.365601,0 -0.661458,-0.297127 -0.661458,-0.661459 v -5.110691 c 0,-0.365602 0.295857,-0.661459 0.661458,-0.661459"
+         id="path1250" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:#080808;stroke-width:0.66145831;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+         d="m 82.913684,86.82529 h 12.82991 c 0.365601,0 0.661458,0.295857 0.661458,0.661458 v 5.109633 c 0,0.365602 -0.295857,0.661459 -0.661458,0.661459 h -12.82991 c -0.365602,0 -0.661459,-0.295857 -0.661459,-0.661459 v -5.109633 c 0,-0.365601 0.295857,-0.661458 0.661459,-0.661458"
+         id="path1252" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:#080808;stroke-width:0.66145831;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+         d="m 97.055663,86.833227 h 12.829907 c 0.3656,0 0.66146,0.295857 0.66146,0.661459 v 5.110691 c 0,0.365601 -0.29586,0.661459 -0.66146,0.661459 H 97.055663 c -0.365602,0 -0.661459,-0.295858 -0.661459,-0.661459 v -5.110691 c 0,-0.365602 0.295857,-0.661459 0.661459,-0.661459"
+         id="path1254" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:#080808;stroke-width:0.66145831;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+         d="m 76.015996,93.257311 h 12.82991 c 0.364332,0 0.661459,0.297127 0.661459,0.661458 v 5.110691 c 0,0.365602 -0.297127,0.661459 -0.661459,0.661459 h -12.82991 c -0.365601,0 -0.661458,-0.295857 -0.661458,-0.661459 v -5.110691 c 0,-0.364331 0.295857,-0.661458 0.661458,-0.661458"
+         id="path1256" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:#080808;stroke-width:0.66145831;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+         d="m 90.157975,93.267894 h 12.829915 c 0.3656,0 0.66145,0.295857 0.66145,0.661458 v 5.109633 c 0,0.365602 -0.29585,0.661459 -0.66145,0.661459 H 90.157975 c -0.365601,0 -0.661458,-0.295857 -0.661458,-0.661459 v -5.109633 c 0,-0.365601 0.295857,-0.661458 0.661458,-0.661458"
+         id="path1258" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:#080808;stroke-width:0.66145831;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+         d="m 104.37933,80.41179 h 5.5036 c 0.3656,0 0.66146,0.295857 0.66146,0.661458 v 5.109633 c 0,0.365602 -0.29586,0.661459 -0.66146,0.661459 h -5.5036 c -0.3656,0 -0.66146,-0.295857 -0.66146,-0.661459 v -5.109633 c 0,-0.365601 0.29586,-0.661458 0.66146,-0.661458"
+         id="path1260" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:#080808;stroke-width:0.66145831;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+         d="m 104.30789,93.259956 h 5.58377 c 0.3656,0 0.66146,0.295857 0.66146,0.661459 v 5.110691 c 0,0.364332 -0.29586,0.661459 -0.66146,0.661459 h -5.58377 c -0.3656,0 -0.66146,-0.297127 -0.66146,-0.661459 v -5.110691 c 0,-0.365602 0.29586,-0.661459 0.66146,-0.661459"
+         id="path1262" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:#080808;stroke-width:0.66145831;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+         d="m 76.000121,86.814706 h 5.583767 c 0.365601,0 0.661458,0.297128 0.661458,0.661459 v 5.110691 c 0,0.365602 -0.295857,0.661459 -0.661458,0.661459 h -5.583767 c -0.364331,0 -0.661458,-0.295857 -0.661458,-0.661459 v -5.110691 c 0,-0.364331 0.297127,-0.661459 0.661458,-0.661459"
+         id="path1264" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#cccccc;fill-opacity:1;stroke:#080808;stroke-width:0.66145831;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+         d="M 75.351892,83.666165 V 94.8038"
+         id="path1266" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#cccccc;fill-opacity:1;stroke:#080808;stroke-width:0.66145831;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+         d="M 106.15997,99.686685 83.529634,99.68404"
+         id="path1268" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#cccccc;fill-opacity:1;stroke:#080808;stroke-width:0.66145831;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+         d="M 101.68852,73.963894 91.51079,73.932872"
+         id="path1270" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#cccccc;fill-opacity:1;stroke:#080808;stroke-width:0.66145831;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+         d="M 110.53883,83.226957 V 94.363269"
+         id="path1272" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#cccccc;fill-opacity:1;stroke:#080808;stroke-width:0.66145831;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+         d="M 110.56793,76.035582 V 87.171894"
+         id="path1274" />
+    </g>
+    <g
+       id="g1094"
+       transform="matrix(0.69252803,0,0,0.69252803,118.38721,-146.41596)"
+       inkscape:export-xdpi="86"
+       inkscape:export-ydpi="86">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#1a1a1a;fill-rule:evenodd;stroke:none;stroke-width:0.33072916;stroke-miterlimit:10"
+         d="m 52.871002,87.166224 1.780249,-2.908035 1.600676,-2.028296 1.058069,-1.329372 1.69111,-1.848724 -0.202803,1.622637 -0.04498,1.262195 0.04498,1.126543 0.135665,0.811318 0.202804,0.609785 0.29329,0.833279 0.472811,0.901753 0.630449,0.992187 0.653732,0.990891 0.698924,0.789358 0.812614,1.1498 0.788062,1.036108 0.856535,1.57742 0.946971,-1.351333 -0.02315,1.148503 0.04498,1.1498 0.248047,1.555459 -0.112382,1.645893 -0.224764,1.262195 -0.586528,1.937862 -0.720884,1.30741 -1.127839,1.21698 -0.945674,0.74414 -1.600676,0.74414 -1.195017,0.29197 -1.329373,0.0233 -0.879713,-0.0905 -1.17176,-0.40566 -1.059365,-0.54131 -0.923714,-0.85654 -0.901752,-1.05936 -0.744141,-1.01415 -0.811318,-1.758291 -0.45085,-1.577419 -0.291968,-1.644598 0.02183,-1.465024 0.09042,-1.645893 0.134343,-1.397847 v -2.095474 l -0.20287,-1.037404 -0.360415,-1.036109 -0.586528,-1.015444 0.811318,0.248047 1.308708,0.541311 z"
+         id="path1276" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#808080;fill-rule:evenodd;stroke:none;stroke-width:0.33072916;stroke-miterlimit:10"
+         d="m 52.206898,87.904412 0.906938,0.862991 0.817774,0.905616 0.658866,0.819071 0.671777,1.023196 0.277759,0.569728 0.218348,-0.307473 0.131762,-0.671803 0.105966,-1.338422 -0.0762,-1.99472 0.164108,-1.952069 0.755756,-1.773793 0.789358,-1.257036 0.555492,-0.877199 -0.291967,0.847487 0.117541,2.265997 0.236405,1.028356 0.377243,0.812615 2.557991,4.501092 0.422487,0.99478 0.177006,0.979276 0.05821,1.037405 0.07236,0.715724 0.102063,0.701516 0.145984,0.481886 0.453443,0.249335 h 0.571024 l 0.452173,-0.175696 0.251949,-0.330729 0.233826,-0.613675 0.145984,-0.905616 0.145983,0.817774 0.175684,1.140751 -0.117541,1.870684 -0.350097,1.753129 -0.701516,1.57872 -0.819071,0.8772 -1.19761,0.81777 -1.139455,0.61494 -0.99478,0.32039 -0.876035,0.0879 -0.731229,0.0297 -0.817774,-0.0879 -0.819071,-0.29197 -0.789358,-0.49739 -0.759645,-0.52581 -0.691171,-0.83846 -0.891408,-1.5503 -0.463814,-1.264788 -0.193808,-1.029653 -0.127926,-1.104582 -0.09174,-1.160145 0.02977,-1.037405 0.131762,-0.891434 0.189905,-1.008989 0.248047,-0.862991 0.307498,-0.993484 0.117541,-0.803566 -0.04498,-0.745437 -0.32168,-0.965068 z"
+         id="path1278" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#999999;fill-rule:evenodd;stroke:none;stroke-width:0.33072916;stroke-miterlimit:10"
+         d="m 56.686293,86.634412 1.331966,2.138098 1.061958,2.180748 0.719587,1.591628 0.664051,1.667854 0.643414,1.914604 0.379809,1.667854 0.113705,1.269947 -0.05689,0.985735 -0.170524,1.08003 -0.323004,0.73898 -0.39661,0.9289 -0.512895,0.60589 -0.586528,0.4173 -0.777716,0.36045 -0.829416,0.19636 -0.687282,-0.0633 -0.776446,-0.32298 -0.795814,-0.49223 -0.568457,-0.89144 -0.266118,-0.89011 -0.151143,-0.60719 -0.03903,-0.96636 0.01918,-1.136892 0.209285,-1.195017 0.549064,-1.364244 0.664051,-1.156256 0.795814,-1.591627 0.435372,-1.232482 0.151143,-0.9289 -0.07494,-1.174353 -0.189905,-1.687248 z"
+         id="path1280" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#cccccc;fill-rule:evenodd;stroke:none;stroke-width:0.33072916;stroke-miterlimit:10"
+         d="m 55.34221,99.569891 0.351367,-1.300957 0.496093,-1.136888 0.413412,-0.971523 0.496094,-1.033516 0.558059,-0.930169 0.688578,-0.92112 -0.213188,0.962475 v 0.950859 l 0.124023,0.826823 0.413412,0.578776 0.640821,0.847487 0.62013,0.930169 0.330729,0.785495 0.267441,0.949538 0.103386,0.70279 -0.04035,0.97152 -0.248047,0.72348 -0.516784,0.72347 -0.826823,0.68212 -0.62013,0.31007 -0.475404,0.10335 -0.578776,-0.10335 -0.682122,-0.39275 -0.558139,-0.70278 -0.372057,-0.82683 -0.351419,-1.09553 -0.144661,-0.7855 z"
+         id="path1282" />
+    </g>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52777767px;line-height:125%;font-family:FreeSans;-inkscape-font-specification:'FreeSans, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.12027878px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="152.93109"
+       y="-67.491882"
+       id="text935-1"
+       inkscape:export-xdpi="86"
+       inkscape:export-ydpi="86"><tspan
+         sodipodi:role="line"
+         id="tspan1629"
+         x="152.93109"
+         y="-67.491882">Firewall</tspan></text>
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.19548066;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 158.95094,-66.041224 c 0,7.618753 0,7.618753 0,7.618753"
+       id="path1118-5"
+       inkscape:connector-curvature="0"
+       inkscape:export-xdpi="86"
+       inkscape:export-ydpi="86" />
+    <g
+       id="g1510"
+       transform="translate(0,3.0735995)">
+      <path
+         id="path1316"
+         d="m 59.291155,-94.894835 h 14.739666 c 0.421033,0 0.762396,0.341332 0.762396,0.762397 v 13.723136 c 0,0.421034 -0.341331,0.762397 -0.762396,0.762397 H 59.291155 c -0.421065,0 -0.762396,-0.341331 -0.762396,-0.762397 v -13.723136 c 0,-0.421065 0.341331,-0.762397 0.762396,-0.762397 z"
+         style="fill:#cad1d8;stroke-width:0.03176652"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path1318"
+         d="m 59.291155,-92.861777 h 14.739666 c 0.140344,0 0.254132,0.113787 0.254132,0.254132 v 12.198343 c 0,0.140345 -0.113788,0.254133 -0.254132,0.254133 H 59.291155 c -0.140344,0 -0.254132,-0.113788 -0.254132,-0.254133 v -12.198343 c 0,-0.140345 0.113788,-0.254132 0.254132,-0.254132 z"
+         style="fill:#ffffff;stroke-width:0.03176652"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path1320"
+         d="m 61.324213,-91.845249 h 10.67355 c 0.280721,0 0.508265,0.227544 0.508265,0.508265 v 7.1157 c 0,0.280721 -0.227544,0.508264 -0.508265,0.508264 h -10.67355 c -0.280721,0 -0.508265,-0.227543 -0.508265,-0.508264 v -7.1157 c 0,-0.280721 0.227576,-0.508265 0.508265,-0.508265 z"
+         style="fill:#b3b3b3;stroke-width:0.03176652"
+         inkscape:connector-curvature="0" />
+      <circle
+         id="circle1322"
+         r="1.0165286"
+         cy="-89.812347"
+         cx="63.102978"
+         style="fill:#1a1a1a;stroke-width:0.03176652" />
+      <g
+         transform="matrix(0.03176652,0,0,0.03176652,58.528759,-95.403099)"
+         id="g1328">
+	<path
+   id="path1324"
+   d="M 151.2,253.76 72,331.84 V 352 c 0,8.837 7.163,16 16,16 H 275.2 L 175.28,253.76 c -5.82,-6.649 -15.928,-7.322 -22.578,-1.502 -0.533,0.467 -1.035,0.969 -1.502,1.502 z"
+   style="fill:#595a66"
+   inkscape:connector-curvature="0" />
+
+	<path
+   id="path1326"
+   d="M 440,352 V 324.799 L 334.56,219.28 c -6.245,-6.252 -16.375,-6.257 -22.627,-0.013 -0.004,0.004 -0.008,0.008 -0.013,0.013 L 163.2,368 H 424.001 C 432.836,368 440,360.837 440,352 Z"
+   style="fill:#595a66"
+   inkscape:connector-curvature="0" />
+
+</g>
+      <g
+         transform="matrix(0.03176652,0,0,0.03176652,58.528759,-95.403099)"
+         id="g1334">
+	<path
+   id="path1330"
+   d="M 440,352 V 324.799 L 403.2,288 c -4.418,-4.418 -11.582,-4.418 -16,0 -4.418,4.418 -4.418,11.582 0,16 l 9.36,9.36 c 14.494,14.491 22.637,34.145 22.64,54.64 h 4.8 c 8.836,0 16,-7.163 16,-16 z"
+   style="fill:#35363e"
+   inkscape:connector-curvature="0" />
+
+	<path
+   id="path1332"
+   d="M 262.56,316.96 C 252.897,305.985 237.025,302.955 224,309.601 l 51.2,58.4 h 32 z"
+   style="fill:#35363e"
+   inkscape:connector-curvature="0" />
+
+</g>
+      <g
+         transform="matrix(0.03176652,0,0,0.03176652,58.528759,-95.403099)"
+         id="g1340">
+	<path
+   id="path1336"
+   d="m 319.528,242.357 v 0 c 3.125,3.125 3.125,8.19 0,11.314 L 296.9,276.297 c -3.125,3.125 -8.189,3.125 -11.314,0 v 0 c -3.125,-3.125 -3.125,-8.19 0,-11.314 l 22.627,-22.627 c 3.126,-3.124 8.191,-3.124 11.315,0.001 z"
+   style="fill:#6f707e"
+   inkscape:connector-curvature="0" />
+
+	<path
+   id="path1338"
+   d="m 160.827,275.747 v 0 c 3.125,3.125 3.125,8.19 0,11.314 L 138.2,309.688 c -3.125,3.125 -8.189,3.125 -11.314,0 v 0 c -3.125,-3.125 -3.125,-8.19 0,-11.314 l 22.627,-22.627 c 3.125,-3.124 8.19,-3.124 11.314,0 z"
+   style="fill:#6f707e"
+   inkscape:connector-curvature="0" />
+
+</g>
+      <g
+         transform="matrix(0.03176652,0,0,0.03176652,58.528759,-95.403099)"
+         id="g1348">
+	<circle
+   id="circle1342"
+   r="7.9980001"
+   cy="47.994999"
+   cx="24.002001"
+   style="fill:#9ba7af" />
+
+	<circle
+   id="circle1344"
+   r="7.9980001"
+   cy="47.994999"
+   cx="56.001999"
+   style="fill:#9ba7af" />
+
+	<circle
+   id="circle1346"
+   r="7.9980001"
+   cy="47.994999"
+   cx="88.001999"
+   style="fill:#9ba7af" />
+
+</g>
+      <path
+         id="path1350"
+         d="m 62.340741,-94.132438 h 11.69008 c 0.140344,0 0.254132,0.113787 0.254132,0.254132 v 0 c 0,0.140344 -0.113788,0.254132 -0.254132,0.254132 h -11.69008 c -0.140344,0 -0.254132,-0.113788 -0.254132,-0.254132 v 0 c 0,-0.140345 0.113788,-0.254132 0.254132,-0.254132 z"
+         style="fill:#e2e5e7;stroke-width:0.03176652"
+         inkscape:connector-curvature="0" />
+      <g
+         transform="matrix(0.03176652,0,0,0.03176652,58.528759,-95.403099)"
+         id="g1358">
+	<path
+   id="path1352"
+   d="m 152.001,392 h 224 c 4.418,0 8,3.582 8,8 v 0 c 0,4.418 -3.582,8 -8,8 H 152 c -4.418,0 -8.001,-3.582 -8.001,-8 v 0 c 0.001,-4.418 3.583,-8 8.002,-8 z"
+   style="fill:#cad1d8"
+   inkscape:connector-curvature="0" />
+
+	<path
+   id="path1354"
+   d="M 152.001,424 H 288 c 4.418,0 8,3.582 8,8 v 0 c 0,4.418 -3.582,8 -8,8 H 152.001 C 147.583,440 144,436.418 144,432 v 0 c 0,-4.418 3.582,-8 8.001,-8 z"
+   style="fill:#cad1d8"
+   inkscape:connector-curvature="0" />
+
+	<circle
+   id="circle1356"
+   r="24.002001"
+   cy="416"
+   cx="96"
+   style="fill:#cad1d8" />
+
+</g>
+      <g
+         transform="matrix(0.03176652,0,0,0.03176652,58.528759,-95.403099)"
+         id="g1364">
+	<path
+   id="path1360"
+   d="m 464,280 c -4.418,-0.023 -7.982,-3.623 -7.959,-8.041 0.008,-1.55 0.466,-3.064 1.319,-4.359 L 470.4,248 457.36,228.4 c -2.656,-3.531 -1.947,-8.546 1.585,-11.202 3.531,-2.656 8.546,-1.947 11.202,1.585 0.178,0.236 0.342,0.483 0.493,0.737 l 16,24 c 1.794,2.688 1.794,6.192 0,8.88 l -16,24 c -1.472,2.235 -3.964,3.587 -6.64,3.6 z"
+   style="fill:#9ba7af"
+   inkscape:connector-curvature="0" />
+
+	<path
+   id="path1362"
+   d="m 56,216.001 c 4.418,0.023 7.982,3.623 7.959,8.041 -0.008,1.55 -0.466,3.064 -1.319,4.359 l -13.04,19.6 13.04,19.6 c 2.248,3.803 0.988,8.709 -2.815,10.957 -3.509,2.074 -8.015,1.179 -10.464,-2.078 l -16,-24.001 c -1.794,-2.688 -1.794,-6.192 0,-8.88 l 16,-24.001 c 1.471,-2.233 3.962,-3.585 6.639,-3.597 z"
+   style="fill:#9ba7af"
+   inkscape:connector-curvature="0" />
+
+</g>
+    </g>
+    <g
+       id="g1366"
+       transform="matrix(0.03176652,0,0,0.03176652,58.528759,-95.403099)">
+</g>
+    <g
+       id="g1368"
+       transform="matrix(0.03176652,0,0,0.03176652,58.528759,-95.403099)">
+</g>
+    <g
+       id="g1370"
+       transform="matrix(0.03176652,0,0,0.03176652,58.528759,-95.403099)">
+</g>
+    <g
+       id="g1372"
+       transform="matrix(0.03176652,0,0,0.03176652,58.528759,-95.403099)">
+</g>
+    <g
+       id="g1374"
+       transform="matrix(0.03176652,0,0,0.03176652,58.528759,-95.403099)">
+</g>
+    <g
+       id="g1376"
+       transform="matrix(0.03176652,0,0,0.03176652,58.528759,-95.403099)">
+</g>
+    <g
+       id="g1378"
+       transform="matrix(0.03176652,0,0,0.03176652,58.528759,-95.403099)">
+</g>
+    <g
+       id="g1380"
+       transform="matrix(0.03176652,0,0,0.03176652,58.528759,-95.403099)">
+</g>
+    <g
+       id="g1382"
+       transform="matrix(0.03176652,0,0,0.03176652,58.528759,-95.403099)">
+</g>
+    <g
+       id="g1384"
+       transform="matrix(0.03176652,0,0,0.03176652,58.528759,-95.403099)">
+</g>
+    <g
+       id="g1386"
+       transform="matrix(0.03176652,0,0,0.03176652,58.528759,-95.403099)">
+</g>
+    <g
+       id="g1388"
+       transform="matrix(0.03176652,0,0,0.03176652,58.528759,-95.403099)">
+</g>
+    <g
+       id="g1390"
+       transform="matrix(0.03176652,0,0,0.03176652,58.528759,-95.403099)">
+</g>
+    <g
+       id="g1392"
+       transform="matrix(0.03176652,0,0,0.03176652,58.528759,-95.403099)">
+</g>
+    <g
+       id="g1394"
+       transform="matrix(0.03176652,0,0,0.03176652,58.528759,-95.403099)">
+</g>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52777767px;line-height:125%;font-family:FreeSans;-inkscape-font-specification:'FreeSans, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.12027878px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="56.550171"
+       y="-71.854996"
+       id="text935-03"
+       inkscape:export-xdpi="86"
+       inkscape:export-ydpi="86"><tspan
+         style="stroke-width:0.12027878px"
+         sodipodi:role="line"
+         id="tspan991-9"
+         x="56.550171"
+         y="-71.854996">Web Browser</tspan></text>
+    <g
+       id="g2732"
+       transform="translate(0.13363476)">
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.24326822;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 105.60794,-92.465901 c 0,15.00919 0,15.00919 0,15.00919"
+         id="path1557"
+         inkscape:connector-curvature="0"
+         inkscape:export-xdpi="86"
+         inkscape:export-ydpi="86" />
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.24326822;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 104.14118,-92.465901 c 0,15.00919 0,15.00919 0,15.00919"
+         id="path1559"
+         inkscape:connector-curvature="0"
+         inkscape:export-xdpi="86"
+         inkscape:export-ydpi="86" />
+      <rect
+         transform="rotate(90)"
+         style="opacity:1;fill:#f0f0f0;fill-opacity:0.91176471;fill-rule:nonzero;stroke:none;stroke-width:0.32646346;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1561"
+         width="15.175172"
+         height="1.4667677"
+         x="-92.631874"
+         y="-105.60793" />
+    </g>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.46944451px;line-height:125%;font-family:FreeSans;-inkscape-font-specification:'FreeSans, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.12027878px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="105.74245"
+       y="-98.783318"
+       id="text935-0-0-4-9-2"
+       inkscape:export-xdpi="86"
+       inkscape:export-ydpi="86"><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.46944451px;font-family:FreeSans;-inkscape-font-specification:'FreeSans, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.12027878px"
+         sodipodi:role="line"
+         x="105.74245"
+         y="-98.783318"
+         id="tspan1599">ásbrú-cm creates a local</tspan><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.46944451px;font-family:FreeSans;-inkscape-font-specification:'FreeSans, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.12027878px"
+         sodipodi:role="line"
+         x="105.74245"
+         y="-95.69651"
+         id="tspan1603">SOCKS proxy server</tspan></text>
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.32600001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow2Mend-6)"
+       d="m 75.324665,-83.022109 c 28.082105,0 28.082105,0 28.082105,0"
+       id="path1120-0"
+       inkscape:connector-curvature="0"
+       inkscape:export-xdpi="86"
+       inkscape:export-ydpi="86" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.46944451px;line-height:125%;font-family:FreeSans;-inkscape-font-specification:'FreeSans, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.12027878px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="73.794067"
+       y="-68.542145"
+       id="text935-0-0-4-9-2-0"
+       inkscape:export-xdpi="86"
+       inkscape:export-ydpi="86"><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.46944451px;font-family:FreeSans;-inkscape-font-specification:'FreeSans, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.12027878px"
+         sodipodi:role="line"
+         x="73.794067"
+         y="-68.542145"
+         id="tspan1603-6">connects to the local</tspan><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.46944451px;font-family:FreeSans;-inkscape-font-specification:'FreeSans, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.12027878px"
+         sodipodi:role="line"
+         x="73.794067"
+         y="-65.455338"
+         id="tspan2723">SOCKS proxy server</tspan></text>
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.32600001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow2Mend-6-5)"
+       d="m 127.07306,-83.21176 c 54.87918,0 54.87918,0 54.87918,0"
+       id="path1120-0-0"
+       inkscape:connector-curvature="0"
+       inkscape:export-xdpi="86"
+       inkscape:export-ydpi="86" />
+    <g
+       id="g3544"
+       transform="matrix(0.50523827,0,0,0.50523827,92.096387,-68.259237)">
+      <path
+         style="fill:#969696;fill-opacity:1;stroke:#2c2c2c;stroke-width:0.28072292;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         inkscape:connector-curvature="0"
+         d="m 106.64926,-35.747165 c -0.17026,-0.02951 -0.34668,0.04244 -0.44618,0.197462 l -4.23909,6.603622 -2.278099,-2.089566 c -0.206699,-0.13266 -0.480275,-0.07602 -0.612937,0.130674 l -1.180495,1.31319 c -0.132658,0.206697 -0.07256,0.480437 0.134135,0.613097 0,0 4.149946,3.950964 4.155196,3.954042 0.0484,0.03109 0.10016,0.04867 0.15325,0.05922 0.17341,0.03447 0.35828,-0.0351 0.45985,-0.193351 l 5.71696,-8.905803 c 0.13266,-0.206698 0.0726,-0.480437 -0.13413,-0.613098 l -1.56154,-1.006159 c -0.0517,-0.03317 -0.11017,-0.05349 -0.16692,-0.06333 z"
+         id="G" />
+      <path
+         style="opacity:0.8;fill:none;stroke:url(#6);stroke-width:0.28072292;stroke-linecap:round;stroke-linejoin:round"
+         inkscape:connector-curvature="0"
+         d="m 106.54468,-35.455873 c -0.0589,0.01815 -0.0974,0.07767 -0.1819,0.198438 l -2.14974,3.365169 -1.91823,2.960026 c -0.0199,0.01756 -0.0302,0.0411 -0.0413,0.06615 -0.0111,0.02505 -0.0253,0.04831 -0.0413,0.07441 -0.0322,0.05221 -0.0825,0.102978 -0.19844,0.124023 -0.081,0.0147 -0.12028,0.0087 -0.16537,-0.01654 -0.0451,-0.02528 -0.0896,-0.06949 -0.17363,-0.132292 l -2.009179,-1.835547 c -0.05594,-0.05187 -0.09702,-0.08944 -0.132292,-0.115755 -0.03527,-0.02632 -0.06759,-0.04003 -0.09922,-0.04134 -0.03163,-0.0013 -0.06091,0.01126 -0.09095,0.03307 -0.03004,0.02181 -0.06277,0.05181 -0.107487,0.09095 l -0.93431,1.016992 c -0.126025,0.117133 -0.183811,0.21911 -0.173633,0.322461 0.01018,0.10335 0.0842,0.1941 0.223242,0.297656 0,0 0.94113,0.897465 1.885159,1.794206 0.47201,0.44837 0.94363,0.895413 1.29811,1.231966 0.17724,0.168276 0.32628,0.306818 0.42995,0.405143 0.0518,0.04916 0.0961,0.08932 0.12402,0.115755 0.014,0.01322 0.0258,0.02618 0.0331,0.03307 0.004,0.0034 0.006,0.0065 0.008,0.0083 2.9e-4,2.5e-4 0.008,-1.1e-5 0.008,0 0.0214,0.01371 0.0235,0.02495 0.0496,0.04961 0.0261,0.02466 0.0676,0.06197 0.16537,0.14056 0.037,0.02976 0.0864,0.03392 0.12402,0.01654 0.0376,-0.01738 0.0674,-0.05124 0.0992,-0.09095 0.0635,-0.07942 0.11856,-0.183402 0.16536,-0.256315 l 5.49837,-8.54108 c 0.0312,-0.04862 0.0592,-0.09231 0.0744,-0.124024 0.0152,-0.03171 0.0232,-0.05494 0.0165,-0.08268 -0.007,-0.02774 -0.0303,-0.05207 -0.0579,-0.07441 -0.0276,-0.02234 -0.0586,-0.04304 -0.10749,-0.07441 -0.003,-4.92e-4 -0.006,-4.92e-4 -0.008,0 l -1.39733,-0.868164 c -0.0504,-0.03214 -0.082,-0.05883 -0.11575,-0.07441 -0.0337,-0.01558 -0.0689,-0.0259 -0.0992,-0.01654 z"
+         id="H" />
+      <path
+         style="opacity:0.8;fill:url(#7);stroke-width:0.28072292"
+         inkscape:connector-curvature="0"
+         d="m 106.53641,-35.612969 c -0.0884,0.01064 -0.16985,0.05736 -0.22324,0.14056 l -2.87735,4.473112 c 1.20091,-0.401494 2.40648,-0.74159 3.61322,-1.025261 l 1.35599,-2.116666 c 0.0946,-0.147357 0.0476,-0.335694 -0.0992,-0.429948 l -1.5627,-1.008724 c -0.0296,-0.01901 -0.0665,-0.02453 -0.11575,-0.03307 -0.0297,-0.0052 -0.0615,-0.0035 -0.0909,0 z m -7.168556,4.646745 c -0.07544,0.01609 -0.144283,0.0608 -0.190169,0.132291 -0.0024,0.0057 -0.0051,0.01122 -0.0083,0.01654 l -1.16582,1.298112 c -0.0016,0.0025 0.0016,0.0057 0,0.0083 -0.08836,0.146125 -0.0451,0.329058 0.09922,0.42168 0.0057,0.0024 0.01122,0.0051 0.01654,0.0083 0,0 0.131492,0.123606 0.14056,0.132292 0.798649,-0.357761 1.597074,-0.696988 2.397785,-1.016993 l -1.050064,-0.959114 c -0.0026,-0.0017 -0.0057,0.0016 -0.0083,0 -0.07404,-0.04492 -0.156073,-0.05743 -0.231511,-0.04134 z"
+         id="I" />
+    </g>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.46944451px;line-height:125%;font-family:FreeSans;-inkscape-font-specification:'FreeSans, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.12027878px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="143.01688"
+       y="-94.066383"
+       id="text935-0-0-4-9-2-3"
+       inkscape:export-xdpi="86"
+       inkscape:export-ydpi="86"><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.46944451px;font-family:FreeSans;-inkscape-font-specification:'FreeSans, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.12027878px"
+         sodipodi:role="line"
+         x="143.01688"
+         y="-94.066383"
+         id="tspan1603-8">browser request is tunnelled</tspan><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.46944451px;font-family:FreeSans;-inkscape-font-specification:'FreeSans, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.12027878px"
+         sodipodi:role="line"
+         x="143.01688"
+         y="-90.979576"
+         id="tspan4213">to the remote SSH server</tspan></text>
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.34898129;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow2Mend-6-5-6)"
+       d="m 208.1824,-83.008136 c 43.83848,0 43.83848,0 43.83848,0"
+       id="path1120-0-0-8"
+       inkscape:connector-curvature="0"
+       inkscape:export-xdpi="86"
+       inkscape:export-ydpi="86" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.46944451px;line-height:125%;font-family:FreeSans;-inkscape-font-specification:'FreeSans, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.12027878px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="229.96217"
+       y="-94.528854"
+       id="text935-0-0-4-9-2-3-3"
+       inkscape:export-xdpi="86"
+       inkscape:export-ydpi="86"><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.46944451px;font-family:FreeSans;-inkscape-font-specification:'FreeSans, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.12027878px"
+         sodipodi:role="line"
+         x="229.96217"
+         y="-94.528854"
+         id="tspan6495">SSH forwards the request</tspan><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.46944451px;font-family:FreeSans;-inkscape-font-specification:'FreeSans, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.12027878px"
+         sodipodi:role="line"
+         x="229.96217"
+         y="-91.442047"
+         id="tspan6499">to the final target site as</tspan><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.46944451px;font-family:FreeSans;-inkscape-font-specification:'FreeSans, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.12027878px"
+         sodipodi:role="line"
+         x="229.96217"
+         y="-88.35524"
+         id="tspan6501">it was emited by</tspan><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.46944451px;font-family:FreeSans;-inkscape-font-specification:'FreeSans, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.12027878px"
+         sodipodi:role="line"
+         x="229.96217"
+         y="-85.26844"
+         id="tspan6503">the remote SSH server</tspan></text>
+    <g
+       id="g6917"
+       transform="matrix(-0.03815705,0,0,0.03815705,273.30742,-91.989179)">
+      <path
+         id="path6862"
+         d="m 405.08,118.873 h 46.976 c 19.854,0 35.934,-16.094 35.934,-35.947 V 35.95 C 487.99,16.093 471.91,0 452.056,0 H 405.08 c -19.858,0 -35.964,16.093 -35.964,35.95 v 11.188 h -30.522 c -17.867,0 -32.439,14.558 -32.439,32.44 V 231.74 H 259.897 C 253.67,165.674 197.963,113.809 130.309,113.809 c -71.795,0 -130.207,58.413 -130.207,130.229 0,71.815 58.412,130.225 130.207,130.225 67.654,0 123.361,-51.862 129.588,-117.93 h 46.258 v 152.178 c 0,17.887 14.572,32.44 32.439,32.44 h 30.522 v 11.193 c 0,19.854 16.105,35.944 35.964,35.944 h 46.976 c 19.854,0 35.934,-16.09 35.934,-35.944 v -46.978 c 0,-19.856 -16.08,-35.95 -35.934,-35.95 H 405.08 c -19.858,0 -35.964,16.094 -35.964,35.95 v 11.189 h -30.522 c -4.322,0 -7.846,-3.521 -7.846,-7.846 V 256.335 h 38.367 v 11.19 c 0,19.862 16.105,35.95 35.964,35.95 h 46.976 c 19.854,0 35.934,-16.088 35.934,-35.95 v -46.974 c 0,-19.855 -16.08,-35.949 -35.934,-35.949 H 405.08 c -19.858,0 -35.964,16.094 -35.964,35.949 V 231.74 H 330.749 V 79.579 c 0,-4.319 3.523,-7.845 7.846,-7.845 h 30.522 v 11.191 c -0.001,19.854 16.104,35.948 35.963,35.948 z M 89.708,143.679 c -7.654,10.182 -14.06,23.2 -18.8,38.331 -14.844,4.099 -27.924,9.668 -38.685,16.427 11.529,-24.754 32.086,-44.435 57.485,-54.758 z M 23.031,229.865 C 30.462,218.516 45.863,208.7 65.944,201.88 63.812,212.702 62.486,224.251 62.04,236.337 H 22.391 c 0.159,-2.178 0.369,-4.34 0.64,-6.472 z m 0.447,31.149 c -0.379,-2.373 -0.769,-4.724 -0.989,-7.143 H 62.04 c 0.446,12.071 1.772,23.632 3.904,34.474 C 46.248,281.652 31.04,272.061 23.478,261.014 Z m 10.186,31.639 c 10.473,6.354 23.058,11.656 37.244,15.546 4.274,13.638 9.88,25.589 16.557,35.273 C 64.121,333.367 45.079,315.261 33.664,292.653 Z m 87.873,58.443 c -11.513,-4.663 -22.657,-18.241 -30.613,-38.428 9.719,1.633 19.997,2.606 30.613,2.962 z m 0,-52.97 c -12.87,-0.49 -25.203,-2.08 -36.604,-4.545 -2.91,-11.852 -4.837,-25.173 -5.379,-39.71 h 41.983 z m 0,-61.789 H 79.553 c 0.542,-14.537 2.469,-27.842 5.379,-39.709 11.401,-2.464 23.734,-4.033 36.604,-4.545 v 44.254 z m 0,-61.758 c -10.616,0.369 -20.895,1.344 -30.613,2.977 7.956,-20.191 19.101,-33.787 30.613,-38.413 z M 228.4,198.436 c -10.761,-6.759 -23.841,-12.328 -38.685,-16.427 -4.74,-15.131 -11.145,-28.149 -18.795,-38.331 25.395,10.324 45.951,30.005 57.48,54.758 z m -89.314,-59.293 c 11.514,4.626 22.657,18.222 30.614,38.413 -9.719,-1.634 -19.998,-2.608 -30.614,-2.977 z m 0,52.94 c 12.876,0.512 25.204,2.081 36.605,4.545 2.931,11.867 4.83,25.172 5.379,39.709 h -41.984 z m 0,61.788 h 41.984 c -0.549,14.537 -2.448,27.858 -5.379,39.71 -11.401,2.465 -23.729,4.055 -36.605,4.545 z m 0,97.225 V 315.63 c 10.616,-0.355 20.895,-1.329 30.614,-2.962 -7.956,20.186 -19.1,33.765 -30.614,38.428 z m 34.074,-7.623 c 6.691,-9.685 12.298,-21.636 16.556,-35.273 14.187,-3.905 26.771,-9.192 37.245,-15.546 -11.417,22.607 -30.458,40.713 -53.801,50.819 z m 63.981,-82.459 c -7.553,11.048 -22.766,20.623 -42.431,27.317 2.101,-10.828 3.444,-22.389 3.879,-34.46 h 39.545 c -0.224,2.419 -0.603,4.77 -0.993,7.143 z m -38.552,-24.677 c -0.435,-12.086 -1.778,-23.635 -3.879,-34.457 20.05,6.835 35.452,16.637 42.883,27.985 0.271,2.132 0.48,4.294 0.64,6.472 z"
+         inkscape:connector-curvature="0" />
+      <g
+         id="g6864">
+</g>
+      <g
+         id="g6866">
+</g>
+      <g
+         id="g6868">
+</g>
+      <g
+         id="g6870">
+</g>
+      <g
+         id="g6872">
+</g>
+      <g
+         id="g6874">
+</g>
+      <g
+         id="g6876">
+</g>
+      <g
+         id="g6878">
+</g>
+      <g
+         id="g6880">
+</g>
+      <g
+         id="g6882">
+</g>
+      <g
+         id="g6884">
+</g>
+      <g
+         id="g6886">
+</g>
+      <g
+         id="g6888">
+</g>
+      <g
+         id="g6890">
+</g>
+      <g
+         id="g6892">
+</g>
+    </g>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52777767px;line-height:125%;font-family:FreeSans;-inkscape-font-specification:'FreeSans, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.12027878px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="264.25748"
+       y="-68.469193"
+       id="text935-0-2"
+       inkscape:export-xdpi="86"
+       inkscape:export-ydpi="86"><tspan
+         style="stroke-width:0.12027878px"
+         sodipodi:role="line"
+         id="tspan995-0"
+         x="264.25748"
+         y="-68.469193">Target</tspan><tspan
+         style="stroke-width:0.12027878px"
+         sodipodi:role="line"
+         x="264.25748"
+         y="-64.059471"
+         id="tspan6942">Web Server</tspan></text>
+    <g
+       id="g7050">
+      <circle
+         r="2.6726956"
+         cy="-98.733383"
+         cx="88.852234"
+         id="path7024"
+         style="opacity:0.36400003;fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.07204421;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <text
+         id="text7022"
+         y="-97.075134"
+         x="87.536293"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.67771673px;line-height:125%;font-family:FreeSans;-inkscape-font-specification:'FreeSans, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.05847146px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           style="stroke-width:0.05847146px"
+           y="-97.075134"
+           x="87.536293"
+           id="tspan7020"
+           sodipodi:role="line">1</tspan></text>
+    </g>
+    <g
+       id="g7079"
+       transform="translate(148.33459,28.464204)">
+      <circle
+         r="2.6726956"
+         cy="-128.04619"
+         cx="81.093536"
+         id="path7024-5"
+         style="opacity:0.36400003;fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.07204421;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <text
+         id="text7022-8"
+         y="-126.38794"
+         x="79.777596"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.67783356px;line-height:125%;font-family:FreeSans;-inkscape-font-specification:'FreeSans, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.05847146px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           y="-126.38794"
+           x="79.777596"
+           id="tspan7052"
+           sodipodi:role="line">4</tspan></text>
+    </g>
+    <g
+       id="g7063"
+       transform="translate(-21.648831,60.402913)">
+      <circle
+         style="opacity:0.36400003;fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.07204421;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="circle7054"
+         cx="81.093536"
+         cy="-128.04619"
+         r="2.6726956" />
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.67783356px;line-height:125%;font-family:FreeSans;-inkscape-font-specification:'FreeSans, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.05847146px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         x="79.777596"
+         y="-126.38794"
+         id="text7058"><tspan
+           sodipodi:role="line"
+           id="tspan7056"
+           x="79.777596"
+           y="-126.38794">2</tspan></text>
+    </g>
+    <g
+       id="g7074"
+       transform="translate(61.605626,28.865109)">
+      <circle
+         style="opacity:0.36400003;fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.07204421;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="circle7065"
+         cx="81.093536"
+         cy="-128.04619"
+         r="2.6726956" />
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.67783356px;line-height:125%;font-family:FreeSans;-inkscape-font-specification:'FreeSans, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.05847146px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         x="79.777596"
+         y="-126.38794"
+         id="text7069"><tspan
+           sodipodi:role="line"
+           id="tspan7067"
+           x="79.777596"
+           y="-126.38794">3</tspan></text>
+    </g>
+  </g>
+</svg>
diff --git a/doc/Managing/images/jump-host-automatic.svg b/doc/Managing/images/jump-host-automatic.svg
new file mode 100644
index 00000000..53ed1263
--- /dev/null
+++ b/doc/Managing/images/jump-host-automatic.svg
@@ -0,0 +1,641 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="190mm"
+   height="45mm"
+   viewBox="0 0 190 45"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="jump-host-auto-forward.svg">
+  <defs
+     id="defs2">
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker3754"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path3752"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="scale(-0.6)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Send"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Send"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path2925"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
+         transform="matrix(-0.2,0,0,-0.2,-1.2,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Send"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Send"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path2943"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(-0.3,0,0,-0.3,0.69,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker3298"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path3296"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="scale(-0.6)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Mend"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path2937"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="scale(-0.6)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lend"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path1143"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lend"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path1125"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,-10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <linearGradient
+       inkscape:collect="always"
+       x1="208.62"
+       y1="119.72"
+       x2="208.62"
+       gradientUnits="userSpaceOnUse"
+       y2="163.8"
+       id="linearGradient1570"
+       gradientTransform="matrix(0.10833947,0,0,0.16369315,144.46451,-111.50045)">
+      <stop
+         offset="0"
+         style="stop-color:#281f00;stop-opacity:1"
+         id="stop9613" />
+      <stop
+         offset="1"
+         style="stop-color:#3f3f3f;stop-opacity:0"
+         id="stop9615" />
+    </linearGradient>
+    <marker
+       inkscape:stockid="Arrow2Lend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lend-8"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path1143-9"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lend-8-6"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path1143-9-8"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <linearGradient
+       id="2">
+      <stop
+         stop-color="#2e3436"
+         id="9" />
+      <stop
+         stop-opacity="0"
+         stop-color="#2e3436"
+         offset="1"
+         id="A" />
+    </linearGradient>
+    <linearGradient
+       id="3">
+      <stop
+         stop-color="#fff"
+         id="B" />
+      <stop
+         stop-opacity="0"
+         stop-color="#fff"
+         offset="1"
+         id="C" />
+    </linearGradient>
+    <linearGradient
+       id="4">
+      <stop
+         stop-opacity="0.8"
+         stop-color="#fff"
+         id="D" />
+      <stop
+         stop-opacity="0"
+         stop-color="#fff"
+         offset="1"
+         id="E" />
+    </linearGradient>
+    <radialGradient
+       gradientTransform="matrix(0.21708208,0,0,0.03549769,97.930273,-26.517959)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#2"
+       id="5"
+       r="12.228"
+       cy="46.616001"
+       cx="20.687" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#4"
+       id="6"
+       y2="44.23"
+       x2="0"
+       y1="4.5500002"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,96.755094,-36.803594)" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#3"
+       id="7"
+       y2="29.688"
+       x2="34.681"
+       y1="-12.905"
+       x1="18.389"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,96.755094,-36.803594)" />
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker3298-2"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path3296-2"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="scale(-0.6)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker3298-7"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path3296-7"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="scale(-0.6)"
+         inkscape:connector-curvature="0" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.979899"
+     inkscape:cx="236.31758"
+     inkscape:cy="108.37165"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="2560"
+     inkscape:window-height="1412"
+     inkscape:window-x="0"
+     inkscape:window-y="28"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5">
+    <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>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-55.302032,103.42247)">
+    <path
+       id="path863"
+       d="m 62.634219,-78.206862 q -0.911416,0 -1.560455,-0.649039 -0.649038,-0.649039 -0.649038,-1.560459 v -9.721778 q 0,-0.911417 0.649038,-1.560455 0.649039,-0.649039 1.560455,-0.649039 h 15.024574 q 0.91141,0 1.56045,0.649039 0.64904,0.649038 0.64904,1.560455 v 9.721778 q 0,0.91142 -0.64904,1.560459 -0.64904,0.649039 -1.56045,0.649039 z m -0.441898,-11.931276 v 9.721778 q 0,0.179522 0.131188,0.310714 0.131188,0.131189 0.31071,0.131189 h 15.024574 q 0.17951,0 0.31071,-0.131189 0.13119,-0.131192 0.13119,-0.310714 v -9.721778 q 0,-0.179522 -0.13119,-0.310711 -0.1312,-0.131188 -0.31071,-0.131188 H 62.634219 q -0.179522,0 -0.31071,0.131188 -0.131188,0.131189 -0.131188,0.310711 z m 19.001662,12.815072 h 2.20949 v 1.325699 q 0,0.552372 -0.64904,0.939035 -0.64904,0.386662 -1.56045,0.386662 H 59.099027 q -0.911419,0 -1.560458,-0.386662 -0.649036,-0.386663 -0.649036,-0.939035 v -1.325699 z m -9.94273,1.325699 q 0.22095,0 0.22095,-0.22095 0,-0.220949 -0.22095,-0.220949 h -2.2095 q -0.22095,0 -0.22095,0.220949 0,0.22095 0.22095,0.22095 z"
+       inkscape:connector-curvature="0"
+       style="stroke-width:0.01380934"
+       inkscape:export-xdpi="86"
+       inkscape:export-ydpi="86" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52777767px;line-height:125%;font-family:FreeSans;-inkscape-font-specification:'FreeSans, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.12027877px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="59.767479"
+       y="-68.321594"
+       id="text935"
+       inkscape:export-xdpi="86"
+       inkscape:export-ydpi="86"><tspan
+         sodipodi:role="line"
+         id="tspan989"
+         x="59.767479"
+         y="-68.321594">Source Client</tspan><tspan
+         sodipodi:role="line"
+         id="tspan991"
+         x="59.767479"
+         y="-63.911873">(Ásbrú-CM)</tspan></text>
+    <path
+       id="path922"
+       d="m 214.56523,-71.135332 h 15.38766 v -1.923451 h -15.38766 z m 0,-7.693829 h 15.38766 v -1.923459 h -15.38766 z m 23.56235,6.732103 q 0,-0.601083 -0.42075,-1.021838 -0.42076,-0.420754 -1.02184,-0.420754 -0.60108,0 -1.02184,0.420754 -0.42075,0.420755 -0.42075,1.021838 0,0.601075 0.42075,1.021838 0.42076,0.420755 1.02184,0.420755 0.60108,0 1.02184,-0.420755 0.42075,-0.420763 0.42075,-1.021838 z m -23.56235,-14.425931 h 15.38766 v -1.92345 h -15.38766 z m 23.56235,6.732103 q 0,-0.601084 -0.42075,-1.021838 -0.42076,-0.420755 -1.02184,-0.420755 -0.60108,0 -1.02184,0.420755 -0.42075,0.420754 -0.42075,1.021838 0,0.601075 0.42075,1.021838 0.42076,0.420754 1.02184,0.420754 0.60108,0 1.02184,-0.420754 0.42075,-0.420763 0.42075,-1.021838 z m 0,-7.693828 q 0,-0.601084 -0.42075,-1.021838 -0.42076,-0.420754 -1.02184,-0.420754 -0.60108,0 -1.02184,0.420754 -0.42075,0.420754 -0.42075,1.021838 0,0.601075 0.42075,1.021838 0.42076,0.420754 1.02184,0.420754 0.60108,0 1.02184,-0.420754 0.42075,-0.420763 0.42075,-1.021838 z m 1.44259,12.502472 v 5.770369 h -26.9284 v -5.770369 z m 0,-7.693828 v 5.770368 h -26.9284 v -5.770368 z m 0,-7.693829 v 5.77037 h -26.9284 v -5.77037 z"
+       inkscape:connector-curvature="0"
+       style="stroke-width:0.01502701"
+       inkscape:export-xdpi="86"
+       inkscape:export-ydpi="86" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52777767px;line-height:125%;font-family:FreeSans;-inkscape-font-specification:'FreeSans, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.12027878px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="226.07077"
+       y="-63.902729"
+       id="text935-0"
+       inkscape:export-xdpi="86"
+       inkscape:export-ydpi="86"><tspan
+         sodipodi:role="line"
+         id="tspan993"
+         x="226.07077"
+         y="-63.902729">Destination</tspan><tspan
+         sodipodi:role="line"
+         id="tspan995"
+         x="226.07077"
+         y="-59.493008">Server</tspan></text>
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.18505192px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 185.22553,-103.33461 c 0,32.541629 0,32.541629 0,32.541629"
+       id="path1118"
+       inkscape:connector-curvature="0"
+       inkscape:export-xdpi="86"
+       inkscape:export-ydpi="86" />
+    <g
+       id="g1112"
+       transform="matrix(0.5924057,0,0,0.5924057,129.1952,-132.0647)"
+       inkscape:export-xdpi="86"
+       inkscape:export-ydpi="86">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:#080808;stroke-width:0.66145831;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+         d="m 82.926913,73.96654 h 12.82991 c 0.365601,0 0.661458,0.297127 0.661458,0.661458 v 5.110692 c 0,0.365601 -0.295857,0.661458 -0.661458,0.661458 h -12.82991 c -0.365602,0 -0.661459,-0.295857 -0.661459,-0.661458 v -5.110692 c 0,-0.364331 0.295857,-0.661458 0.661459,-0.661458"
+         id="path1244" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:#080808;stroke-width:0.66145831;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+         d="M 97.068892,73.977123 H 109.8988 c 0.3656,0 0.66146,0.295857 0.66146,0.661459 v 5.110691 c 0,0.364331 -0.29586,0.661459 -0.66146,0.661459 H 97.068892 c -0.365602,0 -0.661459,-0.297128 -0.661459,-0.661459 v -5.110691 c 0,-0.365602 0.295857,-0.661459 0.661459,-0.661459"
+         id="path1246" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:#080808;stroke-width:0.66145831;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+         d="m 76.015996,80.393269 h 12.82991 c 0.365602,0 0.661459,0.297127 0.661459,0.661458 v 5.110692 c 0,0.365601 -0.295857,0.661458 -0.661459,0.661458 h -12.82991 c -0.365601,0 -0.661458,-0.295857 -0.661458,-0.661458 v -5.110692 c 0,-0.364331 0.295857,-0.661458 0.661458,-0.661458"
+         id="path1248" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:#080808;stroke-width:0.66145831;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+         d="m 90.157975,80.403852 h 12.829915 c 0.3656,0 0.66145,0.295857 0.66145,0.661459 v 5.110691 c 0,0.364332 -0.29585,0.661459 -0.66145,0.661459 H 90.157975 c -0.365601,0 -0.661458,-0.297127 -0.661458,-0.661459 v -5.110691 c 0,-0.365602 0.295857,-0.661459 0.661458,-0.661459"
+         id="path1250" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:#080808;stroke-width:0.66145831;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+         d="m 82.913684,86.82529 h 12.82991 c 0.365601,0 0.661458,0.295857 0.661458,0.661458 v 5.109633 c 0,0.365602 -0.295857,0.661459 -0.661458,0.661459 h -12.82991 c -0.365602,0 -0.661459,-0.295857 -0.661459,-0.661459 v -5.109633 c 0,-0.365601 0.295857,-0.661458 0.661459,-0.661458"
+         id="path1252" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:#080808;stroke-width:0.66145831;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+         d="m 97.055663,86.833227 h 12.829907 c 0.3656,0 0.66146,0.295857 0.66146,0.661459 v 5.110691 c 0,0.365601 -0.29586,0.661459 -0.66146,0.661459 H 97.055663 c -0.365602,0 -0.661459,-0.295858 -0.661459,-0.661459 v -5.110691 c 0,-0.365602 0.295857,-0.661459 0.661459,-0.661459"
+         id="path1254" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:#080808;stroke-width:0.66145831;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+         d="m 76.015996,93.257311 h 12.82991 c 0.364332,0 0.661459,0.297127 0.661459,0.661458 v 5.110691 c 0,0.365602 -0.297127,0.661459 -0.661459,0.661459 h -12.82991 c -0.365601,0 -0.661458,-0.295857 -0.661458,-0.661459 v -5.110691 c 0,-0.364331 0.295857,-0.661458 0.661458,-0.661458"
+         id="path1256" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:#080808;stroke-width:0.66145831;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+         d="m 90.157975,93.267894 h 12.829915 c 0.3656,0 0.66145,0.295857 0.66145,0.661458 v 5.109633 c 0,0.365602 -0.29585,0.661459 -0.66145,0.661459 H 90.157975 c -0.365601,0 -0.661458,-0.295857 -0.661458,-0.661459 v -5.109633 c 0,-0.365601 0.295857,-0.661458 0.661458,-0.661458"
+         id="path1258" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:#080808;stroke-width:0.66145831;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+         d="m 104.37933,80.41179 h 5.5036 c 0.3656,0 0.66146,0.295857 0.66146,0.661458 v 5.109633 c 0,0.365602 -0.29586,0.661459 -0.66146,0.661459 h -5.5036 c -0.3656,0 -0.66146,-0.295857 -0.66146,-0.661459 v -5.109633 c 0,-0.365601 0.29586,-0.661458 0.66146,-0.661458"
+         id="path1260" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:#080808;stroke-width:0.66145831;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+         d="m 104.30789,93.259956 h 5.58377 c 0.3656,0 0.66146,0.295857 0.66146,0.661459 v 5.110691 c 0,0.364332 -0.29586,0.661459 -0.66146,0.661459 h -5.58377 c -0.3656,0 -0.66146,-0.297127 -0.66146,-0.661459 v -5.110691 c 0,-0.365602 0.29586,-0.661459 0.66146,-0.661459"
+         id="path1262" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:#080808;stroke-width:0.66145831;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+         d="m 76.000121,86.814706 h 5.583767 c 0.365601,0 0.661458,0.297128 0.661458,0.661459 v 5.110691 c 0,0.365602 -0.295857,0.661459 -0.661458,0.661459 h -5.583767 c -0.364331,0 -0.661458,-0.295857 -0.661458,-0.661459 v -5.110691 c 0,-0.364331 0.297127,-0.661459 0.661458,-0.661459"
+         id="path1264" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#cccccc;fill-opacity:1;stroke:#080808;stroke-width:0.66145831;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+         d="M 75.351892,83.666165 V 94.8038"
+         id="path1266" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#cccccc;fill-opacity:1;stroke:#080808;stroke-width:0.66145831;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+         d="M 106.15997,99.686685 83.529634,99.68404"
+         id="path1268" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#cccccc;fill-opacity:1;stroke:#080808;stroke-width:0.66145831;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+         d="M 101.68852,73.963894 91.51079,73.932872"
+         id="path1270" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#cccccc;fill-opacity:1;stroke:#080808;stroke-width:0.66145831;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+         d="M 110.53883,83.226957 V 94.363269"
+         id="path1272" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#cccccc;fill-opacity:1;stroke:#080808;stroke-width:0.66145831;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+         d="M 110.56793,76.035582 V 87.171894"
+         id="path1274" />
+    </g>
+    <g
+       id="g3892"
+       transform="translate(5.8208336)">
+      <path
+         id="path2607"
+         style="fill:#e9e9e9;fill-opacity:1;fill-rule:evenodd;stroke:#3c2f00;stroke-width:0.10653654;stroke-opacity:1"
+         inkscape:connector-curvature="0"
+         d="m 167.60257,-92.346716 h 1.70309 l -1.77135,4.634154 -0.5807,-0.505812 -2.14512,5.611401 1.39758,-7.880188 0.59154,0.51727 z" />
+      <path
+         id="path2609"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccccc"
+         style="opacity:0.8;fill:url(#linearGradient1570);fill-rule:evenodd;stroke-width:0.10653654"
+         d="m 167.73258,-91.873643 1.01947,-0.02947 -1.34774,3.553778 -0.49295,-0.430513 -1.52975,4.092328 1.01189,-5.197257 0.50161,0.437061 z" />
+    </g>
+    <g
+       id="g1094"
+       transform="matrix(0.69252803,0,0,0.69252803,144.84556,-146.41596)"
+       inkscape:export-xdpi="86"
+       inkscape:export-ydpi="86">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#1a1a1a;fill-rule:evenodd;stroke:none;stroke-width:0.33072916;stroke-miterlimit:10"
+         d="m 52.871002,87.166224 1.780249,-2.908035 1.600676,-2.028296 1.058069,-1.329372 1.69111,-1.848724 -0.202803,1.622637 -0.04498,1.262195 0.04498,1.126543 0.135665,0.811318 0.202804,0.609785 0.29329,0.833279 0.472811,0.901753 0.630449,0.992187 0.653732,0.990891 0.698924,0.789358 0.812614,1.1498 0.788062,1.036108 0.856535,1.57742 0.946971,-1.351333 -0.02315,1.148503 0.04498,1.1498 0.248047,1.555459 -0.112382,1.645893 -0.224764,1.262195 -0.586528,1.937862 -0.720884,1.30741 -1.127839,1.21698 -0.945674,0.74414 -1.600676,0.74414 -1.195017,0.29197 -1.329373,0.0233 -0.879713,-0.0905 -1.17176,-0.40566 -1.059365,-0.54131 -0.923714,-0.85654 -0.901752,-1.05936 -0.744141,-1.01415 -0.811318,-1.758291 -0.45085,-1.577419 -0.291968,-1.644598 0.02183,-1.465024 0.09042,-1.645893 0.134343,-1.397847 v -2.095474 l -0.20287,-1.037404 -0.360415,-1.036109 -0.586528,-1.015444 0.811318,0.248047 1.308708,0.541311 z"
+         id="path1276" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#808080;fill-rule:evenodd;stroke:none;stroke-width:0.33072916;stroke-miterlimit:10"
+         d="m 52.206898,87.904412 0.906938,0.862991 0.817774,0.905616 0.658866,0.819071 0.671777,1.023196 0.277759,0.569728 0.218348,-0.307473 0.131762,-0.671803 0.105966,-1.338422 -0.0762,-1.99472 0.164108,-1.952069 0.755756,-1.773793 0.789358,-1.257036 0.555492,-0.877199 -0.291967,0.847487 0.117541,2.265997 0.236405,1.028356 0.377243,0.812615 2.557991,4.501092 0.422487,0.99478 0.177006,0.979276 0.05821,1.037405 0.07236,0.715724 0.102063,0.701516 0.145984,0.481886 0.453443,0.249335 h 0.571024 l 0.452173,-0.175696 0.251949,-0.330729 0.233826,-0.613675 0.145984,-0.905616 0.145983,0.817774 0.175684,1.140751 -0.117541,1.870684 -0.350097,1.753129 -0.701516,1.57872 -0.819071,0.8772 -1.19761,0.81777 -1.139455,0.61494 -0.99478,0.32039 -0.876035,0.0879 -0.731229,0.0297 -0.817774,-0.0879 -0.819071,-0.29197 -0.789358,-0.49739 -0.759645,-0.52581 -0.691171,-0.83846 -0.891408,-1.5503 -0.463814,-1.264788 -0.193808,-1.029653 -0.127926,-1.104582 -0.09174,-1.160145 0.02977,-1.037405 0.131762,-0.891434 0.189905,-1.008989 0.248047,-0.862991 0.307498,-0.993484 0.117541,-0.803566 -0.04498,-0.745437 -0.32168,-0.965068 z"
+         id="path1278" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#999999;fill-rule:evenodd;stroke:none;stroke-width:0.33072916;stroke-miterlimit:10"
+         d="m 56.686293,86.634412 1.331966,2.138098 1.061958,2.180748 0.719587,1.591628 0.664051,1.667854 0.643414,1.914604 0.379809,1.667854 0.113705,1.269947 -0.05689,0.985735 -0.170524,1.08003 -0.323004,0.73898 -0.39661,0.9289 -0.512895,0.60589 -0.586528,0.4173 -0.777716,0.36045 -0.829416,0.19636 -0.687282,-0.0633 -0.776446,-0.32298 -0.795814,-0.49223 -0.568457,-0.89144 -0.266118,-0.89011 -0.151143,-0.60719 -0.03903,-0.96636 0.01918,-1.136892 0.209285,-1.195017 0.549064,-1.364244 0.664051,-1.156256 0.795814,-1.591627 0.435372,-1.232482 0.151143,-0.9289 -0.07494,-1.174353 -0.189905,-1.687248 z"
+         id="path1280" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#cccccc;fill-rule:evenodd;stroke:none;stroke-width:0.33072916;stroke-miterlimit:10"
+         d="m 55.34221,99.569891 0.351367,-1.300957 0.496093,-1.136888 0.413412,-0.971523 0.496094,-1.033516 0.558059,-0.930169 0.688578,-0.92112 -0.213188,0.962475 v 0.950859 l 0.124023,0.826823 0.413412,0.578776 0.640821,0.847487 0.62013,0.930169 0.330729,0.785495 0.267441,0.949538 0.103386,0.70279 -0.04035,0.97152 -0.248047,0.72348 -0.516784,0.72347 -0.826823,0.68212 -0.62013,0.31007 -0.475404,0.10335 -0.578776,-0.10335 -0.682122,-0.39275 -0.558139,-0.70278 -0.372057,-0.82683 -0.351419,-1.09553 -0.144661,-0.7855 z"
+         id="path1282" />
+    </g>
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.40000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow2Mend)"
+       d="m 86.160302,-87.238926 c 82.739778,0 82.739778,0 82.739778,0"
+       id="path1120"
+       inkscape:connector-curvature="0"
+       inkscape:export-xdpi="86"
+       inkscape:export-ydpi="86" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.46944451px;line-height:125%;font-family:FreeSans;-inkscape-font-specification:'FreeSans, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:end;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.12027878px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="174.94228"
+       y="-96.669159"
+       id="text935-0-0"
+       inkscape:export-xdpi="86"
+       inkscape:export-ydpi="86"><tspan
+         sodipodi:role="line"
+         id="tspan952"
+         x="174.94228"
+         y="-96.669159">firewall blocks incoming</tspan><tspan
+         sodipodi:role="line"
+         id="tspan954"
+         x="174.94228"
+         y="-93.582352">connection from client</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52777767px;line-height:125%;font-family:FreeSans;-inkscape-font-specification:'FreeSans, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.12027878px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="179.38945"
+       y="-67.491882"
+       id="text935-1"
+       inkscape:export-xdpi="86"
+       inkscape:export-ydpi="86"><tspan
+         sodipodi:role="line"
+         id="tspan1629"
+         x="179.38945"
+         y="-67.491882">Firewall</tspan></text>
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.19548066;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 185.40929,-66.041224 c 0,7.618753 0,7.618753 0,7.618753"
+       id="path1118-5"
+       inkscape:connector-curvature="0"
+       inkscape:export-xdpi="86"
+       inkscape:export-ydpi="86" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52777767px;line-height:125%;font-family:FreeSans;-inkscape-font-specification:'FreeSans, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.12027878px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="129.82375"
+       y="-66.118675"
+       id="text935-0-7"
+       inkscape:export-xdpi="86"
+       inkscape:export-ydpi="86"><tspan
+         sodipodi:role="line"
+         id="tspan2864"
+         x="129.82375"
+         y="-66.118675">SSH</tspan><tspan
+         sodipodi:role="line"
+         id="tspan2866"
+         x="129.82375"
+         y="-61.708954">Jump Host</tspan></text>
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.40000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker3298)"
+       d="m 86.247243,-76.799616 c 123.899217,0 123.899217,0 123.899217,0"
+       id="path1120-3-0"
+       inkscape:connector-curvature="0"
+       inkscape:export-xdpi="86"
+       inkscape:export-ydpi="86" />
+    <g
+       id="g3544"
+       transform="matrix(0.50523827,0,0,0.50523827,118.14146,-62.110068)">
+      <path
+         style="fill:#969696;fill-opacity:1;stroke:#2c2c2c;stroke-width:0.28072292;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         inkscape:connector-curvature="0"
+         d="m 106.64926,-35.747165 c -0.17026,-0.02951 -0.34668,0.04244 -0.44618,0.197462 l -4.23909,6.603622 -2.278099,-2.089566 c -0.206699,-0.13266 -0.480275,-0.07602 -0.612937,0.130674 l -1.180495,1.31319 c -0.132658,0.206697 -0.07256,0.480437 0.134135,0.613097 0,0 4.149946,3.950964 4.155196,3.954042 0.0484,0.03109 0.10016,0.04867 0.15325,0.05922 0.17341,0.03447 0.35828,-0.0351 0.45985,-0.193351 l 5.71696,-8.905803 c 0.13266,-0.206698 0.0726,-0.480437 -0.13413,-0.613098 l -1.56154,-1.006159 c -0.0517,-0.03317 -0.11017,-0.05349 -0.16692,-0.06333 z"
+         id="G" />
+      <path
+         style="opacity:0.8;fill:none;stroke:url(#6);stroke-width:0.28072292;stroke-linecap:round;stroke-linejoin:round"
+         inkscape:connector-curvature="0"
+         d="m 106.54468,-35.455873 c -0.0589,0.01815 -0.0974,0.07767 -0.1819,0.198438 l -2.14974,3.365169 -1.91823,2.960026 c -0.0199,0.01756 -0.0302,0.0411 -0.0413,0.06615 -0.0111,0.02505 -0.0253,0.04831 -0.0413,0.07441 -0.0322,0.05221 -0.0825,0.102978 -0.19844,0.124023 -0.081,0.0147 -0.12028,0.0087 -0.16537,-0.01654 -0.0451,-0.02528 -0.0896,-0.06949 -0.17363,-0.132292 l -2.009179,-1.835547 c -0.05594,-0.05187 -0.09702,-0.08944 -0.132292,-0.115755 -0.03527,-0.02632 -0.06759,-0.04003 -0.09922,-0.04134 -0.03163,-0.0013 -0.06091,0.01126 -0.09095,0.03307 -0.03004,0.02181 -0.06277,0.05181 -0.107487,0.09095 l -0.93431,1.016992 c -0.126025,0.117133 -0.183811,0.21911 -0.173633,0.322461 0.01018,0.10335 0.0842,0.1941 0.223242,0.297656 0,0 0.94113,0.897465 1.885159,1.794206 0.47201,0.44837 0.94363,0.895413 1.29811,1.231966 0.17724,0.168276 0.32628,0.306818 0.42995,0.405143 0.0518,0.04916 0.0961,0.08932 0.12402,0.115755 0.014,0.01322 0.0258,0.02618 0.0331,0.03307 0.004,0.0034 0.006,0.0065 0.008,0.0083 2.9e-4,2.5e-4 0.008,-1.1e-5 0.008,0 0.0214,0.01371 0.0235,0.02495 0.0496,0.04961 0.0261,0.02466 0.0676,0.06197 0.16537,0.14056 0.037,0.02976 0.0864,0.03392 0.12402,0.01654 0.0376,-0.01738 0.0674,-0.05124 0.0992,-0.09095 0.0635,-0.07942 0.11856,-0.183402 0.16536,-0.256315 l 5.49837,-8.54108 c 0.0312,-0.04862 0.0592,-0.09231 0.0744,-0.124024 0.0152,-0.03171 0.0232,-0.05494 0.0165,-0.08268 -0.007,-0.02774 -0.0303,-0.05207 -0.0579,-0.07441 -0.0276,-0.02234 -0.0586,-0.04304 -0.10749,-0.07441 -0.003,-4.92e-4 -0.006,-4.92e-4 -0.008,0 l -1.39733,-0.868164 c -0.0504,-0.03214 -0.082,-0.05883 -0.11575,-0.07441 -0.0337,-0.01558 -0.0689,-0.0259 -0.0992,-0.01654 z"
+         id="H" />
+      <path
+         style="opacity:0.8;fill:url(#7);stroke-width:0.28072292"
+         inkscape:connector-curvature="0"
+         d="m 106.53641,-35.612969 c -0.0884,0.01064 -0.16985,0.05736 -0.22324,0.14056 l -2.87735,4.473112 c 1.20091,-0.401494 2.40648,-0.74159 3.61322,-1.025261 l 1.35599,-2.116666 c 0.0946,-0.147357 0.0476,-0.335694 -0.0992,-0.429948 l -1.5627,-1.008724 c -0.0296,-0.01901 -0.0665,-0.02453 -0.11575,-0.03307 -0.0297,-0.0052 -0.0615,-0.0035 -0.0909,0 z m -7.168556,4.646745 c -0.07544,0.01609 -0.144283,0.0608 -0.190169,0.132291 -0.0024,0.0057 -0.0051,0.01122 -0.0083,0.01654 l -1.16582,1.298112 c -0.0016,0.0025 0.0016,0.0057 0,0.0083 -0.08836,0.146125 -0.0451,0.329058 0.09922,0.42168 0.0057,0.0024 0.01122,0.0051 0.01654,0.0083 0,0 0.131492,0.123606 0.14056,0.132292 0.798649,-0.357761 1.597074,-0.696988 2.397785,-1.016993 l -1.050064,-0.959114 c -0.0026,-0.0017 -0.0057,0.0016 -0.0083,0 -0.07404,-0.04492 -0.156073,-0.05743 -0.231511,-0.04134 z"
+         id="I" />
+    </g>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.46944451px;line-height:125%;font-family:FreeSans;-inkscape-font-specification:'FreeSans, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:end;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.12027878px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="170.23761"
+       y="-72.282089"
+       id="text935-0-0-4"
+       inkscape:export-xdpi="86"
+       inkscape:export-ydpi="86"><tspan
+         sodipodi:role="line"
+         id="tspan977"
+         x="170.23761"
+         y="-72.282089">firewall allows</tspan><tspan
+         sodipodi:role="line"
+         id="tspan979"
+         x="170.23761"
+         y="-69.195282">incoming connection</tspan><tspan
+         sodipodi:role="line"
+         id="tspan981"
+         x="170.23761"
+         y="-66.108475">from jump host</tspan></text>
+    <path
+       id="path922-7"
+       d="m 122.5385,-71.243484 h 9.7507 v -1.218833 h -9.7507 z m 0,-4.875351 h 9.7507 v -1.218839 h -9.7507 z m 14.93076,4.265932 q 0,-0.380887 -0.26662,-0.64751 -0.26662,-0.266617 -0.64751,-0.266617 -0.38088,0 -0.64751,0.266617 -0.26661,0.266623 -0.26661,0.64751 0,0.380886 0.26661,0.647509 0.26663,0.266617 0.64751,0.266617 0.38089,0 0.64751,-0.266617 0.26662,-0.266623 0.26662,-0.647509 z m -14.93076,-9.141283 h 9.7507 v -1.218833 h -9.7507 z m 14.93076,4.265932 q 0,-0.380887 -0.26662,-0.647504 -0.26662,-0.266623 -0.64751,-0.266623 -0.38088,0 -0.64751,0.266623 -0.26661,0.266617 -0.26661,0.647504 0,0.380886 0.26661,0.647509 0.26663,0.266623 0.64751,0.266623 0.38089,0 0.64751,-0.266623 0.26662,-0.266623 0.26662,-0.647509 z m 0,-4.875351 q 0,-0.380887 -0.26662,-0.647504 -0.26662,-0.266623 -0.64751,-0.266623 -0.38088,0 -0.64751,0.266623 -0.26661,0.266617 -0.26661,0.647504 0,0.380886 0.26661,0.647509 0.26663,0.266623 0.64751,0.266623 0.38089,0 0.64751,-0.266623 0.26662,-0.266623 0.26662,-0.647509 z m 0.91413,7.922449 v 3.656512 h -17.06373 v -3.656512 z m 0,-4.875351 v 3.656512 h -17.06373 v -3.656512 z m 0,-4.875351 v 3.656512 h -17.06373 v -3.656512 z"
+       inkscape:connector-curvature="0"
+       style="stroke-width:0.00952217"
+       inkscape:export-xdpi="86"
+       inkscape:export-ydpi="86" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.46944451px;line-height:125%;font-family:FreeSans;-inkscape-font-specification:'FreeSans, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:end;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.12027878px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="115.41436"
+       y="-73.235847"
+       id="text935-0-0-4-9"
+       inkscape:export-xdpi="86"
+       inkscape:export-ydpi="86"><tspan
+         sodipodi:role="line"
+         id="tspan1151"
+         x="115.41436"
+         y="-73.235847">ásbrú-cm transparently</tspan><tspan
+         sodipodi:role="line"
+         id="tspan1153"
+         x="115.41436"
+         y="-70.14904">goes through the jump</tspan><tspan
+         sodipodi:role="line"
+         id="tspan1155"
+         x="115.41436"
+         y="-67.062233">host to connect the</tspan><tspan
+         sodipodi:role="line"
+         id="tspan1157"
+         x="115.41436"
+         y="-63.97543">final destination</tspan></text>
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.30000001;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 117.73092,-75.909942 c 23.62081,0 23.62081,0 23.62081,0"
+       id="path1120-3-0-4"
+       inkscape:connector-curvature="0"
+       inkscape:export-xdpi="86"
+       inkscape:export-ydpi="86" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.30000001;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 117.73092,-77.657741 c 23.62081,0 23.62081,0 23.62081,0"
+       id="path1120-3-0-4-4"
+       inkscape:connector-curvature="0"
+       inkscape:export-xdpi="86"
+       inkscape:export-ydpi="86" />
+    <rect
+       style="opacity:1;fill:#f0f0f0;fill-opacity:0.91176471;fill-rule:nonzero;stroke:none;stroke-width:0.40259695;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect2668"
+       width="23.882023"
+       height="1.4174105"
+       x="117.60189"
+       y="-77.496429" />
+  </g>
+</svg>
diff --git a/doc/Managing/images/jump-host-client-blocked.svg b/doc/Managing/images/jump-host-client-blocked.svg
new file mode 100644
index 00000000..bd86bba9
--- /dev/null
+++ b/doc/Managing/images/jump-host-client-blocked.svg
@@ -0,0 +1,352 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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="145mm"
+   height="45mm"
+   viewBox="0 0 145 45"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="jump-host-client-blocked.svg">
+  <defs
+     id="defs2">
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow2Mend"
+       style="overflow:visible;"
+       inkscape:isstock="true">
+      <path
+         id="path959"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+         transform="scale(0.6) rotate(180) translate(0,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lend"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path1143"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lend"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path1125"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,-10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <linearGradient
+       inkscape:collect="always"
+       x1="208.62"
+       y1="119.72"
+       x2="208.62"
+       gradientUnits="userSpaceOnUse"
+       y2="163.8"
+       id="linearGradient1570"
+       gradientTransform="matrix(0.10833947,0,0,0.16369315,144.46451,-111.50045)">
+      <stop
+         offset="0"
+         style="stop-color:#281f00;stop-opacity:1"
+         id="stop9613" />
+      <stop
+         offset="1"
+         style="stop-color:#3f3f3f;stop-opacity:0"
+         id="stop9615" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.979899"
+     inkscape:cx="18.810202"
+     inkscape:cy="68.665403"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="2560"
+     inkscape:window-height="1412"
+     inkscape:window-x="0"
+     inkscape:window-y="28"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5">
+    <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 />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-14.472246,-19.521508)">
+    <path
+       id="path863"
+       d="m 20.617837,48.441287 q -0.911416,0 -1.560455,-0.649039 -0.649038,-0.649039 -0.649038,-1.560459 V 36.51001 q 0,-0.911417 0.649038,-1.560455 0.649039,-0.649039 1.560455,-0.649039 h 15.024572 q 0.911416,0 1.560454,0.649039 0.64904,0.649038 0.64904,1.560455 v 9.721779 q 0,0.91142 -0.64904,1.560459 -0.649038,0.649039 -1.560454,0.649039 z M 20.175939,36.51001 v 9.721779 q 0,0.179522 0.131188,0.310714 0.131188,0.131189 0.31071,0.131189 h 15.024572 q 0.179517,0 0.31071,-0.131189 0.131188,-0.131192 0.131188,-0.310714 V 36.51001 q 0,-0.179522 -0.131188,-0.310711 -0.131193,-0.131188 -0.31071,-0.131188 H 20.617837 q -0.179522,0 -0.31071,0.131188 -0.131188,0.131189 -0.131188,0.310711 z m 19.001662,12.815073 h 2.209494 v 1.325699 q 0,0.552372 -0.649039,0.939035 -0.64904,0.386662 -1.560455,0.386662 H 17.082645 q -0.911419,0 -1.560458,-0.386662 -0.649036,-0.386663 -0.649036,-0.939035 v -1.325699 z m -9.942729,1.325699 q 0.220948,0 0.220948,-0.22095 0,-0.220949 -0.220948,-0.220949 h -2.209497 q -0.22095,0 -0.22095,0.220949 0,0.22095 0.22095,0.22095 z"
+       inkscape:connector-curvature="0"
+       style="stroke-width:0.01380934"
+       inkscape:export-xdpi="86"
+       inkscape:export-ydpi="86" />
+    <path
+       id="path922"
+       d="m 133.91963,50.750316 h 15.38766 v -1.923451 h -15.38766 z m 0,-7.693829 h 15.38766 v -1.923459 h -15.38766 z m 23.56235,6.732103 q 0,-0.601083 -0.42075,-1.021838 -0.42076,-0.420754 -1.02184,-0.420754 -0.60108,0 -1.02184,0.420754 -0.42075,0.420755 -0.42075,1.021838 0,0.601075 0.42075,1.021838 0.42076,0.420755 1.02184,0.420755 0.60108,0 1.02184,-0.420755 0.42075,-0.420763 0.42075,-1.021838 z M 133.91963,35.362658 h 15.38766 v -1.92345 h -15.38766 z m 23.56235,6.732104 q 0,-0.601084 -0.42075,-1.021838 -0.42076,-0.420755 -1.02184,-0.420755 -0.60108,0 -1.02184,0.420755 -0.42075,0.420754 -0.42075,1.021838 0,0.601075 0.42075,1.021838 0.42076,0.420754 1.02184,0.420754 0.60108,0 1.02184,-0.420754 0.42075,-0.420763 0.42075,-1.021838 z m 0,-7.693829 q 0,-0.601084 -0.42075,-1.021838 -0.42076,-0.420754 -1.02184,-0.420754 -0.60108,0 -1.02184,0.420754 -0.42075,0.420754 -0.42075,1.021838 0,0.601075 0.42075,1.021838 0.42076,0.420754 1.02184,0.420754 0.60108,0 1.02184,-0.420754 0.42075,-0.420763 0.42075,-1.021838 z m 1.44259,12.502473 v 5.770369 h -26.9284 v -5.770369 z m 0,-7.693829 v 5.770369 h -26.9284 v -5.770369 z m 0,-7.693829 v 5.77037 h -26.9284 v -5.77037 z"
+       inkscape:connector-curvature="0"
+       style="stroke-width:0.01502701"
+       inkscape:export-xdpi="86"
+       inkscape:export-ydpi="86" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.18505192px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 104.57993,19.609367 c 0,32.541634 0,32.541634 0,32.541634"
+       id="path1118"
+       inkscape:connector-curvature="0"
+       inkscape:export-xdpi="86"
+       inkscape:export-ydpi="86" />
+    <g
+       id="g1112"
+       transform="matrix(0.5924057,0,0,0.5924057,48.549604,-9.1207212)"
+       inkscape:export-xdpi="86"
+       inkscape:export-ydpi="86">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:#080808;stroke-width:0.66145831;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+         d="m 82.926913,73.96654 h 12.82991 c 0.365601,0 0.661458,0.297127 0.661458,0.661458 v 5.110692 c 0,0.365601 -0.295857,0.661458 -0.661458,0.661458 h -12.82991 c -0.365602,0 -0.661459,-0.295857 -0.661459,-0.661458 v -5.110692 c 0,-0.364331 0.295857,-0.661458 0.661459,-0.661458"
+         id="path1244" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:#080808;stroke-width:0.66145831;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+         d="M 97.068892,73.977123 H 109.8988 c 0.3656,0 0.66146,0.295857 0.66146,0.661459 v 5.110691 c 0,0.364331 -0.29586,0.661459 -0.66146,0.661459 H 97.068892 c -0.365602,0 -0.661459,-0.297128 -0.661459,-0.661459 v -5.110691 c 0,-0.365602 0.295857,-0.661459 0.661459,-0.661459"
+         id="path1246" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:#080808;stroke-width:0.66145831;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+         d="m 76.015996,80.393269 h 12.82991 c 0.365602,0 0.661459,0.297127 0.661459,0.661458 v 5.110692 c 0,0.365601 -0.295857,0.661458 -0.661459,0.661458 h -12.82991 c -0.365601,0 -0.661458,-0.295857 -0.661458,-0.661458 v -5.110692 c 0,-0.364331 0.295857,-0.661458 0.661458,-0.661458"
+         id="path1248" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:#080808;stroke-width:0.66145831;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+         d="m 90.157975,80.403852 h 12.829915 c 0.3656,0 0.66145,0.295857 0.66145,0.661459 v 5.110691 c 0,0.364332 -0.29585,0.661459 -0.66145,0.661459 H 90.157975 c -0.365601,0 -0.661458,-0.297127 -0.661458,-0.661459 v -5.110691 c 0,-0.365602 0.295857,-0.661459 0.661458,-0.661459"
+         id="path1250" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:#080808;stroke-width:0.66145831;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+         d="m 82.913684,86.82529 h 12.82991 c 0.365601,0 0.661458,0.295857 0.661458,0.661458 v 5.109633 c 0,0.365602 -0.295857,0.661459 -0.661458,0.661459 h -12.82991 c -0.365602,0 -0.661459,-0.295857 -0.661459,-0.661459 v -5.109633 c 0,-0.365601 0.295857,-0.661458 0.661459,-0.661458"
+         id="path1252" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:#080808;stroke-width:0.66145831;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+         d="m 97.055663,86.833227 h 12.829907 c 0.3656,0 0.66146,0.295857 0.66146,0.661459 v 5.110691 c 0,0.365601 -0.29586,0.661459 -0.66146,0.661459 H 97.055663 c -0.365602,0 -0.661459,-0.295858 -0.661459,-0.661459 v -5.110691 c 0,-0.365602 0.295857,-0.661459 0.661459,-0.661459"
+         id="path1254" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:#080808;stroke-width:0.66145831;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+         d="m 76.015996,93.257311 h 12.82991 c 0.364332,0 0.661459,0.297127 0.661459,0.661458 v 5.110691 c 0,0.365602 -0.297127,0.661459 -0.661459,0.661459 h -12.82991 c -0.365601,0 -0.661458,-0.295857 -0.661458,-0.661459 v -5.110691 c 0,-0.364331 0.295857,-0.661458 0.661458,-0.661458"
+         id="path1256" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:#080808;stroke-width:0.66145831;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+         d="m 90.157975,93.267894 h 12.829915 c 0.3656,0 0.66145,0.295857 0.66145,0.661458 v 5.109633 c 0,0.365602 -0.29585,0.661459 -0.66145,0.661459 H 90.157975 c -0.365601,0 -0.661458,-0.295857 -0.661458,-0.661459 v -5.109633 c 0,-0.365601 0.295857,-0.661458 0.661458,-0.661458"
+         id="path1258" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:#080808;stroke-width:0.66145831;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+         d="m 104.37933,80.41179 h 5.5036 c 0.3656,0 0.66146,0.295857 0.66146,0.661458 v 5.109633 c 0,0.365602 -0.29586,0.661459 -0.66146,0.661459 h -5.5036 c -0.3656,0 -0.66146,-0.295857 -0.66146,-0.661459 v -5.109633 c 0,-0.365601 0.29586,-0.661458 0.66146,-0.661458"
+         id="path1260" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:#080808;stroke-width:0.66145831;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+         d="m 104.30789,93.259956 h 5.58377 c 0.3656,0 0.66146,0.295857 0.66146,0.661459 v 5.110691 c 0,0.364332 -0.29586,0.661459 -0.66146,0.661459 h -5.58377 c -0.3656,0 -0.66146,-0.297127 -0.66146,-0.661459 v -5.110691 c 0,-0.365602 0.29586,-0.661459 0.66146,-0.661459"
+         id="path1262" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:#080808;stroke-width:0.66145831;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+         d="m 76.000121,86.814706 h 5.583767 c 0.365601,0 0.661458,0.297128 0.661458,0.661459 v 5.110691 c 0,0.365602 -0.295857,0.661459 -0.661458,0.661459 h -5.583767 c -0.364331,0 -0.661458,-0.295857 -0.661458,-0.661459 v -5.110691 c 0,-0.364331 0.297127,-0.661459 0.661458,-0.661459"
+         id="path1264" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#cccccc;fill-opacity:1;stroke:#080808;stroke-width:0.66145831;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+         d="M 75.351892,83.666165 V 94.8038"
+         id="path1266" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#cccccc;fill-opacity:1;stroke:#080808;stroke-width:0.66145831;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+         d="M 106.15997,99.686685 83.529634,99.68404"
+         id="path1268" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#cccccc;fill-opacity:1;stroke:#080808;stroke-width:0.66145831;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+         d="M 101.68852,73.963894 91.51079,73.932872"
+         id="path1270" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#cccccc;fill-opacity:1;stroke:#080808;stroke-width:0.66145831;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+         d="M 110.53883,83.226957 V 94.363269"
+         id="path1272" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#cccccc;fill-opacity:1;stroke:#080808;stroke-width:0.66145831;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+         d="M 110.56793,76.035582 V 87.171894"
+         id="path1274" />
+    </g>
+    <g
+       id="g1094"
+       transform="matrix(0.69252803,0,0,0.69252803,64.199959,-23.47198)"
+       inkscape:export-xdpi="86"
+       inkscape:export-ydpi="86">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#1a1a1a;fill-rule:evenodd;stroke:none;stroke-width:0.33072916;stroke-miterlimit:10"
+         d="m 52.871002,87.166224 1.780249,-2.908035 1.600676,-2.028296 1.058069,-1.329372 1.69111,-1.848724 -0.202803,1.622637 -0.04498,1.262195 0.04498,1.126543 0.135665,0.811318 0.202804,0.609785 0.29329,0.833279 0.472811,0.901753 0.630449,0.992187 0.653732,0.990891 0.698924,0.789358 0.812614,1.1498 0.788062,1.036108 0.856535,1.57742 0.946971,-1.351333 -0.02315,1.148503 0.04498,1.1498 0.248047,1.555459 -0.112382,1.645893 -0.224764,1.262195 -0.586528,1.937862 -0.720884,1.30741 -1.127839,1.21698 -0.945674,0.74414 -1.600676,0.74414 -1.195017,0.29197 -1.329373,0.0233 -0.879713,-0.0905 -1.17176,-0.40566 -1.059365,-0.54131 -0.923714,-0.85654 -0.901752,-1.05936 -0.744141,-1.01415 -0.811318,-1.758291 -0.45085,-1.577419 -0.291968,-1.644598 0.02183,-1.465024 0.09042,-1.645893 0.134343,-1.397847 v -2.095474 l -0.20287,-1.037404 -0.360415,-1.036109 -0.586528,-1.015444 0.811318,0.248047 1.308708,0.541311 z"
+         id="path1276" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#808080;fill-rule:evenodd;stroke:none;stroke-width:0.33072916;stroke-miterlimit:10"
+         d="m 52.206898,87.904412 0.906938,0.862991 0.817774,0.905616 0.658866,0.819071 0.671777,1.023196 0.277759,0.569728 0.218348,-0.307473 0.131762,-0.671803 0.105966,-1.338422 -0.0762,-1.99472 0.164108,-1.952069 0.755756,-1.773793 0.789358,-1.257036 0.555492,-0.877199 -0.291967,0.847487 0.117541,2.265997 0.236405,1.028356 0.377243,0.812615 2.557991,4.501092 0.422487,0.99478 0.177006,0.979276 0.05821,1.037405 0.07236,0.715724 0.102063,0.701516 0.145984,0.481886 0.453443,0.249335 h 0.571024 l 0.452173,-0.175696 0.251949,-0.330729 0.233826,-0.613675 0.145984,-0.905616 0.145983,0.817774 0.175684,1.140751 -0.117541,1.870684 -0.350097,1.753129 -0.701516,1.57872 -0.819071,0.8772 -1.19761,0.81777 -1.139455,0.61494 -0.99478,0.32039 -0.876035,0.0879 -0.731229,0.0297 -0.817774,-0.0879 -0.819071,-0.29197 -0.789358,-0.49739 -0.759645,-0.52581 -0.691171,-0.83846 -0.891408,-1.5503 -0.463814,-1.264788 -0.193808,-1.029653 -0.127926,-1.104582 -0.09174,-1.160145 0.02977,-1.037405 0.131762,-0.891434 0.189905,-1.008989 0.248047,-0.862991 0.307498,-0.993484 0.117541,-0.803566 -0.04498,-0.745437 -0.32168,-0.965068 z"
+         id="path1278" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#999999;fill-rule:evenodd;stroke:none;stroke-width:0.33072916;stroke-miterlimit:10"
+         d="m 56.686293,86.634412 1.331966,2.138098 1.061958,2.180748 0.719587,1.591628 0.664051,1.667854 0.643414,1.914604 0.379809,1.667854 0.113705,1.269947 -0.05689,0.985735 -0.170524,1.08003 -0.323004,0.73898 -0.39661,0.9289 -0.512895,0.60589 -0.586528,0.4173 -0.777716,0.36045 -0.829416,0.19636 -0.687282,-0.0633 -0.776446,-0.32298 -0.795814,-0.49223 -0.568457,-0.89144 -0.266118,-0.89011 -0.151143,-0.60719 -0.03903,-0.96636 0.01918,-1.136892 0.209285,-1.195017 0.549064,-1.364244 0.664051,-1.156256 0.795814,-1.591627 0.435372,-1.232482 0.151143,-0.9289 -0.07494,-1.174353 -0.189905,-1.687248 z"
+         id="path1280" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#cccccc;fill-rule:evenodd;stroke:none;stroke-width:0.33072916;stroke-miterlimit:10"
+         d="m 55.34221,99.569891 0.351367,-1.300957 0.496093,-1.136888 0.413412,-0.971523 0.496094,-1.033516 0.558059,-0.930169 0.688578,-0.92112 -0.213188,0.962475 v 0.950859 l 0.124023,0.826823 0.413412,0.578776 0.640821,0.847487 0.62013,0.930169 0.330729,0.785495 0.267441,0.949538 0.103386,0.70279 -0.04035,0.97152 -0.248047,0.72348 -0.516784,0.72347 -0.826823,0.68212 -0.62013,0.31007 -0.475404,0.10335 -0.578776,-0.10335 -0.682122,-0.39275 -0.558139,-0.70278 -0.372057,-0.82683 -0.351419,-1.09553 -0.144661,-0.7855 z"
+         id="path1282" />
+    </g>
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow2Mend)"
+       d="m 45.273344,42.05506 c 42.200828,0 42.200828,0 42.200828,0"
+       id="path1120"
+       inkscape:connector-curvature="0"
+       inkscape:export-xdpi="86"
+       inkscape:export-ydpi="86" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52777767px;line-height:125%;font-family:FreeSans;-inkscape-font-specification:'FreeSans, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.12027878px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="98.743988"
+       y="55.452103"
+       id="text935-1"
+       inkscape:export-xdpi="86"
+       inkscape:export-ydpi="86"><tspan
+         sodipodi:role="line"
+         id="tspan1629"
+         x="98.743988"
+         y="55.452103">Firewall</tspan></text>
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.19548066;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 104.76369,56.902758 c 0,7.618752 0,7.618752 0,7.618752"
+       id="path1118-5"
+       inkscape:connector-curvature="0"
+       inkscape:export-xdpi="86"
+       inkscape:export-ydpi="86" />
+    <g
+       transform="translate(-76.412239,129.29399)"
+       id="g3892">
+      <path
+         id="path2607"
+         style="fill:#e9e9e9;fill-opacity:1;fill-rule:evenodd;stroke:#3c2f00;stroke-width:0.10653654;stroke-opacity:1"
+         inkscape:connector-curvature="0"
+         d="m 167.60257,-92.346716 h 1.70309 l -1.77135,4.634154 -0.5807,-0.505812 -2.14512,5.611401 1.39758,-7.880188 0.59154,0.51727 z" />
+      <path
+         id="path2609"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccccc"
+         style="opacity:0.8;fill:url(#linearGradient1570);fill-rule:evenodd;stroke-width:0.10653654"
+         d="m 167.73258,-91.873643 1.01947,-0.02947 -1.34774,3.553778 -0.49295,-0.430513 -1.52975,4.092328 1.01189,-5.197257 0.50161,0.437061 z" />
+    </g>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52777767px;line-height:125%;font-family:FreeSans;-inkscape-font-specification:'FreeSans, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.12027878px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="17.751097"
+       y="56.835274"
+       id="text935"
+       inkscape:export-xdpi="86"
+       inkscape:export-ydpi="86"><tspan
+         style="stroke-width:0.12027878px"
+         sodipodi:role="line"
+         id="tspan989"
+         x="17.751097"
+         y="56.835274">Source Client</tspan><tspan
+         style="stroke-width:0.12027878px"
+         sodipodi:role="line"
+         id="tspan991"
+         x="17.751097"
+         y="61.244995">(Ásbrú-CM)</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52777767px;line-height:125%;font-family:FreeSans;-inkscape-font-specification:'FreeSans, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.12027878px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="145.42526"
+       y="57.548386"
+       id="text935-0"
+       inkscape:export-xdpi="86"
+       inkscape:export-ydpi="86"><tspan
+         style="stroke-width:0.12027878px"
+         sodipodi:role="line"
+         id="tspan993"
+         x="145.42526"
+         y="57.548386">Destination</tspan><tspan
+         style="stroke-width:0.12027878px"
+         sodipodi:role="line"
+         id="tspan995"
+         x="145.42526"
+         y="61.958107">Server</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.46944451px;line-height:125%;font-family:FreeSans;-inkscape-font-specification:'FreeSans, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:end;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.12027878px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="92.899925"
+       y="32.449352"
+       id="text935-0-0"
+       inkscape:export-xdpi="86"
+       inkscape:export-ydpi="86"><tspan
+         style="stroke-width:0.12027878px"
+         sodipodi:role="line"
+         id="tspan952"
+         x="92.899925"
+         y="32.449352">firewall blocks incoming</tspan><tspan
+         style="stroke-width:0.12027878px"
+         sodipodi:role="line"
+         id="tspan954"
+         x="92.899925"
+         y="35.53616">connection from client</tspan></text>
+  </g>
+</svg>
diff --git a/doc/Managing/images/jump-host-connection-settings.png b/doc/Managing/images/jump-host-connection-settings.png
new file mode 100644
index 00000000..f31ddc5b
Binary files /dev/null and b/doc/Managing/images/jump-host-connection-settings.png differ
diff --git a/doc/Managing/images/jump-host-manual.svg b/doc/Managing/images/jump-host-manual.svg
new file mode 100644
index 00000000..f80e5745
--- /dev/null
+++ b/doc/Managing/images/jump-host-manual.svg
@@ -0,0 +1,563 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="180mm"
+   height="45mm"
+   viewBox="0 0 180 45"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="jump-host.svg">
+  <defs
+     id="defs2">
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="marker3754"
+       style="overflow:visible;"
+       inkscape:isstock="true">
+      <path
+         id="path3752"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+         transform="scale(0.6) rotate(180) translate(0,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Send"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Send"
+       style="overflow:visible;"
+       inkscape:isstock="true">
+      <path
+         id="path2925"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         transform="scale(0.2) rotate(180) translate(6,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Send"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow2Send"
+       style="overflow:visible;"
+       inkscape:isstock="true">
+      <path
+         id="path2943"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+         transform="scale(0.3) rotate(180) translate(-2.3,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker3298"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path3296"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="scale(-0.6)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Mend"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path2937"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="scale(-0.6)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lend"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path1143"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lend"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path1125"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,-10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <linearGradient
+       inkscape:collect="always"
+       x1="208.62"
+       y1="119.72"
+       x2="208.62"
+       gradientUnits="userSpaceOnUse"
+       y2="163.8"
+       id="linearGradient1570"
+       gradientTransform="matrix(0.10833947,0,0,0.16369315,144.46451,-111.50045)">
+      <stop
+         offset="0"
+         style="stop-color:#281f00;stop-opacity:1"
+         id="stop9613" />
+      <stop
+         offset="1"
+         style="stop-color:#3f3f3f;stop-opacity:0"
+         id="stop9615" />
+    </linearGradient>
+    <marker
+       inkscape:stockid="Arrow2Lend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lend-8"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path1143-9"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lend-8-6"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path1143-9-8"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <linearGradient
+       id="2">
+      <stop
+         stop-color="#2e3436"
+         id="9" />
+      <stop
+         stop-opacity="0"
+         stop-color="#2e3436"
+         offset="1"
+         id="A" />
+    </linearGradient>
+    <linearGradient
+       id="3">
+      <stop
+         stop-color="#fff"
+         id="B" />
+      <stop
+         stop-opacity="0"
+         stop-color="#fff"
+         offset="1"
+         id="C" />
+    </linearGradient>
+    <linearGradient
+       id="4">
+      <stop
+         stop-opacity="0.8"
+         stop-color="#fff"
+         id="D" />
+      <stop
+         stop-opacity="0"
+         stop-color="#fff"
+         offset="1"
+         id="E" />
+    </linearGradient>
+    <radialGradient
+       gradientTransform="matrix(0.21708208,0,0,0.03549769,97.930273,-26.517959)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#2"
+       id="5"
+       r="12.228"
+       cy="46.616001"
+       cx="20.687" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#4"
+       id="6"
+       y2="44.23"
+       x2="0"
+       y1="4.5500002"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,96.755094,-36.803594)" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#3"
+       id="7"
+       y2="29.688"
+       x2="34.681"
+       y1="-12.905"
+       x1="18.389"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,96.755094,-36.803594)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.979899"
+     inkscape:cx="209.80108"
+     inkscape:cy="44.191071"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="2560"
+     inkscape:window-height="1412"
+     inkscape:window-x="0"
+     inkscape:window-y="28"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5">
+    <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 />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-55.302032,103.42247)">
+    <path
+       id="path863"
+       d="m 62.105052,-78.206862 q -0.911416,0 -1.560455,-0.649039 -0.649038,-0.649039 -0.649038,-1.560459 v -9.721778 q 0,-0.911417 0.649038,-1.560455 0.649039,-0.649039 1.560455,-0.649039 h 15.024574 q 0.91141,0 1.56045,0.649039 0.64904,0.649038 0.64904,1.560455 v 9.721778 q 0,0.91142 -0.64904,1.560459 -0.64904,0.649039 -1.56045,0.649039 z m -0.441898,-11.931276 v 9.721778 q 0,0.179522 0.131188,0.310714 0.131188,0.131189 0.31071,0.131189 h 15.024574 q 0.17951,0 0.31071,-0.131189 0.13119,-0.131192 0.13119,-0.310714 v -9.721778 q 0,-0.179522 -0.13119,-0.310711 -0.1312,-0.131188 -0.31071,-0.131188 H 62.105052 q -0.179522,0 -0.31071,0.131188 -0.131188,0.131189 -0.131188,0.310711 z m 19.001662,12.815072 h 2.20949 v 1.325699 q 0,0.552372 -0.64904,0.939035 -0.64904,0.386662 -1.56045,0.386662 H 58.56986 q -0.911419,0 -1.560458,-0.386662 -0.649036,-0.386663 -0.649036,-0.939035 v -1.325699 z m -9.94273,1.325699 q 0.22095,0 0.22095,-0.22095 0,-0.220949 -0.22095,-0.220949 h -2.2095 q -0.22095,0 -0.22095,0.220949 0,0.22095 0.22095,0.22095 z"
+       inkscape:connector-curvature="0"
+       style="stroke-width:0.01380934"
+       inkscape:export-xdpi="86"
+       inkscape:export-ydpi="86" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52777767px;line-height:125%;font-family:FreeSans;-inkscape-font-specification:'FreeSans, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.12027877px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="59.238312"
+       y="-68.321594"
+       id="text935"
+       inkscape:export-xdpi="86"
+       inkscape:export-ydpi="86"><tspan
+         sodipodi:role="line"
+         id="tspan989"
+         x="59.238312"
+         y="-68.321594">Source Client</tspan><tspan
+         sodipodi:role="line"
+         id="tspan991"
+         x="59.238312"
+         y="-63.911873">(Ásbrú-CM)</tspan></text>
+    <path
+       id="path922"
+       d="m 208.74436,-71.135332 h 15.38766 v -1.923451 h -15.38766 z m 0,-7.693829 h 15.38766 v -1.923459 h -15.38766 z m 23.56235,6.732103 q 0,-0.601083 -0.42075,-1.021838 -0.42076,-0.420754 -1.02184,-0.420754 -0.60108,0 -1.02184,0.420754 -0.42075,0.420755 -0.42075,1.021838 0,0.601075 0.42075,1.021838 0.42076,0.420755 1.02184,0.420755 0.60108,0 1.02184,-0.420755 0.42075,-0.420763 0.42075,-1.021838 z m -23.56235,-14.425931 h 15.38766 v -1.92345 h -15.38766 z m 23.56235,6.732103 q 0,-0.601084 -0.42075,-1.021838 -0.42076,-0.420755 -1.02184,-0.420755 -0.60108,0 -1.02184,0.420755 -0.42075,0.420754 -0.42075,1.021838 0,0.601075 0.42075,1.021838 0.42076,0.420754 1.02184,0.420754 0.60108,0 1.02184,-0.420754 0.42075,-0.420763 0.42075,-1.021838 z m 0,-7.693828 q 0,-0.601084 -0.42075,-1.021838 -0.42076,-0.420754 -1.02184,-0.420754 -0.60108,0 -1.02184,0.420754 -0.42075,0.420754 -0.42075,1.021838 0,0.601075 0.42075,1.021838 0.42076,0.420754 1.02184,0.420754 0.60108,0 1.02184,-0.420754 0.42075,-0.420763 0.42075,-1.021838 z m 1.44259,12.502472 v 5.770369 h -26.9284 v -5.770369 z m 0,-7.693828 v 5.770368 h -26.9284 v -5.770368 z m 0,-7.693829 v 5.77037 h -26.9284 v -5.77037 z"
+       inkscape:connector-curvature="0"
+       style="stroke-width:0.01502701"
+       inkscape:export-xdpi="86"
+       inkscape:export-ydpi="86" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52777767px;line-height:125%;font-family:FreeSans;-inkscape-font-specification:'FreeSans, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.12027878px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="220.25002"
+       y="-63.902729"
+       id="text935-0"
+       inkscape:export-xdpi="86"
+       inkscape:export-ydpi="86"><tspan
+         sodipodi:role="line"
+         id="tspan993"
+         x="220.25002"
+         y="-63.902729">Destination</tspan><tspan
+         sodipodi:role="line"
+         id="tspan995"
+         x="220.25002"
+         y="-59.493008">Server</tspan></text>
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.18505192px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 179.40466,-103.33461 c 0,32.541629 0,32.541629 0,32.541629"
+       id="path1118"
+       inkscape:connector-curvature="0"
+       inkscape:export-xdpi="86"
+       inkscape:export-ydpi="86" />
+    <g
+       id="g1112"
+       transform="matrix(0.5924057,0,0,0.5924057,123.37433,-132.0647)"
+       inkscape:export-xdpi="86"
+       inkscape:export-ydpi="86">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:#080808;stroke-width:0.66145831;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+         d="m 82.926913,73.96654 h 12.82991 c 0.365601,0 0.661458,0.297127 0.661458,0.661458 v 5.110692 c 0,0.365601 -0.295857,0.661458 -0.661458,0.661458 h -12.82991 c -0.365602,0 -0.661459,-0.295857 -0.661459,-0.661458 v -5.110692 c 0,-0.364331 0.295857,-0.661458 0.661459,-0.661458"
+         id="path1244" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:#080808;stroke-width:0.66145831;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+         d="M 97.068892,73.977123 H 109.8988 c 0.3656,0 0.66146,0.295857 0.66146,0.661459 v 5.110691 c 0,0.364331 -0.29586,0.661459 -0.66146,0.661459 H 97.068892 c -0.365602,0 -0.661459,-0.297128 -0.661459,-0.661459 v -5.110691 c 0,-0.365602 0.295857,-0.661459 0.661459,-0.661459"
+         id="path1246" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:#080808;stroke-width:0.66145831;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+         d="m 76.015996,80.393269 h 12.82991 c 0.365602,0 0.661459,0.297127 0.661459,0.661458 v 5.110692 c 0,0.365601 -0.295857,0.661458 -0.661459,0.661458 h -12.82991 c -0.365601,0 -0.661458,-0.295857 -0.661458,-0.661458 v -5.110692 c 0,-0.364331 0.295857,-0.661458 0.661458,-0.661458"
+         id="path1248" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:#080808;stroke-width:0.66145831;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+         d="m 90.157975,80.403852 h 12.829915 c 0.3656,0 0.66145,0.295857 0.66145,0.661459 v 5.110691 c 0,0.364332 -0.29585,0.661459 -0.66145,0.661459 H 90.157975 c -0.365601,0 -0.661458,-0.297127 -0.661458,-0.661459 v -5.110691 c 0,-0.365602 0.295857,-0.661459 0.661458,-0.661459"
+         id="path1250" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:#080808;stroke-width:0.66145831;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+         d="m 82.913684,86.82529 h 12.82991 c 0.365601,0 0.661458,0.295857 0.661458,0.661458 v 5.109633 c 0,0.365602 -0.295857,0.661459 -0.661458,0.661459 h -12.82991 c -0.365602,0 -0.661459,-0.295857 -0.661459,-0.661459 v -5.109633 c 0,-0.365601 0.295857,-0.661458 0.661459,-0.661458"
+         id="path1252" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:#080808;stroke-width:0.66145831;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+         d="m 97.055663,86.833227 h 12.829907 c 0.3656,0 0.66146,0.295857 0.66146,0.661459 v 5.110691 c 0,0.365601 -0.29586,0.661459 -0.66146,0.661459 H 97.055663 c -0.365602,0 -0.661459,-0.295858 -0.661459,-0.661459 v -5.110691 c 0,-0.365602 0.295857,-0.661459 0.661459,-0.661459"
+         id="path1254" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:#080808;stroke-width:0.66145831;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+         d="m 76.015996,93.257311 h 12.82991 c 0.364332,0 0.661459,0.297127 0.661459,0.661458 v 5.110691 c 0,0.365602 -0.297127,0.661459 -0.661459,0.661459 h -12.82991 c -0.365601,0 -0.661458,-0.295857 -0.661458,-0.661459 v -5.110691 c 0,-0.364331 0.295857,-0.661458 0.661458,-0.661458"
+         id="path1256" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:#080808;stroke-width:0.66145831;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+         d="m 90.157975,93.267894 h 12.829915 c 0.3656,0 0.66145,0.295857 0.66145,0.661458 v 5.109633 c 0,0.365602 -0.29585,0.661459 -0.66145,0.661459 H 90.157975 c -0.365601,0 -0.661458,-0.295857 -0.661458,-0.661459 v -5.109633 c 0,-0.365601 0.295857,-0.661458 0.661458,-0.661458"
+         id="path1258" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:#080808;stroke-width:0.66145831;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+         d="m 104.37933,80.41179 h 5.5036 c 0.3656,0 0.66146,0.295857 0.66146,0.661458 v 5.109633 c 0,0.365602 -0.29586,0.661459 -0.66146,0.661459 h -5.5036 c -0.3656,0 -0.66146,-0.295857 -0.66146,-0.661459 v -5.109633 c 0,-0.365601 0.29586,-0.661458 0.66146,-0.661458"
+         id="path1260" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:#080808;stroke-width:0.66145831;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+         d="m 104.30789,93.259956 h 5.58377 c 0.3656,0 0.66146,0.295857 0.66146,0.661459 v 5.110691 c 0,0.364332 -0.29586,0.661459 -0.66146,0.661459 h -5.58377 c -0.3656,0 -0.66146,-0.297127 -0.66146,-0.661459 v -5.110691 c 0,-0.365602 0.29586,-0.661459 0.66146,-0.661459"
+         id="path1262" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:#080808;stroke-width:0.66145831;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+         d="m 76.000121,86.814706 h 5.583767 c 0.365601,0 0.661458,0.297128 0.661458,0.661459 v 5.110691 c 0,0.365602 -0.295857,0.661459 -0.661458,0.661459 h -5.583767 c -0.364331,0 -0.661458,-0.295857 -0.661458,-0.661459 v -5.110691 c 0,-0.364331 0.297127,-0.661459 0.661458,-0.661459"
+         id="path1264" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#cccccc;fill-opacity:1;stroke:#080808;stroke-width:0.66145831;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+         d="M 75.351892,83.666165 V 94.8038"
+         id="path1266" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#cccccc;fill-opacity:1;stroke:#080808;stroke-width:0.66145831;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+         d="M 106.15997,99.686685 83.529634,99.68404"
+         id="path1268" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#cccccc;fill-opacity:1;stroke:#080808;stroke-width:0.66145831;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+         d="M 101.68852,73.963894 91.51079,73.932872"
+         id="path1270" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#cccccc;fill-opacity:1;stroke:#080808;stroke-width:0.66145831;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+         d="M 110.53883,83.226957 V 94.363269"
+         id="path1272" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#cccccc;fill-opacity:1;stroke:#080808;stroke-width:0.66145831;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
+         d="M 110.56793,76.035582 V 87.171894"
+         id="path1274" />
+    </g>
+    <g
+       id="g3892">
+      <path
+         id="path2607"
+         style="fill:#e9e9e9;fill-opacity:1;fill-rule:evenodd;stroke:#3c2f00;stroke-width:0.10653654;stroke-opacity:1"
+         inkscape:connector-curvature="0"
+         d="m 167.60257,-92.346716 h 1.70309 l -1.77135,4.634154 -0.5807,-0.505812 -2.14512,5.611401 1.39758,-7.880188 0.59154,0.51727 z" />
+      <path
+         id="path2609"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccccc"
+         style="opacity:0.8;fill:url(#linearGradient1570);fill-rule:evenodd;stroke-width:0.10653654"
+         d="m 167.73258,-91.873643 1.01947,-0.02947 -1.34774,3.553778 -0.49295,-0.430513 -1.52975,4.092328 1.01189,-5.197257 0.50161,0.437061 z" />
+    </g>
+    <g
+       id="g1094"
+       transform="matrix(0.69252803,0,0,0.69252803,139.02469,-146.41596)"
+       inkscape:export-xdpi="86"
+       inkscape:export-ydpi="86">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#1a1a1a;fill-rule:evenodd;stroke:none;stroke-width:0.33072916;stroke-miterlimit:10"
+         d="m 52.871002,87.166224 1.780249,-2.908035 1.600676,-2.028296 1.058069,-1.329372 1.69111,-1.848724 -0.202803,1.622637 -0.04498,1.262195 0.04498,1.126543 0.135665,0.811318 0.202804,0.609785 0.29329,0.833279 0.472811,0.901753 0.630449,0.992187 0.653732,0.990891 0.698924,0.789358 0.812614,1.1498 0.788062,1.036108 0.856535,1.57742 0.946971,-1.351333 -0.02315,1.148503 0.04498,1.1498 0.248047,1.555459 -0.112382,1.645893 -0.224764,1.262195 -0.586528,1.937862 -0.720884,1.30741 -1.127839,1.21698 -0.945674,0.74414 -1.600676,0.74414 -1.195017,0.29197 -1.329373,0.0233 -0.879713,-0.0905 -1.17176,-0.40566 -1.059365,-0.54131 -0.923714,-0.85654 -0.901752,-1.05936 -0.744141,-1.01415 -0.811318,-1.758291 -0.45085,-1.577419 -0.291968,-1.644598 0.02183,-1.465024 0.09042,-1.645893 0.134343,-1.397847 v -2.095474 l -0.20287,-1.037404 -0.360415,-1.036109 -0.586528,-1.015444 0.811318,0.248047 1.308708,0.541311 z"
+         id="path1276" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#808080;fill-rule:evenodd;stroke:none;stroke-width:0.33072916;stroke-miterlimit:10"
+         d="m 52.206898,87.904412 0.906938,0.862991 0.817774,0.905616 0.658866,0.819071 0.671777,1.023196 0.277759,0.569728 0.218348,-0.307473 0.131762,-0.671803 0.105966,-1.338422 -0.0762,-1.99472 0.164108,-1.952069 0.755756,-1.773793 0.789358,-1.257036 0.555492,-0.877199 -0.291967,0.847487 0.117541,2.265997 0.236405,1.028356 0.377243,0.812615 2.557991,4.501092 0.422487,0.99478 0.177006,0.979276 0.05821,1.037405 0.07236,0.715724 0.102063,0.701516 0.145984,0.481886 0.453443,0.249335 h 0.571024 l 0.452173,-0.175696 0.251949,-0.330729 0.233826,-0.613675 0.145984,-0.905616 0.145983,0.817774 0.175684,1.140751 -0.117541,1.870684 -0.350097,1.753129 -0.701516,1.57872 -0.819071,0.8772 -1.19761,0.81777 -1.139455,0.61494 -0.99478,0.32039 -0.876035,0.0879 -0.731229,0.0297 -0.817774,-0.0879 -0.819071,-0.29197 -0.789358,-0.49739 -0.759645,-0.52581 -0.691171,-0.83846 -0.891408,-1.5503 -0.463814,-1.264788 -0.193808,-1.029653 -0.127926,-1.104582 -0.09174,-1.160145 0.02977,-1.037405 0.131762,-0.891434 0.189905,-1.008989 0.248047,-0.862991 0.307498,-0.993484 0.117541,-0.803566 -0.04498,-0.745437 -0.32168,-0.965068 z"
+         id="path1278" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#999999;fill-rule:evenodd;stroke:none;stroke-width:0.33072916;stroke-miterlimit:10"
+         d="m 56.686293,86.634412 1.331966,2.138098 1.061958,2.180748 0.719587,1.591628 0.664051,1.667854 0.643414,1.914604 0.379809,1.667854 0.113705,1.269947 -0.05689,0.985735 -0.170524,1.08003 -0.323004,0.73898 -0.39661,0.9289 -0.512895,0.60589 -0.586528,0.4173 -0.777716,0.36045 -0.829416,0.19636 -0.687282,-0.0633 -0.776446,-0.32298 -0.795814,-0.49223 -0.568457,-0.89144 -0.266118,-0.89011 -0.151143,-0.60719 -0.03903,-0.96636 0.01918,-1.136892 0.209285,-1.195017 0.549064,-1.364244 0.664051,-1.156256 0.795814,-1.591627 0.435372,-1.232482 0.151143,-0.9289 -0.07494,-1.174353 -0.189905,-1.687248 z"
+         id="path1280" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#cccccc;fill-rule:evenodd;stroke:none;stroke-width:0.33072916;stroke-miterlimit:10"
+         d="m 55.34221,99.569891 0.351367,-1.300957 0.496093,-1.136888 0.413412,-0.971523 0.496094,-1.033516 0.558059,-0.930169 0.688578,-0.92112 -0.213188,0.962475 v 0.950859 l 0.124023,0.826823 0.413412,0.578776 0.640821,0.847487 0.62013,0.930169 0.330729,0.785495 0.267441,0.949538 0.103386,0.70279 -0.04035,0.97152 -0.248047,0.72348 -0.516784,0.72347 -0.826823,0.68212 -0.62013,0.31007 -0.475404,0.10335 -0.578776,-0.10335 -0.682122,-0.39275 -0.558139,-0.70278 -0.372057,-0.82683 -0.351419,-1.09553 -0.144661,-0.7855 z"
+         id="path1282" />
+    </g>
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow2Mend)"
+       d="m 85.309429,-87.238926 c 79.496561,0 79.496561,0 79.496561,0"
+       id="path1120"
+       inkscape:connector-curvature="0"
+       inkscape:export-xdpi="86"
+       inkscape:export-ydpi="86" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.46944451px;line-height:125%;font-family:FreeSans;-inkscape-font-specification:'FreeSans, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:end;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.12027878px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="169.12152"
+       y="-96.669159"
+       id="text935-0-0"
+       inkscape:export-xdpi="86"
+       inkscape:export-ydpi="86"><tspan
+         sodipodi:role="line"
+         id="tspan952"
+         x="169.12152"
+         y="-96.669159">firewall blocks incoming</tspan><tspan
+         sodipodi:role="line"
+         id="tspan954"
+         x="169.12152"
+         y="-93.582352">connection from client</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52777767px;line-height:125%;font-family:FreeSans;-inkscape-font-specification:'FreeSans, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.12027878px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="173.5687"
+       y="-67.491882"
+       id="text935-1"
+       inkscape:export-xdpi="86"
+       inkscape:export-ydpi="86"><tspan
+         sodipodi:role="line"
+         id="tspan1629"
+         x="173.5687"
+         y="-67.491882">Firewall</tspan></text>
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.19548066;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 179.58842,-66.041224 c 0,7.618753 0,7.618753 0,7.618753"
+       id="path1118-5"
+       inkscape:connector-curvature="0"
+       inkscape:export-xdpi="86"
+       inkscape:export-ydpi="86" />
+    <path
+       id="path922-7"
+       d="m 115.13012,-71.243484 h 9.7507 v -1.218833 h -9.7507 z m 0,-4.875351 h 9.7507 v -1.218839 h -9.7507 z m 14.93076,4.265932 q 0,-0.380887 -0.26662,-0.64751 -0.26662,-0.266617 -0.64751,-0.266617 -0.38088,0 -0.64751,0.266617 -0.26661,0.266623 -0.26661,0.64751 0,0.380886 0.26661,0.647509 0.26663,0.266617 0.64751,0.266617 0.38089,0 0.64751,-0.266617 0.26662,-0.266623 0.26662,-0.647509 z m -14.93076,-9.141283 h 9.7507 v -1.218833 h -9.7507 z m 14.93076,4.265932 q 0,-0.380887 -0.26662,-0.647504 -0.26662,-0.266623 -0.64751,-0.266623 -0.38088,0 -0.64751,0.266623 -0.26661,0.266617 -0.26661,0.647504 0,0.380886 0.26661,0.647509 0.26663,0.266623 0.64751,0.266623 0.38089,0 0.64751,-0.266623 0.26662,-0.266623 0.26662,-0.647509 z m 0,-4.875351 q 0,-0.380887 -0.26662,-0.647504 -0.26662,-0.266623 -0.64751,-0.266623 -0.38088,0 -0.64751,0.266623 -0.26661,0.266617 -0.26661,0.647504 0,0.380886 0.26661,0.647509 0.26663,0.266623 0.64751,0.266623 0.38089,0 0.64751,-0.266623 0.26662,-0.266623 0.26662,-0.647509 z m 0.91413,7.922449 v 3.656512 h -17.06373 v -3.656512 z m 0,-4.875351 v 3.656512 h -17.06373 v -3.656512 z m 0,-4.875351 v 3.656512 h -17.06373 v -3.656512 z"
+       inkscape:connector-curvature="0"
+       style="stroke-width:0.00952217"
+       inkscape:export-xdpi="86"
+       inkscape:export-ydpi="86" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52777778px;line-height:125%;font-family:FreeSans;-inkscape-font-specification:'FreeSans, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.12027878px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+       x="122.41544"
+       y="-64.98278"
+       id="text935-0-7"
+       inkscape:export-xdpi="86"
+       inkscape:export-ydpi="86"><tspan
+         sodipodi:role="line"
+         id="tspan950">Jump Host</tspan></text>
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker3754)"
+       d="m 85.309429,-77.016117 c 23.883831,0 23.883831,0 23.883831,0"
+       id="path1120-3"
+       inkscape:connector-curvature="0"
+       inkscape:export-xdpi="86"
+       inkscape:export-ydpi="86" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker3298)"
+       d="m 134.3976,-76.799616 c 70.01071,0 70.01071,0 70.01071,0"
+       id="path1120-3-0"
+       inkscape:connector-curvature="0"
+       inkscape:export-xdpi="86"
+       inkscape:export-ydpi="86" />
+    <g
+       id="g3544"
+       transform="matrix(0.50523827,0,0,0.50523827,112.32059,-62.110068)">
+      <path
+         style="fill:#969696;fill-opacity:1;stroke:#2c2c2c;stroke-width:0.28072292;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         inkscape:connector-curvature="0"
+         d="m 106.64926,-35.747165 c -0.17026,-0.02951 -0.34668,0.04244 -0.44618,0.197462 l -4.23909,6.603622 -2.278099,-2.089566 c -0.206699,-0.13266 -0.480275,-0.07602 -0.612937,0.130674 l -1.180495,1.31319 c -0.132658,0.206697 -0.07256,0.480437 0.134135,0.613097 0,0 4.149946,3.950964 4.155196,3.954042 0.0484,0.03109 0.10016,0.04867 0.15325,0.05922 0.17341,0.03447 0.35828,-0.0351 0.45985,-0.193351 l 5.71696,-8.905803 c 0.13266,-0.206698 0.0726,-0.480437 -0.13413,-0.613098 l -1.56154,-1.006159 c -0.0517,-0.03317 -0.11017,-0.05349 -0.16692,-0.06333 z"
+         id="G" />
+      <path
+         style="opacity:0.8;fill:none;stroke:url(#6);stroke-width:0.28072292;stroke-linecap:round;stroke-linejoin:round"
+         inkscape:connector-curvature="0"
+         d="m 106.54468,-35.455873 c -0.0589,0.01815 -0.0974,0.07767 -0.1819,0.198438 l -2.14974,3.365169 -1.91823,2.960026 c -0.0199,0.01756 -0.0302,0.0411 -0.0413,0.06615 -0.0111,0.02505 -0.0253,0.04831 -0.0413,0.07441 -0.0322,0.05221 -0.0825,0.102978 -0.19844,0.124023 -0.081,0.0147 -0.12028,0.0087 -0.16537,-0.01654 -0.0451,-0.02528 -0.0896,-0.06949 -0.17363,-0.132292 l -2.009179,-1.835547 c -0.05594,-0.05187 -0.09702,-0.08944 -0.132292,-0.115755 -0.03527,-0.02632 -0.06759,-0.04003 -0.09922,-0.04134 -0.03163,-0.0013 -0.06091,0.01126 -0.09095,0.03307 -0.03004,0.02181 -0.06277,0.05181 -0.107487,0.09095 l -0.93431,1.016992 c -0.126025,0.117133 -0.183811,0.21911 -0.173633,0.322461 0.01018,0.10335 0.0842,0.1941 0.223242,0.297656 0,0 0.94113,0.897465 1.885159,1.794206 0.47201,0.44837 0.94363,0.895413 1.29811,1.231966 0.17724,0.168276 0.32628,0.306818 0.42995,0.405143 0.0518,0.04916 0.0961,0.08932 0.12402,0.115755 0.014,0.01322 0.0258,0.02618 0.0331,0.03307 0.004,0.0034 0.006,0.0065 0.008,0.0083 2.9e-4,2.5e-4 0.008,-1.1e-5 0.008,0 0.0214,0.01371 0.0235,0.02495 0.0496,0.04961 0.0261,0.02466 0.0676,0.06197 0.16537,0.14056 0.037,0.02976 0.0864,0.03392 0.12402,0.01654 0.0376,-0.01738 0.0674,-0.05124 0.0992,-0.09095 0.0635,-0.07942 0.11856,-0.183402 0.16536,-0.256315 l 5.49837,-8.54108 c 0.0312,-0.04862 0.0592,-0.09231 0.0744,-0.124024 0.0152,-0.03171 0.0232,-0.05494 0.0165,-0.08268 -0.007,-0.02774 -0.0303,-0.05207 -0.0579,-0.07441 -0.0276,-0.02234 -0.0586,-0.04304 -0.10749,-0.07441 -0.003,-4.92e-4 -0.006,-4.92e-4 -0.008,0 l -1.39733,-0.868164 c -0.0504,-0.03214 -0.082,-0.05883 -0.11575,-0.07441 -0.0337,-0.01558 -0.0689,-0.0259 -0.0992,-0.01654 z"
+         id="H" />
+      <path
+         style="opacity:0.8;fill:url(#7);stroke-width:0.28072292"
+         inkscape:connector-curvature="0"
+         d="m 106.53641,-35.612969 c -0.0884,0.01064 -0.16985,0.05736 -0.22324,0.14056 l -2.87735,4.473112 c 1.20091,-0.401494 2.40648,-0.74159 3.61322,-1.025261 l 1.35599,-2.116666 c 0.0946,-0.147357 0.0476,-0.335694 -0.0992,-0.429948 l -1.5627,-1.008724 c -0.0296,-0.01901 -0.0665,-0.02453 -0.11575,-0.03307 -0.0297,-0.0052 -0.0615,-0.0035 -0.0909,0 z m -7.168556,4.646745 c -0.07544,0.01609 -0.144283,0.0608 -0.190169,0.132291 -0.0024,0.0057 -0.0051,0.01122 -0.0083,0.01654 l -1.16582,1.298112 c -0.0016,0.0025 0.0016,0.0057 0,0.0083 -0.08836,0.146125 -0.0451,0.329058 0.09922,0.42168 0.0057,0.0024 0.01122,0.0051 0.01654,0.0083 0,0 0.131492,0.123606 0.14056,0.132292 0.798649,-0.357761 1.597074,-0.696988 2.397785,-1.016993 l -1.050064,-0.959114 c -0.0026,-0.0017 -0.0057,0.0016 -0.0083,0 -0.07404,-0.04492 -0.156073,-0.05743 -0.231511,-0.04134 z"
+         id="I" />
+    </g>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.46944451px;line-height:125%;font-family:FreeSans;-inkscape-font-specification:'FreeSans, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:end;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.12027878px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="164.41685"
+       y="-72.282089"
+       id="text935-0-0-4"
+       inkscape:export-xdpi="86"
+       inkscape:export-ydpi="86"><tspan
+         sodipodi:role="line"
+         id="tspan977"
+         x="164.41685"
+         y="-72.282089">firewall allows</tspan><tspan
+         sodipodi:role="line"
+         id="tspan979"
+         x="164.41685"
+         y="-69.195282">incoming connection</tspan><tspan
+         sodipodi:role="line"
+         id="tspan981"
+         x="164.41685"
+         y="-66.108475">from jump host</tspan></text>
+  </g>
+</svg>
diff --git a/doc/Managing/images/jump-host-network-settings.png b/doc/Managing/images/jump-host-network-settings.png
new file mode 100644
index 00000000..9b404b15
Binary files /dev/null and b/doc/Managing/images/jump-host-network-settings.png differ
diff --git a/doc/Managing/images/template1.png b/doc/Managing/images/template1.png
new file mode 100644
index 00000000..3499de11
Binary files /dev/null and b/doc/Managing/images/template1.png differ
diff --git a/doc/Managing/images/template2.png b/doc/Managing/images/template2.png
new file mode 100644
index 00000000..23dde64c
Binary files /dev/null and b/doc/Managing/images/template2.png differ
diff --git a/doc/Managing/images/template3.png b/doc/Managing/images/template3.png
new file mode 100644
index 00000000..4c8ffed1
Binary files /dev/null and b/doc/Managing/images/template3.png differ
diff --git a/doc/Managing/images/template4.png b/doc/Managing/images/template4.png
new file mode 100644
index 00000000..dfe71726
Binary files /dev/null and b/doc/Managing/images/template4.png differ
diff --git a/doc/Managing/images/template5.png b/doc/Managing/images/template5.png
new file mode 100644
index 00000000..aa20ca7a
Binary files /dev/null and b/doc/Managing/images/template5.png differ
diff --git a/doc/Manual/CommandLine.md b/doc/Manual/CommandLine.md
new file mode 100644
index 00000000..c81acd13
--- /dev/null
+++ b/doc/Manual/CommandLine.md
@@ -0,0 +1,114 @@
+# Command Line
+
+This section explains how to start Ásbrú from the command line and the available options.
+
+!!! tip "start from the command line"
+    Starting asbru-cm from the command line helps you to detect possible errors if the application:  crashes, freezed or behaves in un expected ways.
+
+    This messages will be help full at the time to report a bug.
+
+## asbru-cm
+
+To start execute : `./asbru-cm` or `perl asbru-cm`
+
+```
+Usage: asbru-cm [options]
+Options:
+	--help : show this message
+	--config-dir=path : absolute '/path' or relative 'path' to ~/.config/
+	--no-backup : do no create alternative config files as a backup (faster shutdown)
+	--start-shell : start a local terminal
+	--password=<pwd> : automatically logon with given password without prompting user
+	--start-uuid=<uuid>[:<cluster] : start connection in cluster (if given)
+	--edit-uuid=<uuid> : edit connection
+	--dump-uuid=<uuid> : dump data for given connection
+	--scripts : open scripts window
+	--start-script=<script> : start given script
+	--preferences : open global preferences dialog
+	--quick-conn : open the Quick Connect dialog on startup
+	--list-uuids : list existing connections/groups and their UUIDs
+	--no-splash : no splash screen on startup
+	--iconified : go to tray once started
+	--readonly : start in read only mode (no config changes allowed)
+	--verbose : display more debugging information
+
+See 'man asbru' for additional information.
+
+```
+
+## Options
+
+We will detail options that might need additional detail or have some useful uses.
+
+### --config-dir
+
+Let's you start asrbu-cm using a different configuration path.
+
+This path could be a shared directory or it can be used to creates tests etc.
+
+Path can be a relative or absolute path
+
++ __Relative paths__ to : `/home/user/.config`
++ __Absolute paths__ : Any path defined from root
+
+Example usage:
+
+Start asbru-cm with test connections
+
+`perl asbru-cm --config-dir=asbru.test`
+
+Will open or create a complete config directory in : `/home/user/.config/asbru.test`
+
+Start asru-cm with a set of completely new settings
+
+`perl asbru-cm --config-dir=/home/user/asbru.new`
+
+Will open or create a complete config directory in : `/home/user/asbru.new`
+
+### --start-shell
+
+Start asbru-cm and launch a shell after loading.
+
+### --password
+
+If you defined a lock password for asbru-cm, this option allows you to pass that password to asbru-cm so it does not asks for it.
+
+### --verbose
+
+Display more information to help debug an issue.
+
+## Execution example
+
+__Use default configuration__
+
+```
+perl asbru-cm
+
+INFO: Ásbrú Connection Manager 6.2.0 (asbru-cm) started with PID 2247
+INFO: Desktop environment detected : cinnamon
+INFO: Config directory is '/home/xxxx/.config/asbru'
+INFO: Used config file '/home/xxxx/.config/asbru/asbru.nfreeze'
+INFO: Virtual terminal emulator (VTE) version is 0.52
+INFO: Theme directory is '/home/xxxx/asbru-cm/res/themes/default'
+INFO: Using Gnome tray icon
+```
+
+__Use test configuration__
+
+```
+perl asbru-cm --verbose --config-dir=asbru.test
+
+INFO: Ásbrú Connection Manager 6.2.0 (asbru-cm) started with PID 4522
+INFO: Desktop environment detected : cinnamon
+INFO: Config directory is '/home/xxxx/.config/asbru.test'
+INFO: Used config file '/home/xxxx/.config/asbru.test/asbru.nfreeze'
+INFO: Virtual terminal emulator (VTE) version is 0.52
+       - has_bright = 1
+       - major_version = 0
+       - minor_version = 52
+       - vte_feed_binary = 1
+       - vte_feed_child = 0
+INFO: Theme directory is '/home/xxxx/asbru-cm/res/themes/asbru-color'
+INFO: Using Gnome tray icon
+
+```
diff --git a/doc/Manual/Connections/RDP.md b/doc/Manual/Connections/RDP.md
new file mode 100644
index 00000000..a090bcfd
--- /dev/null
+++ b/doc/Manual/Connections/RDP.md
@@ -0,0 +1,18 @@
+## Connection
+
+### Connection Details
+
++ __Method__ : For this case, we select
+    - freerdp
+    - rdesktop
+
+![](images/rdp1.png)
+
+## RDP Settings
+
+![](images/rdp4.png)
+
+!!! note
+    Looking for help to finish this
+
+
diff --git a/doc/Manual/Connections/SSH.md b/doc/Manual/Connections/SSH.md
new file mode 100644
index 00000000..a4ae6bc5
--- /dev/null
+++ b/doc/Manual/Connections/SSH.md
@@ -0,0 +1,202 @@
+# Common configuration options
+
+## Connection Details
+
+![](images/ssh1.png)
+
++ __Method__ : Select any of the selection methods available
++ __Host__ : The IP or Hostname of the machine we want to connect to.
++ __Port__ : Port number to use for this connection.
++ __Run with sudo__ : * Pending
++ __Use autossh__ : * Pending
++ __TAB/Window Title__ : The name will be assigned to this tab or window. (Useful for password managers, that use the window title to execute macros, or to identify each connection on the taskbar).
++ __Launch on start up__ : If this connection should be launched automatically each time Ásbrú starts for the first time.
++ __Reconnecton on disconnection__ : If there is a remote disconnection, reconnect automatically.
+
++ __Authentication__
+    - __KeePass button__ : If you have KeePass integration available, the button will be enabled. To see the use of this feature read [KeePass Integration](../Preferences/KeePassXC.md)
+
+    - __User / Password__ : Authenticate using the traditional logging sequence of typing a user and password.
+    - __Private Key__ : Use a public or private key to login into the remote server.
+        - Private Key : Select your private key, or leave black if you are going to use your public key.
+        - User / Passphrase : The user and passphrase that will be used to automate your login.
+    - __Manual__ : Do not automate login, let me do all the authentication sequence.
+
+!!! danger "Important information about passwords"
+    The password / passphrase fields can have 3 possible values.
+
+    + Password field
+        - Empty : During the login process you will be requested to type your password
+        - Value : The value saved in the field will be used as the password to automate your login.
+    + Passphrase field
+        - Empty : During the login process the passphrase will not be asked. It asumes your have configured a passwordless key.
+        - Value = `<<ASK_PASSS>>`: If you type this keyword, the Ásbrú will prompt for the passphrase when it detects that has been requested by the login process. This is useful if you do not want to store the passphrase in its configuration file.
+        - Value : Any other value will be stored in Ásbrú's configuration file. And it will be used to automate the login process.
+            - The value can be the password, or a KeePass mask (see below).
+
+    If you are aiming for the highest level of security and automation at the same time, you need to use [KeePass Integration](../Preferences/KeePassXC.md)
+
+## Advanced Parameters
+
+![](images/ssh2.png)
+
++ __Programmatically send a string__ : Send a specified regex expression every selected seconds to the terminal.
+    + _Idle Only_: Restart the timer (from `Every X seconds field`) each time the terminal is updated or focused., effectively preventing the string from being sent unless the terminal has been idle for the configured period.
++ __Prepend command__ : Add this command before the ssh command connection string.
++ __Start next script when connection is launched__ : * Pending
++ __Auto save session logs__ : Save session log at the end of the session. Select the location.
+    + _Log pattern name_: Define the pattern to name your session file.
+
+## Network Settings
+
+This networking options override the Global Networking options for this connection.
+
+![](images/ssh3.png)
+
++ __Use global proxy options__ : Use the globally predefined Networking options.
++ __Use direct connection__ : If you declared a Global Proxy and you do not need it for this connection.
++ __Use SOCKS proxy__ : Use a SOCKS proxy to exit the local network.
++ __Jump Server__ : Use a jump server to exit the local network, or connect to an internal machine behind a FireWall.
+
+### Socks Server
+
+![](images/ssh4.png)
+
+If your network administrator has added a SOCKS server to the network and grants you access to it, you will have to select and configure the SOCKS Proxy.
+
+### Jump Server
+
+![](images/ssh5.png)
+
+If you have SSH access to a remote machine in your network, that has access to the a local machine on the remote network. Then you can use this technique to access to an external machine behind a firewall, that has no public address.
+
+Rules for connections
+
++ Certificate is set
+    - Username is required
+    - Password will be used as a passphrase
++ Certificate is __not__ set
+    - User name and password will be used to login.
+    - They are not required will be asked during the login process if they are not set
+
+### Pseudo Jump Server
+
+![](images/js1.png)
+
+If you activate the checkbox __Pseudo jump server__.
+
+The connection __will not__ use the `-J` option from ssh. Instead, it will do the following actions:
+
++ SSH into the jump server
++ Send an SSH connection string based on your connection settings
+
+!!! important "Important for this to work"
+    Because the connection now is stablished in the __Jump Server__ any keys, hostnames, etc. Has to be available in the Jump server environment for the destination connection to take place.
+
+    So if you use a private key in your server, you need to provide the key in the destination server. And the path to that key has to be the connection.
+
+    Because the keys are selected locally in your computer, you need to have the same key and path in the destination server.
+
+    Or to easy the situation, create an entry in the on user ssh config file  `~/ssh/.config` with the corresponding paths to your key and the user name. And use the connection name as your Host name.
+
+## (Pre / Post) Exec
+
+This commands will be executed immediately __before__ (Pre) the connection is launched. And after (Post) the connection has been __closed__.
+
+![](images/ssh9.png)
+
+This commands are executed in the local computer, not on the remote terminal.
+
+You may add as many commands as needed.  When the option `Ask` is checked, Ásbrú will ask to confirm which command needs to be executed.  When the option `Default` is checked, the command will be proposed to be executed by default.  If both `Ask` and `Default` are unchecked, the command will never be executed.
+
+!!! danger "Important"
+    The terminal interaction and login will be frozen until the external application is finished. Or is demonized.
+
+**Variables**
+
+Variable [substitution](../Substitutions.md) can be used to create dynamic commands.
+
+**Example 1**
+
+Before launching the terminal start a __local__ apache server
+
+![](images/exec9.png)
+
+**Example 2**
+
+After closing the terminal, execute `pdfshufler`
+
+![](images/exec10.png)
+
+Pre exec is configured to ask, is waiting for you to execute an available command from the list.
+
+![](images/exec11.png)
+
+Application is launched and the terminal waits for the end of the execution.
+
+![](images/exec12.png)
+
+We exit the terminal, the terminal is closed and the post exec command is executed.
+
+![](images/exec13.png)
+
+!!! tip "Possible uses"
+    Launch : an IDE, a Database Client (DBeaver), start a local scripts that uploads or downloads files, etc.
+
+## Expect
+
+![](images/ssh7.png)
+
+You can create and execute a sequence of automated actions that will be executed during your login process.
+
++ __Expect__ : Regular expression that defines what pattern to wait from the terminal.
+    - __Timeout__ : How long to wait for the pattern and abort if it does not presents.
++ __Send__ : When the pattern has a match, send the next sequence of characters.
+    - __Return__ : Add a CR at the end of the string.
+    - __Hide__ : If the content of this box should be treated as a password field. Hide visual information for peering eyes.
++ __On MATCH / Fail__ : Execute the next Expect #number in case of MATCH or Fail.
++ __Delete__ : Remove the selected rule.
+
+!!! danger "Executed during the login process only"
+    This expect actions take place only during the login process.
+
+    It helps you to automate a login sequence and a continuous set of actions.
+
+    But they do not work after the complete login sequence ends.
+
+    Ásbrú is not constantly monitoring your typing, so as soon as the login process ends, and the last expect is executed, there will be no more expect detection an execution.
+
+!!! tip "More detailed information"
+    For a more detailed information on Expect read : [Introduction to Expect](../../Managing/Expect.md)
+
+## Remote Macros
+
+Remote Macros have the same principle as the [Global Remote Commands](../Preferences/RemoteCommands.md)
+
+!!! note
+    This commands will show on the popup menu for this connection only, and no others.
+
+## Local Macros
+
+Local Macros have the same principle as the [Global Local Commands](../Preferences/LocalCommands.md)
+
+!!! note
+    This commands will show on the popup menu for this connection only, and no others.
+
+## User Variables
+
+This have the same principle as the [Global Variables](../Preferences/GlobalVariables.md)
+
+!!! note
+    Will be available only for this particular connection.
+
+## Terminal Options
+
+You can override the Global Terminal Options and Look&Feel of any particular connection.
+
+Enable "Use these personal options"
+
+![](images/ssh8.png)
+
+!!! tip "Stand out a terminal"
+    Perhaps you want to add a dark red color to a terminal to note that you are connected to a production server and not to a testing server.
diff --git a/doc/Manual/Connections/SSH_Terminal.md b/doc/Manual/Connections/SSH_Terminal.md
new file mode 100644
index 00000000..f77ea485
--- /dev/null
+++ b/doc/Manual/Connections/SSH_Terminal.md
@@ -0,0 +1,159 @@
+# The SSH Terminal
+
+### Connection Details
+
+__Method__ : For this case we select __SSH__
+
+![](images/ssh1.png)
+
+
+## SSH Options Tab
+
+![](images/ssh6.png)
+
+Select any additional SSH options.
+
+### Local / Remote Port Forwarding
+
+Define your local or remote port forwarding rules.
+
+In the example image above, the connection opens 4 port forwards to access remote SQL Servers behind a Firewall.
+
+### Dynamic Socks Proxy
+
+*Pending
+
+### Advanced Options
+
+Write any sequence of additional SSH options.
+
+The command field allows you to right click and have access to known SSH options.
+
+
+## The login process
+
+If you have configured your connection to have full automation, the login sequence will not require any intervention on your part, and the login process will look as clean as this.
+
+![](images/ssht1.png)
+
+If you have configured your connection not to have a saved password, you will receive a popup window requesting you to type your password.
+
+![](images/ssht2.png)
+
+
+!!! note "Expired passwords and change password required"
+    In this cases you may see additional popup windows for each password requested: password, original password, new password, confirmation password.
+
+    If you have problems to complete an expired password process, because the expect regex do not work well for you.
+
+    + Edit the connection and set it to __Manual__
+    + Save
+    + Open the connection and complete the login sequence manually
+
+## Mouse Interaction
+
+Ásbrú uses the gnome vte library, and is a mouse driven terminal.
+
+### Copy / Paste
+
+We will begin explaining the concept of copy paste in the terminal, because is the one that confuses many users.
+
+When you are connected to a remote server, the remote application could request and process mouse events or not.
+
+If the remote application does not process any mouse events, then the local terminal processes this mouse events locally.
+
+To distinguish if the remote application is processing mouse events, look at the mouse pointer shape. When a remote program is not processing mouse events then the mouse pointer is a text caret.
+
+__No mouse processing__
+
+![](images/ssht3.png)
+
+__Mouse processing__
+
+The mouse pointer looks as your default pointer.
+
+![](images/ssht4.png)
+
+
+!!! tip "Local Clipboard"
+    A local selection creates copies to your __local clipboard__, not to the remote clipboard.
+
+    This will let you paste the text in some local application (text editor, IDE, etc.)
+
+#### Remote application does NOT process mouse events.
+
+__double click__ : The terminal will select a "word" on the "visible" text of the terminal. The characters used as a word are [a-Z_] plus any additional characters that you configured in rule described in the [Main options Advanced Tab : Select by word characters](../Preferences/MOAdvanced.md).
+
+![](images/ssht5.png)
+
+
+__triple click__ : The terminal will select the "visible" row of text of the terminal.
+
+![](images/ssht6.png)
+
+
+__Click and drag__ : The terminal will select the text from the start point of the mouse drag to the end point in a complete sequence, jumping lines and start from the beginning of the next new line.
+
+![](images/ssht10.png)
+
+__`<Shift + Ctrl>` + drag__ : Will create a square selection from the starting drag point to the end.
+
+![](images/ssht9.png)
+
+
+!!! tip "Copy / Paste"
+    As soon as you select the text and release the mouse, the selected text is copied to the clipboard without any further actions (no need to : `right-click > Copy`, `<crtl-c>`)
+
+    + To paste your text into another application `<Ctrl-V>`
+    + To paste text from your local clipboard into the terminal. `<Shift + Insert>` or `right clic > Paste`.
+        - You can imagine that the "Paste action", is similar to sending all the characters in the buffer to the terminal. So they will be sent with all the existing tabs, new line characters, etc.
+
+!!! danger "The terminal is a canvas"
+    The terminal has no knowledge of the remote application, so when selecting and copying, it selects the text that finds on the visible area, and treats it as a canvas (a paintable area).
+
+    Do not expect the terminal to know that there are : line numbers or drawing characters to ignore, it will copy all the text under the selection.
+
+#### Remote application does process mouse events.
+
+Depending on the remote application and connection speed, the selection process would look and feel different :
+
++ could be very slow
++ or the selection is shown after releasing the mouse
++ or the highlight is delayed.
+
+__Example of a remote double and triple click selection__
+
+![](images/ssht7.png)
+
+![](images/ssht8.png)
+
+
+!!! tip "Selected text"
+    When the selection and copy actions take place, they are located in the remote application clipboard, not on your local clipboard.
+
+    To be able to use the terminal actions described above. You will have to use the `Shift` key during your mouse operations to instruct the terminal "not to pass the mouse event to the remote program".
+
+### Common problems of copy paste text from terminal to local application
+
+__Copy / Paste from editor copies line numbers__
+
+![](images/ssht11.png)
+
+__Solution__
+
+Use the square selection technique, or hide the number panel in your editor before copying.
+
+![](images/ssht12.png)
+
+## Poppup Menu
+
+When you right click on the terminal or `<Shift> + right click` (if the remote application process mouse events)
+
+You will see a popup menu similar to the next image.
+
+![](images/ssht13.png)
+
+__Actions__
+
+* Pending
+
diff --git a/doc/Manual/Connections/images/exec10.png b/doc/Manual/Connections/images/exec10.png
new file mode 100644
index 00000000..b2b79009
Binary files /dev/null and b/doc/Manual/Connections/images/exec10.png differ
diff --git a/doc/Manual/Connections/images/exec11.png b/doc/Manual/Connections/images/exec11.png
new file mode 100644
index 00000000..e2056efb
Binary files /dev/null and b/doc/Manual/Connections/images/exec11.png differ
diff --git a/doc/Manual/Connections/images/exec12.png b/doc/Manual/Connections/images/exec12.png
new file mode 100644
index 00000000..31b96f21
Binary files /dev/null and b/doc/Manual/Connections/images/exec12.png differ
diff --git a/doc/Manual/Connections/images/exec13.png b/doc/Manual/Connections/images/exec13.png
new file mode 100644
index 00000000..a29bec49
Binary files /dev/null and b/doc/Manual/Connections/images/exec13.png differ
diff --git a/doc/Manual/Connections/images/exec9.png b/doc/Manual/Connections/images/exec9.png
new file mode 100644
index 00000000..062bc243
Binary files /dev/null and b/doc/Manual/Connections/images/exec9.png differ
diff --git a/doc/Manual/Connections/images/js1.png b/doc/Manual/Connections/images/js1.png
new file mode 100644
index 00000000..6bf82fb5
Binary files /dev/null and b/doc/Manual/Connections/images/js1.png differ
diff --git a/doc/Manual/Connections/images/rdp1.png b/doc/Manual/Connections/images/rdp1.png
new file mode 100644
index 00000000..6d1ab3e4
Binary files /dev/null and b/doc/Manual/Connections/images/rdp1.png differ
diff --git a/doc/Manual/Connections/images/rdp2.png b/doc/Manual/Connections/images/rdp2.png
new file mode 100644
index 00000000..44361cf9
Binary files /dev/null and b/doc/Manual/Connections/images/rdp2.png differ
diff --git a/doc/Manual/Connections/images/rdp3.png b/doc/Manual/Connections/images/rdp3.png
new file mode 100644
index 00000000..91f193ed
Binary files /dev/null and b/doc/Manual/Connections/images/rdp3.png differ
diff --git a/doc/Manual/Connections/images/rdp4.png b/doc/Manual/Connections/images/rdp4.png
new file mode 100644
index 00000000..93314896
Binary files /dev/null and b/doc/Manual/Connections/images/rdp4.png differ
diff --git a/doc/Manual/Connections/images/ssh1.png b/doc/Manual/Connections/images/ssh1.png
new file mode 100644
index 00000000..3c591e65
Binary files /dev/null and b/doc/Manual/Connections/images/ssh1.png differ
diff --git a/doc/Manual/Connections/images/ssh2.png b/doc/Manual/Connections/images/ssh2.png
new file mode 100644
index 00000000..5e85732b
Binary files /dev/null and b/doc/Manual/Connections/images/ssh2.png differ
diff --git a/doc/Manual/Connections/images/ssh3.png b/doc/Manual/Connections/images/ssh3.png
new file mode 100644
index 00000000..42c858a0
Binary files /dev/null and b/doc/Manual/Connections/images/ssh3.png differ
diff --git a/doc/Manual/Connections/images/ssh4.png b/doc/Manual/Connections/images/ssh4.png
new file mode 100644
index 00000000..71214603
Binary files /dev/null and b/doc/Manual/Connections/images/ssh4.png differ
diff --git a/doc/Manual/Connections/images/ssh5.png b/doc/Manual/Connections/images/ssh5.png
new file mode 100644
index 00000000..63d4dbd9
Binary files /dev/null and b/doc/Manual/Connections/images/ssh5.png differ
diff --git a/doc/Manual/Connections/images/ssh6.png b/doc/Manual/Connections/images/ssh6.png
new file mode 100644
index 00000000..9dc50c0d
Binary files /dev/null and b/doc/Manual/Connections/images/ssh6.png differ
diff --git a/doc/Manual/Connections/images/ssh7.png b/doc/Manual/Connections/images/ssh7.png
new file mode 100644
index 00000000..9d18e871
Binary files /dev/null and b/doc/Manual/Connections/images/ssh7.png differ
diff --git a/doc/Manual/Connections/images/ssh8.png b/doc/Manual/Connections/images/ssh8.png
new file mode 100644
index 00000000..347e7afd
Binary files /dev/null and b/doc/Manual/Connections/images/ssh8.png differ
diff --git a/doc/Manual/Connections/images/ssh9.png b/doc/Manual/Connections/images/ssh9.png
new file mode 100644
index 00000000..54e5e6a7
Binary files /dev/null and b/doc/Manual/Connections/images/ssh9.png differ
diff --git a/doc/Manual/Connections/images/ssht1.png b/doc/Manual/Connections/images/ssht1.png
new file mode 100644
index 00000000..2345294b
Binary files /dev/null and b/doc/Manual/Connections/images/ssht1.png differ
diff --git a/doc/Manual/Connections/images/ssht10.png b/doc/Manual/Connections/images/ssht10.png
new file mode 100644
index 00000000..0913820d
Binary files /dev/null and b/doc/Manual/Connections/images/ssht10.png differ
diff --git a/doc/Manual/Connections/images/ssht11.png b/doc/Manual/Connections/images/ssht11.png
new file mode 100644
index 00000000..60a43eb3
Binary files /dev/null and b/doc/Manual/Connections/images/ssht11.png differ
diff --git a/doc/Manual/Connections/images/ssht12.png b/doc/Manual/Connections/images/ssht12.png
new file mode 100644
index 00000000..5bab627f
Binary files /dev/null and b/doc/Manual/Connections/images/ssht12.png differ
diff --git a/doc/Manual/Connections/images/ssht13.png b/doc/Manual/Connections/images/ssht13.png
new file mode 100644
index 00000000..00aa6fdb
Binary files /dev/null and b/doc/Manual/Connections/images/ssht13.png differ
diff --git a/doc/Manual/Connections/images/ssht2.png b/doc/Manual/Connections/images/ssht2.png
new file mode 100644
index 00000000..45d382bf
Binary files /dev/null and b/doc/Manual/Connections/images/ssht2.png differ
diff --git a/doc/Manual/Connections/images/ssht3.png b/doc/Manual/Connections/images/ssht3.png
new file mode 100644
index 00000000..09582ffa
Binary files /dev/null and b/doc/Manual/Connections/images/ssht3.png differ
diff --git a/doc/Manual/Connections/images/ssht4.png b/doc/Manual/Connections/images/ssht4.png
new file mode 100644
index 00000000..f06d9bea
Binary files /dev/null and b/doc/Manual/Connections/images/ssht4.png differ
diff --git a/doc/Manual/Connections/images/ssht5.png b/doc/Manual/Connections/images/ssht5.png
new file mode 100644
index 00000000..94b91db4
Binary files /dev/null and b/doc/Manual/Connections/images/ssht5.png differ
diff --git a/doc/Manual/Connections/images/ssht6.png b/doc/Manual/Connections/images/ssht6.png
new file mode 100644
index 00000000..6b4e1a27
Binary files /dev/null and b/doc/Manual/Connections/images/ssht6.png differ
diff --git a/doc/Manual/Connections/images/ssht7.png b/doc/Manual/Connections/images/ssht7.png
new file mode 100644
index 00000000..507a19ef
Binary files /dev/null and b/doc/Manual/Connections/images/ssht7.png differ
diff --git a/doc/Manual/Connections/images/ssht8.png b/doc/Manual/Connections/images/ssht8.png
new file mode 100644
index 00000000..c57b74b8
Binary files /dev/null and b/doc/Manual/Connections/images/ssht8.png differ
diff --git a/doc/Manual/Connections/images/ssht9.png b/doc/Manual/Connections/images/ssht9.png
new file mode 100644
index 00000000..baa1b2aa
Binary files /dev/null and b/doc/Manual/Connections/images/ssht9.png differ
diff --git a/doc/Manual/Preferences/GlobalVariables.md b/doc/Manual/Preferences/GlobalVariables.md
new file mode 100644
index 00000000..7b998359
--- /dev/null
+++ b/doc/Manual/Preferences/GlobalVariables.md
@@ -0,0 +1,30 @@
+# Global Variables
+
+![](images/gv1.png)
+
+Global variables, allows you to define variable names and assign them a value.
+
+That variable can be latter used in any:
+
++ Local Commands
++ Global Commands
++ Expect definitions
+
+To add a new entry click on the "Add" Button.
+
+## Fields
+
++ __Variable__ : The name you want to assign to you variable.
++ __Value__ : The value of your variable. It can be any text.
++ __Hide__ : If this entry should be masked with the password character so its not visible displayed when editing this section.
++ __Delete__ button : Remove the selected variable from the list.
+
+To use a variable use the pattern : <GV:variable_name>
+
+For example, using the above image, you could create a command similar to this one:
+
+`ls -l <GV:MyDocs>`
+
+And assign it to a local, remote command or expect.
+
+
diff --git a/doc/Manual/Preferences/KeePassXC.md b/doc/Manual/Preferences/KeePassXC.md
new file mode 100644
index 00000000..c00ff83e
--- /dev/null
+++ b/doc/Manual/Preferences/KeePassXC.md
@@ -0,0 +1,182 @@
+## KeePass Integration
+
+!!! danger "Important"
+    This documentation corresponds to Ásbrú 6.2+
+
+    __This new integration breaks compatibility with stored users and passwords of previous Ásbrú versions__.
+    Which means you will have to reconfigure the usernames and passwords fields. Or run a helper migration application if available.
+
+    The current integration uses `keepassxc-cli` to access the database, [https://keepassxc.org/](https://keepassxc.org/).
+
+    To see the reasons for this hard changes, please read at the end of this documentation page.
+
+## KeePass Organization
+
+It is very important to prepare your KeePass database to work with this integration. The database access is done using the command line tool `keepassxc-cli`
+
+And by design this tool imposes certain restrictions.
+
+* All paths must be unique to be able to retrieve the correct user name and password at the time of the connection
+* The cli will not allow to search by `uuid`, so the only search pattern that guaranties unique entries is the full path to the key
+
+This means that you must organize your data in groups and subgroups to guaranty unique paths at the time of configuration.
+
+To explain this better, lets look at the following images.
+
+__You have this password organization__
+
+In keepass, you can visually tell what is the entry you are interested in, by looking at the relationship of Group:Title:Username
+
+![](images/kpxcc1.png)
+
+But when using the CLI, we only have access to Group:Title, and a listing of entries would look like this.
+
+![](images/kpxcc2.png)
+
+This brings 2 problems
+
+* We do not know which entry we want.
+* Later when Ásbrú wants to pull the user name and password during a connection, keepassxc-cli will pull the first entry found, it will not return all the entries. So the CLI will not know which entry we want either.
+
+__So, you must make sure all your entries are unique : Group:Subgroup:..:Title__
+
+You can use any technique you like, this are some recommendations of organizations that can produce unique paths.
+
+* /Group/hostname
+* /Group/Subgroup/hostname
+* /Group/Service/hostname
+* /Group/Location/hostname
+
+
+__Example of unique titles__
+
+![](images/kpxcc3.png)
+
+
+__Search result.__
+
+![](images/kpxcc4.png)
+
+__Another alternative, with subgroups__
+
+![](images/kpxcc5.png)
+
+__List__
+
+![](images/kpxcc6.png)
+
+## Configure
+
+![](images/kpxc1.png)
+
++ __Activate use of KeePass database file__ : Activate KeePass functionality.
++ __Database file__ : Select the location of your database.
++ __Master Password__ : This field is optional.
+    - If provided, the password will be stored in the `asbry.yml` file for convenience so you do not need to type it.
+    - If left blank. Ásbrú will ask for the password the first time is needed, and then retain in memory for the remaining of the Ásbrú session.
++ __Key file__ : If your version of keypassxc-cli supports it, and you have configured your database to use a keyfile, then selected here.
++ __keepassxc-cli binary__ : you can choose a different `keepassxc-cli` binary to use. In case you have installed for your user only or want to use a different version available in your system.
+    - On every change the application will validate the existence and capabilities of the selected version.
++ __Clear buttons__ : Remove any previously selected file.
++ __Info__ : Ásbrú, will show the current keepassxc-cli version and the capabilities detected in your current version.
+    - If no keepassxc-cli detected, install keepassxc package to have it available.
+    - If some capabilities are not present, it means you may have to upgrade your keepassxc version.
+
+## How to use
+
+### Enter Master Password
+
+If you decided not to save the Master Password, when access to the database is needed you will see a prompt similar to this one.
+
+![](images/kpxc2.png)
+
+Type your password and clic on "Accept". If the application can not unlock the database will prompt again.
+
+You can type cancel if you do not want to unlock the database, or the password you are entering is not working.
+
+### Assign a user name and password to a connection.
+
+![](images/kpxc3.png)
+
+Click on the "KeyPass" icon to open the KeePassXC search, this window will allow you to search keepass entries and list the results.
+
+Locate the entry you want to use as a reference and then double click on that entry.
+
+After the double click the link to your username and password will be assigned to the active authentication method selected in the configuration tab.
+
+![](images/kpxc4.png)
+
+
+!!! tip "Recommendations"
+    __KeyPass pattern__ : The pattern is formed as : `<keepass_property|keepass entry path>`. You can edit and change the text to any valid property and path if your need.
+
+    Current properties available from keepassxc-cli : username, password, title, url, notes
+
+    ![](images/kpxc5.png)
+
+    __I selected the wrong authentication method__ before selecting my keepass link. Simply copy paste the entries to your the correct fields, or change the method and select your entry again.
+
+## Assign URL, or other properties to other fields
+
+Some fields gives you access to keepass list search to add an entry to : expects, variables, local commands, etc.
+
+![](images/kpxc6.png)
+
+![](images/kpxc7.png)
+
+
+## Known restriction or limitations of the current model.
+
+This are known limitations of the current model.
+
++ The cli access will not allow to have an "unlocked" state.
+    - It could be accomplished by opening an interactive session.
+    - But this would introduce the need to replicate most of the logic in keepassxc-browser integration (create a service). Which is quite extensive, and in this case would make no sense to replicate existing work, would be better to implement the browser integration client.
+    - The `cli`, offers a very clean, easy and safe access that decouples Ásbrú from becoming a security target for command injections, etc.
++ The main impact is visible if you decide to setup a keepass database with version 4+ and add a very strong encryption. This will create a delay of up to 5 seconds to unlock the database on every connection.
+
+!!! note "Is your decision to balance the time to unlock and level of encryption"
+    If you are willing to wait the 5 seconds of unlock time for a connection then is OK, you decide.
+
+!!! note "Why don't you implement the browser integration?"
+
+    Perhaps in the future it could be possible. And the current implementation would be ready to do so.
+
+    But as of this date (2020-03-12), the Ásbrú project, is still recovering from the hard migration to gkt3 and there are many features and stability issues that need to be addressed.
+
+    This was the must balanced path to deliver a good integration and attend all other issues.
+
+## Why did you have to rewrite and brake compatibility?
+
+The functionality was completely rewritten to address several related requests and additional issues detected in the previous implementation.
+
+__Current Implementation__
+
++ Is no longer required to save the database Master Password inside Ásbrú configuration files.
+    - If password is not stored, it will ask for it when needed only once, and saved in memory for the current Ásbrú session.
++ User names and passwords are retrieved from database on the fly at the moment of connection.
+    - You can change your passwords in your database and in the next connection the new one will be used.
+    - No unencrypted passwords, users, database are retained in memory or files any more.
+    - User name and passwords are references now.
+    - KeePass Url entry, can be used as a reference to get the host to connect to.
+    - User has complete control over what Ásbrú should access and not.
++ User can migrate databases versions freely without any need to wait for Ásbrú to catch up.
++ Users can use a keyfile to unlock the database.
++ Linking keepass users and password to entry paths guaranties a 1 to 1 match.
++ Decouple Ásbrú from any responsibility to access the database directly, making it more secure for the end user.
+
+__Previous Implementation issues__
+
++ Would extract absolutely __all passwords even when they were not related to any connection__, pulling out any other information that a user could have stored like : bank accounts, credit card nips, etc.
+    - The full information, was completely cached inside Ásbrú.
+    - This also lead to the need to manually "Reload" the database when changes in keepass were made.
++ If hundreds of entries
+    - The full password list was located in a long popup submenu.
+    - Very difficult to follow and select.
+    - Slow database reload. Ásbrú would look as it freezed.
+    - Slow start ups.
++ Some entries could return more than one match and the user would be required to choose the correct one during logins.
++ The database was accessed directly with a library
+    - The library had to be maintained if the database encryption algorithms changed.
+    - Use of keyfile had to be implemented in the library to be able to use.
+
diff --git a/doc/Manual/Preferences/KeyBindings.md b/doc/Manual/Preferences/KeyBindings.md
new file mode 100644
index 00000000..1eca590d
--- /dev/null
+++ b/doc/Manual/Preferences/KeyBindings.md
@@ -0,0 +1,57 @@
+# Keybindings
+
+Select the __Keybindings tab__ to list the available actions and current keybindings set to each one.
+
+![](images/kb1.png)
+
++ Window : where the action will take place.
++ Action : What will be executed
++ Keybind : The key combination that will trigger the corresponding action.
+
+!!! important "Precedence"
+    The key bindings should not be repeated on different actions, to avoid conflicts when multiple windows are available simultaneously. 
+
+    For example users of the traditional mode have all windows available at the same time : Main Window, Tabs, Terminal, Connections list.
+
+    Gtk will use the following priority at the moment to test events
+    
+    1. Main Window
+    2. Tabs widget
+    3. Terminal
+   
+    If a key combination is processed in a window with precedence, the action will not be available for the window with less priority.
+
+    But key combinations in different windows is not restricted, because when working with detached window terminals there is no conflict with other windows.
+
+ 
+    
+## How to customize keybindings
+
++ Select a row
++ Type your new key combination, the Keybinding column will be updated.
+    - If you select a repeated combination in the same window, the action will be aborted and you will receive an error message. Unbind the offending key first.
+    + If the selected combination is repeated in a different window the application will warn but will not forbid it
++ Use the `Delete` or `Backspace` keys to remove a keybinding. This will disable that action to be triggered by any combination. Some of them will still be available from the popup menus.
+
+## List keybindings
+
+If you forget the available actions and what are the current keybindings associated.
+
+Right click on the terminal or Connection List, and select "Show Keybindings"
+
+![](images/kb2.png)
+
+This will show a message box with the current available keybindings.
+
+Any action that is disabled will not be shown.
+
+![](images/kb3.png)
+
+## Bind a key to Local or Remote Commands
+
+Create your command. Select the field with the placeholder that says "Set keybinding".
+
+Type your key combination.
+
+![](images/kb4.png)
+
diff --git a/doc/Manual/Preferences/LocalCommands.md b/doc/Manual/Preferences/LocalCommands.md
new file mode 100644
index 00000000..fab23325
--- /dev/null
+++ b/doc/Manual/Preferences/LocalCommands.md
@@ -0,0 +1,31 @@
+# Local Commands
+
+![](images/lc1.png)
+
+Local commands are instructions that will be executed in your local computer.
+
+They could be used to :
+
++ Open your favourite local text editor, web browser, etc.
++ Remove a temporary directory or file.
++ Open a location in your hard drive, etc.
+
+## Fields
+
++ __Confirm__ : If Ásbrú should prompt for a confirmation before executing this command. Useful if your command takes to much time or destroys information.
++ __Command__ : The command to be executed in your computer. The command can include a global variable.
++ __Description__ : The name to show in the popup menu.
+- __Set Keybinding__  : Click in the field and type a key combination to assign a hot key to your command. This hot key will be available in a terminal (version 6.3+) 
+
+## Execution
+
+In the image above we created a command that will open the local Text Editor `xed`.
+
+To access this commands we must have an open terminal and right click on it.
+
+![](images/lc2.png)
+
+After clicking on the remote command, the local text editor is shown.
+
+![](images/lc3.png)
+
diff --git a/doc/Manual/Preferences/LookAndFeel.md b/doc/Manual/Preferences/LookAndFeel.md
new file mode 100644
index 00000000..55323c66
--- /dev/null
+++ b/doc/Manual/Preferences/LookAndFeel.md
@@ -0,0 +1,53 @@
+## Options
+
+![](images/lf1.png)
+
++ __Start on__ : Select the tab you would like Ásbrú to start on when launching the application.
++ __Show screenshots__ : Present the thumbnails of existing screenshots.
++ __Show Statistics__ : If the statistics section should be presented in the main application interface.
++ __Always show Tray icon__ : Show tray icon even when the main application is open or just when has been hidden.
++ __Use Black & White icon__ : Useful for dark themes.
++ __Mouse selection copies to global clipboard__ : When selecting text in a terminal, the text will be copied to the global clipboard so it will be available to other applications for paste.
+
++ __Show connections tooltips__ : When you hover over your connections lists, will show a tooltip with the basic information for that connection.
++ __Show lines in connections tree__ : se images below
++ __Enable overlay scrolling for connections tree__ : will hide scroll bars when mouse is inside the connection tree only
++ __Show tree titles__ : When disabled, the tab titles for the different connection lists, will be hidden to compact the tabs interface (se images below).
+
+![](images/lf2.png)
+
+![](images/lf3.png)
+
++ __Font for__
+    - __Info TAB__ : Select the font and size you want to use in the Info Tab
+    - __Connection List__ : Select the font and size to use in the Connection List
++ __Color for__
+    - __Unprotected nodes__ : Select foreground or background color
+    - __Protected nodes__ : Select foreground or background color
+
+The correct selection of this colors, will allow you to configure the interface to handle dark or light themes, and decide what is it that you want to stand out: Protected nodes or Unprotected nodes.
+
+Examples
+
+__Protected nodes stand out by being green (Safe)__
+
+![](images/lf4-b.png)
+
+![](images/lf4-a.png)
+
+__Unproteceted nodes stand out by being red (Danger)__
+
+![](images/lf5-b.png)
+
+![](images/lf5-a.png)
+
++ __Put terminals in TABS in Main Window__
+    - __This settings are ignored in compact mode__
+    - Hide connection list on terminal open
+    - Auto hide button bar on terminal open
+    - Auto Hide/Show when entering connection list
+    - Show connections list on : Left or Right
+
+!!! note "Show connection list buttons"
+    When the auto hide options are set, you will be able to see the hidden list and buttons by selecting the "Info" tab.
+
diff --git a/doc/Manual/Preferences/MOAdvanced.md b/doc/Manual/Preferences/MOAdvanced.md
new file mode 100644
index 00000000..b931495d
--- /dev/null
+++ b/doc/Manual/Preferences/MOAdvanced.md
@@ -0,0 +1,61 @@
+# Advanced Options
+
+![](images/advs1.png)
+
+!!! note "Customize to your language"
+    Some of this options might need to be customized to work with your language, or more detections might be needed for multiple languages.
+
++ __PASSWORD prompt__ : Regular expression to identify your terminal password prompt.
++ __USERNAME prompt__ : Regular expression to identify your terminal username prompt.
++ __Command prompt__ : Regular expression to identify your terminal prompt.
++ __Remote host key changed__ : Regular expression to identify when a message of a conflicting known host was sent by the terminal.
++ __Select by word characters__ : List of characters that identify a "word". This is used when double clicking on the terminal. The selection will expand as long as any of the listed characters appears next to the doubleclick location. __Important, this is "not" a regular expression, is a simple list of characters__
++ __Host key verification string__ : Regular expression to identify when a message of a new known host was sent by the terminal.
++ __Press any key to continue__ : Regular expression to identify when a request to continue has been sent by the terminal.
++ __sudo password prompt__ : *pending
++ __sudo password__ : *pending
+
++ __When opening screenshots, use__
+    - The internal viewer
+    - And external viewer. You must the the path and name of the application.
+
+## Prompts (Password, Username, etc.)
+
+The original prompt command for detecting a password request could not work for some of your servers, depending on the : language settings, customized distribution prompt changes, etc.
+
+In this cases you may need to adjust your prompt regex.
+
+For example, the original prompt regex for password detections is:
+
+`([pP]ass|[pP]ass[wW]or[dt](\s+for\s+|\w+@\w+)*|[cC]ontrase.a|Enter passphrase for key '.+')\s*:\s*$`
+
+While this prompt work very will in general for english platforms, it has some minor issues in other latin languages where the grammar changes.
+
+In the above example, the expression expects that immediately after the "password" word detected e ":" should come up. Which is not true for spanish.
+
+```
+# Enlish prompt
+
+(current) UNIX Password:
+
+# Spanish prompt
+
+(actual) Contraseña de UNIX:
+```
+
+Below is a more general regular expression (but not complete)
+
+`(?mi)(pass(word|phrase)|contraseña).*?:\s*$`
+
+But this expression is limited to English and Spanish. You may need to edit the Spanish word _contraseña_ or add more words in different languages to the regular expression.
+
+For example:
+
+`(?mi)(pass(word|phrase)|contraseña|passwort).*?:\s*$`
+
+or
+
+`(?mi)(pass(wor[dt]|phrase)|contraseña).*?:\s*$`
+
+!!! tip "Recommended Password prompt"
+    `(?mi)(pass(word|phrase)|contraseña).*?:\s*$`
diff --git a/doc/Manual/Preferences/MainOptions.md b/doc/Manual/Preferences/MainOptions.md
new file mode 100644
index 00000000..1bbaf4ee
--- /dev/null
+++ b/doc/Manual/Preferences/MainOptions.md
@@ -0,0 +1,111 @@
+## Main Options
+
+![](images/pref1.png)
+
+## Main Window Layout
+
+Ásbrú offers two interface options to interact.
+
+__Traditional__
+
+This is the standard interface and is recommended for users that are "Tabs" driven users and like to have all options and interactions available in the same window.
+
+All sessions are launched in the same interface in separate Tabs.
+
+__Image example__
+
+![](images/pref2.png)
+
++ Recommended for users that
+    - Want to have all options accesible in a single interface
+    - Do not want to deal with moving, resizing and arranging windows
+
+__Compact__
+
+This mode is for "Windows", "Minimalist" driven users. The main window interface will be hidden in your system tray. And you will launch all sessions in separate windows, or inside a single window with tabs. You will have the minimum amount of buttons to interact with the application.
+
++ Recommended for users that
+    - Like having multiple windows and arranged them to have simultaneous multiple views, without size restrictions and overlapping
+    - Like to have the cleanest interface possible when working with your projects
+
+__Image examples__
+
+__Tabbed interface hidden__
+
+![](images/pref3.png)
+
+__Tabbed and interface shown__
+
+![](images/pref4.png)
+
+__Separate windows simultaneous views side by side__
+
+![](images/pref5.png)
+
+!!! danger "Important"
+    The Compact mode hides or disables certain options because they are incompatible with this operational mode.
+
+    Consider, for example, that opening the window interface "Maximized" makes no sense in a compact mode.
+
+    Recommended Settings for the Compact mode:
+
+    + __Some of this options will be preset to the most convenient setting and hidden from the interface__.
+    + Start minimized to system tray (Enable)
+    + Hide to tray instead of closing (Enable)
+    + Hide on connection (Enable)
+    + Automatically save on every configuration change (Enable)
+    + Put Terminal TABS in main window  (Disable)
+
+## Icons Theme
+
+Starting with Ásbru 6.2 the applications offers 4 themes for icons.
+
++ __default__ : Set of grey icons
++ __asbru-color__ : Set of color icons
++ __asbru-dark__ : Theme for system dark themes, with color icons
++ __system__ : Neutral theme with color icons. This options should have no conflicts with any system theme.
+
+![](images/pref6.png)
+
+![](images/pref7.png)
+
+## Actions at : Start, Exit, Tabs interaction
+
+### At start
+
++ __Maximized__ : Will open the main interface Maximized
++ __With last size__ : Will open the main interface with the last window size and position
++ __Iconified in system tray__ : Will start minimized to system tray
++ __Start at start up__ : Will add an entry to your start up applications configuration to launch Ásbrú on your session start.
+
+!!! warning "Window managers"
+    Some window related options could be overridden by the window manager.
+
+
+### At exit
+
++ __Hide to tray instead of closing__ : When clicking in the "Window close button", Ásbrú will hide to the system tray (if available) instead of closing the application.
++ __Confirm Exit__ : Will ask if you really want to close the application
++ __Auto save on exit__ : If there are any settings changes unsaved, will ask if you want to save them permanently before exit the application.
++ __Automatically save configurations on every change__ : This will save your configuration changes on every change you make to your settings.
+
+!!! danger "Important notes"
+    gnome-shell requires that a tray extension be installed to be able to show the icon on the tray.
+
+    If you do not install the extension, and activate "hide to tray on close", your will have no access to the main window anymore.
+
+    Ásrbú know about some of this extensions and will try to detect them. If they are not available, the close to tray icon option, will minimize the Window instead of hide it.
+
+    Check [System Tray Extensions for some recommendations](SytemTrayExtensions.md)
+    
+
+### Other options
+
++ __Select key bindings to disable from TABS Window__ : If you need your remote application to receive some of those key combinations, you will have to disable them from Ásbrú, so they can be passed to your remote application.
++ __Protect with Password__ : You can establish a password to have access to the application after launch or you have locked the interface.
++ __Force split TABS to 50%__ : When splitting a window inside a TAB, this will tell Ásbrú to always set them give half the with to both terminals.
++ __Hide on Connection__ : This option only has meaning when using a windows driven mode. What will do is hide the main interface to the system tray after launching your new terminal with your window
++ __Auto accept remove offending SSH keys__ : Will add, remove, replace your local ssh known hosts keys when they have changed on the remote server.
++ __Check port status at connect__ : Set a timeout and port reachability before trying to connect.
++ __Automatically append group names to new connection names__ : (recommended) when connecting Ásbrú will display a connection message in your terminal, if you use the same name on different connections, this will give you a better hint of where you have connected.
+
diff --git a/doc/Manual/Preferences/Networking.md b/doc/Manual/Preferences/Networking.md
new file mode 100644
index 00000000..ce2bfcd9
--- /dev/null
+++ b/doc/Manual/Preferences/Networking.md
@@ -0,0 +1,42 @@
+# Networking Options
+
+![](images/network1.png)
+
+If you are behind a firewall and have no direct access to the external network, you may need an intermediate machine to get outside of your network.
+
+There are 2 technologies that can help you connect to a machine outside your network.
+
+## SOCKS Proxy
+
+If your network administrator has added a SOCKS server to the network and grants you access to it, you will have to select and configure the SOCKS Proxy.
+
++ __IP/Host__ : Address of your SOCKS Server
++ __User / Password__ : Should be set if your administration assigns you one.
+
+## Jump Server
+
+If you have access to a local machine in your network, that has access to the outside. And you have ___SSH___ access to this machine. Then you can use this technique to access to an external machine.
+
+You need to have a public key installed in your __Jump Server__  to be able to use it as an intermediate machine to access the external network.
+
+It can be a default public key, or a personal private key that you were assigned.
+
+!!! note "Note about Keys"
+    At the moment, the keys have to be "passwordless", without password.
+
++ __IP/Host__ : Address of your Jump Server
++ __Port__ : Port to use to connect.
++ __User__ : User to log in
++ __Private Key__
+    - If you are assigned a private key, select the private key.
+    - If you leave it blank, that it will default to your public local key.
+
+!!! danger "Important"
+    When you activate any of this options, the default exit for all your connections will be using the selected technology.
+
+    There are two possible scenarios for your situation.
+
+    + __Most of your connections are local inside your network__ : In this case you should leave the "Do not use proxy" option as the default. And configure the proxy or jump server for at the connection level.
+    + __Most of your connections are outside your network__ : In this case select the technology that best fits your network.
+
+
diff --git a/doc/Manual/Preferences/Preferences.md b/doc/Manual/Preferences/Preferences.md
new file mode 100644
index 00000000..c065f472
--- /dev/null
+++ b/doc/Manual/Preferences/Preferences.md
@@ -0,0 +1,57 @@
+## Introduction
+
+The first thing that you would like to customize is the application so it fits better to your way to work.
+
+We'll begin by clicking in the "Preferences" button located at the bottom of the Standard Interface.
+
+!!! note " "
+
+    The first time you access the Preferences, will begin at : Main Options > Behaviour
+
+    Subsequent access will open on the last Section > Tab you were editing previously.
+
+The __Preferences__ window will be similar to the following image.
+
+![](images/pref1.png)
+
+## Lower Buttons
+
++ __Reset to DEFAULT values__ : Will reset all configuration settings to there original state
++ __Export config__ : Export configuration settings (explained below).
++ __Close without saving__ : Abort any changes made and do not apply
++ __Save and Close__ : Will save all current settings and close the window.
+
+!!! note "Restart Ásbru"
+    Some options requiere to close and open Ásrbú, they will be marked with an asterix (*)
+
+## Export Settings
+
+To export your configurations click on the button : "Export config ..."
+
+![](images/export1.png)
+
+This options offers 2 export options
+
+### Settings as yml
+
+Will let you create a copy of all your configurations, so it can be backed up or used in another computer.
+
+To use, copy the file to your config directory, located by default at: `/home/user/.config/asbru`
+
+### Anonymized data for DEBUG
+
+This creates a configuration file that cleans up all the sensitive information. Is requested and used by the Ásbrú Team to facilitate the solution of some bug report when we have problems trying to reproduce. Some bugs are related to the combination of settings and only can be reproduced all settings are known.
+
+When you select this option you will receive a warning similar to the next image, and the option to cancel the process.
+
+![](images/export2.png)
+
+!!! warning "Review the file"
+    The generated file can be reviewed with any text editor, just open the file and search or scroll the file to detect for any personal sensitive data that has remained and remove it.
+
+    __If you detect that some data was no properly anonymized, please open an issue at__: [asbru-cm/issues](https://github.com/asbru-cm/asbru-cm/issues)
+
+    Include in your report:
+    
+    + The line that was not anonymized (removing the sensitive data).
+    + An image of the configuration window where this data belongs.
diff --git a/doc/Manual/Preferences/RemoteCommands.md b/doc/Manual/Preferences/RemoteCommands.md
new file mode 100644
index 00000000..14662d3a
--- /dev/null
+++ b/doc/Manual/Preferences/RemoteCommands.md
@@ -0,0 +1,34 @@
+# Remote Commands
+
+![](images/rc1.png)
+
+Remote commands are similar to local commands, but they will be executed on the remote connection.
+
+To add a new remote command to the list, click on the "Add" Button.
+
+## Fields
+
++ __Confirm__ : If Ásbrú should launch a confirmation dialog before executing the command. This is useful if your command has instructions that could remove data.
++ __Command__ : The command to be executed. It can contain global variables in it.
++ __Send `<INTRO>` at the end__ : Will send or not a \n at the end of the command string. Uncheck if your command requires you to type some extra information before sending the `<Enter>` key.
++ __Description__ : The name that will be displayed in the pop up menu.
+    - Description has a pattern that you can use to group common commands. The patterns is `Group:Name` (version 6.2+)
+    - Descriptions with "no" group. Will be shown after all grouped commands.
+    - If you omit giving a Description to your command, the command will become the description.
+    - All commands are sorted alphabetically by Description.
+- __Set Keybinding__  : Click in the field and type a key combination to assign a hot key to your command. This hot key will be available in a terminal (version 6.3+) 
+
+## Execution
+
+Example of the generated list of commands when you right click on the terminal and hover over the "Remote Commands" entry.
+
+![](images/rc2.png)
+
+You will see all Bash commands grouped under the "Bash" group, followed by the "Git Commands" group and at the end you will see the list of all the commands that had no group.
+
+If we select and execute the "List all" command, that has a global variable assigned in it, the command will be executed in the terminal (on the remote server), as shown in the next 2 images.
+
+![](images/rc3.png)
+
+![](images/rc4.png)
+
diff --git a/doc/Manual/Preferences/ShellOptions.md b/doc/Manual/Preferences/ShellOptions.md
new file mode 100644
index 00000000..342bab77
--- /dev/null
+++ b/doc/Manual/Preferences/ShellOptions.md
@@ -0,0 +1,19 @@
+## Behaviour
+
+![](images/shell1.png)
+
++ __Start a shell on start up__ : Will open a local shell terminal when Ásbrú starts.
++ __Shell Binary__ : Path to your preferred shell (bash, zsh, fish).
++ __Shell options__ : any additional options to start your shell.
++ __Initial Directory__ : Path to your initial directory.
+
+!!! warning "Initial Directory"
+    The given path will not be expanded.  Consequently, a tilde (~) or `$HOME` will not be replaced by the home directory and shall not be used.
+
+## Look & Feel
+
+![](images/shell2.png)
+
+This Section holds terminal configurations specific for local shell terminals.
+
+Activating this option will overwrite the Global Options.
diff --git a/doc/Manual/Preferences/SytemTrayExtensions.md b/doc/Manual/Preferences/SytemTrayExtensions.md
new file mode 100644
index 00000000..da06c890
--- /dev/null
+++ b/doc/Manual/Preferences/SytemTrayExtensions.md
@@ -0,0 +1,17 @@
+# System Tray Extensions 
+
+__gnome-shell__ desktop environment removed the traditional system tray functionality in the desktop environment.
+
+To have a system tray back, is required that you install an extension that provides a system tray for your Linux Distribution.
+
+## Ubuntu
+
+Install [unite](https://extensions.gnome.org/extension/1287/unite/)
+
+## Centos
+
+`sudo dnf install gnome-shell-extension-top-icons`
+
++ Then open the Tweaks tool (press the Alt key and write "tweak" in the search field)
++ Enable __Top icnos__
+
diff --git a/doc/Manual/Preferences/TermAdvanced.md b/doc/Manual/Preferences/TermAdvanced.md
new file mode 100644
index 00000000..a26e916e
--- /dev/null
+++ b/doc/Manual/Preferences/TermAdvanced.md
@@ -0,0 +1,27 @@
+# Terminal Advanced Settings
+
+!!! note "Global Settings"
+    This options apply to all terminals. If you need a particular terminal to behave differently is best to configure the look and feel options at the connection level.
+
+![](images/to3.png)
+
++ __Character Encoding__ : Decode characters sent by the remote server before showing in the terminal.
+    - This options is used when connecting to old servers that have a regional encoding installation. Current servers should work with UTF-8 as a standard.
++ __Backspace__ : Select the backspace character to send.
++ __Expect DEBUG__ : Enable to see a full trace of the actions taken by the Expect module.
+    - The expect module reads and processes login lines received in the terminal to detect: login patterns, password request, etc.
++ __Hide Connections submenu__ : (Enable recommended) When you right click on the terminal, a popup menu will show several options available. Normally the menu will include a list of all current connections available will be listed too. If your connections tree is too big, the pop up menu will take several seconds to show.  
+
+![](images/to8.png)
+
+![](images/to9.png)
+
+!!! note "Access"
+    You can always access your connections from the connection tree, or right clicking on the system tray.
+
++ __Audible Bell__ : Produce a sound when the terminal wants to send a bell event. (Not available in all vte versions)
++ __Confirm chains selection / execution__ : * pending
++ __Skip first Chain expect__ : Ignore the first event sent by terminals, normally is an empty command sent to expect aware applications.
++ __Prevent F11 from going full screen__ : Disable F11 full screen option.
++ __Use login shell to start connections__ : This is not necessary in general. But it can be used if your terminals behave in an unexpected way for the lack of Environment variables available.
+
diff --git a/doc/Manual/Preferences/TermLookAndFeel.md b/doc/Manual/Preferences/TermLookAndFeel.md
new file mode 100644
index 00000000..a3de3719
--- /dev/null
+++ b/doc/Manual/Preferences/TermLookAndFeel.md
@@ -0,0 +1,73 @@
+# Look & Feel
+
+!!! note "Global Settings"
+    This options apply to all terminals. If you need a particular terminal to behave differently is best to configure the look and feel options at the connection level.
+
+
+![](images/to2.png)
+
++ __Start terminal maximized__ : If the new launched terminal window or tabbed window should be maximized.
++ __Show status bar on every terminal__ : Add extra information and buttons at the bottom of the termina.
++ __Change main window title with terminal title__ : Sets the main window (tabs window) title with the title from the selected terminal tab.
+
+!!! tip "Password Managers"
+    Changing the main window title with the current selected Tab, is useful with some password applications (like KeePassXC), that uses the main title window to execute auto typing sequences.
+
+Example of a terminal windows with a status bar.
+
+![](images/to5.png)
+
+
+Example of terminal window without the status bar.
+
+![](images/to4.png)
+
++ __Show MACROS__: Show access to local macros configured in a terminal
+    - __Never__ : Do not show configured macros.
+    - __In combobox__ : Show as a selection box, recommended when you have a long list.
+    - __As buttons__ : Recommended when you have a very short list of macros.
+    - __Show GLOBAL commands in terminal__ : Add the local and global commands to the list of available macros.
+
+Example macros as buttons
+
+![](images/to6.png)
+
+Example macros as list
+
+![](images/to7.png)
+
++ __Tabs__ : Define colors for tabs depending on their terminal current state. Set the position to locate the tabs.
+
++ __Terminal UI__
+    - __Text color__ : Default color for text.
+    - __Back color__ : Default background color for terminal.
+    - __Bold color__ : Default bold color
++ __Bold is__
+    - __Also bright__ : show bold text as bright text too. (Not available in all vterm versions)
+    - __Same as text__ : show bold text as normal default text, no distinction
++ __Font__ : Set the font and size for all terminals.
++ __Cursor shape__ : Cursor shape to use in the terminal.
++ __Scrollback lines__ : How many lines of history to store to scroll back.
++ __Transparency__ : Set background transparency for the terminal.
+    - You must enable transparency first to activate the transparency feature.
++ __Colors__ : Set your predefined colors to override the basic 16 terminal colors.
+    - Top row are the normal text colors.
+    - Bottom row are the bold text colors.
+
+!!! danger "Transparency"
+    Transparency __is not a feature__ , the transparency feature was removed from the Vte library.
+
+    And to provide the so desired __visual effect__, a __hack__ into the code had to be applied to make it work.
+
+    The conclusion is that it will consume more CPU resources. The reason is that the full window is made transparent, and the the visible areas that have to be visible, repainted.
+
+    Depending on your environment, the impact could be minimal or high.
+
+    There are too many things in an environment to list, but this are some of them:
+    
+    + screen resolution (the higher the resolution, more pixels to repaint)
+    + desktop environment performance : gnome-shell, gnome-classic, cinnamon, xfce, etc.
+    + Additional visual effects used in Ásbrú: show tooltips.
+    + Number of CPUs, amount of ram, graphics card, etc.
+
+    For a discussion about this you can check this thread: [Discussion about CPU usage](https://github.com/asbru-cm/asbru-cm/issues/533#issuecomment-607359378)
\ No newline at end of file
diff --git a/doc/Manual/Preferences/TermOptions.md b/doc/Manual/Preferences/TermOptions.md
new file mode 100644
index 00000000..96aa99ab
--- /dev/null
+++ b/doc/Manual/Preferences/TermOptions.md
@@ -0,0 +1,27 @@
+## Options
+
+!!! note "Global Settings"
+    This options apply to all terminals. If you need a particular terminal to behave differently is best to configure the look and feel options at the connection level.
+
+![](images/to1.png)
+
++ __Close terminal on disconnect__
+    - Enabled. The terminal will close immediately after : you type exit, a network error, disconnection from the server.
+    - Disabled. You will be asked if you really want to close the terminal.
++ __Auto unsplit disconnected terminals__ : Same concept as previous option but with slit terminal.
++ __Timeouts__
+    - __Time to connect__ : How many seconds to wait to establish new connection.
+    - __Expect CMD exec__ : Time to wait for an expect sequence to execute.
+
++ __Auto save Session logs__ : When __enabled__, will save a log the complete session in a file for __all__ established connections.
+    - __Save in__ : Location to save logs
+    - __Remove control characters__ : Will clean the logs from all terminal control characters. Just leave a clean text output.
+    - __Pattern for the filename__
++ __Open new connections on__
+    - __Tabs__
+        - Set the key combination to switch tabs.
+        - Set the action to perform when closing the last tab.
+    - __Windows__
+        - Set predefined Width and Height.
+
+
diff --git a/doc/Manual/Preferences/images/advs1.png b/doc/Manual/Preferences/images/advs1.png
new file mode 100644
index 00000000..3f413120
Binary files /dev/null and b/doc/Manual/Preferences/images/advs1.png differ
diff --git a/doc/Manual/Preferences/images/export1.png b/doc/Manual/Preferences/images/export1.png
new file mode 100644
index 00000000..e9b3c6be
Binary files /dev/null and b/doc/Manual/Preferences/images/export1.png differ
diff --git a/doc/Manual/Preferences/images/export2.png b/doc/Manual/Preferences/images/export2.png
new file mode 100644
index 00000000..053cd392
Binary files /dev/null and b/doc/Manual/Preferences/images/export2.png differ
diff --git a/doc/Manual/Preferences/images/gv1.png b/doc/Manual/Preferences/images/gv1.png
new file mode 100644
index 00000000..c4f22d07
Binary files /dev/null and b/doc/Manual/Preferences/images/gv1.png differ
diff --git a/doc/Manual/Preferences/images/kb1.png b/doc/Manual/Preferences/images/kb1.png
new file mode 100644
index 00000000..65866a6b
Binary files /dev/null and b/doc/Manual/Preferences/images/kb1.png differ
diff --git a/doc/Manual/Preferences/images/kb2.png b/doc/Manual/Preferences/images/kb2.png
new file mode 100644
index 00000000..a38441b3
Binary files /dev/null and b/doc/Manual/Preferences/images/kb2.png differ
diff --git a/doc/Manual/Preferences/images/kb3.png b/doc/Manual/Preferences/images/kb3.png
new file mode 100644
index 00000000..bd00634f
Binary files /dev/null and b/doc/Manual/Preferences/images/kb3.png differ
diff --git a/doc/Manual/Preferences/images/kb4.png b/doc/Manual/Preferences/images/kb4.png
new file mode 100644
index 00000000..d9ee2841
Binary files /dev/null and b/doc/Manual/Preferences/images/kb4.png differ
diff --git a/doc/Manual/Preferences/images/kpxc1.png b/doc/Manual/Preferences/images/kpxc1.png
new file mode 100644
index 00000000..5f77765e
Binary files /dev/null and b/doc/Manual/Preferences/images/kpxc1.png differ
diff --git a/doc/Manual/Preferences/images/kpxc2.png b/doc/Manual/Preferences/images/kpxc2.png
new file mode 100644
index 00000000..823a3f50
Binary files /dev/null and b/doc/Manual/Preferences/images/kpxc2.png differ
diff --git a/doc/Manual/Preferences/images/kpxc3.png b/doc/Manual/Preferences/images/kpxc3.png
new file mode 100644
index 00000000..ffd2ff0f
Binary files /dev/null and b/doc/Manual/Preferences/images/kpxc3.png differ
diff --git a/doc/Manual/Preferences/images/kpxc4.png b/doc/Manual/Preferences/images/kpxc4.png
new file mode 100644
index 00000000..2324d21a
Binary files /dev/null and b/doc/Manual/Preferences/images/kpxc4.png differ
diff --git a/doc/Manual/Preferences/images/kpxc5.png b/doc/Manual/Preferences/images/kpxc5.png
new file mode 100644
index 00000000..31c117d6
Binary files /dev/null and b/doc/Manual/Preferences/images/kpxc5.png differ
diff --git a/doc/Manual/Preferences/images/kpxc6.png b/doc/Manual/Preferences/images/kpxc6.png
new file mode 100644
index 00000000..2bb58a31
Binary files /dev/null and b/doc/Manual/Preferences/images/kpxc6.png differ
diff --git a/doc/Manual/Preferences/images/kpxc7.png b/doc/Manual/Preferences/images/kpxc7.png
new file mode 100644
index 00000000..9248c378
Binary files /dev/null and b/doc/Manual/Preferences/images/kpxc7.png differ
diff --git a/doc/Manual/Preferences/images/kpxcc1.png b/doc/Manual/Preferences/images/kpxcc1.png
new file mode 100644
index 00000000..6365a1f7
Binary files /dev/null and b/doc/Manual/Preferences/images/kpxcc1.png differ
diff --git a/doc/Manual/Preferences/images/kpxcc2.png b/doc/Manual/Preferences/images/kpxcc2.png
new file mode 100644
index 00000000..5b696cf7
Binary files /dev/null and b/doc/Manual/Preferences/images/kpxcc2.png differ
diff --git a/doc/Manual/Preferences/images/kpxcc3.png b/doc/Manual/Preferences/images/kpxcc3.png
new file mode 100644
index 00000000..3517985c
Binary files /dev/null and b/doc/Manual/Preferences/images/kpxcc3.png differ
diff --git a/doc/Manual/Preferences/images/kpxcc4.png b/doc/Manual/Preferences/images/kpxcc4.png
new file mode 100644
index 00000000..2a6fb8ed
Binary files /dev/null and b/doc/Manual/Preferences/images/kpxcc4.png differ
diff --git a/doc/Manual/Preferences/images/kpxcc5.png b/doc/Manual/Preferences/images/kpxcc5.png
new file mode 100644
index 00000000..412fb86d
Binary files /dev/null and b/doc/Manual/Preferences/images/kpxcc5.png differ
diff --git a/doc/Manual/Preferences/images/kpxcc6.png b/doc/Manual/Preferences/images/kpxcc6.png
new file mode 100644
index 00000000..28296e50
Binary files /dev/null and b/doc/Manual/Preferences/images/kpxcc6.png differ
diff --git a/doc/Manual/Preferences/images/lc1.png b/doc/Manual/Preferences/images/lc1.png
new file mode 100644
index 00000000..7d337fff
Binary files /dev/null and b/doc/Manual/Preferences/images/lc1.png differ
diff --git a/doc/Manual/Preferences/images/lc2.png b/doc/Manual/Preferences/images/lc2.png
new file mode 100644
index 00000000..4ada1733
Binary files /dev/null and b/doc/Manual/Preferences/images/lc2.png differ
diff --git a/doc/Manual/Preferences/images/lc3.png b/doc/Manual/Preferences/images/lc3.png
new file mode 100644
index 00000000..4c38b78a
Binary files /dev/null and b/doc/Manual/Preferences/images/lc3.png differ
diff --git a/doc/Manual/Preferences/images/lf1.png b/doc/Manual/Preferences/images/lf1.png
new file mode 100644
index 00000000..783cc174
Binary files /dev/null and b/doc/Manual/Preferences/images/lf1.png differ
diff --git a/doc/Manual/Preferences/images/lf2.png b/doc/Manual/Preferences/images/lf2.png
new file mode 100644
index 00000000..8c5a8c7f
Binary files /dev/null and b/doc/Manual/Preferences/images/lf2.png differ
diff --git a/doc/Manual/Preferences/images/lf3.png b/doc/Manual/Preferences/images/lf3.png
new file mode 100644
index 00000000..e2301769
Binary files /dev/null and b/doc/Manual/Preferences/images/lf3.png differ
diff --git a/doc/Manual/Preferences/images/lf4-a.png b/doc/Manual/Preferences/images/lf4-a.png
new file mode 100644
index 00000000..0077a47f
Binary files /dev/null and b/doc/Manual/Preferences/images/lf4-a.png differ
diff --git a/doc/Manual/Preferences/images/lf4-b.png b/doc/Manual/Preferences/images/lf4-b.png
new file mode 100644
index 00000000..4155333e
Binary files /dev/null and b/doc/Manual/Preferences/images/lf4-b.png differ
diff --git a/doc/Manual/Preferences/images/lf5-a.png b/doc/Manual/Preferences/images/lf5-a.png
new file mode 100644
index 00000000..4e4410b8
Binary files /dev/null and b/doc/Manual/Preferences/images/lf5-a.png differ
diff --git a/doc/Manual/Preferences/images/lf5-b.png b/doc/Manual/Preferences/images/lf5-b.png
new file mode 100644
index 00000000..b44c70b9
Binary files /dev/null and b/doc/Manual/Preferences/images/lf5-b.png differ
diff --git a/doc/Manual/Preferences/images/network1.png b/doc/Manual/Preferences/images/network1.png
new file mode 100644
index 00000000..3ad3c5c8
Binary files /dev/null and b/doc/Manual/Preferences/images/network1.png differ
diff --git a/doc/Manual/Preferences/images/pref1.png b/doc/Manual/Preferences/images/pref1.png
new file mode 100644
index 00000000..09dd24ba
Binary files /dev/null and b/doc/Manual/Preferences/images/pref1.png differ
diff --git a/doc/Manual/Preferences/images/pref2.png b/doc/Manual/Preferences/images/pref2.png
new file mode 100644
index 00000000..b5899e70
Binary files /dev/null and b/doc/Manual/Preferences/images/pref2.png differ
diff --git a/doc/Manual/Preferences/images/pref3.png b/doc/Manual/Preferences/images/pref3.png
new file mode 100644
index 00000000..dd6bda14
Binary files /dev/null and b/doc/Manual/Preferences/images/pref3.png differ
diff --git a/doc/Manual/Preferences/images/pref4.png b/doc/Manual/Preferences/images/pref4.png
new file mode 100644
index 00000000..87a464c7
Binary files /dev/null and b/doc/Manual/Preferences/images/pref4.png differ
diff --git a/doc/Manual/Preferences/images/pref5.png b/doc/Manual/Preferences/images/pref5.png
new file mode 100644
index 00000000..785e1282
Binary files /dev/null and b/doc/Manual/Preferences/images/pref5.png differ
diff --git a/doc/Manual/Preferences/images/pref6.png b/doc/Manual/Preferences/images/pref6.png
new file mode 100644
index 00000000..f35f9f19
Binary files /dev/null and b/doc/Manual/Preferences/images/pref6.png differ
diff --git a/doc/Manual/Preferences/images/pref7.png b/doc/Manual/Preferences/images/pref7.png
new file mode 100644
index 00000000..b4bb644a
Binary files /dev/null and b/doc/Manual/Preferences/images/pref7.png differ
diff --git a/doc/Manual/Preferences/images/rc1.png b/doc/Manual/Preferences/images/rc1.png
new file mode 100644
index 00000000..6f8bed57
Binary files /dev/null and b/doc/Manual/Preferences/images/rc1.png differ
diff --git a/doc/Manual/Preferences/images/rc2.png b/doc/Manual/Preferences/images/rc2.png
new file mode 100644
index 00000000..99292a4e
Binary files /dev/null and b/doc/Manual/Preferences/images/rc2.png differ
diff --git a/doc/Manual/Preferences/images/rc3.png b/doc/Manual/Preferences/images/rc3.png
new file mode 100644
index 00000000..9de3732a
Binary files /dev/null and b/doc/Manual/Preferences/images/rc3.png differ
diff --git a/doc/Manual/Preferences/images/rc4.png b/doc/Manual/Preferences/images/rc4.png
new file mode 100644
index 00000000..bb6c4429
Binary files /dev/null and b/doc/Manual/Preferences/images/rc4.png differ
diff --git a/doc/Manual/Preferences/images/shell1.png b/doc/Manual/Preferences/images/shell1.png
new file mode 100644
index 00000000..6444879b
Binary files /dev/null and b/doc/Manual/Preferences/images/shell1.png differ
diff --git a/doc/Manual/Preferences/images/shell2.png b/doc/Manual/Preferences/images/shell2.png
new file mode 100644
index 00000000..216c8c43
Binary files /dev/null and b/doc/Manual/Preferences/images/shell2.png differ
diff --git a/doc/Manual/Preferences/images/to1.png b/doc/Manual/Preferences/images/to1.png
new file mode 100644
index 00000000..56f87849
Binary files /dev/null and b/doc/Manual/Preferences/images/to1.png differ
diff --git a/doc/Manual/Preferences/images/to2.png b/doc/Manual/Preferences/images/to2.png
new file mode 100644
index 00000000..d4a00769
Binary files /dev/null and b/doc/Manual/Preferences/images/to2.png differ
diff --git a/doc/Manual/Preferences/images/to3.png b/doc/Manual/Preferences/images/to3.png
new file mode 100644
index 00000000..c32832d6
Binary files /dev/null and b/doc/Manual/Preferences/images/to3.png differ
diff --git a/doc/Manual/Preferences/images/to4.png b/doc/Manual/Preferences/images/to4.png
new file mode 100644
index 00000000..11ba1f60
Binary files /dev/null and b/doc/Manual/Preferences/images/to4.png differ
diff --git a/doc/Manual/Preferences/images/to5.png b/doc/Manual/Preferences/images/to5.png
new file mode 100644
index 00000000..7fc0a994
Binary files /dev/null and b/doc/Manual/Preferences/images/to5.png differ
diff --git a/doc/Manual/Preferences/images/to6.png b/doc/Manual/Preferences/images/to6.png
new file mode 100644
index 00000000..2a5472f0
Binary files /dev/null and b/doc/Manual/Preferences/images/to6.png differ
diff --git a/doc/Manual/Preferences/images/to7.png b/doc/Manual/Preferences/images/to7.png
new file mode 100644
index 00000000..c22280a9
Binary files /dev/null and b/doc/Manual/Preferences/images/to7.png differ
diff --git a/doc/Manual/Preferences/images/to8.png b/doc/Manual/Preferences/images/to8.png
new file mode 100644
index 00000000..ade3902e
Binary files /dev/null and b/doc/Manual/Preferences/images/to8.png differ
diff --git a/doc/Manual/Preferences/images/to9.png b/doc/Manual/Preferences/images/to9.png
new file mode 100644
index 00000000..38fd54d0
Binary files /dev/null and b/doc/Manual/Preferences/images/to9.png differ
diff --git a/doc/Manual/QuickStart.md b/doc/Manual/QuickStart.md
new file mode 100644
index 00000000..c5a97166
--- /dev/null
+++ b/doc/Manual/QuickStart.md
@@ -0,0 +1,143 @@
+
+## Standard Interface
+
+When you start Ásbrú for the first time, you'll see a standard interface similar to the next image.
+
+![](images/qs1.png)
+
++ __(1) Info tab__
+    - On start it gives general instructions on how to create your first connection.
+    - When you select/open a connection will allow you to type and save notes.
++ __(2) Statistics__
+    - This section shows some statistics about your usage
++ __(3) Screenshots__
+    - This section shows thumbnails of your currently saved screenshots
++ __(4) Your existing connections__
+    - __Top toolbar__ : from left to right
+        - Create a new group
+        - Create a new connection configuration
+        - Edit an existing connection
+        - Rename a node in the connections list (you can rename groups or connections)
+        - Delete a current node (group / connection)
+    - __Connections__
+        - This tab shows all your currently configured connections
+            - Double click on an existing connection to launch the session
+            - Double clic on a group to expand/contract its children
+        -Select and node and right click to show a popup menu with available options for the current node
+    - __Favourites__
+        - List of connections that you have marked as favourite connections
+    - __History__
+        - List of must recent opened session
+    - __Clusters__
+        - Listo of current configured clusters (clusters are groups of connections that will open simultaneously and will share keystrokes and mouse events)
++ __(5) Preferences__
+    - Access to the configuration settings that allows you to customize the behavior, appearance and tune some actions to your particular needs.
+
+## Connection list management
+
+- Click on _My Connections_ to create a new group or connection at root level.
+- Clic on a current existing group to create a new group or connection at group level
+- Select a node
+    - click on any of the top toolbar buttons (add, delete, rename, edit)
+    - right click and select desireg action (add, delete, rename, edit)
+
+!!! note "Recommended"
+    Always create groups at root level.  
+    This will allow you to organize your connections in some meaningful order.
+
+    Example of a __Client__ driven configuration tree:
+
+    + __Client Name__
+        + __Main Office__
+            + __VNC__
+                - vnc PC1
+                - vnc Shipment Scale
+            + __RDP__
+                - rdp PC2
+            - ssh Server
+            - ssh SQL Server
+        + __Plant on City A__
+            - ssh Server
+            - ssh RaspBerryPi
+            - ssh Shipment scale
+        + __Plant on City B__
+            - ssh Server
+            - ssh Backups
+    + __Client B__
+        - ssh Server A
+        - ssh Server B
+    + __Client C__
+        - ssh Server A
+        - ssh Server B
+
+    __Choose the logic that best fits you__, some possible organization trees
+
+    + Connection Type (ssh,vnc,rdp) > Client (client names) > Locations (locations if exist)
+    + Client > Service Type (ssh, sqlserver, etc)
+    + Project Name > Client Name > Services
+
+## Create a group
+
+1. Click on an existing group or _My Connections_ (root level).
+1. Click on `add group` button or right click on selected group
+1. Add a name to your group
+1. Click "Accept"
+
+![](images/qs2.png)
+
+__Connection list__ after
+
+![](images/qs3.png)
+
+Add more groups
+
+![](images/qs4.png)
+
+## Create Connections
+
+We will show the basic procedure to configure a basic ssh connection, there is a dedicated section for each type of connection with full details on how to configure more complex one.
+
+1. Click on a group where you want to add your current ssh connection
+1. Click on the Add connection icon. Or right click on the group and select "Add connection"
+
+__Give your connection a name that will hint you where will you be connecting__
+
+![](images/qs5.png)
+
+__Configure your connection__
+
+![](images/qs6.png)
+
+Click on "Save and Close" button
+
+__Example of a connections tree after several connections have been added__
+
+![](images/qs7.png)
+
+## Editing the connection list
+
+### To move a connection or full group from one place in the tree to another.
+
+1. Select a connection or full group
+1. `<Ctrl-X>` to cut the node (or right click Cut)
+1. `<Ctrl-V>` to paste the node in the new location
+
+### To copy an existing connection so you can replace some parameters
+
+1. Select a connection
+1. `<Ctrl-C>` to copy the node (or right click Copy)
+1. `<Ctrl-V>` to paste the node in the new location
+
+### To clone an existing connection
+
+1. Select a connection
+1. `<Ctrl-D>` to duplicate connection (or right click Clone Connection)
+
+!!! danger "Important notes"
+    gnome-shell requires that a tray extension be installed to be able to show the icon on the tray.
+
+    If you do not install the extension, and activate "hide to tray on close", your will have no access to the main window anymore.
+
+    Ásrbú knows about some of this extensions and will try to detect them. If they are not available, the close to tray icon option, will minimize the Window instead of hide it.
+    
+    Check [System Tray Extensions for some recommendations](Preferences/SytemTrayExtensions.md)
\ No newline at end of file
diff --git a/doc/Manual/Substitutions.md b/doc/Manual/Substitutions.md
new file mode 100644
index 00000000..91c91f67
--- /dev/null
+++ b/doc/Manual/Substitutions.md
@@ -0,0 +1,100 @@
+# Substitutions
+
+Inside many fields, values can be represented as masks. And this masks will be substituted by their real value at the time of a connection.
+
+These masks can be included in fields like : Global variables, local or remote commands, pre- and post execution commands, expects, some connection parameters.
+
+By right clicking on the input field, a wizard will help you building the substitution mask:
+![Wizard for variable substitution](images/subst3.png)
+
+The general format of the mask is `<[(Name|Type):]VALUE>`.
+
+## Internal Variables
+
+`<name>`
+
+|Name              |Description                        |
+|------------------|-----------------------------------|
+|IP                |Connection IP or Host              |
+|PORT              |Connection PORT                    |
+|USER              |Connection USER                    |
+|PASS              |Connection Password                |
+|UUID              |Connection UUID                    |
+|SOCKS5_PORT        |Socks5 tunnel port                  |
+|TIMESTAMP         |Elapsed time in seconds since epoch|
+|DATE_Y            |Year                               |
+|DATE_M            |Month                              |
+|DATE_D            |Day                                |
+|TIME_H            |Hour                               |
+|TIME_M            |Minute                             |
+|TIME_S            |Seconds                            |
+|NAME              |Connection Name                    |
+|TITLE             |Connection Title                   |
+|command prompt    |Configured command prompt regex    |
+
+## Environment Variables
+
+`<ENV:name>`
+
+Examples
+
+|Name    |Value      |
+|--------|-----------|
+|LANG    |es_MX.UTF-8|
+|DISPLAY |:0         |
+|HOME    |/home/user |
+
+## Global Variables
+
+These are created in you General Preferences > Global Variables
+
+`<GV:variable name>`
+
+## ASK
+
+Will prompt user to enter data and use that data for substitution
+
+`<ASK:parameters>`
+
+|Parameters                      |Action                               |
+|--------------------------------|-------------------------------------|
+|`description|opt1|opt2|opt3|..` |select box with options (opt1,..)    |
+|description|value               |textbox with predefined value        |
+|description                     |textbox empty                        |
+
+**Example**
+
+Lets say that you want to use a connection configuration with 2 different servers, but you do not want to have 2 separate configurations for this.
+
+The only thing that changes is the IP
+
+Create an ASK mask in your host entry like this : `<ASK:Select host|destination1.com|destination2.com|...>`
+
+![Create an ASK mask](images/subst1.png)
+
+
+When you connect the terminal will prompt you to select an IP from the previous list that you created.
+
+![Ask mask prompt](images/subst2.png)
+
+## CMD
+
+Will execute a command with the shell and use the output of that command for substitution
+
+Example
+
+`<CMD:date>`
+
+Will execute date in the shell, and the resulting date will be used for the substitution.
+
+## KeePass
+
+If you need to type a mask in a field where the right click access is not available or you want to pull a value different than the predefined user or password.
+
+`<field|path to key>`
+
+Example
+
+`<title|/banks/tdc/0000>`
+
+For a full reference on how to use [KeePass Integration ](Preferences/KeePassXC.md)
diff --git a/doc/Manual/images/qs1.png b/doc/Manual/images/qs1.png
new file mode 100644
index 00000000..cd45deca
Binary files /dev/null and b/doc/Manual/images/qs1.png differ
diff --git a/doc/Manual/images/qs2.png b/doc/Manual/images/qs2.png
new file mode 100644
index 00000000..3a6ab236
Binary files /dev/null and b/doc/Manual/images/qs2.png differ
diff --git a/doc/Manual/images/qs3.png b/doc/Manual/images/qs3.png
new file mode 100644
index 00000000..349c13de
Binary files /dev/null and b/doc/Manual/images/qs3.png differ
diff --git a/doc/Manual/images/qs4.png b/doc/Manual/images/qs4.png
new file mode 100644
index 00000000..6ebe0baa
Binary files /dev/null and b/doc/Manual/images/qs4.png differ
diff --git a/doc/Manual/images/qs5.png b/doc/Manual/images/qs5.png
new file mode 100644
index 00000000..b0bf623e
Binary files /dev/null and b/doc/Manual/images/qs5.png differ
diff --git a/doc/Manual/images/qs6.png b/doc/Manual/images/qs6.png
new file mode 100644
index 00000000..4689c6a3
Binary files /dev/null and b/doc/Manual/images/qs6.png differ
diff --git a/doc/Manual/images/qs7.png b/doc/Manual/images/qs7.png
new file mode 100644
index 00000000..cb3604a6
Binary files /dev/null and b/doc/Manual/images/qs7.png differ
diff --git a/doc/Manual/images/subst1.png b/doc/Manual/images/subst1.png
new file mode 100644
index 00000000..28ad1ccb
Binary files /dev/null and b/doc/Manual/images/subst1.png differ
diff --git a/doc/Manual/images/subst2.png b/doc/Manual/images/subst2.png
new file mode 100644
index 00000000..875dafea
Binary files /dev/null and b/doc/Manual/images/subst2.png differ
diff --git a/doc/Manual/images/subst3.png b/doc/Manual/images/subst3.png
new file mode 100644
index 00000000..e4d46efa
Binary files /dev/null and b/doc/Manual/images/subst3.png differ
diff --git a/doc/index.md b/doc/index.md
new file mode 100644
index 00000000..3f2d6b22
--- /dev/null
+++ b/doc/index.md
@@ -0,0 +1,52 @@
+# Ásbrú Connection Manager Documentation
+
+[<img src="https://www.asbru-cm.net/assets/img/asbru-logo-200.png" align="right" width="200px" height="200px" />](https://asbru-cm.net)
+
+**Ásbrú Connection Manager** is a user interface that helps organizing remote terminal sessions and automating repetitive tasks.
+
+### Features
+
+- Simple GUI to manage/launch connections to remote machines
+- Scripting possibilities, 'ala' SecureCRT
+- Configurable pre or post connection local commands execution
+- Configurable list of macros (commands) to execute locally when connected or to send to connected client
+- Configurable list of conditional executions on connected machine via 'Expect':
+    - forget about SSH certificates
+    - chain multiple SSH connections
+    - automate tunnels creation
+    - with line-send delay capabilities
+- [KeePass](https://keepass.info/) database file (.kdbx) integration
+- Ability to connect to machines through a proxy server
+- Cluster connections
+- Tabbed/Windowed terminals
+- Wake On LAN capabilities
+- Local and global variables, eg.: write down a password once, use it ANY where, centralizing its modification for faster changes! use them for:
+    - password vault
+    - reusing connection strings
+- Seamless Gnome/Gtk integration
+- Tray icon for 'right button' quick launching of managed connections. Screenshots and statistics.
+- DEB, RPM and .TAR.GZ packages available
+
+### Frequenty Asked Questions
+
+- Why did you call that project "Ásbrú" ?
+
+    In Norse mythology, [Ásbrú](https://en.wikipedia.org/wiki/Bifr%C3%B6st) refers to a burning rainbow bridge that connects Midgard (Earth) and Asgard, the realm of the gods.
+
+- Is this a fork of PAC (Perl Auto Connector) Manager ?
+
+    Yes.
+  
+    As [David Torrejon Vaquerizas](https://github.com/perseo22), the author of PAC Manager, could not find time, for some reasons that we respect, to continue the work on his project and was not open for external contributions ([see this](https://github.com/perseo22/pacmanager/issues/57)), a fork was needed to ensure the future and give the opportunity to the community to take over.
+  
+More questions can be found on the [dedicated project wiki page](https://github.com/asbru-cm/asbru-cm/wiki/Frequently-Asked-Questions).
+
+### License
+
+Ásbrú Connection Manager is licensed under the GNU General Public License version 3 <http://www.gnu.org/licenses/gpl-3.0.html>.  A full copy of the license can be found in the [LICENSE](https://github.com/asbru-cm/asbru-cm/blob/master/LICENSE) file.
+
+### Packages
+
+The repositories for our RPM and DEB builds are thankfully sponsored by [packagecloud](https://packagecloud.io/). A great thanks to them.
+
+<a title="Private Maven, RPM, DEB, PyPi and RubyGem Repository" href="https://packagecloud.io/"><img height="46" width="158" alt="Private Maven, RPM, DEB, PyPi and RubyGem Repository" src="https://packagecloud.io/images/packagecloud-badge.png" /></a>
diff --git a/doc/stylesheets/custom.css b/doc/stylesheets/custom.css
new file mode 100644
index 00000000..0632091d
--- /dev/null
+++ b/doc/stylesheets/custom.css
@@ -0,0 +1,5 @@
+.md-typeset h1,
+.md-typeset h2,
+.md-typeset h3 {
+  font-weight: bold;
+}
diff --git a/lib/PACCluster.pm b/lib/PACCluster.pm
index 1a89b48c..d5b3dce1 100644
--- a/lib/PACCluster.pm
+++ b/lib/PACCluster.pm
@@ -3,7 +3,7 @@ package PACCluster;
 ###############################################################################
 # This file is part of Ásbrú Connection Manager
 #
-# Copyright (C) 2017-2020 Ásbrú Connection Manager team (https://asbru-cm.net)
+# Copyright (C) 2017-2022 Ásbrú Connection Manager team (https://asbru-cm.net)
 # Copyright (C) 2010-2016 David Torrejon Vaquerizas
 #
 # Ásbrú Connection Manager is free software: you can redistribute it and/or
@@ -57,12 +57,15 @@ my $APPNAME = $PACUtils::APPNAME;
 my $APPVERSION = $PACUtils::APPVERSION;
 
 my $CFG_DIR = $ENV{"ASBRU_CFG"};
-my $CLUSTERS_FILE = "$CFG_DIR/pac_clusters.nfreeze";
-my $GROUPICONCLOSED = _pixBufFromFile("$RealBin/res/asbru_group_closed_16x16.svg");
-my $GROUPICON_ROOT = _pixBufFromFile("$RealBin/res/asbru_group.png");
-my $AUTOCLUSTERICON = _pixBufFromFile("$RealBin/res/asbru_cluster_auto.png");
-my $ICON_ON = Gtk3::Gdk::Pixbuf->new_from_file_at_scale("$RealBin/res/asbru_terminal16x16.png", 16, 16, 0);
-my $ICON_OFF = Gtk3::Gdk::Pixbuf->new_from_file_at_scale("$RealBin/res/asbru_terminal_x16x16.png", 16, 16, 0);
+my $CLUSTERS_FILE = "$CFG_DIR/asbru_clusters.nfreeze";
+my $RES_DIR = "$RealBin/res";
+my $THEME_DIR;
+my $GROUPICONOPEN;
+my $GROUPICONCLOSED;
+my $GROUPICON_ROOT;
+my $AUTOCLUSTERICON;
+my $ICON_ON;
+my $ICON_OFF;
 # END: Define GLOBAL CLASS variables
 ###################################################################
 
@@ -104,6 +107,14 @@ sub show {
     my $self = shift;
     my $cluster = shift // 0;
 
+    $THEME_DIR = $PACMain::FUNCS{_MAIN}{_THEME};
+    $GROUPICONCLOSED = _pixBufFromFile("$THEME_DIR/asbru_group_closed_16x16.svg");
+    $GROUPICONOPEN = _pixBufFromFile("$THEME_DIR/asbru_group_open_16x16.svg");
+    $GROUPICON_ROOT = _pixBufFromFile("$THEME_DIR/asbru_group.svg");
+    $AUTOCLUSTERICON = _pixBufFromFile("$THEME_DIR/asbru_cluster_auto.png");
+    $ICON_ON = Gtk3::Gdk::Pixbuf->new_from_file_at_scale("$RES_DIR/asbru_terminal16x16.png", 16, 16, 0);
+    $ICON_OFF = Gtk3::Gdk::Pixbuf->new_from_file_at_scale("$RES_DIR/asbru_terminal_x16x16.png", 16, 16, 0);
+
     $$self{_WINDOWCLUSTER}{main}->set_title("Cluster Administration : $APPNAME (v$APPVERSION)");
     $$self{_WINDOWCLUSTER}{main}->set_position('center');
     $$self{_WINDOWCLUSTER}{main}->show_all;
@@ -142,7 +153,7 @@ sub _loadTreeConfiguration {
     my $tree = shift // $$self{_WINDOWCLUSTER}{treeConnections};
 
     @{$$self{_WINDOWCLUSTER}{treeConnections}{'data'}} = ({
-        value => [$GROUPICON_ROOT, '<b>AVAILABLE CONNECTIONS</b>', '__PAC__ROOT__'],
+        value => [$GROUPICON_ROOT, '<b>My Connections</b>', '__PAC__ROOT__'],
         children => []
     });
     foreach my $child (keys %{$PACMain::{FUNCS}{_MAIN}{_CFG}{environments}{'__PAC__ROOT__'}{children}}) {
@@ -225,7 +236,7 @@ sub _initGUI {
 
     $$self{_WINDOWCLUSTER}{main} = Gtk3::Window->new;
     $$self{_WINDOWCLUSTER}{main}->set_position('center');
-    $$self{_WINDOWCLUSTER}{main}->set_icon_name('pac-app-big');
+    $$self{_WINDOWCLUSTER}{main}->set_icon_name('asbru-app-big');
     $$self{_WINDOWCLUSTER}{main}->set_size_request(650, 500);
     $$self{_WINDOWCLUSTER}{main}->set_default_size(650, 500);
     $$self{_WINDOWCLUSTER}{main}->set_resizable(1);
@@ -248,7 +259,7 @@ sub _initGUI {
     my $lbl1 = Gtk3::Label->new;
     $lbl1->set_markup('<b>RUNNING CLUSTERS </b>');
     $tablbl1->pack_start($lbl1, 0, 1, 0);
-    $tablbl1->pack_start(Gtk3::Image->new_from_stock('pac-terminal-ok-small', 'menu'), 0, 1, 0);
+    $tablbl1->pack_start(Gtk3::Image->new_from_stock('asbru-terminal-ok-small', 'menu'), 0, 1, 0);
     $tablbl1->show_all;
 
     my $vbox1 = Gtk3::VBox->new(0, 0);
@@ -257,10 +268,10 @@ sub _initGUI {
     my $hbox1 = Gtk3::HBox->new(0, 0);
     $vbox1->pack_start($hbox1, 1, 1, 0);
 
-    my $frame0 = Gtk3::Frame->new(' UNCLUSTERED TERMINALS: ');
+    my $frame0 = Gtk3::Frame->new(' Unclustered Terminals');
     $hbox1->pack_start($frame0, 1, 1, 0);
     my $frame0lbl = Gtk3::Label->new;
-    $frame0lbl->set_markup(' <b>UNCLUSTERED TERMINALS:</b> ');
+    $frame0lbl->set_markup(' <b>Clustered Terminals</b> ');
     $frame0->set_label_widget($frame0lbl);
 
     # Terminals list
@@ -305,10 +316,10 @@ sub _initGUI {
     my $vbox3 = Gtk3::VBox->new(0, 0);
     $hbox1->pack_start($vbox3, 1, 1, 0);
 
-    my $frame1 = Gtk3::Frame->new(' ACTIVE CLUSTERS: ');
+    my $frame1 = Gtk3::Frame->new(' Active Clusters');
     $vbox3->pack_start($frame1, 0, 1, 0);
     my $frame1lbl = Gtk3::Label->new();
-    $frame1lbl->set_markup(' <b>ACTIVE CLUSTERS:</b> ');
+    $frame1lbl->set_markup(' <b>Active Clusters</b> ');
     $frame1->set_label_widget($frame1lbl);
 
     my $vbox4 = Gtk3::VBox->new(0, 0);
@@ -334,10 +345,10 @@ sub _initGUI {
     $$self{_WINDOWCLUSTER}{delCluster}->set('can-focus' => 0);
     $$self{_WINDOWCLUSTER}{delCluster}->set_sensitive(0);
 
-    my $frame2 = Gtk3::Frame->new(' TERMINALS: ');
+    my $frame2 = Gtk3::Frame->new(' Terminals');
     $vbox3->pack_start($frame2, 1, 1, 0);
     my $frame2lbl = Gtk3::Label->new();
-    $frame2lbl->set_markup(' <b>TERMINALS IN SELECTED CLUSTER:</b> ');
+    $frame2lbl->set_markup(' <b>Terminals in selected Cluster</b> ');
     $frame2->set_label_widget($frame2lbl);
 
     my $vbox5 = Gtk3::VBox->new(0, 0);
@@ -364,9 +375,9 @@ sub _initGUI {
 
     my $tablbl2 = Gtk3::HBox->new(0, 0);
     my $lbl2 = Gtk3::Label->new;
-    $lbl2->set_markup('<b>SAVED CLUSTERS </b>');
+    $lbl2->set_markup('<b>Saved Clusters </b>');
     $tablbl2->pack_start($lbl2, 0, 1, 0);
-    $tablbl2->pack_start(Gtk3::Image->new_from_stock('pac-cluster-manager', 'menu'), 0, 1, 0);
+    $tablbl2->pack_start(Gtk3::Image->new_from_stock('asbru-cluster-manager', 'menu'), 0, 1, 0);
     $tablbl2->show_all;
 
     my $hboxclu = Gtk3::HBox->new(0, 0);
@@ -395,7 +406,7 @@ sub _initGUI {
     $$self{_WINDOWCLUSTER}{treeConnections}->get_selection->set_mode('GTK_SELECTION_MULTIPLE');
 
     @{$$self{_WINDOWCLUSTER}{treeConnections}{'data'}} = ({
-        value => [$GROUPICON_ROOT, '<b>AVAILABLE CONNECTIONS</b>', '__PAC__ROOT__'],
+        value => [$GROUPICON_ROOT, '<b>My Connections</b>', '__PAC__ROOT__'],
         children => []
     });
     my @col = $$self{_WINDOWCLUSTER}{treeConnections}->get_columns;
@@ -423,10 +434,10 @@ sub _initGUI {
     my $vbox3clu = Gtk3::VBox->new(0, 0);
     $hboxclu->pack_start($vbox3clu, 0, 1, 0);
 
-    my $frame1clu = Gtk3::Frame->new(' CONFIGURED CLUSTERS: ');
+    my $frame1clu = Gtk3::Frame->new(' Configured Clusters');
     $vbox3clu->pack_start($frame1clu, 0, 1, 0);
     my $frame1lblclu = Gtk3::Label->new;
-    $frame1lblclu->set_markup(' <b>CONFIGURED CLUSTERS:</b> ');
+    $frame1lblclu->set_markup(' <b>Configured Clusters</b> ');
     $frame1clu->set_label_widget($frame1lblclu);
 
     my $vbox4clu = Gtk3::VBox->new(0, 0);
@@ -457,10 +468,10 @@ sub _initGUI {
     $$self{_WINDOWCLUSTER}{delCluster1}->set('can-focus' => 0);
     $$self{_WINDOWCLUSTER}{delCluster1}->set_sensitive(0);
 
-    my $frame2clu = Gtk3::Frame->new(' TERMINALS: ');
+    my $frame2clu = Gtk3::Frame->new(' Terminals');
     $vbox3clu->pack_start($frame2clu, 1, 1, 0);
     my $frame2lblclu = Gtk3::Label->new;
-    $frame2lblclu->set_markup(' <b>TERMINALS IN SELECTED CLUSTER:</b> ');
+    $frame2lblclu->set_markup(' <b>Terminals in selected cluster</b> ');
     $frame2clu->set_label_widget($frame2lblclu);
 
     my $vbox5clu = Gtk3::VBox->new(0, 0);
@@ -484,9 +495,9 @@ sub _initGUI {
     # Add an "autocluster" tab
     my $tablbl3 = Gtk3::HBox->new(0, 0);
     my $lbl3 = Gtk3::Label->new;
-    $lbl3->set_markup('<b>AUTO CLUSTERS </b>');
+    $lbl3->set_markup('<b>Auto Clusters </b>');
     $tablbl3->pack_start($lbl3, 0, 1, 0);
-    $tablbl3->pack_start(Gtk3::Image->new_from_stock('pac-cluster-manager2', 'menu'), 0, 1, 0);
+    $tablbl3->pack_start(Gtk3::Image->new_from_stock('asbru-cluster-manager2', 'menu'), 0, 1, 0);
     $tablbl3->show_all;
 
     my $hboxautoclu = Gtk3::HBox->new(0, 0);
@@ -529,7 +540,7 @@ sub _initGUI {
     my $frameac = Gtk3::Frame->new;
     $hboxautoclu->pack_start($frameac, 1, 1, 0);
     my $frameaclbl = Gtk3::Label->new;
-    $frameaclbl->set_markup(' <b>AUTOCLUSTER MATCHING PROPERTIES:</b> ');
+    $frameaclbl->set_markup(' <b>Auto Matching Properties</b> ');
     $frameac->set_label_widget($frameaclbl);
     $frameac->set_tooltip_text("These entries accept Regular Expressions,like:\n^server\\d+\nor\nconn.*\\d{1,3}\$\nor any other Perl RegExp");
 
@@ -537,19 +548,19 @@ sub _initGUI {
     $frameac->add($vboxacprops);
 
     my $hboxacpname = Gtk3::HBox->new; $vboxacprops->pack_start($hboxacpname, 0, 1, 0);
-    $hboxacpname->pack_start(Gtk3::Label->new('Name:') , 0, 1, 0);
+    $hboxacpname->pack_start(Gtk3::Label->new('Name') , 0, 1, 0);
     $hboxacpname->pack_start($$self{_WINDOWCLUSTER}{entryname} = Gtk3::Entry->new, 1, 1, 0);
 
     my $hboxacptitle = Gtk3::HBox->new; $vboxacprops->pack_start($hboxacptitle, 0, 1, 0);
-    $hboxacptitle->pack_start(Gtk3::Label->new('Title:') , 0, 1, 0);
+    $hboxacptitle->pack_start(Gtk3::Label->new('Title') , 0, 1, 0);
     $hboxacptitle->pack_start($$self{_WINDOWCLUSTER}{entrytitle} = Gtk3::Entry->new, 1, 1, 0);
 
     my $hboxacphost = Gtk3::HBox->new; $vboxacprops->pack_start($hboxacphost, 0, 1, 0);
-    $hboxacphost->pack_start(Gtk3::Label->new('IP/Host:') , 0, 1, 0);
+    $hboxacphost->pack_start(Gtk3::Label->new('IP/Host') , 0, 1, 0);
     $hboxacphost->pack_start($$self{_WINDOWCLUSTER}{entryhost} = Gtk3::Entry->new, 1, 1, 0);
 
     my $hboxacpdesc = Gtk3::HBox->new; $vboxacprops->pack_start($hboxacpdesc, 0, 1, 0);
-    $hboxacpdesc->pack_start(Gtk3::Label->new('Description:') , 0, 1, 0);
+    $hboxacpdesc->pack_start(Gtk3::Label->new('Description') , 0, 1, 0);
     $hboxacpdesc->pack_start($$self{_WINDOWCLUSTER}{entrydesc} = Gtk3::Entry->new, 1, 1, 0);
 
     $$self{_WINDOWCLUSTER}{btnCheckAC} = Gtk3::Button->new;
@@ -640,6 +651,23 @@ sub _setupCallbacks {
         $self->_updateButtons1;
     });
 
+    $$self{_WINDOWCLUSTER}{treeConnections}->signal_connect('row_expanded' => sub {
+        my ($tree, $iter, $path) = @_;
+
+        my $selection = $$self{_WINDOWCLUSTER}{treeConnections}->get_selection;
+        my $modelsort = $$self{_WINDOWCLUSTER}{treeConnections}->get_model;
+        my $model = $modelsort->get_model;
+        my $group_uuid = $model->get_value($modelsort->convert_iter_to_child_iter($modelsort->get_iter($path)), 2);
+        if ($group_uuid eq '__PAC__ROOT__') {
+            return 0;
+        }
+        $model->set($modelsort->convert_iter_to_child_iter($modelsort->get_iter($path)), 0, $GROUPICONOPEN);
+        foreach my $child ($$self{_WINDOWCLUSTER}{treeConnections}->_getChildren($group_uuid, 1, 0)) {
+            $model->set($modelsort->convert_iter_to_child_iter($modelsort->get_iter($$self{_WINDOWCLUSTER}{treeConnections}->_getPath($child))), 0, $GROUPICONCLOSED);
+        }
+        return 1;
+    });
+
     $$self{_WINDOWCLUSTER}{treeClustered1}->get_selection->signal_connect('changed' => sub {
         $self->_updateButtons1;
     });
@@ -728,8 +756,11 @@ sub _setupCallbacks {
             }
         }
 
+        for (my $i=$total-1;$i>=0;$i--) {
+            splice @{$$self{_WINDOWCLUSTER}{treeClustered1}->{data}},$select[$i],1;
+        }
+        $$self{CLUSTERS} = $self->getCFGClusters();
         $self->_updateButtons1;
-        $self->_updateGUI1;
 
         #$PACMain::{FUNCS}{_MAIN}{_CFG}{tmp}{changed} = 1;
         $PACMain::FUNCS{_MAIN}->_setCFGChanged(1);
@@ -742,7 +773,7 @@ sub _setupCallbacks {
 
     # Capture 'add cluster' button clicked
     $$self{_WINDOWCLUSTER}{addCluster}->signal_connect('clicked' => sub {
-        my $new_cluster = _wEnterValue($self, 'Enter a name for the <b>New Cluster</b>');
+        my $new_cluster = _wEnterValue($$self{_WINDOWCLUSTER}{main}, 'Enter a name for the <b>New Cluster</b>');
 
         if ((! defined $new_cluster) || ($new_cluster =~ /^\s*$/go)) {
             return 1;
@@ -771,7 +802,7 @@ sub _setupCallbacks {
 
     # Capture 'add cluster 1' button clicked
     $$self{_WINDOWCLUSTER}{addCluster1}->signal_connect('clicked' => sub {
-        my $new_cluster = _wEnterValue($self, 'Enter a name for the <b>New Cluster</b>');
+        my $new_cluster = _wEnterValue($$self{_WINDOWCLUSTER}{main}, 'Enter a name for the <b>New Cluster</b>');
 
         if ((!defined $new_cluster)||($new_cluster =~ /^\s*$/go)) {
             return 1;
@@ -813,7 +844,7 @@ sub _setupCallbacks {
     # Capture 'rename cluster 1' button clicked
     $$self{_WINDOWCLUSTER}{renCluster1}->signal_connect('clicked' => sub {
         my $old_cluster = $$self{_WINDOWCLUSTER}{comboClusters1}->get_active_text;
-        my $new_cluster = _wEnterValue($self, "Enter a <b>NEW</b> name for cluster <b>$old_cluster</b>", undef, $old_cluster);
+        my $new_cluster = _wEnterValue($$self{_WINDOWCLUSTER}{main}, "Enter a <b>NEW</b> name for cluster <b>$old_cluster</b>", undef, $old_cluster);
 
         if ((! defined $new_cluster) || ($new_cluster =~ /^\s*$/go)) {
             return 1;
@@ -961,7 +992,7 @@ sub _setupCallbacks {
         if (!($total && (defined $cluster) && ($cluster ne ''))) {
             _wMessage($$self{_WINDOWCLUSTER}{main}, "Before Adding a Terminal to a Cluster, you MUST either:\n - Select an existing CLUSTER\n...or...\n - Create a NEW Cluster");
 
-            $cluster = _wEnterValue($self, 'Enter a name for the <b>New Cluster</b>');
+            $cluster = _wEnterValue($$self{_WINDOWCLUSTER}{main}, 'Enter a name for the <b>New Cluster</b>');
 
             if ((!defined $cluster) || ($cluster =~ /^\s*$/go) ) {
                 return 1;
@@ -1053,7 +1084,17 @@ sub _setupCallbacks {
 
     $$self{_WINDOWCLUSTER}{treeConnections}->signal_connect('row_collapsed' => sub {
         my ($tree, $iter, $path) = @_;
+
+        my $selection = $$self{_WINDOWCLUSTER}{treeConnections}->get_selection;
+        my $modelsort = $$self{_WINDOWCLUSTER}{treeConnections}->get_model;
+        my $model = $modelsort->get_model;
+        my $group_uuid = $model->get_value($modelsort->convert_iter_to_child_iter($modelsort->get_iter($path)), 2);
         $$self{_WINDOWCLUSTER}{treeConnections}->columns_autosize;
+        if ($group_uuid eq '__PAC__ROOT__') {
+            return 0;
+        }
+        $model->set($modelsort->convert_iter_to_child_iter($modelsort->get_iter($path)), 0, $GROUPICONCLOSED);
+        return 1;
     });
 
     $$self{_WINDOWCLUSTER}{treeConnections}->signal_connect('key_press_event' => sub {
@@ -1151,7 +1192,7 @@ sub _setupCallbacks {
     });
 
     $$self{_WINDOWCLUSTER}{addAC}->signal_connect('clicked' => sub {
-        my $new_ac = _wEnterValue($self, 'Enter new <b>AUTO CLUSTER</b> name');
+        my $new_ac = _wEnterValue($$self{_WINDOWCLUSTER}{main}, 'Enter new <b>AUTO CLUSTER</b> name');
         if ((! defined $new_ac) || ($new_ac =~ /^\s*$/go)) {
             return 1;
         }
@@ -1187,7 +1228,7 @@ sub _setupCallbacks {
         }
         my $sel = $selected[0];
         my $old_cluster = $$self{_WINDOWCLUSTER}{treeAutocluster}{data}[$sel][0];
-        my $new_cluster = _wEnterValue($self, "Enter a <b>NEW</b> name for Auto Cluster <b>$old_cluster</b>", undef, $old_cluster);
+        my $new_cluster = _wEnterValue($$self{_WINDOWCLUSTER}{main}, "Enter a <b>NEW</b> name for Auto Cluster <b>$old_cluster</b>", undef, $old_cluster);
         if ((! defined $new_cluster) || ($new_cluster =~ /^\s*$/go)) {
             return 1;
         }
@@ -1300,7 +1341,7 @@ sub _setupCallbacks {
             ''
         );
         $windowConfirm->set_markup("Terminals matching Auto Cluster <b>$cluster</b> conditions:$cond");
-        $windowConfirm->set_icon_name('pac-app-big');
+        $windowConfirm->set_icon_name('asbru-app-big');
         $windowConfirm->set_title("$APPNAME (v$APPVERSION) : Auto Cluster matching");
         $windowConfirm->add_buttons('gtk-ok' => 'ok');
         $windowConfirm->set_size_request(640, 400);
@@ -1423,7 +1464,7 @@ sub addToCluster {
 
     $$self{_RUNNING}{$uuid}{'terminal'}{_CLUSTER} = $cluster;
     if (defined $$self{_RUNNING}{$uuid}{'terminal'}{_GUI}{statusCluster}) {
-        $$self{_RUNNING}{$uuid}{'terminal'}{_GUI}{statusCluster}->set_from_stock('pac-cluster-manager', 'button');
+        $$self{_RUNNING}{$uuid}{'terminal'}{_GUI}{statusCluster}->set_from_stock('asbru-cluster-manager', 'button');
     }
     if (defined $$self{_RUNNING}{$uuid}{'terminal'}{_GUI}{statusCluster}) {
         $$self{_RUNNING}{$uuid}{'terminal'}{_GUI}{statusCluster}->set_tooltip_text("In CLUSTER: $cluster");
@@ -1440,7 +1481,7 @@ sub delFromCluster {
 
     $$self{_RUNNING}{$uuid}{'terminal'}{_CLUSTER} = '';
     if (defined $$self{_RUNNING}{$uuid}{'terminal'}{_GUI}{statusCluster}) {
-        $$self{_RUNNING}{$uuid}{'terminal'}{_GUI}{statusCluster}->set_from_stock('pac-cluster-manager-off', 'button');
+        $$self{_RUNNING}{$uuid}{'terminal'}{_GUI}{statusCluster}->set_from_stock('asbru-cluster-manager-off', 'button');
     }
     if (defined $$self{_RUNNING}{$uuid}{'terminal'}{_GUI}{statusCluster}) {
         $$self{_RUNNING}{$uuid}{'terminal'}{_GUI}{statusCluster}->set_tooltip_text("Unclustered");
diff --git a/lib/PACConfig.pm b/lib/PACConfig.pm
index f3da5d9a..befb622e 100644
--- a/lib/PACConfig.pm
+++ b/lib/PACConfig.pm
@@ -3,7 +3,7 @@ package PACConfig;
 ###############################################################################
 # This file is part of Ásbrú Connection Manager
 #
-# Copyright (C) 2017-2020 Ásbrú Connection Manager team (https://asbru-cm.net)
+# Copyright (C) 2017-2022 Ásbrú Connection Manager team (https://asbru-cm.net)
 # Copyright (C) 2010-2016 David Torrejon Vaquerizas
 #
 # Ásbrú Connection Manager is free software: you can redistribute it and/or
@@ -26,8 +26,8 @@ $|++;
 ###################################################################
 # Import Modules
 use utf8;
-binmode STDOUT,':utf8';
-binmode STDERR,':utf8';
+binmode STDOUT, ':utf8';
+binmode STDERR, ':utf8';
 
 # Standard
 use strict;
@@ -49,6 +49,7 @@ use PACTermOpts;
 use PACGlobalVarEntry;
 use PACExecEntry;
 use PACKeePass;
+use PACKeyBindings;
 
 # END: Import Modules
 ###################################################################
@@ -58,13 +59,14 @@ use PACKeePass;
 
 my $APPNAME = $PACUtils::APPNAME;
 my $APPVERSION = $PACUtils::APPVERSION;
-my $AUTOSTART_FILE = "$RealBin/res/pac_start.desktop";
+my $AUTOSTART_FILE = "$RealBin/res/asbru_start.desktop";
 
 my $GLADE_FILE = "$RealBin/res/asbru.glade";
 my $CFG_DIR = $ENV{"ASBRU_CFG"};
 my $RES_DIR = "$RealBin/res";
-
-my $CIPHER = Crypt::CBC->new(-key => 'PAC Manager (David Torrejon Vaquerizas, david.tv@gmail.com)', -cipher => 'Blowfish', -salt => '12345678') or die "ERROR: $!";
+my $THEME_DIR = "$RES_DIR/themes/default";
+my $SALT = '12345678';
+my $CIPHER = Crypt::CBC->new(-key => 'PAC Manager (David Torrejon Vaquerizas, david.tv@gmail.com)', -cipher => 'Blowfish', -salt => pack('Q', $SALT), -pbkdf => 'opensslv1', -nodeprecate => 1) or die "ERROR: $!";
 
 # END: Define GLOBAL CLASS variables
 ###################################################################
@@ -138,7 +140,6 @@ sub show {
 
 sub _initGUI {
     my $self = shift;
-    my $opt = shift;
 
     # Load XML Glade file
     defined $$self{_GLADE} or $$self{_GLADE} = Gtk3::Builder->new_from_file($GLADE_FILE) or die "ERROR: Could not load GLADE file '$GLADE_FILE' ($!)";
@@ -147,41 +148,57 @@ sub _initGUI {
     $$self{_WINDOWCONFIG} = $$self{_GLADE}->get_object ('windowConfig');
     $$self{_WINDOWCONFIG}->set_size_request(-1, -1);
 
-    _($self, 'imgBannerIcon')->set_from_file("$RES_DIR/asbru-preferences.svg");
+    _($self, 'imgBannerIcon')->set_from_file("$THEME_DIR/asbru-preferences.svg");
     _($self, 'imgBannerText')->set_text('Preferences');
 
     # Setup the check-button that defined whether PAC is auto-started on session init
-    _($self, 'cbCfgAutoStart')->set_active(-f $ENV{'HOME'} . '/.config/autostart/pac_start.desktop');
+    _($self, 'cbCfgAutoStart')->set_active(-f $ENV{'HOME'} . '/.config/autostart/asbru_start.desktop');
 
     # Initialize main window
-    $$self{_WINDOWCONFIG}->set_icon_name('pac-app-big');
+    $$self{_WINDOWCONFIG}->set_icon_name('asbru-app-big');
 
     _($self, 'btnResetDefaults')->set_image(Gtk3::Image->new_from_stock('gtk-undo', 'button'));
     _($self, 'btnResetDefaults')->set_label('_Reset to DEFAULT values');
+    foreach my $o ('MO', 'TO') {
+        foreach my $t ('BE', 'LF', 'AD') {
+            _($self, "linkHelp$o$t")->set_label('');
+            _($self, "linkHelp$o$t")->set_image(Gtk3::Image->new_from_stock('asbru-help', 'button'));
+        }
+    }
+    foreach my $t ('linkHelpLocalShell', 'linkHelpGlobalNetwork') {
+        _($self, $t)->set_label('');
+        _($self, $t)->set_image(Gtk3::Image->new_from_stock('asbru-help', 'button'));
+    }
 
     # Option currently disabled
     #_($self, 'btnCheckVersion')->set_image(Gtk3::Image->new_from_stock('gtk-refresh', 'button') );
     #_($self, 'btnCheckVersion')->set_label('Check _now');
 
-    _($self, 'rbCfgStartTreeConn')->set_image(Gtk3::Image->new_from_stock('pac-treelist', 'button'));
-    _($self, 'rbCfgStartTreeFavs')->set_image(Gtk3::Image->new_from_stock('pac-favourite-on', 'button'));
-    _($self, 'rbCfgStartTreeHist')->set_image(Gtk3::Image->new_from_stock('pac-history', 'button'));
-    _($self, 'rbCfgStartTreeCluster')->set_image(Gtk3::Image->new_from_stock('pac-cluster-manager', 'button'));
-    _($self, 'imgKeePassOpts')->set_from_stock('pac-keepass', 'button');
-    _($self, 'btnCfgSetGUIPassword')->set_image(Gtk3::Image->new_from_stock('pac-protected', 'button'));
+    _($self, 'rbCfgStartTreeConn')->set_image(Gtk3::Image->new_from_stock('asbru-treelist', 'button'));
+    _($self, 'rbCfgStartTreeFavs')->set_image(Gtk3::Image->new_from_stock('asbru-favourite-on', 'button'));
+    _($self, 'rbCfgStartTreeHist')->set_image(Gtk3::Image->new_from_stock('asbru-history', 'button'));
+    _($self, 'rbCfgStartTreeCluster')->set_image(Gtk3::Image->new_from_stock('asbru-cluster-manager', 'button'));
+    _($self, 'imgKeePassOpts')->set_from_stock('asbru-keepass', 'button');
+    _($self, 'btnCfgSetGUIPassword')->set_image(Gtk3::Image->new_from_stock('asbru-protected', 'button'));
     _($self, 'btnCfgSetGUIPassword')->set_label('Set...');
     _($self, 'btnExportYAML')->set_image(Gtk3::Image->new_from_stock('gtk-save-as', 'button'));
     _($self, 'btnExportYAML')->set_label('Export config...');
     _($self, 'alignShellOpts')->add(($$self{_SHELL} = PACTermOpts->new())->{container});
     _($self, 'alignGlobalVar')->add(($$self{_VARIABLES} = PACGlobalVarEntry->new())->{container});
-    _($self, 'alignCmdRemote')->add(($$self{_CMD_REMOTE} = PACExecEntry->new())->{container});
-    _($self, 'alignCmdLocal')->add(($$self{_CMD_LOCAL} = PACExecEntry->new())->{container});
-    _($self, 'alignKeePass')->add(($$self{_KEEPASS} = PACKeePass->new())->{container});
+    _($self, 'alignCmdRemote')->add(($$self{_CMD_REMOTE} = PACExecEntry->new(undef, undef, 'remote'))->{container});
+    _($self, 'alignCmdLocal')->add(($$self{_CMD_LOCAL} = PACExecEntry->new(undef, undef, 'local'))->{container});
+    _($self, 'alignKeePass')->add(($$self{_KEEPASS} = PACKeePass->new(1, $$self{_CFG}{defaults}{keepass}))->{container});
+    _($self, 'alignKeyBindings')->add(($$self{_KEYBINDS} = PACKeyBindings->new($$self{_CFG}{defaults}{keybindings}, $$self{_WINDOWCONFIG}))->{container});
     _($self, 'nbPreferences')->show_all();
 
+    _($self, 'btnCfgProxyCheckKPX')->set_image(Gtk3::Image->new_from_stock('asbru-keepass', 'button') );
+    _($self, 'btnCfgProxyCheckKPX')->set_label('');
+
     $$self{cbShowHidden} = Gtk3::CheckButton->new_with_mnemonic('Show _hidden files');
     _($self, 'btnCfgSaveSessionLogs')->set_extra_widget($$self{cbShowHidden});
 
+    _($self, 'spCfgTerminalScrollback')->set_range(-1, 99999);
+
     # Populate the Encodings combobox
     my $i = -1;
     $$self{_ENCODINGS_ARRAY} = _getEncodings();
@@ -191,6 +208,11 @@ sub _initGUI {
         $$self{_ENCODINGS_MAP}{$enc} = ++$i;
     }
 
+    if (!$PACMain::STRAY) {
+        _($self, 'lblRestartRequired')->set_markup(_($self, 'lblRestartRequired')->get_text() . "\nTray icon not available, install an extension for tray functionality, <a href='https://docs.asbru-cm.net/Manual/Preferences/SytemTrayExtensions/'>see online help for more details</a>.");
+    }
+
+    # Show preferences
     _updateGUIPreferences($self);
 
     return 1;
@@ -198,22 +220,6 @@ sub _initGUI {
 
 sub _setupCallbacks {
     my $self = shift;
-    my $tabs_on_main =  _($self,'cbCfgTabsInMain')->get_active();
-
-
-    # Capture 'autostart' checkbox toggled state
-    _($self, 'cbCfgAutoStart')->signal_connect('toggled' => sub {
-        if ((_($self, 'cbCfgAutoStart')->get_active()) && (! -f "$ENV{'HOME'}/.config/autostart/pac_start.desktop") ) {
-            $$self{_CFG}{'defaults'}{'start at session startup'} = eval {
-                symlink($AUTOSTART_FILE, "$ENV{'HOME'}/.config/autostart/pac_start.desktop");
-                1;
-            };
-        } elsif (! _($self, 'cbCfgAutoStart')->get_active()) {
-            unlink("$ENV{'HOME'}/.config/autostart/pac_start.desktop");
-            $$self{_CFG}{'defaults'}{'start at session startup'} = 0;
-        }
-        return 1;
-    });
 
     # Capture 'Show hidden files' checkbox for session log files
     $$self{cbShowHidden}->signal_connect('toggled' => sub {_($self, 'btnCfgSaveSessionLogs')->set_show_hidden($$self{cbShowHidden}->get_active());});
@@ -221,9 +227,6 @@ sub _setupCallbacks {
     _($self, 'cbConnShowPass')->signal_connect('toggled' => sub {
         _($self, 'entryPassword')->set_visibility(_($self, 'cbConnShowPass')->get_active());
     });
-    _($self, 'cbCfgPreConnPingPort')->signal_connect('toggled' => sub {
-        _($self, 'spCfgPingTimeout')->set_sensitive(_($self, 'cbCfgPreConnPingPort')->get_active());
-    });
     _($self, 'cbCfgSaveSessionLogs')->signal_connect('toggled' => sub {
         _($self, 'hboxCfgSaveSessionLogs')->set_sensitive(_($self, 'cbCfgSaveSessionLogs')->get_active());
     });
@@ -238,7 +241,23 @@ sub _setupCallbacks {
         _($self, 'colorBold')->set_sensitive(! _($self, 'cbBoldAsText')->get_active());
     });
     _($self, 'cbCfgTabsInMain')->signal_connect('toggled' => sub {
-        _($self, 'cbCfgConnectionsAutoHide')->set_sensitive(_($self, 'cbCfgTabsInMain')->get_active()); _($self, 'cbCfgButtonBarAutoHide')->set_sensitive(_($self, 'cbCfgTabsInMain')->get_active());
+        _($self, 'cbCfgConnectionsAutoHide')->set_sensitive(_($self, 'cbCfgTabsInMain')->get_active());
+        _($self, 'cbCfgButtonBarAutoHide')->set_sensitive(_($self, 'cbCfgTabsInMain')->get_active());
+        _($self, 'cbCfgPreventMOShowTree')->set_sensitive(_($self, 'cbCfgTabsInMain')->get_active());
+        if (!_($self, 'cbCfgTabsInMain')->get_active()) {
+            # Set safe values other wise options would be unaccesible
+            _($self, 'cbCfgConnectionsAutoHide')->set_active(0);
+            _($self, 'cbCfgButtonBarAutoHide')->set_active(0);
+        }
+    });
+    _($self, 'cbCfgStatusBar')->signal_connect('toggled' => sub {
+        _($self, 'rbCfgStatusShort')->set_sensitive(_($self, 'cbCfgStatusBar')->get_active());
+        _($self, 'rbCfgStatusFull')->set_sensitive(_($self, 'cbCfgStatusBar')->get_active());
+        if (!_($self, 'cbCfgStatusBar')->get_active()) {
+            # Set safe values other wise options would be unaccesible
+            _($self, 'rbCfgStatusShort')->set_active(0);
+            _($self, 'rbCfgStatusFull')->set_active(0);
+        }
     });
     _($self, 'cbCfgNewInTab')->signal_connect('toggled' => sub {
         _($self, 'vboxCfgTabsOptions')->set_sensitive(_($self, 'cbCfgNewInTab')->get_active());
@@ -247,7 +266,7 @@ sub _setupCallbacks {
         _($self, 'hboxWidthHeight')->set_sensitive(_($self, 'cbCfgNewInWindow')->get_active());
     });
     _($self, 'btnCfgOpenSessionLogs')->signal_connect('clicked' => sub {
-        system('/usr/bin/xdg-open ' . (_($self, 'btnCfgSaveSessionLogs')->get_current_folder()));
+        system("$ENV{'ASBRU_ENV_FOR_EXTERNAL'} /usr/bin/xdg-open " . (_($self, 'btnCfgSaveSessionLogs')->get_current_folder()));
     });
     _($self, 'btnCloseConfig')->signal_connect('clicked' => sub {
         $self->_closeConfiguration();
@@ -260,14 +279,21 @@ sub _setupCallbacks {
         return 1;
     });
     _($self, 'cfgComboCharEncode')->signal_connect('changed' => sub {
-        _($self, 'cfgLblCharEncode')->set_text($self->{_ENCODINGS_HASH}{_($self, 'cfgComboCharEncode')->get_active_text()} // '');
+        my $desc = __($self->{_ENCODINGS_HASH}{_($self, 'cfgComboCharEncode')->get_active_text()} // '');
+        if ($desc) {
+            $desc = "<span size='x-small'>$desc</span>";
+        }
+        _($self, 'cfgLblCharEncode')->set_markup($desc);
     });
     _($self, 'cbCfgBWTrayIcon')->signal_connect('toggled' => sub {
-        _($self, 'imgTrayIcon')->set_from_stock(_($self, 'cbCfgBWTrayIcon')->get_active() ? 'pac-tray-bw' : 'pac-tray', 'menu');
+        _($self, 'imgTrayIcon')->set_from_stock(_($self, 'cbCfgBWTrayIcon')->get_active() ? 'asbru-tray-bw' : 'asbru-tray', 'menu');
     });
     _($self, 'cbCfgShowSudoPassword')->signal_connect('toggled' => sub {
         _($self, 'entryCfgSudoPassword')->set_visibility(_($self, 'cbCfgShowSudoPassword')->get_active());
     });
+    _($self, 'cbCfgAutoSave')->signal_connect('toggled' => sub {
+        _updateSaveOnExit($self);
+    });
 
     #DevNote: option currently disabled
     #_($self, 'btnCheckVersion')->signal_connect('clicked' => sub {
@@ -307,8 +333,11 @@ sub _setupCallbacks {
                 $PACMain::FUNCS{_MAIN}->_setCFGChanged(1);
             }
         } else {
-            my $pass = _wEnterValue($self, 'PAC GUI Password Removal', 'Enter current PAC GUI Password to remove protection...', undef, 0, 'pac-protected');
-            if ((! defined $pass) || ($CIPHER->encrypt_hex($pass) ne $$self{_CFG}{'defaults'}{'gui password'}) ) {
+            if (!$CIPHER->salt()) {
+                $CIPHER->salt(pack('Q',$SALT));
+            }
+            my $pass = _wEnterValue($$self{_WINDOWCONFIG}, 'Ásbrú GUI Password Removal', 'Enter current Ásbrú GUI Password to remove protection...', undef, 0, 'asbru-protected');
+            if ((! defined $pass) || ($pass ne $CIPHER->decrypt_hex($$self{_CFG}{'defaults'}{'gui password'}))) {
                 $$self{_CFGTOGGLEPASS} = 0;
                 _($self, 'cbCfgUseGUIPassword')->set_active(1);
                 _($self, 'hboxCfgPACPassword')->set_sensitive(1);
@@ -379,6 +408,10 @@ sub _setupCallbacks {
         # Populate with environment variables
         my @environment_menu;
         foreach my $key (sort {$a cmp $b} keys %ENV) {
+            # Do not offer Master Password, or any other environment variable with word PRIVATE, TOKEN
+            if ($key =~ /KPXC|PRIVATE|TOKEN/i) {
+                next;
+            }
             my $value = $ENV{$key};
             push(@environment_menu, {
                 label => "<ENV:" . __($key) . ">",
@@ -424,47 +457,6 @@ sub _setupCallbacks {
             }
         });
 
-        # Populate with KeePass special strings
-        if ($$self{_CFG}{'defaults'}{'keepass'}{'use_keepass'}) {
-            my (@titles, @usernames, @urls, @query);
-            foreach my $hash ($PACMain::FUNCS{_KEEPASS} ->find) {
-                push(@titles, {
-                    label => "<KPX_title:$$hash{title}>",
-                    tooltip => "$$hash{password}",
-                    code => sub {_($self, 'entryCfgSudoPassword')->set_text("<KPX_title:$$hash{title}>");}
-                });
-                push(@usernames, {
-                    label => "<KPX_username:$$hash{username}>",
-                    tooltip => "$$hash{password}",
-                    code => sub {_($self, 'entryCfgSudoPassword')->set_text("<KPX_username:$$hash{username}>");}
-                });
-                push(@urls, {
-                    label => "<KPX_url:$$hash{url}>",
-                    tooltip => "$$hash{password}",
-                    code => sub {_($self, 'entryCfgSudoPassword')->set_text("<KPX_url:$$hash{url}>");}
-                });
-            }
-            push(@menu_items, {
-                label => 'KeePassX',
-                stockicon => 'pac-keepass',
-                submenu =>
-                [{
-                    label => 'KeePassX title values',
-                    submenu => \@titles
-                }, {
-                    label => 'KeePassX username values',
-                    submenu => \@usernames
-                }, {
-                    label => 'KeePassX URL values',
-                    submenu => \@urls
-                }, {
-                    label => "KeePass Extended Query",
-                    tooltip => "This allows you to select the value to be returned, based on another value's match againt a Perl Regular Expression",
-                    code => sub {_($self, 'entryCfgSudoPassword')->set_text("<KPXRE_GET_(title|username|password|url)_WHERE_(title|username|password|url)==Your_RegExp_here==>");}
-                }]
-            });
-        }
-
         _wPopUpMenu(\@menu_items, $event);
 
         return 1;
@@ -485,21 +477,27 @@ sub _setupCallbacks {
     # Layout signal
     _($self, 'comboLayout')->signal_connect('changed' => sub {
         if (_($self, 'comboLayout')->get_active_text() eq 'Traditional') {
-            _($self,'frameTabsInMainWindow')->show();
-            _($self,'frameTabsInMainWindow')->show();
-            _($self,'cbCfgStartMainMaximized')->show();
-            _($self,'cbCfgRememberSize')->show();
-            _($self,'cbCfgSaveOnExit')->show();
-            _($self,'cbCfgStartIconified')->show();
-            _($self,'cbCfgCloseToTray')->show();
+            _($self, 'frameTabsInMainWindow')->show();
+            _($self, 'frameTabsInMainWindow')->show();
+            _($self, 'cbCfgStartMainMaximized')->show();
+            _($self, 'cbCfgRememberSize')->show();
+            _($self, 'cbCfgSaveOnExit')->show();
+            _($self, 'cbCfgStartIconified')->show();
+            _($self, 'cbCfgCloseToTray')->show();
+            _($self, 'cbCfgShowTreeTitles')->show();
+            _($self, 'cbCfgShowTreeTitles')->set_active(1);
         } else {
-            _($self,'frameTabsInMainWindow')->hide();
-            _($self,'cbCfgStartMainMaximized')->hide();
-            _($self,'cbCfgRememberSize')->hide();
-            _($self,'cbCfgSaveOnExit')->hide();
-            if ($ENV{'ASBRU_DESKTOP'} eq 'gnome-shell') {
-                _($self,'cbCfgStartIconified')->hide();
-                _($self,'cbCfgCloseToTray')->hide();
+            _($self, 'frameTabsInMainWindow')->hide();
+            _($self, 'cbCfgStartMainMaximized')->hide();
+            _($self, 'cbCfgRememberSize')->hide();
+            _($self, 'cbCfgSaveOnExit')->hide();
+            _($self, 'cbCfgSaveOnExit')->set_active(1);
+            _($self, 'cbCfgAutoSave')->set_active(1);
+            _($self, 'cbCfgShowTreeTitles')->hide();
+            _($self, 'cbCfgShowTreeTitles')->set_active(0);
+            if (!$PACMain::STRAY) {
+                _($self, 'cbCfgStartIconified')->hide();
+                _($self, 'cbCfgCloseToTray')->hide();
             }
         }
     });
@@ -507,11 +505,13 @@ sub _setupCallbacks {
     # Capture proxy usage change
     _($self, 'cbCfgProxyManual')->signal_connect('toggled' => sub {
         _($self, 'hboxPrefProxyManualOptions')->set_sensitive(_($self, 'cbCfgProxyManual')->get_active());
+        _updateCfgProxyKeePass($self);
     });
 
     # Capture jump host change
     _($self, 'cbCfgProxyJump')->signal_connect('toggled' => sub {
         _($self, 'vboxPrefJumpCfgOptions')->set_sensitive(_($self, 'cbCfgProxyJump')->get_active());
+        _updateCfgProxyKeePass($self);
     });
 
     # Clear private key
@@ -520,6 +520,60 @@ sub _setupCallbacks {
         _($self, 'entryCfgJumpKey')->unselect_uri("file://$ENV{'HOME'}");
     });
 
+    # Capture support transparency change
+    _($self, 'cbCfgTerminalSupportTransparency')->signal_connect('toggled' => sub {
+        _($self, 'spCfgTerminalTransparency')->set_sensitive(_($self, 'cbCfgTerminalSupportTransparency')->get_active());
+    });
+
+    # Associated proxy settings to KeePass entries
+    _($self, 'btnCfgProxyCheckKPX')->signal_connect('clicked' => sub {
+        # User selects an entry in KeePass
+        my $title = $PACMain::FUNCS{_KEEPASS}->listEntries($$self{_WINDOWCONFIG});
+
+        if ($title) {
+            if (_($self, 'cbCfgProxyManual')->get_active) {
+                _($self, 'entryCfgProxyIP')->set_text("<url|$title>");
+                _($self, 'entryCfgProxyUser')->set_text("<username|$title>");
+                _($self, 'entryCfgProxyPassword')->set_text("<password|$title>");
+            } elsif (_($self, 'cbCfgProxyJump')->get_active) {
+                _($self, 'entryCfgJumpIP')->set_text("<url|$title>");
+                _($self, 'entryCfgJumpUser')->set_text("<username|$title>");
+                _($self, 'entryCfgJumpPass')->set_text("<password|$title>");
+            }
+        }
+    });
+
+    # Monitor the main notebook and detects when we are switching to the keybindings frame
+    # When the keybindings frame is shown, all 'mnemonics' has to be disabled to avoid conflicts when assigning keyboard shortcuts
+    # When another frame is shown, original mnemonics are restored
+    # DevNote: did not find a way to ignore the mnemonic, if use 'mnemonic_activate' ; the shortcut was not processed by the keybindings frame at all
+    my $hasMnemonics = 1;
+    my $labelClose = _($self, 'label86')->get_label();
+    my $textClose = _($self, 'label86')->get_text();
+    my $labelSave = _($self, 'label16')->get_label();
+    my $textSave = _($self, 'label16')->get_text();
+    my $labelReset = _($self, 'btnResetDefaults')->get_label();
+    my $textReset = $labelReset =~ s/_//r;
+    _($self, 'nbPreferences')->signal_connect('switch_page' => sub {
+        my ($nb, $frame, $data) = @_;
+        if ($frame eq _($self, 'frameKeyBindings')) {
+            if ($hasMnemonics) {
+                _($self, 'label86')->set_text($textClose);
+                _($self, 'label16')->set_text($textSave);
+                _($self, 'btnResetDefaults')->set_label($textReset);
+                $hasMnemonics = 0;
+            }
+        } else {
+            if (!$hasMnemonics) {
+                _($self, 'label86')->set_text_with_mnemonic($labelClose);
+                _($self, 'label16')->set_text_with_mnemonic($labelSave);
+                _($self, 'btnResetDefaults')->set_label($labelReset);
+                $hasMnemonics = 1;
+            }
+        }
+        return 0;
+    });
+
     return 1;
 }
 
@@ -540,7 +594,7 @@ sub _exporter {
         $func = 'use Data::Dumper; $Data::Dumper::Indent = 1; $Data::Dumper::Purity = 1; open(F, ">:utf8",$file) or die "ERROR: Could not open file \'$file\' for writting ($!)"; print F Dumper($$self{_CFG}); close F;';
     } elsif ($format eq 'debug') {
         $name = 'debug';
-        $suffix = '.txt';
+        $suffix = '.yml';
         $func = 'require YAML; YAML::DumpFile($file, $$self{_CFG}) or die "ERROR: Could not save file \'$file\' ($!)";';
         my $answ = _wConfirm($$self{_WINDOWCONFIG}, "You are about to create a file containing an anonymized version of your settings.\n\nThis file will contain your configuration settings without any sensitive personal data in it.  It is only useful for debugging purposes only. Do not use this file for backup purposes.\n\nCare has been taken to remove all personal information but no guarantee is given, you are the only responsible for any disclosed information.\nPlease review the exported data before sharing it with a third party.\n\n<b>Do you wish to continue?</b>");
         if (!$answ) {
@@ -555,8 +609,8 @@ sub _exporter {
             "$APPNAME (v.$APPVERSION) Choose file to Export configuration as '$format'",
             $$self{_WINDOWCONFIG},
             'GTK_FILE_CHOOSER_ACTION_SAVE',
-            'Export' , 'GTK_RESPONSE_ACCEPT',
             'Cancel' , 'GTK_RESPONSE_CANCEL',
+            'Export' , 'GTK_RESPONSE_ACCEPT',
         );
         $choose->set_do_overwrite_confirmation(1);
         $choose->set_current_folder($ENV{'HOME'} // '/tmp');
@@ -568,7 +622,6 @@ sub _exporter {
         if ($out ne 'accept') {
             return 1;
         }
-
         $$self{_WINDOWCONFIG}->get_window()->set_cursor(Gtk3::Gdk::Cursor->new('watch') );
         $w = _wMessage($$self{_WINDOWCONFIG}, "Please, wait while file '$file' is being created...", 0);
         while (Gtk3::events_pending) {
@@ -589,7 +642,7 @@ sub _exporter {
         _wMessage($$self{_WINDOWCONFIG}, "'$format' file succesfully saved to:\n\n$file");
     } elsif (defined $w) {
         $w->destroy();
-        _wMessage($$self{_WINDOWCONFIG}, "ERROR: Could not save PAC Config file '$file':\n\n$@");
+        _wMessage($$self{_WINDOWCONFIG}, "ERROR: Could not save Ásrbú Config file '$file':\n\n$@");
     }
     delete $$self{_CFG}{'__PAC__EXPORTED__'};
     delete $$self{_CFG}{'__PAC__EXPORTED__FULL__'};
@@ -605,50 +658,89 @@ sub _exporter {
 sub cleanUpPersonalData {
     my $file = shift;
     my $out = $file;
-    $out =~ s/debug\.txt/debug.yml/;
+
+    system "$ENV{'ASBRU_ENV_FOR_EXTERNAL'} mv -f $file $file.txt";
+    $file .= ".txt";
 
     $SIG{__WARN__} = sub{};
     print STDERR "SAVED IN : $file\nOUT: $out\n";
     # Remove all personal information
-    open(F,"<:utf8",$file);
-    open(D,">:utf8",$out);
+    open(F, "<:utf8", $file);
+    open(D, ">:utf8", $out);
     my $C = 0;
     while (my $line = <F>) {
+        my $next = 0;
+        foreach my $key ('name', 'send', 'ip', 'user', 'prepend command', 'postpend_command', 'database', 'gui password', 'sudo password') {
+            if ($line =~ /^[\t ]+$key:/) {
+                $line =~ s/$key:.+/$key: 'removed'/;
+                $next = 1;
+            }
+            if ($next) {
+                next;
+            }
+        }
         if ($line =~ /KPX title regexp/) {
             $line =~ s/KPX title regexp:.+/KPX title regexp: ''/;
-        } elsif ($line =~ /^[\t ]+(send|ip|user):/) {
-            my $p = $1;
-            $line =~ s/$p:.+/$p: 'removed'/;
         } elsif ($line =~ /^[\t ]+(title|name):/) {
             my $p = $1;
             if ($p eq 'name') {
                 $C++;
             }
             $line =~ s/$p:.+/$p: '$p $C'/;
+        } elsif (($line =~ /^[\t ]+(global variables|remote commands|local commands|expect|local before|local after|local connected):/) && ($line !~ /^[\t ]+(global variables|remote commands|local commands|expect|local before|local after|local connected): \[\]/)) {
+            my $global = 0;
+            my $indent = '';
+            if ($line =~ /global variables/) {
+                $global = 1;
+            }
+            if ($line =~ /^([\t ]+)/) {
+                $indent = $1;
+            }
+            print D $line;
+            while (my $l = <F>) {
+                if ($l =~ /^${indent}\w/) {
+                    print D $l;
+                    last;
+                } elsif ($global) {
+                    next;
+                } elsif ($l =~ /description|expect|send|txt/) {
+                    $l =~ s|(.+?):.+|$1: 'removed'|;
+                }
+                print D $l;
+            }
+            next;
+        } elsif ($line =~ /^[\t ]+options:/) {
+            $line =~ s/\/drive:.+?( |\')/\/drive: removed$1/;
+            $line =~ s/ disk:.+?( |\')/ disk: removed$1/;
+            $line =~ s/\/d:.+?( |\')/\/d: removed$1/;
+            $line =~ s/-d .+?( |\')/-d removed$1/;
+            if ($line =~ / -(D|L|R)/) {
+                $line =~ s/(^[\t ]+options):.+/$1: 'removed'/;
+            }
+        } elsif (($line =~ /^[\t ]+proxy (ip|pass|user):/)&&($line !~ /^[\t ]+proxy (ip|pass|user): \'\'/)) {
+            $line =~ s/(proxy.+?):.+/$1: 'removed'/;
+        } elsif (($line =~ /^[\t ]+jump (config|ip|pass|user|key):/)&&($line !~ /^[\t ]+jump (config|ip|pass|user|key): \'\'/)) {
+            $line =~ s/(jump.+?):.+/$1: 'removed'/;
         } elsif ($line =~ /^[\t ]+description:/) {
             $line =~ s/description:.+/description: 'Description'/;
         } elsif ($line =~ /^[\t ]+public key: (.+)/) {
             $line =~ s/public key:.+/public key: 'uses public key'/;
         } elsif ($line =~ /^[\t ]+pass(word|phrase)?:/) {
             $line =~ s/pass(word|phrase)?:.+/pass$1: 'removed'/;
-        } elsif ($line =~ /^[\t ]+sudo password:/) {
-            $line =~ s/sudo password:.+/sudo password: 'removed'/;
-        } elsif ($line =~ /^[\t ]+gui password:/) {
-            $line =~ s/gui password:.+/gui password: 'removed'/;
-        } elsif ($line =~ /^[\t ]+use gui password:/) {
-            $line =~ s/use gui password:.+/use gui password: 0/;
+        } elsif ($line =~ /^[\t ]+use gui password( tray)?:/) {
+            $line =~ s/use gui password( tray)?:.+/use gui password$1: \'\'/;
         } elsif ($line =~ /^[\t ]+passphrase user:/) {
             $line =~ s/passphrase user:.+/passphrase user: 'removed'/;
-        } else {
-            $line =~ s|/home/(\w+)|/home/USER|;
         }
+        $line =~ s|/home/.+?/|/home/PATH/|;
+        $line =~ s|$ENV{USER}|USER|;
         print D $line;
     }
     # Add runtime information
     print D "\n\n#$APPNAME : $APPVERSION\n\n# ENV Data\n";
     my $user = $ENV{USER} ? $ENV{USER} : $ENV{LOGNAME};
     foreach my $k (sort keys %ENV) {
-        if ($ENV{$k} =~ /token/i) {
+        if ($k =~ /token|hostname|startup|KPXC|AUTH/i) {
             next;
         }
         my $str = $ENV{$k};
@@ -677,7 +769,8 @@ sub _resetDefaults {
 sub _updateGUIPreferences {
     my $self = shift;
     my $cfg = shift // $$self{_CFG};
-    my %layout = ('Traditional',0,'Compact',1);
+    my %layout = ('Traditional', 0, 'Compact', 1);
+    my %theme = ('default', 0, 'asbru-color', 1, 'asbru-dark', 2, 'system', 3);
 
     if (!defined $$cfg{'defaults'}{'layout'}) {
         $$cfg{'defaults'}{'layout'} = 'Traditional';
@@ -688,6 +781,15 @@ sub _updateGUIPreferences {
     if (!defined $$cfg{'defaults'}{'bold is brigth'}) {
         $$cfg{'defaults'}{'bold is brigth'} = 0;
     }
+    if (!defined $$cfg{'defaults'}{'unprotected set'}) {
+        $$cfg{'defaults'}{'unprotected set'} = 'foreground';
+    }
+    if (!defined $$cfg{'defaults'}{'theme'}) {
+        $$cfg{'defaults'}{'theme'} = 'default';
+    }
+    if (!-d $$cfg{'defaults'}{'session logs folder'}) {
+        $$cfg{'defaults'}{'session logs folder'} = "$CFG_DIR/session_logs";
+    }
     # Main options
     #_($self, 'btnCfgLocation')->set_uri('file://' . $$self{_CFG}{'defaults'}{'config location'});
     _($self, 'cbCfgAutoAcceptKeys')->set_active($$cfg{'defaults'}{'auto accept key'});
@@ -700,9 +802,6 @@ sub _updateGUIPreferences {
     _($self, 'cbCfgAutoSave')->set_active($$cfg{'defaults'}{'auto save'});
     _($self, 'cbCfgSaveOnExit')->set_active($$cfg{'defaults'}{'save on exit'});
     _($self, 'cbCfgBWTrayIcon')->set_active($$cfg{'defaults'}{'use bw icon'});
-    _($self, 'cbCfgPreConnPingPort')->set_active($$cfg{'defaults'}{'ping port before connect'});
-    _($self, 'spCfgPingTimeout')->set_value($$cfg{'defaults'}{'ping port timeout'});
-    _($self, 'spCfgPingTimeout')->set_sensitive(_($self, 'cbCfgPreConnPingPort')->get_active());
     _($self, 'cbCfgSaveShowScreenshots')->set_active($$cfg{'defaults'}{'show screenshots'});
     _($self, 'cbCfgConfirmExit')->set_active($$cfg{'defaults'}{'confirm exit'});
     _($self, 'rbCfgInternalViewer')->set_active(! $$cfg{'defaults'}{'screenshots use external viewer'});
@@ -714,9 +813,14 @@ sub _updateGUIPreferences {
     _($self, 'cbCfgConnectionsAutoHide')->set_sensitive(_($self, 'cbCfgTabsInMain')->get_active());
     _($self, 'cbCfgButtonBarAutoHide')->set_active($$cfg{'defaults'}{'auto hide button bar'});
     _($self, 'cbCfgButtonBarAutoHide')->set_sensitive(_($self, 'cbCfgTabsInMain')->get_active());
+    _($self, 'cbCfgPreventMOShowTree')->set_sensitive(_($self, 'cbCfgTabsInMain')->get_active());
+    _($self, 'cbCfgStatusBar')->set_active($$cfg{'defaults'}{'info in status bar'});
+    _($self, 'rbCfgStatusShort')->set_active(! $$cfg{'defaults'}{'forwarding short names'});
+    _($self, 'rbCfgStatusFull')->set_active($$cfg{'defaults'}{'forwarding full names'});
     _($self, 'entryCfgPrompt')->set_text($$cfg{'defaults'}{'command prompt'});
     _($self, 'entryCfgUserPrompt')->set_text($$cfg{'defaults'}{'username prompt'});
     _($self, 'entryCfgPasswordPrompt')->set_text($$cfg{'defaults'}{'password prompt'});
+    _($self, 'entryCfgPasswordPrompt')->select_region(0, 0);
     _($self, 'entryCfgHostKeyVerification')->set_text($$cfg{'defaults'}{'hostkey changed prompt'});
     _($self, 'entryCfgPressAnyKey')->set_text($$cfg{'defaults'}{'press any key prompt'});
     _($self, 'entryCfgRemoteHostChanged')->set_text($$cfg{'defaults'}{'remote host changed prompt'});
@@ -726,42 +830,45 @@ sub _updateGUIPreferences {
     _($self, 'entryCfgSudoPassword')->set_visibility(_($self, 'cbCfgShowSudoPassword')->get_active());
     _($self, 'entryCfgSelectByWordChars')->set_text($$cfg{'defaults'}{'word characters'});
     _($self, 'cbCfgShowTrayIcon')->set_active($$cfg{'defaults'}{'show tray icon'});
-    _($self, 'cbCfgAutoStart')->set_active(-f "$ENV{'HOME'}/.config/autostart/pac_start.desktop");
+    _($self, 'cbCfgAutoStart')->set_active(-f "$ENV{'HOME'}/.config/autostart/asbru_start.desktop");
     #DevNote: option currently disabled
     #_($self, 'cbCfgCheckVersions')->set_active($$cfg{'defaults'}{'check versions at start'});
     #_($self, 'btnCheckVersion')->set_sensitive(! $PACMain::FUNCS{_MAIN}{_UPDATING});
     _($self, 'cbCfgShowStatistics')->set_active($$cfg{'defaults'}{'show statistics'});
+
+    _($self, 'rbCfgUnForeground')->set_active($$cfg{'defaults'}{'unprotected set'} eq 'foreground');
+    _($self, 'rbCfgUnBackground')->set_active($$cfg{'defaults'}{'unprotected set'} eq 'background');
+    _updateWidgetColor($self, $$cfg{'defaults'}, 'colorCfgUnProtected', 'unprotected color', _($self, 'colorCfgUnProtected')->get_color()->to_string());
+
     _($self, 'rbCfgForeground')->set_active($$cfg{'defaults'}{'protected set'} eq 'foreground');
     _($self, 'rbCfgBackground')->set_active($$cfg{'defaults'}{'protected set'} eq 'background');
     _updateWidgetColor($self, $$cfg{'defaults'}, 'colorCfgProtected', 'protected color', _($self, 'colorCfgProtected')->get_color()->to_string());
+
     _($self, 'cbCfgUseGUIPassword')->set_active($$cfg{'defaults'}{'use gui password'});
     _($self, 'hboxCfgPACPassword')->set_sensitive($$cfg{'defaults'}{'use gui password'});
     _($self, 'cbCfgUseGUIPasswordTray')->set_active($$cfg{'defaults'}{'use gui password tray'});
-    _($self, 'cbCfgCTRLDisable')->set_active($$cfg{'defaults'}{'disable CTRL key bindings'});
-    _($self, 'cbCfgALTDisable')->set_active($$cfg{'defaults'}{'disable ALT key bindings'});
-    _($self, 'cbCfgSHIFTDisable')->set_active($$cfg{'defaults'}{'disable SHIFT key bindings'});
     _($self, 'cbCfgAutoStartShell')->set_active($$cfg{'defaults'}{'autostart shell upon PAC start'});
     _($self, 'cbCfgTreeOnRight')->set_active($$cfg{'defaults'}{'tree on right side'});
     _($self, 'cbCfgTreeOnLeft')->set_active(! $$cfg{'defaults'}{'tree on right side'});
-    _($self, 'cbCfgPreventMOShowTree')->set_active(! $$cfg{'defaults'}{'prevent mouse over show tree'});
+    _($self, 'cbCfgPreventMOShowTree')->set_active(!$$cfg{'defaults'}{'prevent mouse over show tree'});
     _($self, 'rbCfgStartTreeConn')->set_active($$cfg{'defaults'}{'start PAC tree on'} eq 'connections');
     _($self, 'rbCfgStartTreeFavs')->set_active($$cfg{'defaults'}{'start PAC tree on'} eq 'favourites');
     _($self, 'rbCfgStartTreeHist')->set_active($$cfg{'defaults'}{'start PAC tree on'} eq 'history');
     _($self, 'rbCfgStartTreeCluster')->set_active($$cfg{'defaults'}{'start PAC tree on'} eq 'clusters');
     _($self, 'cbCfgShowTreeTooltips')->set_active($$cfg{'defaults'}{'show connections tooltips'});
     _($self, 'cbCfgUseShellToConnect')->set_active($$cfg{'defaults'}{'use login shell to connect'});
-    _($self, 'rbCfgCtrlTabLast')->set_active($$cfg{'defaults'}{'ctrl tab'} eq 'last');
-    _($self, 'rbCfgCtrlTabNext')->set_active($$cfg{'defaults'}{'ctrl tab'} ne 'last');
     _($self, 'cbCfgAutoAppendGroupName')->set_active($$cfg{'defaults'}{'append group name'});
-    _($self, 'imgTrayIcon')->set_from_stock($$cfg{'defaults'}{'use bw icon'} ? 'pac-tray-bw' : 'pac-tray', 'menu');
+    _($self, 'imgTrayIcon')->set_from_stock($$cfg{'defaults'}{'use bw icon'} ? 'asbru-tray-bw' : 'asbru-tray', 'menu');
     _($self, 'rbOnNoTabsNothing')->set_active($$cfg{'defaults'}{'when no more tabs'} == 0);
     _($self, 'rbOnNoTabsClose')->set_active($$cfg{'defaults'}{'when no more tabs'} == 1);
     _($self, 'rbOnNoTabsHide')->set_active($$cfg{'defaults'}{'when no more tabs'} == 2);
     _($self, 'cbCfgSelectionToClipboard')->set_active($$cfg{'defaults'}{'selection to clipboard'});
     _($self, 'cbCfgRemoveCtrlCharsConf')->set_active($$cfg{'defaults'}{'remove control chars'});
+    _($self, 'cbCfgLogTimestam')->set_active($$cfg{'defaults'}{'log timestamp'});
     _($self, 'cbCfgAllowMoreInstances')->set_active($$cfg{'defaults'}{'allow more instances'});
     _($self, 'cbCfgShowFavOnUnity')->set_active($$cfg{'defaults'}{'show favourites in unity'});
     _($self, 'comboLayout')->set_active($layout{$$cfg{'defaults'}{'layout'}});
+    _($self, 'comboTheme')->set_active($theme{$$cfg{'defaults'}{'theme'}});
 
     # Terminal Options
     _($self, 'spCfgTmoutConnect')->set_value($$cfg{'defaults'}{'timeout connect'});
@@ -773,6 +880,8 @@ sub _updateGUIPreferences {
     #_($self, 'hboxOnNoMoreTabs')->set_sensitive(_($self, 'cbCfgNewInTab')->get_active());
     _($self, 'spCfgTerminalScrollback')->set_value($$cfg{'defaults'}{'terminal scrollback lines'} // 5000);
     _($self, 'spCfgTerminalTransparency')->set_value($$cfg{'defaults'}{'terminal transparency'});
+    _($self, 'cbCfgTerminalSupportTransparency')->set_active($$cfg{'defaults'}{'terminal support transparency'} // ($$cfg{'defaults'}{'terminal transparency'} > 0));
+    _($self, 'spCfgTerminalTransparency')->set_sensitive(_($self, 'cbCfgTerminalSupportTransparency')->get_active());
     _($self, 'cbCfgExpectDebug')->set_active($$cfg{'defaults'}{'debug'});
     _($self, 'cbCfgStartMaximized')->set_active($$cfg{'defaults'}{'start maximized'});
     _($self, 'radioCfgTabsTop')->set_active($$cfg{'defaults'}{'tabs position'} eq 'top');
@@ -802,23 +911,22 @@ sub _updateGUIPreferences {
     _($self, 'btnCfgSaveSessionLogs')->set_current_folder($$cfg{'defaults'}{'session logs folder'});
     _($self, 'spCfgSaveSessionLogs')->set_value($$cfg{'defaults'}{'session logs amount'});
     _($self, 'cfgComboCharEncode')->set_active($self->{_ENCODINGS_MAP}{$$cfg{'defaults'}{'terminal character encoding'} // 'UTF-8'});
-    _($self, 'cfgLblCharEncode')->set_text($self->{_ENCODINGS_HASH}{$$cfg{'defaults'}{'terminal character encoding'} // 'RFC-3629'});
+    my $desc = __($self->{_ENCODINGS_HASH}{$$cfg{'defaults'}{'terminal character encoding'}} // 'RFC-3629');
+    _($self, 'cfgLblCharEncode')->set_markup("<span size='x-small'>$desc</span>");
     _($self, 'cfgComboBackspace')->set_active($$self{_BACKSPACE_BINDING}{$$cfg{'defaults'}{'terminal backspace'} // '0'});
     _($self, 'cbCfgUnsplitDisconnected')->set_active($$cfg{'defaults'}{'unsplit disconnected terminals'} // '0');
     _($self, 'cbCfgConfirmChains')->set_active($$cfg{'defaults'}{'confirm chains'} // 1);
     _($self, 'cbCfgSkip1stChainExpect')->set_active($$cfg{'defaults'}{'skip first chain expect'} // 1);
     _($self, 'cbCfgEnableTreeLines')->set_active($$cfg{'defaults'}{'enable tree lines'} // 0);
+    _($self, 'cbCfgShowTreeTitles')->set_active($$cfg{'defaults'}{'show tree titles'} // 1);
     _($self, 'cbCfgEnableOverlayScrolling')->set_active($$cfg{'defaults'}{'tree overlay scrolling'} // 1);
     _($self, 'cbCfgShowStatistics')->set_active($$cfg{'defaults'}{'show statistics'} // 1);
-    _($self, 'cbCfgPreventF11')->set_active($$cfg{'defaults'}{'prevent F11'});
     _($self, 'cbCfgHideConnSubMenu')->set_active($$cfg{'defaults'}{'hide connections submenu'});
     _($self, 'fontTree')->set_font_name($$cfg{'defaults'}{'tree font'});
     _($self, 'fontInfo')->set_font_name($$cfg{'defaults'}{'info font'});
     _($self, 'cbCfgAudibleBell')->set_active($$cfg{'defaults'}{'audible bell'});
     _($self, 'cbCfgShowTerminalStatus')->set_active($$cfg{'defaults'}{'terminal show status bar'});
     _($self, 'cbCfgChangeMainTitle')->set_active($$cfg{'defaults'}{'change main title'});
-    _($self, 'rbCfgSwitchTabsCtrl')->set_active(! $$cfg{'defaults'}{'how to switch tabs'});
-    _($self, 'rbCfgSwitchTabsAlt')->set_active($$cfg{'defaults'}{'how to switch tabs'});
 
     # Terminal Colors
     _updateWidgetColor($self, $$cfg{'defaults'}, 'colorBlack', 'color black', _($self, 'colorBlack')->get_color()->to_string());
@@ -865,6 +973,7 @@ sub _updateGUIPreferences {
     _($self, 'entryCfgJumpIP')->set_text($$cfg{'defaults'}{'jump ip'} // '');
     _($self, 'entryCfgJumpPort')->set_value(($$cfg{'defaults'}{'jump port'} // 22) || 22);
     _($self, 'entryCfgJumpUser')->set_text($$cfg{'defaults'}{'jump user'} // '');
+    _($self, 'entryCfgJumpPass')->set_text($$cfg{'defaults'}{'jump pass'} // '');
     if (($$cfg{'defaults'}{'proxy'} eq 'Jump')&&(defined $$self{_CFG}{'defaults'}{'jump key'})&&($$self{_CFG}{'defaults'}{'jump key'} ne '')) {
         _($self, 'entryCfgJumpKey')->set_uri("file://$$self{_CFG}{'defaults'}{'jump key'}");
     }
@@ -878,28 +987,37 @@ sub _updateGUIPreferences {
     $$self{_VARIABLES}->update($$self{_CFG}{'defaults'}{'global variables'});
     $$self{_CMD_LOCAL}->update($$self{_CFG}{'defaults'}{'local commands'}, undef, 'local');
     $$self{_CMD_REMOTE}->update($$self{_CFG}{'defaults'}{'remote commands'}, undef, 'remote');
-    if (!$$self{_KEEPASS}->update($$self{_CFG}{'defaults'}{'keepass'})) {
-        show($self, 0);
-        _($self, 'nbPreferences')->set_current_page(-1);
-        return 0;
-    }
+    $$self{_KEEPASS}->update($$self{_CFG}{'defaults'}{'keepass'});
+    $$self{_KEYBINDS}->update($$self{_CFG}{'defaults'}{'keybindings'});
+    $$self{_KEYBINDS}->LoadHotKeys($$self{_CFG});
 
-    if (defined($$self{_CFG}{'tmp'}{'tray available'}) && $$self{_CFG}{'tmp'}{'tray available'} eq 'warning') {
-        _($self, 'lblRestartRequired')->set_text("(*) Requires restarting PAC for the change(s) to take effect\n\n" . (_($self, 'cbCfgStartIconified')->get_tooltip_text() // '') );
+    if (defined $PACMain::FUNCS{_EDIT}) {
+        _($PACMain::FUNCS{_EDIT}, 'btnCheckKPX')->set_sensitive($$self{'_CFG'}{'defaults'}{'keepass'}{'use_keepass'});
     }
 
     # Hide show options not available on choosen layout
     if ($$cfg{'defaults'}{'layout'} eq 'Compact') {
-        _($self,'frameTabsInMainWindow')->hide();
-        _($self,'cbCfgStartMainMaximized')->hide();
-        _($self,'cbCfgRememberSize')->hide();
-        _($self,'cbCfgSaveOnExit')->hide();
-        if ($ENV{'ASBRU_DESKTOP'} eq 'gnome-shell') {
-            _($self,'cbCfgStartIconified')->hide();
-            _($self,'cbCfgCloseToTray')->hide();
+        _($self, 'frameTabsInMainWindow')->hide();
+        _($self, 'cbCfgStartMainMaximized')->hide();
+        _($self, 'cbCfgRememberSize')->hide();
+        _($self, 'cbCfgSaveOnExit')->hide();
+        _($self, 'cbCfgCloseToTray')->hide();
+        if ($$cfg{'defaults'}{'close to tray'} == 0) {
+            # Force close to tray on Compact mode
+            _($self, 'cbCfgCloseToTray')->set_active(1);
+            $$cfg{'defaults'}{'close to tray'} = 1;
+        }
+        if (!$PACMain::STRAY) {
+            _($self, 'cbCfgStartIconified')->hide();
         }
     }
 
+    # Disable "save on exit" if "auto save" is enabled
+    _updateSaveOnExit($self);
+
+    # Update KeePass button
+    _updateCfgProxyKeePass($self);
+
     return 1;
 }
 
@@ -912,6 +1030,10 @@ sub _closeConfiguration {
 sub _saveConfiguration {
     my $self = shift;
 
+    # Increase and document config version changes
+    $$self{_CFG}{'config version'} = 2;
+    $$self{_CFG}{'config version change'} = 'Added keybindings settings';
+
     $$self{_CFG}{'defaults'}{'command prompt'} = _($self, 'entryCfgPrompt')->get_chars(0, -1);
     $$self{_CFG}{'defaults'}{'username prompt'} = _($self, 'entryCfgUserPrompt')->get_chars(0, -1);
     $$self{_CFG}{'defaults'}{'password prompt'} = _($self, 'entryCfgPasswordPrompt')->get_chars(0, -1);
@@ -928,6 +1050,7 @@ sub _saveConfiguration {
     $$self{_CFG}{'defaults'}{'terminal scrollback lines'} = _($self, 'spCfgTerminalScrollback')->get_chars(0, -1);
     $$self{_CFG}{'defaults'}{'terminal transparency'} = _($self, 'spCfgTerminalTransparency')->get_value();
     $$self{_CFG}{'defaults'}{'terminal transparency'} =~ s/,/\./go;
+    $$self{_CFG}{'defaults'}{'terminal support transparency'} = _($self, 'cbCfgTerminalSupportTransparency')->get_active();
     $$self{_CFG}{'defaults'}{'terminal backspace'} = _($self, 'cfgComboBackspace')->get_active_text();
     $$self{_CFG}{'defaults'}{'auto accept key'} = _($self, 'cbCfgAutoAcceptKeys')->get_active();
     $$self{_CFG}{'defaults'}{'debug'} = _($self, 'cbCfgExpectDebug')->get_active();
@@ -937,10 +1060,11 @@ sub _saveConfiguration {
     $$self{_CFG}{'defaults'}{'tabs in main window'} = _($self, 'cbCfgTabsInMain')->get_active();
     $$self{_CFG}{'defaults'}{'auto hide connections list'} = _($self, 'cbCfgConnectionsAutoHide')->get_active();
     $$self{_CFG}{'defaults'}{'auto hide button bar'} = _($self, 'cbCfgButtonBarAutoHide')->get_active();
+    $$self{_CFG}{'defaults'}{'info in status bar'} = _($self, 'cbCfgStatusBar')->get_active();
+    $$self{_CFG}{'defaults'}{'forwarding short names'} = _($self, 'rbCfgStatusShort')->get_active();
+    $$self{_CFG}{'defaults'}{'forwarding full names'} = _($self, 'rbCfgStatusFull')->get_active();
     $$self{_CFG}{'defaults'}{'hide on connect'} = _($self, 'cbCfgHideOnConnect')->get_active();
     $$self{_CFG}{'defaults'}{'force split tabs to 50%'} = _($self, 'cbCfgForceSplitSize')->get_active();
-    $$self{_CFG}{'defaults'}{'ping port before connect'} = _($self, 'cbCfgPreConnPingPort')->get_active();
-    $$self{_CFG}{'defaults'}{'ping port timeout'} = _($self, 'spCfgPingTimeout')->get_chars(0, -1);
     $$self{_CFG}{'defaults'}{'start iconified'} = _($self, 'cbCfgStartIconified')->get_active();
     $$self{_CFG}{'defaults'}{'start maximized'} = _($self, 'cbCfgStartMaximized')->get_active();
     $$self{_CFG}{'defaults'}{'start main maximized'} = _($self, 'cbCfgStartMainMaximized')->get_active();
@@ -965,6 +1089,26 @@ sub _saveConfiguration {
     $$self{_CFG}{'defaults'}{'jump ip'} = _($self, 'entryCfgJumpIP')->get_chars(0, -1);
     $$self{_CFG}{'defaults'}{'jump port'} = _($self, 'entryCfgJumpPort')->get_chars(0, -1);
     $$self{_CFG}{'defaults'}{'jump user'} = _($self, 'entryCfgJumpUser')->get_chars(0, -1);
+    $$self{_CFG}{'defaults'}{'jump pass'} = _($self, 'entryCfgJumpPass')->get_chars(0, -1);
+
+    # Remove un used settings in network settings to avoid unexpected conflicts
+    if ($$self{_CFG}{'defaults'}{'proxy'} eq 'No') {
+        $$self{_CFG}{'defaults'}{'proxy ip'} = '';
+        $$self{_CFG}{'defaults'}{'proxy user'} = '';
+        $$self{_CFG}{'defaults'}{'proxy pass'} = '';
+        $$self{_CFG}{'defaults'}{'jump ip'} = '';
+        $$self{_CFG}{'defaults'}{'jump user'} = '';
+        $$self{_CFG}{'defaults'}{'jump pass'} = '';
+    } elsif ($$self{_CFG}{'defaults'}{'proxy'} eq 'Proxy') {
+        $$self{_CFG}{'defaults'}{'jump ip'} = '';
+        $$self{_CFG}{'defaults'}{'jump user'} = '';
+        $$self{_CFG}{'defaults'}{'jump pass'} = '';
+    } elsif ($$self{_CFG}{'defaults'}{'proxy'} eq 'Jump') {
+        $$self{_CFG}{'defaults'}{'proxy ip'} = '';
+        $$self{_CFG}{'defaults'}{'proxy user'} = '';
+        $$self{_CFG}{'defaults'}{'proxy pass'} = '';
+    }
+
 
     $$self{_CFG}{'defaults'}{'shell binary'} = _($self, 'entryCfgShellBinary')->get_chars(0, -1);
     $$self{_CFG}{'defaults'}{'shell options'} = _($self, 'entryCfgShellOptions')->get_chars(0, -1);
@@ -1007,18 +1151,20 @@ sub _saveConfiguration {
     $$self{_CFG}{'defaults'}{'confirm chains'} = _($self, 'cbCfgConfirmChains')->get_active();
     $$self{_CFG}{'defaults'}{'skip first chain expect'} = _($self, 'cbCfgSkip1stChainExpect')->get_active();
     $$self{_CFG}{'defaults'}{'enable tree lines'} = _($self, 'cbCfgEnableTreeLines')->get_active();
+    $$self{_CFG}{'defaults'}{'show tree titles'} = _($self, 'cbCfgShowTreeTitles')->get_active();
     $$self{_CFG}{'defaults'}{'tree overlay scrolling'} = _($self, 'cbCfgEnableOverlayScrolling')->get_active();
     #DevNote: option currently disabled
     #$$self{_CFG}{'defaults'}{'check versions at start'} = _($self, 'cbCfgCheckVersions')->get_active();
     $$self{_CFG}{'defaults'}{'show statistics'} = _($self, 'cbCfgShowStatistics')->get_active();
+
+    $$self{_CFG}{'defaults'}{'unprotected set'} = _($self, 'rbCfgUnForeground')->get_active() ? 'foreground' : 'background' ;
+    $$self{_CFG}{'defaults'}{'unprotected color'} = _($self, 'colorCfgUnProtected')->get_color()->to_string();
+
     $$self{_CFG}{'defaults'}{'protected set'} = _($self, 'rbCfgForeground')->get_active() ? 'foreground' : 'background' ;
     $$self{_CFG}{'defaults'}{'protected color'} = _($self, 'colorCfgProtected')->get_color()->to_string();
+
     $$self{_CFG}{'defaults'}{'use gui password'} = _($self, 'cbCfgUseGUIPassword')->get_active();
     $$self{_CFG}{'defaults'}{'use gui password tray'} = _($self, 'cbCfgUseGUIPasswordTray')->get_active();
-    $$self{_CFG}{'defaults'}{'disable CTRL key bindings'} = _($self, 'cbCfgCTRLDisable')->get_active();
-    $$self{_CFG}{'defaults'}{'disable ALT key bindings'} = _($self, 'cbCfgALTDisable')->get_active();
-    $$self{_CFG}{'defaults'}{'disable SHIFT key bindings'} = _($self, 'cbCfgSHIFTDisable')->get_active();
-    $$self{_CFG}{'defaults'}{'prevent F11'} = _($self, 'cbCfgPreventF11')->get_active();
     $$self{_CFG}{'defaults'}{'autostart shell upon PAC start'} = _($self, 'cbCfgAutoStartShell')->get_active();
     $$self{_CFG}{'defaults'}{'tree on right side'} = _($self, 'cbCfgTreeOnRight')->get_active();
     $$self{_CFG}{'defaults'}{'prevent mouse over show tree'} = ! _($self, 'cbCfgPreventMOShowTree')->get_active();
@@ -1028,17 +1174,17 @@ sub _saveConfiguration {
     $$self{_CFG}{'defaults'}{'info font'} = _($self, 'fontInfo')->get_font_name();
     $$self{_CFG}{'defaults'}{'use login shell to connect'} = _($self, 'cbCfgUseShellToConnect')->get_active();
     $$self{_CFG}{'defaults'}{'audible bell'} = _($self, 'cbCfgAudibleBell')->get_active();
-    $$self{_CFG}{'defaults'}{'ctrl tab'} = _($self, 'rbCfgCtrlTabLast')->get_active() ? 'last' : 'next';
     $$self{_CFG}{'defaults'}{'terminal show status bar'} = _($self, 'cbCfgShowTerminalStatus')->get_active();
     $$self{_CFG}{'defaults'}{'append group name'} = _($self, 'cbCfgAutoAppendGroupName')->get_active();
     $$self{_CFG}{'defaults'}{'change main title'} = _($self, 'cbCfgChangeMainTitle')->get_active();
     $$self{_CFG}{'defaults'}{'when no more tabs'} = _($self, 'rbOnNoTabsNothing')->get_active() ? 'last' : 'next';
     $$self{_CFG}{'defaults'}{'selection to clipboard'} = _($self, 'cbCfgSelectionToClipboard')->get_active();
-    $$self{_CFG}{'defaults'}{'how to switch tabs'} = _($self, 'rbCfgSwitchTabsAlt')->get_active();
     $$self{_CFG}{'defaults'}{'remove control chars'} = _($self, 'cbCfgRemoveCtrlCharsConf')->get_active();
+    $$self{_CFG}{'defaults'}{'log timestamp'} = _($self, 'cbCfgLogTimestam')->get_active();
     $$self{_CFG}{'defaults'}{'allow more instances'} = _($self, 'cbCfgAllowMoreInstances')->get_active();
     $$self{_CFG}{'defaults'}{'show favourites in unity'} = _($self, 'cbCfgShowFavOnUnity')->get_active();
     $$self{_CFG}{'defaults'}{'layout'} = _($self, 'comboLayout')->get_active_text();
+    $$self{_CFG}{'defaults'}{'theme'} = _($self, 'comboTheme')->get_active_text();
 
     # Terminal colors
     $$self{_CFG}{'defaults'}{'color black'} = _($self, 'colorBlack')->get_color()->to_string();
@@ -1066,17 +1212,6 @@ sub _saveConfiguration {
         $$self{_CFG}{'defaults'}{'when no more tabs'} = 2;
     }
 
-    #my $new_cfg_location = _($self, 'btnCfgLocation')->get_uri // "$ENV{HOME}/.config/pac";
-    #$new_cfg_location =~ s/^file:\/\///go;
-    #if ($new_cfg_location ne $$self{_CFG}{'defaults'}{'config location'}) {
-    #    system("mv $$self{_CFG}{'defaults'}{'config location'} $new_cfg_location");
-    #    if (-d $new_cfg_location) {
-    #        system("rm -rf $ENV{HOME}/.config/pac");
-    #        system("ln -s $new_cfg_location/pac $ENV{HOME}/.config/pac");
-    #}
-    #}
-    #$$self{_CFG}{'defaults'}{'config location'} = $new_cfg_location;
-
     if (_($self, 'rbCfgStartTreeConn')->get_active()) {
         $$self{_CFG}{'defaults'}{'start PAC tree on'} = 'connections';
     }
@@ -1090,14 +1225,23 @@ sub _saveConfiguration {
         $$self{_CFG}{'defaults'}{'start PAC tree on'} = 'clusters';
     }
 
-    unlink("$ENV{'HOME'}/.config/autostart/pac_start.desktop");
+    unlink("$ENV{'HOME'}/.config/autostart/asbru_start.desktop");
     $$self{_CFG}{'defaults'}{'start at session startup'} = 0;
     if (_($self, 'cbCfgAutoStart')->get_active()) {
-        $PACUtils::PACDESKTOP[6] = 'Exec=/usr/bin/pac --no-splash' . ($$self{_CFG}{'defaults'}{'start iconified'} ? ' --iconified' : '');
-        open(F, ">:utf8","$ENV{HOME}/.config/autostart/pac_start.desktop");
-        print F join("\n", @PACUtils::PACDESKTOP);
-        close F;
-        $$self{_CFG}{'defaults'}{'start at session startup'} = 1;
+        my $autostart_dir = "$ENV{HOME}/.config/autostart";
+
+        $PACUtils::PACDESKTOP[6] = 'Exec=env GDK_BACKEND=x11 /usr/bin/asbru-cm --no-splash' . ($$self{_CFG}{'defaults'}{'start iconified'} ? ' --iconified' : '');
+        if (!-e $autostart_dir) {
+            mkdir($autostart_dir);
+        }
+        if (-d $autostart_dir) {
+            open(F, ">:utf8", "$autostart_dir/asbru_start.desktop");
+            print F join("\n", @PACUtils::PACDESKTOP);
+            close F;
+            $$self{_CFG}{'defaults'}{'start at session startup'} = 1;
+        } else {
+            print("ERROR: Unable to create autostart directory [$autostart_dir]\n");
+        }
     }
 
     # Save the global variables tab options
@@ -1109,7 +1253,9 @@ sub _saveConfiguration {
     # Save the global remote commands tab options
     $$self{_CFG}{'defaults'}{'remote commands'} = $$self{_CMD_REMOTE}->get_cfg();
     # Save KeePass options
-    $$self{_CFG}{'defaults'}{'keepass'} = $$self{_KEEPASS}->get_cfg();
+    $$self{_CFG}{'defaults'}{'keepass'} = $$self{_KEEPASS}->get_cfg(1);
+    # Save KeyBindings options
+    $$self{_CFG}{'defaults'}{'keybindings'} = $$self{_KEYBINDS}->get_cfg();
 
     $PACMain::FUNCS{_MAIN}->_setCFGChanged(1);
     $self->_updateGUIPreferences();
@@ -1122,6 +1268,18 @@ sub _saveConfiguration {
     return 1;
 }
 
+sub _updateSaveOnExit {
+    my $self = shift;
+
+    _($self, 'cbCfgSaveOnExit')->set_sensitive(!_($self, 'cbCfgAutoSave')->get_active());
+}
+
+sub _updateCfgProxyKeePass {
+    my $self = shift;
+
+    _($self, 'btnCfgProxyCheckKPX')->set_sensitive($$self{'_CFG'}{'defaults'}{'keepass'}{'use_keepass'} && !_($self, 'cbCfgProxyNo')->get_active());
+}
+
 # END: Define PRIVATE CLASS functions
 ###################################################################
 
diff --git a/lib/PACEdit.pm b/lib/PACEdit.pm
index 9cc0395b..804c8c7d 100644
--- a/lib/PACEdit.pm
+++ b/lib/PACEdit.pm
@@ -3,7 +3,7 @@ package PACEdit;
 ###############################################################################
 # This file is part of Ásbrú Connection Manager
 #
-# Copyright (C) 2017-2020 Ásbrú Connection Manager team (https://asbru-cm.net)
+# Copyright (C) 2017-2022 Ásbrú Connection Manager team (https://asbru-cm.net)
 # Copyright (C) 2010-2016 David Torrejon Vaquerizas
 #
 # Ásbrú Connection Manager is free software: you can redistribute it and/or
@@ -42,6 +42,8 @@ use Storable qw (dclone nstore nstore_fd fd_retrieve);
 use Encode;
 use Glib::IO; # GSettings
 
+use Config;
+
 # GTK
 use Gtk3 '-init';
 use Gtk3::SimpleList;
@@ -54,6 +56,7 @@ use PACExecEntry;
 use PACPrePostEntry;
 use PACVarEntry;
 use PACTermOpts;
+use PACKeePass;
 
 # END: Import Modules
 ###################################################################
@@ -63,13 +66,13 @@ use PACTermOpts;
 
 my $APPNAME = $PACUtils::APPNAME;
 my $APPVERSION = $PACUtils::APPVERSION;
-my $RES_DIR = $RealBin . '/res';
-my $AUTOSTART_FILE = $RES_DIR . '/pac_start.desktop';
-
-my $GLADE_FILE = $RES_DIR . '/asbru.glade';
-my $INIT_CFG_FILE = $RES_DIR . '/pac.yml';
+my $RES_DIR = "$RealBin/res";
+my $AUTOSTART_FILE = "$RES_DIR/asbru_start.desktop";
+my $THEME_DIR = "$RES_DIR/themes/defualt";
+my $GLADE_FILE = "$RES_DIR/asbru.glade";
+my $INIT_CFG_FILE = "$RES_DIR/asbru.yml";
 my $CFG_DIR = $ENV{"ASBRU_CFG"};
-my $CFG_FILE = $CFG_DIR . '/pac.yml';
+my $CFG_FILE = "$CFG_DIR/asbru.yml";
 
 # END: Define GLOBAL CLASS variables
 ###################################################################
@@ -99,8 +102,12 @@ sub new {
     $self->{_LOCAL_EXEC} = undef;
     $self->{_TXTOPTSBUFFER} = undef;
 
+    if ($$self{_CFG}{defaults}{theme}) {
+        $THEME_DIR = "$RES_DIR/themes/$$self{_CFG}{defaults}{theme}";
+    }
+
     # Setup known connection methods
-    %{$$self{_METHODS}} = _getMethods($self);
+    %{$$self{_METHODS}} = _getMethods($self,$THEME_DIR);
 
     # Build the GUI
     _initGUI($self) or return 0;
@@ -130,7 +137,7 @@ sub show {
     my $title;
     if ($$self{_IS_NEW} eq 'quick') {
         _($self, 'btnSaveEdit')->set_label('_Start Connection');
-        _($self, 'btnSaveEdit')->set_image(Gtk3::Image->new_from_stock('pac-quick-connect', 'button') );
+        _($self, 'btnSaveEdit')->set_image(Gtk3::Image->new_from_stock('asbru-quick-connect', 'button') );
         _($self, 'btnCloseEdit')->set_label('_Cancel Quick connect');
         _($self, 'btnCloseEdit')->set_image(Gtk3::Image->new_from_stock('gtk-close', 'button') );
         $title = "Quick Connect : $APPNAME (v$APPVERSION)";
@@ -144,7 +151,11 @@ sub show {
 
     $$self{_WINDOWEDIT}->set_title($title);
 
-    if ($$self{_IS_NEW}) {_($self, 'nbProps')->set_current_page(0); _($self, 'entryIP')->grab_focus; _($self, 'nbDetails')->set_current_page(0);}
+    if ($$self{_IS_NEW}) {
+        _($self, 'nbProps')->set_current_page(0);
+        _($self, 'entryIP')->grab_focus;
+        _($self, 'nbDetails')->set_current_page(0);
+    }
 
     $$self{_WINDOWEDIT}->set_modal(1);
 
@@ -167,17 +178,24 @@ sub _initGUI {
     $$self{_WINDOWEDIT} = $$self{_GLADE}->get_object('windowEdit');
     $$self{_WINDOWEDIT}->set_size_request(-1, 550);
 
-    _($self, 'imgBannerEditIcon')->set_from_file($RES_DIR . '/asbru-edit.svg');
+    _($self, 'imgBannerEditIcon')->set_from_file($THEME_DIR . '/asbru-edit.svg');
+    _($self, "linkHelpConn1")->set_label('');
+    _($self, "linkHelpConn1")->set_image(Gtk3::Image->new_from_stock('asbru-help', 'button'));
+    _($self, "linkHelpNetwokSettings")->set_label('');
+    _($self, "linkHelpNetwokSettings")->set_image(Gtk3::Image->new_from_stock('asbru-help', 'button'));
+
+    _($self, 'btnEditNetworkSettingsCheckKPX')->set_label('');
+    _($self, 'btnEditNetworkSettingsCheckKPX')->set_image(Gtk3::Image->new_from_stock('asbru-keepass', 'button') );
 
     $$self{_SPECIFIC} = PACMethod->new();
     _($self, 'alignSpecific')->add($PACMethod::CONTAINER);
     _($self, 'alignTermOpts')->add(($$self{_TERMOPTS} = PACTermOpts->new())->{container});
-    _($self, 'imgTermOpts')->set_from_stock('pac-terminal-ok-small', 'button');
+    _($self, 'imgTermOpts')->set_from_stock('asbru-terminal-ok-small', 'button');
     _($self, 'alignVar')->add(($$self{_VARIABLES} = PACVarEntry->new())->{container});
     _($self, 'alignPreExec')->add(($$self{_PRE_EXEC} = PACPrePostEntry->new())->{container});
     _($self, 'alignPostExec')->add(($$self{_POST_EXEC} = PACPrePostEntry->new())->{container});
-    _($self, 'alignMacros')->add(($$self{_MACROS} = PACExecEntry->new())->{container});
-    _($self, 'alignLocal')->add(($$self{_LOCAL_EXEC} = PACExecEntry->new())->{container});
+    _($self, 'alignMacros')->add(($$self{_MACROS} = PACExecEntry->new(undef, undef, 'cremote'))->{container});
+    _($self, 'alignLocal')->add(($$self{_LOCAL_EXEC} = PACExecEntry->new(undef, undef, 'clocal'))->{container});
     _($self, 'alignExpect')->add(($$self{_EXPECT_EXEC} = PACExpectEntry->new())->{container});
     _($self, 'nbProps')->show_all();
 
@@ -188,10 +206,8 @@ sub _initGUI {
         $$self{_METHODS}{$method}{'position'} = $i++;
     }
 
-    map({_($self, 'comboKPXWhere')->append_text($_); push(@{$$self{_KPXWHERE}}, $_);} ('comment', 'created', 'password', 'title', 'url', 'username') );
-
     # Initialize main window
-    $$self{_WINDOWEDIT}->set_icon_name('pac-app-big');
+    $$self{_WINDOWEDIT}->set_icon_name('asbru-app-big');
     $$self{_WINDOWEDIT}->set_position('center');
 
     $$self{cbShowHidden} = Gtk3::CheckButton->new_with_mnemonic('Show _hidden files');
@@ -200,10 +216,12 @@ sub _initGUI {
     $$self{cbLogsShowHidden} = Gtk3::CheckButton->new_with_mnemonic('Show _hidden files');
     _($self, 'btnEditSaveSessionLogs')->set_extra_widget($$self{cbLogsShowHidden});
 
-    _($self, 'btnCheckKPX')->set_image(Gtk3::Image->new_from_stock('pac-keepass', 'button') );
+    _($self, 'btnCheckKPX')->set_image(Gtk3::Image->new_from_stock('asbru-keepass', 'button') );
+    _($self, 'btnCheckKPX')->set_label('');
 
     _($self, 'btnSaveEdit')->set_use_underline(1);
     _($self, 'btnCloseEdit')->set_use_underline(1);
+    _($self, 'btnCheckKPX')->set_sensitive($$self{'_CFG'}{'defaults'}{'keepass'}{'use_keepass'});
 
     return 1;
 }
@@ -212,6 +230,10 @@ sub __checkRBAuth {
     my $self = shift;
 
     if (_($self, 'comboMethod')->get_active_text() =~ /SSH|SFTP/i) {
+        _($self, 'entryCfgJumpConnPass')->set_sensitive(1);
+        _($self, 'entryCfgJumpConnPass')->set_visible(1);
+        _($self, 'lblJumpPass')->set_sensitive(1);
+        _($self, 'lblJumpPass')->set_visible(1);
         if(_($self, 'rbCfgAuthManual')->get_active()) {
             _($self, 'frameExpect')->set_sensitive(0);
             _($self, 'labelExpect')->set_sensitive(0);
@@ -238,7 +260,12 @@ sub __checkRBAuth {
         _($self, 'rbUseProxyJump')->set_tooltip_text("If selected, use a SSH tunnel to simulate a jump host for this connection.");
         _($self, 'vboxJumpCfgOptions')->set_sensitive(_($self, 'rbUseProxyJump')->get_active());
         _($self, 'vboxJumpCfg')->set_visible(1);
+        _($self, 'entryCfgJumpConnPass')->set_sensitive(0);
+        _($self, 'entryCfgJumpConnPass')->set_visible(0);
         _($self, 'vboxCfgManualProxyConn')->set_visible(1);
+        _($self, 'lblJumpPass')->set_sensitive(0);
+        _($self, 'lblJumpPass')->set_visible(0);
+        _($self, 'entryCfgJumpConnPass')->set_text('');
     } else {
         if (_($self, 'rbUseProxyJump')->get_active()) {
             _($self, 'rbUseProxyIfCFG')->set_active(1);
@@ -251,9 +278,9 @@ sub __checkRBAuth {
         _($self, 'vboxCfgManualProxyConn')->set_visible(0);
     }
 
-    _($self, 'alignUserPass')->set_sensitive(_($self, 'rbCfgAuthUserPass')->get_active());
+    _($self, 'alignUserPass')->set_sensitive(_($self, 'rbCfgAuthUserPass')->get_active() || _($self, 'rbCfgAuthManual')->get_active());
     _($self, 'alignPublicKey')->set_sensitive(_($self, 'rbCfgAuthPublicKey')->get_active());
-    _($self, 'alignManual')->set_sensitive(_($self, 'rbCfgAuthManual')->get_active());
+    _($self, 'hboxAuthPassword')->set_sensitive(!_($self, 'rbCfgAuthManual')->get_active());
 
     return 1;
 }
@@ -281,13 +308,14 @@ sub _setupCallbacks {
 
         &{$$self{_METHODS}{$method}{'updateGUI'}}($$self{_CFG}{'environments'}{$$self{_UUID}});
         $$self{_SPECIFIC}->change($method, $$self{_CFG}{'environments'}{$$self{_UUID}});
+        $$self{_WINDOWEDIT}->show_all(); # Without this line, $$self{_SPECIFIC} widgets WILL NOT BE SHOWN!!!!!!!!!
         __checkRBAuth($self);
     });
 
     # Capture "User/Pass" connection radiobutton state change
-    _($self, 'rbCfgAuthUserPass')->signal_connect(toggled => sub {$self->__checkRBAuth;});
-    _($self, 'rbCfgAuthPublicKey')->signal_connect(toggled => sub {$self->__checkRBAuth;});
-    _($self, 'rbCfgAuthManual')->signal_connect(toggled => sub {$self->__checkRBAuth;});
+    _($self, 'rbCfgAuthUserPass')->signal_connect(toggled => sub {$self->__checkRBAuth();});
+    _($self, 'rbCfgAuthPublicKey')->signal_connect(toggled => sub {$self->__checkRBAuth();});
+    _($self, 'rbCfgAuthManual')->signal_connect(toggled => sub {$self->__checkRBAuth();});
 
     # Capture 'show password' checkbox toggled state
     _($self, 'cbConnShowPass')->signal_connect('toggled' => sub {
@@ -318,13 +346,27 @@ sub _setupCallbacks {
 
     # Capture 'open folder' button clicked
     _($self, 'btnEditOpenSessionLogs')->signal_connect('clicked' => sub {
-        system('/usr/bin/xdg-open ' . (_($self, 'btnEditSaveSessionLogs')->get_current_folder()) );
+        my $folder = _($self, 'btnEditSaveSessionLogs')->get_current_folder();
+        if (!-e $folder) {
+            $folder = "$CFG_DIR/session_logs";
+            _($self, 'btnEditSaveSessionLogs')->get_current_folder($folder);
+        }
+        system("$ENV{'ASBRU_ENV_FOR_EXTERNAL'} /usr/bin/xdg-open $folder");
     });
 
     # Capture 'Get Command line' button clicked
     _($self, 'btnEditGetCMD')->signal_connect('clicked' => sub {
-        my $cmd = `$RealBin/lib/pac_conn $CFG_DIR/pac.nfreeze $$self{_UUID} 1`;
-        _wMessage($$self{_WINDOWEDIT}, "<b>COMMAND LINE:</b>\n$cmd");
+        # DevNote: please make sure to keep double quotes in "$RealBin/lib/asbru_conn" since it might be replaced by packagers (see RPM spec)
+        if (!$ENV{'KPXC_MP'} && $PACMain::FUNCS{_KEEPASS}->hasKeePassField($$self{_CFG},$$self{_UUID})) {
+            if ($$self{_CFG}{defaults}{keepass}{password}) {
+                $ENV{'KPXC_MP'} = $$self{_CFG}{defaults}{keepass}{password};
+            } else {
+                my $kpxc = PACKeePass->new(0, $$self{_CFG}{defaults}{keepass});
+                $kpxc->getMasterPassword($$self{_WINDOWEDIT});
+            }
+        }
+        my $cmd = `'$^X' "$RealBin/lib/asbru_conn" "$CFG_DIR/asbru.nfreeze" "$$self{_UUID}" 0 1`;
+        _wMessage($$self{_WINDOWEDIT}, $cmd, 1, 1, 'w-info');
     });
 
     # Capture "Save session logs" checkbox
@@ -338,41 +380,37 @@ sub _setupCallbacks {
         _($self, 'cbCfgQuoteCommand')->set_sensitive(_($self, 'cbEditPrependCommand')->get_active());
     });
 
-    #_($self, 'cbInferUserPassKPX')->signal_connect('toggled' => sub {_($self, 'hboxCfgAuthUserPass')->set_sensitive(! _($self, 'cbInferUserPassKPX')->get_active());});
-    _($self, 'cbInferUserPassKPX')->signal_connect('toggled' => sub {
-        _($self, 'hboxCfgAuthUserPass')->set_sensitive(! _($self, 'cbInferUserPassKPX')->get_active());
-        _($self, 'entryKPXRE')->set_sensitive(_($self, 'cbInferUserPassKPX')->get_active());
-        _($self, 'btnCheckKPX')->set_sensitive(_($self, 'cbInferUserPassKPX')->get_active());
-        _($self, 'comboKPXWhere')->set_sensitive(_($self, 'cbInferUserPassKPX')->get_active());
+    # Capture "Postpend command" checkbox
+    _($self, 'cbEditPostpendCommand')->signal_connect(toggled => sub {
+        _($self, 'entryEditPostpendCommand')->set_sensitive(_($self, 'cbEditPostpendCommand')->get_active());
+        _($self, 'cbCfgQuotePostCommand')->set_sensitive(_($self, 'cbEditPostpendCommand')->get_active());
     });
 
     # Capture 'check keepassx' button clicked
     _($self, 'btnCheckKPX')->signal_connect('clicked' => sub {
-        if (! $$self{_CFG}{'defaults'}{'keepass'}{'use_keepass'}) {
-            _wMessage($$self{_WINDOWEDIT}, "ERROR: <b>KeePassX</b> can not be used because\nit is not enabled under <b>'Preferences->KeePass Options'</b>");
-            return 1;
-        }
-
-        my $title = _($self, 'entryKPXRE')->get_chars(0,-1);
-        my $where = $$self{_KPXWHERE}[_($self, 'comboKPXWhere')->get_active()];
-        my ($user, $pass, $comment, $created);
-
-        $PACMain::FUNCS{_KEEPASS}->reload;
-        my @found = $PACMain::FUNCS{_KEEPASS}->find($where, qr/$title/);
-        if (! scalar @found) {
-            wMessage($$self{_WINDOWEDIT}, "ERROR: No entry '<b>$where</b>' found on KeePassX matching '<b>" . __($title) . "</b>'");
-            return 1;
+        if (!$ENV{'KPXC_MP'} && $$self{_CFG}{defaults}{keepass}{password}) {
+            $ENV{'KPXC_MP'} = $$self{_CFG}{defaults}{keepass}{password};
         }
-        elsif (((scalar @found) > 1) && $$self{_CFG}{defaults}{keepass}{ask_user})    {
-            my $tmp = "<ASK:KeePass $where matching '$title':"; foreach my $hash (@found) {$tmp .= '|' . $$hash{$where};} $tmp .= '>';
-            my ($str, $out) = _subst($tmp);
-            ($user, $pass, $comment, $created) = ($found[$$out{pos}]{username}, $found[$$out{pos}]{password}, $found[$$out{pos}]{comment}, $found[$$out{pos}]{created});
-        } else {
-            ($user, $pass, $comment, $created) = ($found[0]{username}, $found[0]{password}, $found[0]{comment}, $found[0]{created});
+        my $selection = $PACMain::FUNCS{_KEEPASS}->listEntries($$self{_WINDOWEDIT});
+        if ($selection) {
+            # Commented for the time being, until keepassxc-cli team implements get the UUID
+            # Feature request at https://github.com/keepassxreboot/keepassxc/issues/4112
+            # Feature request at https://github.com/keepassxreboot/keepassxc/issues/4113
+            #my ($title,$ok) = $PACMain::FUNCS{_KEEPASS}->getFieldValue('Uuid',$selection);
+
+            # For the time being, we will use the full path
+            my $title = $selection;
+            if ($title) {
+                _($self, 'entryIP')->set_text("<url|$title>");
+                if (_($self, 'rbCfgAuthUserPass')->get_active) {
+                    _($self, 'entryUser')->set_text("<username|$title>");
+                    _($self, 'entryPassword')->set_text("<password|$title>");
+                } elsif (_($self, 'rbCfgAuthPublicKey')->get_active) {
+                    _($self, 'entryUserPassphrase')->set_text("<username|$title>");
+                    _($self, 'entryPassphrase')->set_text("<password|$title>");
+                }
+            }
         }
-
-        _wMessage($$self{_WINDOWEDIT}, "KeePass data inferred for $where '<b>" . __($title) . "</b>'\n - <b>User:</b> " . __($user) . "\n - <b>Password:</b> " . __($pass) . "\n - <b>Created:</b> " . __($created) . "\n - <b>Comment:</b> " . __($comment) );
-
         return 1;
     });
 
@@ -424,6 +462,10 @@ sub _setupCallbacks {
         # Populate with environment variables
         my @environment_menu;
         foreach my $key (sort {$a cmp $b} keys %ENV) {
+            # Do not offer Master Password, or any other environment variable with word PRIVATE, TOKEN
+            if ($key =~ /KPXC|PRIVATE|TOKEN/i) {
+                next;
+            }
             my $value = $ENV{$key};
             push(@environment_menu, {
                 label => "<ENV:" . __($key) . ">",
@@ -447,49 +489,6 @@ sub _setupCallbacks {
             }
         });
 
-        # Populate with <KPX_(title|username|url):*> special string
-        if ($$self{_CFG}{'defaults'}{'keepass'}{'use_keepass'}) {
-            my (@titles, @usernames, @urls);
-            foreach my $hash ($PACMain::FUNCS{_KEEPASS}->find) {
-                push(@titles, {
-                    label => "<KPX_title:$$hash{title}>",
-                    tooltip => "$$hash{password}",
-                    code => sub {_($self, "entryEditSendString")->set_text("<KPX_title:$$hash{title}>");}
-                });
-                push(@usernames, {
-                    label => "<KPX_username:$$hash{username}>",
-                    tooltip => "$$hash{password}",
-                    code => sub {_($self, "entryEditSendString")->set_text("<KPX_username:$$hash{username}>");}
-                });
-                push(@urls, {
-                    label => "<KPX_url:$$hash{url}>",
-                    tooltip => "$$hash{password}",
-                    code => sub {_($self, "entryEditSendString")->set_text("<KPX_url:$$hash{url}>");}
-                });
-            }
-
-            push(@menu_items, {
-                label => 'KeePassX',
-                stockicon => 'pac-keepass',
-                submenu =>
-                [{
-                        label => 'KeePassX title values',
-                        submenu => \@titles
-                    }, {
-                        label => 'KeePassX username values',
-                        submenu => \@usernames
-                    }, {
-                        label => 'KeePassX URL values',
-                        submenu => \@urls
-                    }, {
-                        label => "KeePass Extended Query",
-                        tooltip => "This allows you to select the value to be returned, based on another value's match againt a Perl Regular Expression",
-                        code => sub {_($self, "entryEditSendString")->set_text("<KPXRE_GET_(title|username|password|url)_WHERE_(title|username|password|url)==Your_RegExp_here==>");}
-                    }
-                ]
-            });
-        }
-
         _wPopUpMenu(\@menu_items, $event);
 
         return 1;
@@ -498,11 +497,13 @@ sub _setupCallbacks {
     # Capture proxy usage change
     _($self, 'rbUseProxyAlways')->signal_connect('toggled' => sub {
         _($self, 'vboxCfgManualProxyConnOptions')->set_sensitive(_($self, 'rbUseProxyAlways')->get_active());
+        _updateCfgProxyKeePass($self);
     });
 
     # Capture jump host change
     _($self, 'rbUseProxyJump')->signal_connect('toggled' => sub {
         _($self, 'vboxJumpCfgOptions')->set_sensitive(_($self, 'rbUseProxyJump')->get_active());
+        _updateCfgProxyKeePass($self);
     });
 
     _($self, 'btnEditClearJumpPrivateKey')->signal_connect('clicked' => sub {
@@ -516,7 +517,7 @@ sub _setupCallbacks {
     });
 
     # Capture right mouse click to show custom context menu
-    foreach my $w ('IP', 'Port', 'User', 'Password', 'EditPrependCommand', 'TabWindowTitle', 'UserPassphrase', 'Passphrase') {_($self, "entry$w")->signal_connect('button_press_event' => sub {
+    foreach my $w ('IP', 'Port', 'User', 'Password', 'EditPrependCommand', 'EditPostpendCommand', 'TabWindowTitle', 'UserPassphrase', 'Passphrase','CfgProxyConnUser','CfgProxyConnPassword','CfgJumpConnUser','CfgJumpConnPass','CfgProxyConnIP','CfgJumpConnIP') {_($self, "entry$w")->signal_connect('button_press_event' => sub {
             my ($widget, $event) = @_;
 
             return 0 unless $event->button eq 3;
@@ -610,47 +611,12 @@ sub _setupCallbacks {
                 }
             });
 
-            # Populate with KeePass special strings
-            if ($$self{_CFG}{'defaults'}{'keepass'}{'use_keepass'}) {
-                my (@titles, @usernames, @urls, @query);
-                foreach my $hash ($PACMain::FUNCS{_KEEPASS} ->find) {
-                    push(@titles, {
-                        label => "<KPX_title:$$hash{title}>",
-                        tooltip => "$$hash{password}",
-                        code => sub {_($self, "entry$w")->set_text("<KPX_title:$$hash{title}>");}
-                    });
-                    push(@usernames, {
-                        label => "<KPX_username:$$hash{username}>",
-                        tooltip => "$$hash{password}",
-                        code => sub {_($self, "entry$w")->set_text("<KPX_username:$$hash{username}>");}
-                    });
-                    push(@urls, {
-                        label => "<KPX_url:$$hash{url}>",
-                        tooltip => "$$hash{password}",
-                        code => sub {_($self, "entry$w")->set_text("<KPX_url:$$hash{url}>");}
-                    });
-                }
-
-                push(@menu_items, {
-                    label => 'KeePassX',
-                    stockicon => 'pac-keepass',
-                    submenu =>
-                    [{
-                            label => 'KeePassX title values',
-                            submenu => \@titles
-                        }, {
-                            label => 'KeePassX username values',
-                            submenu => \@usernames
-                        }, {
-                            label => 'KeePassX URL values',
-                            submenu => \@urls
-                        }, {
-                            label => "KeePass Extended Query",
-                            tooltip => "This allows you to select the value to be returned, based on another value's match againt a Perl Regular Expression",
-                            code => sub {_($self, "entry$w")->set_text("<KPXRE_GET_(title|username|password|url)_WHERE_(title|username|password|url)==Your_RegExp_here==>");}
-                        }
-                    ]
-                });
+            if ($w eq 'IP' || $w =~ /ConnIP/) {
+                $PACMain::FUNCS{_KEEPASS}->setRigthClickMenuEntry($PACMain::FUNCS{_EDIT}{_WINDOWEDIT},'url',_($self, "entry$w"),\@menu_items);
+            } elsif ($w =~ /ConnUser/) {
+                $PACMain::FUNCS{_KEEPASS}->setRigthClickMenuEntry($PACMain::FUNCS{_EDIT}{_WINDOWEDIT},'username',_($self, "entry$w"),\@menu_items);
+            } elsif ($w =~ /ConnPass/) {
+                $PACMain::FUNCS{_KEEPASS}->setRigthClickMenuEntry($PACMain::FUNCS{_EDIT}{_WINDOWEDIT},'password',_($self, "entry$w"),\@menu_items);
             }
 
             _wPopUpMenu(\@menu_items, $event);
@@ -680,6 +646,24 @@ sub _setupCallbacks {
         _($self, 'cbStartScript')->get_active() and _($self, 'comboStartScript')->popup();
     });
 
+    # Associated proxy settings to KeePass entries
+    _($self, 'btnEditNetworkSettingsCheckKPX')->signal_connect('clicked' => sub {
+        # User selects an entry in KeePass
+        my $title = $PACMain::FUNCS{_KEEPASS}->listEntries($$self{_WINDOWEDIT});
+
+        if ($title) {
+            if (_($self, 'rbUseProxyAlways')->get_active) {
+                _($self, 'entryCfgProxyConnIP')->set_text("<url|$title>");
+                _($self, 'entryCfgProxyConnUser')->set_text("<username|$title>");
+                _($self, 'entryCfgProxyConnPassword')->set_text("<password|$title>");
+            } elsif (_($self, 'rbUseProxyJump')->get_active) {
+                _($self, 'entryCfgJumpConnIP')->set_text("<url|$title>");
+                _($self, 'entryCfgJumpConnUser')->set_text("<username|$title>");
+                _($self, 'entryCfgJumpConnPass')->set_text("<password|$title>");
+            }
+        }
+    });
+
     return 1;
 }
 
@@ -694,19 +678,27 @@ sub _updateGUIPreferences {
     if (!defined $$self{_CFG}{'environments'}{$uuid}{'use proxy'}) {
         $$self{_CFG}{'environments'}{$uuid}{'use proxy'} = 0;
     }
+    # Test for missing folders, wrong migrations paths, alternate config paths
+    if (!$$self{_CFG}{'environments'}{$uuid}{'session logs folder'} || !-d $$self{_CFG}{'environments'}{$uuid}{'session logs folder'}) {
+        $$self{_CFG}{'environments'}{$uuid}{'session logs folder'} = "$CFG_DIR/session_logs";
+    }
     _($self, 'rbUseProxyIfCFG')->set_active($$self{_CFG}{'environments'}{$uuid}{'use proxy'} == 0);
     _($self, 'rbUseProxyAlways')->set_active($$self{_CFG}{'environments'}{$uuid}{'use proxy'} == 1);
     _($self, 'rbUseProxyNever')->set_active($$self{_CFG}{'environments'}{$uuid}{'use proxy'} == 2);
     _($self, 'rbUseProxyJump')->set_active($$self{_CFG}{'environments'}{$uuid}{'use proxy'} == 3);
     _($self, 'vboxCfgManualProxyConnOptions')->set_sensitive(_($self, 'rbUseProxyAlways')->get_active());
     # SOCKS Proxy
-    _($self, 'entryCfgProxyConnIP')->set_text($$self{_CFG}{'environments'}{$uuid}{'proxy ip'});
+    _($self, 'entryCfgProxyConnIP')->set_text($$self{_CFG}{'environments'}{$uuid}{'proxy ip'} // '');
     _($self, 'entryCfgProxyConnPort')->set_value($$self{_CFG}{'environments'}{$uuid}{'proxy port'} // 8080);
-    _($self, 'entryCfgProxyConnUser')->set_text($$self{_CFG}{'environments'}{$uuid}{'proxy user'});
+    _($self, 'entryCfgProxyConnUser')->set_text($$self{_CFG}{'environments'}{$uuid}{'proxy user'} // '');
+    _($self, 'entryCfgProxyConnPassword')->set_text($$self{_CFG}{'environments'}{$uuid}{'proxy pass'} // '');
     # Jump Server
     _($self, 'entryCfgJumpConnIP')->set_text($$self{_CFG}{'environments'}{$uuid}{'jump ip'} // '');
+    _($self, 'entryCfgJumpConnPort')->set_range(0, 65536);
     _($self, 'entryCfgJumpConnPort')->set_value($$self{_CFG}{'environments'}{$uuid}{'jump port'} // 22);
     _($self, 'entryCfgJumpConnUser')->set_text($$self{_CFG}{'environments'}{$uuid}{'jump user'} // '');
+    _($self, 'entryCfgJumpConnPass')->set_text($$self{_CFG}{'environments'}{$uuid}{'jump pass'} // '');
+    _($self, 'chkPseudoJumpServer')->set_active($$self{_CFG}{'environments'}{$uuid}{'pseudo jump'} // 0);
     if ((defined $$self{_CFG}{'environments'}{$uuid}{'jump key'})&&($$self{_CFG}{'environments'}{$uuid}{'jump key'} ne '')) {
         _($self, 'entryCfgJumpConnKey')->set_uri("file://$$self{_CFG}{'environments'}{$uuid}{'jump key'}");
     } else {
@@ -720,11 +712,16 @@ sub _updateGUIPreferences {
     _($self, 'cbEditPrependCommand')->set_active($$self{_CFG}{'environments'}{$uuid}{'use prepend command'} // 0);
     _($self, 'entryEditPrependCommand')->set_text($$self{_CFG}{'environments'}{$uuid}{'prepend command'} // '');
     _($self, 'entryEditPrependCommand')->set_sensitive(_($self, 'cbEditPrependCommand')->get_active());
+    _($self, 'cbEditPostpendCommand')->set_active($$self{_CFG}{'environments'}{$uuid}{'use postpend command'} // 0);
+    _($self, 'entryEditPostpendCommand')->set_text($$self{_CFG}{'environments'}{$uuid}{'postpend command'} // '');
+    _($self, 'entryEditPostpendCommand')->set_sensitive(_($self, 'cbEditPostpendCommand')->get_active());
     _($self, 'cbCfgQuoteCommand')->set_active($$self{_CFG}{'environments'}{$uuid}{'quote command'} // 0);
     _($self, 'cbCfgQuoteCommand')->set_sensitive(_($self, 'cbEditPrependCommand')->get_active());
+    _($self, 'cbCfgQuotePostCommand')->set_active($$self{_CFG}{'environments'}{$uuid}{'quotepost command'} // 0);
+    _($self, 'cbCfgQuotePostCommand')->set_sensitive(_($self, 'cbEditPostpendCommand')->get_active());
     _($self, 'vboxEditSaveSessionLogs')->set_sensitive($$self{_CFG}{'environments'}{$uuid}{'save session logs'});
     _($self, 'entryEditLogFileName')->set_text($$self{_CFG}{'environments'}{$uuid}{'session log pattern'});
-    _($self, 'btnEditSaveSessionLogs')->set_current_folder($$self{_CFG}{'environments'}{$uuid}{'session logs folder'} // $CFG_DIR . '/session_logs');
+    _($self, 'btnEditSaveSessionLogs')->set_current_folder($$self{_CFG}{'environments'}{$uuid}{'session logs folder'});
     _($self, 'spEditSaveSessionLogs')->set_value($$self{_CFG}{'environments'}{$uuid}{'session logs amount'} // 10);
     _($self, 'entryUserPassphrase')->set_text($$self{_CFG}{'environments'}{$uuid}{'passphrase user'} // '');
     _($self, 'entryPassphrase')->set_text($$self{_CFG}{'environments'}{$uuid}{'passphrase'} // '');
@@ -740,27 +737,21 @@ sub _updateGUIPreferences {
     _($self, 'entryPassword')->set_text($$self{_CFG}{'environments'}{$uuid}{'pass'});
     _($self, 'cbCfgAuthFallback')->set_active(! $$self{_CFG}{'environments'}{$uuid}{'auth fallback'});
     _($self, 'comboMethod')->set_active($$self{_METHODS}{$$self{_CFG}{'environments'}{$uuid}{'method'}}{'position'} // 4);
-    _($self, 'imageMethod')->set_from_stock('pac-' . $$self{_CFG}{'environments'}{$uuid}{'method'}, 'button');
+    _($self, 'imageMethod')->set_from_stock('asbru-' . $$self{_CFG}{'environments'}{$uuid}{'method'}, 'button');
     _($self, 'entryTabWindowTitle')->set_text($$self{_CFG}{'environments'}{$uuid}{'title'} || "$$self{_CFG}{'environments'}{$uuid}{'name'} ");
     _($self, 'cbEditSendString')->set_active($$self{_CFG}{'environments'}{$uuid}{'send string active'});
     _($self, 'hboxEditSendString')->set_sensitive($$self{_CFG}{'environments'}{$uuid}{'send string active'});
     _($self, 'cbEditSendStringIntro')->set_active($$self{_CFG}{'environments'}{$uuid}{'send string intro'});
+    _($self, 'cbSendStringOnlyWhenIdle')->set_active($$self{_CFG}{'environments'}{$uuid}{'send string only when idle'});
     _($self, 'entryEditSendString')->set_text($$self{_CFG}{'environments'}{$uuid}{'send string txt'} // '');
     _($self, 'entryEditSendStringSeconds')-> set_value($$self{_CFG}{'environments'}{$uuid}{'send string every'} // 0);
     _($self, 'cbCfgAutoreconnect')->set_active($$self{_CFG}{'environments'}{$uuid}{'autoreconnect'} // 0);
     _($self, 'cbCfgStartupLaunch')->set_active($$self{_CFG}{'environments'}{$uuid}{'startup launch'} // 0);
     _($self, 'sbCfgSendSlow')->set_value($$self{_CFG}{'environments'}{$uuid}{'send slow'} // 0);
     _($self, 'cbAutossh')->set_active($$self{_CFG}{'environments'}{$uuid}{'autossh'} // 0);
-    _($self, 'cbInferUserPassKPX')->set_active(($$self{_CFG}{'environments'}{$uuid}{'infer user pass from KPX'} // 0) && $$self{_CFG}{'defaults'}{'keepass'}{'use_keepass'});
-    _($self, 'entryKPXRE')->set_text($$self{_CFG}{'environments'}{$uuid}{'KPX title regexp'} // ".*$$self{_CFG}{'environments'}{$uuid}{'title'}.*");
-    _($self, 'entryKPXRE')->set_sensitive($$self{_CFG}{'environments'}{$uuid}{'infer user pass from KPX'});
-    _($self, 'btnCheckKPX')->set_sensitive($$self{_CFG}{'environments'}{$uuid}{'infer user pass from KPX'});
-    _($self, 'hboxCfgAuthUserPass')->set_sensitive(! _($self, 'cbInferUserPassKPX')->get_active());
-    _($self, 'hboxKeePass')->set_sensitive($$self{_CFG}{'defaults'}{'keepass'}{'use_keepass'});
     _($self, 'entryUUID')->set_text($uuid);
-    _($self, 'comboKPXWhere')->set_active($$self{_CFG}{'environments'}{$uuid}{'infer from KPX where'} // 3);
-    _($self, 'comboKPXWhere')->set_sensitive($$self{_CFG}{'environments'}{$uuid}{'infer user pass from KPX'});
     _($self, 'cbCfgRemoveCtrlChars')->set_active($$self{_CFG}{'environments'}{$uuid}{'remove control chars'});
+    _($self, 'cbCfgLogTimestamp')->set_active($$self{_CFG}{'environments'}{$uuid}{'log timestamp'});
 
     # Populate 'comboStartScript' combobox
     _($self, 'comboStartScript')->remove_all();
@@ -788,8 +779,8 @@ sub _updateGUIPreferences {
     $$self{_VARIABLES}->update($$self{_CFG}{'environments'}{$uuid}{'variables'});
     $$self{_PRE_EXEC}->update($$self{_CFG}{'environments'}{$uuid}{'local before'}, $$self{_CFG}{'environments'}{$uuid}{'variables'});
     $$self{_POST_EXEC}->update($$self{_CFG}{'environments'}{$uuid}{'local after'}, $$self{_CFG}{'environments'}{$uuid}{'variables'});
-    $$self{_MACROS}->update($$self{_CFG}{'environments'}{$uuid}{'macros'}, $$self{_CFG}{'environments'}{$uuid}{'variables'}, 'remote');
-    $$self{_LOCAL_EXEC}->update($$self{_CFG}{'environments'}{$uuid}{'local connected'}, $$self{_CFG}{'environments'}{$uuid}{'variables'}, 'local');
+    $$self{_MACROS}->update($$self{_CFG}{'environments'}{$uuid}{'macros'}, $$self{_CFG}{'environments'}{$uuid}{'variables'}, 'remote', $uuid);
+    $$self{_LOCAL_EXEC}->update($$self{_CFG}{'environments'}{$uuid}{'local connected'}, $$self{_CFG}{'environments'}{$uuid}{'variables'}, 'local', $uuid);
     _($self, 'frameExpect')->set_sensitive(! _($self, 'rbCfgAuthManual')->get_active());
     _($self, 'labelExpect')->set_sensitive(! _($self, 'rbCfgAuthManual')->get_active());
     $$self{_EXPECT_EXEC}->update($$self{_CFG}{'environments'}{$uuid}{'expect'}, $$self{_CFG}{'environments'}{$uuid}{'variables'});
@@ -803,22 +794,22 @@ sub _updateGUIPreferences {
     _($self, 'rbCfgAuthUserPass')->set_active($$self{_CFG}{'environments'}{$uuid}{'auth type'} eq 'userpass');
     _($self, 'rbCfgAuthPublicKey')->set_active($$self{_CFG}{'environments'}{$uuid}{'auth type'} eq 'publickey');
     _($self, 'rbCfgAuthManual')->set_active($$self{_CFG}{'environments'}{$uuid}{'auth type'} eq 'manual');
-    $self->__checkRBAuth;
+    $self->__checkRBAuth();
 
     if ($$self{_CFG}{'environments'}{$uuid}{'_protected'}) {
-        _($self, 'imgProtectedEdit')->set_from_stock('pac-protected', 'button');
+        _($self, 'imgProtectedEdit')->set_from_stock('asbru-protected', 'button');
         _($self, 'btnSaveEdit')->set_sensitive(0);
         _($self, 'lblProtectedEdit')->set_markup('Connection is <b><span foreground="#E60023">PROTECTED</span></b> against changes. You <b>can not</b> save changes.');
     } else {
-        _($self, 'imgProtectedEdit')->set_from_stock('pac-unprotected', 'button');
+        _($self, 'imgProtectedEdit')->set_from_stock('asbru-unprotected', 'button');
         _($self, 'btnSaveEdit')->set_sensitive(1);
         _($self, 'lblProtectedEdit')->set_markup('Connection is <b><span foreground="#04C100">UNPROTECTED</span></b> against changes. You <b>can</b> save changes.');
     }
 
     # Show Jump options in network settings (only for SSH method)
-    if ($$self{_CFG}{'environments'}{$uuid}{'method'} eq "SSH") {
+    if ($$self{_CFG}{'environments'}{$uuid}{'method'} =~ /SSH|SFTP/i) {
         # Control SSH capabilities
-        my $ssh = `ssh 2>&1`;
+        my $ssh = `$ENV{'ASBRU_ENV_FOR_EXTERNAL'} ssh 2>&1`;
         $ssh =~ s/\n//g;
         $ssh =~ s/[ \t][ \t]+/ /g;
         if ($ssh =~ /-J /) {
@@ -842,6 +833,8 @@ sub _updateGUIPreferences {
         _($self, 'vboxJumpCfgOptions')->set_sensitive(0);
     }
 
+    _updateCfgProxyKeePass($self);
+
     return 1;
 }
 
@@ -887,6 +880,8 @@ sub _saveConfiguration {
     $$self{_CFG}{'environments'}{$uuid}{'jump ip'} = _($self, 'entryCfgJumpConnIP')->get_chars(0, -1);
     $$self{_CFG}{'environments'}{$uuid}{'jump port'} = _($self, 'entryCfgJumpConnPort')->get_chars(0, -1);
     $$self{_CFG}{'environments'}{$uuid}{'jump user'} = _($self, 'entryCfgJumpConnUser')->get_chars(0, -1);
+    $$self{_CFG}{'environments'}{$uuid}{'jump pass'} = _($self, 'entryCfgJumpConnPass')->get_chars(0, -1);
+    $$self{_CFG}{'environments'}{$uuid}{'pseudo jump'} = _($self, 'chkPseudoJumpServer')->get_active();
     if (_($self, 'rbCfgAuthUserPass')->get_active()) {
         $$self{_CFG}{'environments'}{$uuid}{'auth type'} = 'userpass';
     } elsif (_($self, 'rbCfgAuthPublicKey')->get_active()) {
@@ -911,7 +906,10 @@ sub _saveConfiguration {
     }
     $$self{_CFG}{'environments'}{$uuid}{'use prepend command'} = _($self, 'cbEditPrependCommand')->get_active();
     $$self{_CFG}{'environments'}{$uuid}{'prepend command'} = _($self, 'entryEditPrependCommand')->get_chars(0, -1);
+    $$self{_CFG}{'environments'}{$uuid}{'use postpend command'} = _($self, 'cbEditPostpendCommand')->get_active();
+    $$self{_CFG}{'environments'}{$uuid}{'postpend command'} = _($self, 'entryEditPostpendCommand')->get_chars(0, -1);
     $$self{_CFG}{'environments'}{$uuid}{'quote command'} = _($self, 'cbCfgQuoteCommand')->get_active();
+    $$self{_CFG}{'environments'}{$uuid}{'quotepost command'} = _($self, 'cbCfgQuotePostCommand')->get_active();
     $$self{_CFG}{'environments'}{$uuid}{'use sudo'} = _($self, 'cbEditUseSudo')->get_active();
     $$self{_CFG}{'environments'}{$uuid}{'save session logs'} = _($self, 'cbEditSaveSessionLogs')->get_active();
     $$self{_CFG}{'environments'}{$uuid}{'session log pattern'} = _($self, 'entryEditLogFileName')->get_chars(0, -1);
@@ -927,22 +925,54 @@ sub _saveConfiguration {
     $$self{_CFG}{'environments'}{$uuid}{'send string active'} = _($self, 'cbEditSendString')->get_active();
     $$self{_CFG}{'environments'}{$uuid}{'send string txt'} = _($self, 'entryEditSendString')->get_chars(0,-1);
     $$self{_CFG}{'environments'}{$uuid}{'send string intro'} = _($self, 'cbEditSendStringIntro')->get_active();
+    $$self{_CFG}{'environments'}{$uuid}{'send string only when idle'} = _($self, 'cbSendStringOnlyWhenIdle')->get_active();
     $$self{_CFG}{'environments'}{$uuid}{'send string every'} = _($self, 'entryEditSendStringSeconds')->get_chars(0, -1);
     $$self{_CFG}{'environments'}{$uuid}{'autoreconnect'} = _($self, 'cbCfgAutoreconnect')->get_active();
     $$self{_CFG}{'environments'}{$uuid}{'startup launch'} = _($self, 'cbCfgStartupLaunch')->get_active();
     $$self{_CFG}{'environments'}{$uuid}{'send slow'} = _($self, 'sbCfgSendSlow')->get_chars(0, -1);
-    $$self{_CFG}{'environments'}{$uuid}{'startup script'} = _($self, 'cbStartScript')->get_active && _($self, 'comboStartScript')->get_active_text();
-    $$self{_CFG}{'environments'}{$uuid}{'startup script name'} = _($self, 'comboStartScript')->get_active_text();
-    $$self{_CFG}{'environments'}{$uuid}{'autossh'} = _($self, 'cbAutossh')->get_active();
-    $$self{_CFG}{'environments'}{$uuid}{'infer user pass from KPX'} = _($self, 'cbInferUserPassKPX')->get_active();
-    $$self{_CFG}{'environments'}{$uuid}{'KPX title regexp'} = _($self, 'entryKPXRE')->get_chars(0, -1);
-    $$self{_CFG}{'environments'}{$uuid}{'infer from KPX where'} = _($self, 'comboKPXWhere')->get_active();
-    $$self{_CFG}{'environments'}{$uuid}{'remove control chars'} = _($self, 'cbCfgRemoveCtrlChars')->get_active();
+    $$self{_CFG}{'environments'}{$uuid}{'startup script'} = _($self, 'cbStartScript')->get_active && _($self, 'comboStartScript')->get_active_text;
+    $$self{_CFG}{'environments'}{$uuid}{'startup script name'} = _($self, 'comboStartScript')->get_active_text;
+    $$self{_CFG}{'environments'}{$uuid}{'autossh'} = _($self, 'cbAutossh')->get_active;
+    $$self{_CFG}{'environments'}{$uuid}{'remove control chars'} = _($self, 'cbCfgRemoveCtrlChars')->get_active;
+    $$self{_CFG}{'environments'}{$uuid}{'log timestamp'} = _($self, 'cbCfgLogTimestamp')->get_active;
+
+    # Remove lefovers from user in : network connections and authentication
+    if ($$self{_CFG}{'environments'}{$uuid}{'auth type'} eq 'userpass') {
+        $$self{_CFG}{'environments'}{$uuid}{'passphrase user'} = '';
+        $$self{_CFG}{'environments'}{$uuid}{'passphrase'} = '';
+    } elsif ($$self{_CFG}{'environments'}{$uuid}{'auth type'} eq 'publickey') {
+        $$self{_CFG}{'environments'}{$uuid}{'user'} = '';
+        $$self{_CFG}{'environments'}{$uuid}{'pass'} = '';
+    } else {
+        $$self{_CFG}{'environments'}{$uuid}{'passphrase user'} = '';
+        $$self{_CFG}{'environments'}{$uuid}{'passphrase'} = '';
+        $$self{_CFG}{'environments'}{$uuid}{'pass'} = '';
+    }
 
+    if ($$self{_CFG}{'environments'}{$uuid}{'use proxy'} == 1) {
+        # Use proxy
+        $$self{_CFG}{'environments'}{$uuid}{'jump ip'} = '';
+        $$self{_CFG}{'environments'}{$uuid}{'jump user'} = '';
+        $$self{_CFG}{'environments'}{$uuid}{'jump pass'} = '';
+    } elsif ($$self{_CFG}{'environments'}{$uuid}{'use proxy'} == 3) {
+        # Jump Server
+        $$self{_CFG}{'environments'}{$uuid}{'proxy ip'} = '';
+        $$self{_CFG}{'environments'}{$uuid}{'proxy user'} = '';
+        $$self{_CFG}{'environments'}{$uuid}{'proxy pass'} = '';
+    } else {
+        # Global or direct connection
+        $$self{_CFG}{'environments'}{$uuid}{'proxy ip'} = '';
+        $$self{_CFG}{'environments'}{$uuid}{'proxy user'} = '';
+        $$self{_CFG}{'environments'}{$uuid}{'proxy pass'} = '';
+        $$self{_CFG}{'environments'}{$uuid}{'jump ip'} = '';
+        $$self{_CFG}{'environments'}{$uuid}{'jump user'} = '';
+        $$self{_CFG}{'environments'}{$uuid}{'jump pass'} = '';
+    }
     ##################
     # Other options...
     ##################
     $$self{_CFG}{'environments'}{$uuid}{'options'} = $$self{_SPECIFIC}->get_cfg();
+    $$self{_CFG}{'environments'}{$uuid}{'connection options'} = $$self{_SPECIFIC}->get_cfg_array();
     $$self{_CFG}{'environments'}{$uuid}{'terminal options'} = $$self{_TERMOPTS}->get_cfg();
     $$self{_CFG}{'environments'}{$uuid}{'variables'} = $$self{_VARIABLES}->get_cfg();
     $$self{_CFG}{'environments'}{$uuid}{'local before'} = $$self{_PRE_EXEC}->get_cfg();
@@ -977,6 +1007,12 @@ sub _closeConfiguration {
     $$self{_WINDOWEDIT}->hide();
 }
 
+sub _updateCfgProxyKeePass {
+    my $self = shift;
+
+    _($self, 'btnEditNetworkSettingsCheckKPX')->set_sensitive($$self{'_CFG'}{'defaults'}{'keepass'}{'use_keepass'} && (_($self, 'rbUseProxyAlways')->get_active() || _($self, 'rbUseProxyJump')->get_active()));
+}
+
 # END: Define PRIVATE CLASS functions
 ###################################################################
 
diff --git a/lib/PACGlobalVarEntry.pm b/lib/PACGlobalVarEntry.pm
index 5016f03e..ba6623dc 100644
--- a/lib/PACGlobalVarEntry.pm
+++ b/lib/PACGlobalVarEntry.pm
@@ -3,7 +3,7 @@ package PACGlobalVarEntry;
 ###############################################################################
 # This file is part of Ásbrú Connection Manager
 #
-# Copyright (C) 2017-2020 Ásbrú Connection Manager team (https://asbru-cm.net)
+# Copyright (C) 2017-2022 Ásbrú Connection Manager team (https://asbru-cm.net)
 # Copyright (C) 2010-2016 David Torrejon Vaquerizas
 #
 # Ásbrú Connection Manager is free software: you can redistribute it and/or
@@ -122,15 +122,25 @@ sub _buildVarGUI {
 
     # Build a vbox for:buttons, separator and expect widgets
     $w{vbox} = Gtk3::VBox->new(0, 0);
+    $w{hbox} = Gtk3::HBox->new(1, 0);
 
     # Build a hbuttonbox for widgets actions (add, etc.)
     $w{bbox} = Gtk3::HButtonBox->new();
-    $w{vbox}->pack_start($w{bbox}, 0, 1, 0);
+    $w{vbox}->pack_start($w{hbox}, 0, 1, 0);
+    $w{hbox}->pack_start($w{bbox}, 0, 1, 0);
     $w{bbox}->set_layout('GTK_BUTTONBOX_START');
 
     # Build 'add' button
     $w{btnadd} = Gtk3::Button->new_from_stock('gtk-add');
     $w{bbox}->add($w{btnadd});
+    $w{help} = Gtk3::LinkButton->new('https://docs.asbru-cm.net/Manual/Preferences/GlobalVariables/');
+    $w{hbox}->pack_start($w{help},0,1,0);
+
+    $w{help}->set_halign('GTK_ALIGN_END');
+    $w{help}->set_label('');
+    $w{help}->set_tooltip_text('Open Online Help');
+    $w{help}->set_always_show_image(1);
+    $w{help}->set_image(Gtk3::Image->new_from_stock('asbru-help', 'button'));
 
     # Build a separator
     $w{sep} = Gtk3::HSeparator->new();
diff --git a/lib/PACKeePass.pm b/lib/PACKeePass.pm
index cb4ce132..da67a859 100644
--- a/lib/PACKeePass.pm
+++ b/lib/PACKeePass.pm
@@ -3,7 +3,7 @@ package PACKeePass;
 ###############################################################################
 # This file is part of Ásbrú Connection Manager
 #
-# Copyright (C) 2017-2020 Ásbrú Connection Manager team (https://asbru-cm.net)
+# Copyright (C) 2017-2022 Ásbrú Connection Manager team (https://asbru-cm.net)
 # Copyright (C) 2010-2016 David Torrejon Vaquerizas
 #
 # Ásbrú Connection Manager is free software: you can redistribute it and/or
@@ -33,16 +33,20 @@ $|++;
 # Standard
 use strict;
 use warnings;
+use version;
 
 use Encode;
-use KeePass;
 use FindBin qw ($RealBin $Bin $Script);
+use IPC::Open2;
+use IPC::Open3;
+use File::stat;
 
 # GTK
 use Gtk3 '-init';
 
 # PAC modules
 use PACUtils;
+use PACTree;
 
 # END: Import Modules
 ###################################################################
@@ -50,7 +54,11 @@ use PACUtils;
 ###################################################################
 # Define GLOBAL CLASS variables
 
-
+my $KPXC_MP = $ENV{'KPXC_MP'};
+my @KPXC_LIST;
+my $KPXC_CACHE_TIMESTAMP;
+my %KPXC_CACHE;
+my $CLI = 'keepassxc-cli';
 
 # END: Define GLOBAL CLASS variables
 ###################################################################
@@ -60,268 +68,925 @@ use PACUtils;
 
 sub new {
     my $class = shift;
-    my $self = {};
+    my $buildgui = shift;
+    my $self;
 
     $self->{cfg} = shift;
-
     $self->{container} = undef;
-    $self->{frame} = {};
-
-    $self->{entries} = [];
+    $self->{'last_timestamp'} = '';
+
+    if (!$KPXC_MP) {
+        if ($ENV{'KPXC_MP'}) {
+            $KPXC_MP = $ENV{'KPXC_MP'};
+        } elsif ($$self{cfg}{password}) {
+            $KPXC_MP = $$self{cfg}{password};
+            $ENV{'KPXC_MP'} = $$self{cfg}{password};
+        }
+    }
 
-    _buildKeePassGUI($self);
+    _setCapabilities($self);
+    if ($buildgui) {
+        _buildKeePassGUI($self);
+    }
 
     bless($self, $class);
     return $self;
 }
 
+sub isKeePassMask {
+    my ($class, $str) = @_;
+    return $str =~ /<.\w+\|.+?>/;
+}
+
+# END: Public class methods
+###################################################################
+
+###################################################################
+# START: Public object methods
+
 sub update {
     my $self = shift;
     my $cfg = shift;
 
-    # Destroy previous widgets
-    $$self{frame}{vbKeePass}->foreach(sub {$_[0]->destroy;});
-
     defined $cfg and $$self{cfg} = $cfg;
 
     my $file = $$self{cfg}{'database'};
-    defined $file or return 0;
+    my $pathcli = $$self{cfg}{'pathcli'} // '';
+    my $key = $$self{cfg}{'keyfile'};
+    if ((!defined $file)||(-d $file)||(!-e $file)) {
+        return 0;
+    }
+    if (!-e $pathcli) {
+        $pathcli = '';
+    }
+    if ($$self{disable_keepassxc}) {
+        $$self{cfg}{use_keepass} = 0;
+    }
     $$self{frame}{fcbKeePassFile}->set_filename($file);
 
+    if ($pathcli) {
+        $$self{frame}{fcbCliFile}->set_filename($pathcli);
+        $CLI = $pathcli;
+    }
+    if ($key) {
+        $$self{frame}{fcbKeePassKeyFile}->set_filename($key);
+        $$self{kpxc_keyfile_opt} = "--key-file '$key'";
+    }
     $$self{frame}{hboxkpmain}->set_sensitive($$self{cfg}{use_keepass});
-    return 1 unless $$self{cfg}{use_keepass};
+    if (!$$self{cfg}{use_keepass}) {
+        return 1;
+    }
+    $$self{frame}{entryKeePassPassword}->set_text($$self{cfg}{'password'});
+    $$self{frame}{cbUseKeePass}->set_active($$self{cfg}{use_keepass});
+    $$self{frame}{hboxkpmain}->set_sensitive($$self{cfg}{use_keepass});
+    if ($$self{cfg}{'password'}) {
+        $KPXC_MP = $$self{cfg}{'password'};
+        $ENV{'KPXC_MP'} = $$self{cfg}{'password'};
+    }
+    return 1;
+}
+
+sub getUseKeePass {
+    my $self = shift;
 
-    if (($$self{cfg}{password} eq '') && (-f $$cfg{'database'}) ) {
-        my $pass = _wEnterValue($self, 'KeePassX Integration', "Please, enter KeePassX MASTER password\nto unlock database file '$$self{cfg}{'database'}'", '', 0, 'pac-keepass');
-        if (($pass // '') eq '') {$$self{frame}{cbUseKeePass}->set_active(0); return 0;}
-        $$self{cfg}{password} = $pass;
+    return $$self{cfg}{use_keepass} // 0;
+}
+
+sub getMasterPassword {
+    my $self = shift;
+    my $parent = shift;
+    my $mp = '';
+
+    while (!$mp) {
+        $mp = _wEnterValue($parent, 'KeePass database', "Enter your MASTER password to unlock\nyour KeePass file '$$self{cfg}{'database'}'", '', 0, 'asbru-keepass');
+        # Test Master Password
+        if ($mp) {
+            $KPXC_MP = $mp;
+            my ($msg, $flg) = testMasterKey($self, 'a', 'ASBRUKeePassXCTEST');
+            if (!$flg && $msg !~ /ASBRUKeePassXCTEST/) {
+                $KPXC_MP='';
+                $mp = '';
+                _wMessage($parent,"<b>Error keepassxc-cli message</b>\n\n$msg");
+            }
+        } else {
+            last;
+        }
     }
+    $KPXC_MP = $mp;
+    $ENV{'KPXC_MP'} = $mp;
+    return $mp;
+}
 
-    my $pass = $$self{cfg}{'password'};
+sub testMasterKey {
+    my ($self, $field, $uid) = @_;
+    my ($pid,$cfg);
+    my $ok = 0;
+    my @err;
+    my @out;
+
+    if ($$self{cfg}) {
+        $cfg = $$self{cfg};
+    } else {
+        $cfg = $self->get_cfg();
+    }
+    $pid = open3(*Writer, *Reader, *ErrReader, "$CLI $$self{kpxc_cli} show $$self{kpxc_show_protected} $$self{kpxc_keyfile_opt} '$$cfg{database}' '$uid'");
+    print Writer "$KPXC_MP\n";
+    close Writer;
+    @out = <Reader>;
+    @err = <ErrReader>;
+    # Wait so we do not create zombies
+    waitpid($pid,0);
+    close Reader;
+    close ErrReader;
+    if (@err) {
+        my $msg = join('',@err);
+        return (decode('utf8',$msg),0);
+    }
+    return ('',1);
+}
 
-    $$self{frame}{entryKeePassPassword}->set_text($pass);
-    $$self{frame}{cbUseKeePass}->set_active($$self{cfg}{use_keepass});
-    $$self{frame}{cbKeePassAskUser}->set_active($$self{cfg}{ask_user});
-    $$self{frame}{hboxkpmain}->set_sensitive($$self{cfg}{use_keepass});
+sub getFieldValueFromString {
+    my ($self, $str) = @_;
+    my ($ok, $value, $field, $uid, $flg, $cfg);
 
-    return 0 unless $pass ne '';
+    if (!$str) {
+        return ($str, 1);
+    }
+    if (!PACKeePass->isKeePassMask($str)) {
+        return ($str, 1);
+    }
+    if ($$self{cfg}) {
+        $cfg = $$self{cfg};
+    } else {
+        $cfg = $self->get_cfg();
+    }
+    $str =~ s/[<>]//g;
+    ($field, $uid) = split /\|/, $str, 2;
+    ($value, $flg) = $self->getFieldValue($field, $uid);
+    return ($value, $flg);
+}
 
-    # Reload DDBB if no entries are found
-    $self->reload;
+sub regexTransform {
+    my ($self, $field, $uid) = @_;
 
-    # Now, add the -new?- widgets
-    foreach my $hash (@{$$self{entries}}) {$self->_buildVar($$hash{title}, $$hash{url}, $$hash{username}, $$hash{password});}
+    my ($value, $flg) = $self->getFieldValue($field, $uid);
+    if ($flg) {
+        return $value;
+    }
+    return '';
+}
 
-    return 1;
+sub applyMask {
+    my ($self, $value) = @_;
+    $value =~ s/<(\w+)\|(.+?)>/$self->regexTransform($1, $2)/eg;
+    return $value;
+}
+
+sub getFieldValue {
+    my ($self, $field, $uid) = @_;
+    my ($pid, $cfg, @err);
+    my $data='';
+    my $flg = 0;
+    my @out;
+
+    $field = lc($field);
+    if ($self->_hasCacheValue("$field,$uid")) {
+        return ($KPXC_CACHE{"$field,$uid"}, 1);
+    }
+    if ($$self{cfg}) {
+        $cfg = $$self{cfg};
+    } else {
+        $cfg = $self->get_cfg();
+    }
+    if (!$KPXC_MP) {
+        # Get Password from config file or from user
+        if ($$cfg{password}) {
+            $KPXC_MP = $$cfg{password};
+        } else {
+            $self->getMasterPassword();
+            if (!$KPXC_MP) {
+                # We could not get a valid password
+                return ('Bad key/master password',0);
+            }
+        }
+    }
+    $pid = open3(*Writer, *Reader, *ErrReader, "$CLI $$self{kpxc_cli} show $$self{kpxc_show_protected} $$self{kpxc_keyfile_opt} '$$cfg{database}' '$uid'");
+    print Writer "$KPXC_MP\n";
+    close Writer;
+    @out = <Reader>;
+    @err = <ErrReader>;
+    # Wait so we do not create zombies
+    waitpid($pid, 0);
+    close Reader;
+    close ErrReader;
+    foreach $data (@out) {
+        $data =~ s/\n//g;
+        if ($data =~ /(username|password|url|title): (.*)/i) {
+            my $f = lc ($1);
+            my $v = $2;
+            $KPXC_CACHE{"$f,$uid"} = $v;
+        }
+    }
+    if ($self->_hasCacheValue("$field,$uid")) {
+        return ($KPXC_CACHE{"$field,$uid"}, 1);
+    }
+    return ('', 0);
 }
 
 sub get_cfg {
     my $self = shift;
+    my $from_pref = shift;
 
     my %hash;
-    $hash{use_keepass} = $$self{frame}{'cbUseKeePass'}->get_active;
-    $hash{ask_user} = $$self{frame}{'cbKeePassAskUser'}->get_active;
-    $hash{database} = $$self{frame}{'fcbKeePassFile'}->get_filename;
-    $hash{password} = ($$self{frame}{'cbUseKeePass'}->get_active) ? $$self{frame}{'entryKeePassPassword'}->get_chars(0, -1) : '';
-
+    $hash{use_keepass} = $$self{frame}{'cbUseKeePass'}->get_active();
+    $hash{database} = decode('utf8',$$self{frame}{'fcbKeePassFile'}->get_filename());
+    $hash{pathcli} = decode('utf8',$$self{frame}{'fcbCliFile'}->get_filename());
+    $hash{keyfile} = decode('utf8',$$self{frame}{'fcbKeePassKeyFile'}->get_filename());
+    if ((!defined $hash{database})||(-d $hash{database})||(!-e $hash{database})) {
+        $hash{database} = '';
+        $$self{disable_keepassxc} = 1;
+    }
+    if (($$self{kpxc_keyfile})&&($hash{keyfile})&&(-e $hash{keyfile})) {
+        $$self{kpxc_keyfile_opt} = "$$self{kpxc_keyfile} '$hash{keyfile}'";
+    } else {
+        $$self{kpxc_keyfile_opt} = '';
+    }
+    $hash{password} = ($$self{frame}{'cbUseKeePass'}->get_active()) ? $$self{frame}{'entryKeePassPassword'}->get_chars(0, -1) : '';
+    if ($$self{disable_keepassxc}) {
+        # Avoid saving information that will not work
+        if ($from_pref && $hash{use_keepass}) {
+            _wMessage($PACMain::FUNCS{_CONFIG}{_WINDOWCONFIG},"KeePassXC was disabled, information was incomplete");
+        }
+        $hash{use_keepass} = 0;
+        $hash{database} = '';
+        $hash{pathcli} = '';
+        $hash{keyfile} = '';
+        $hash{password} = '';
+        $$self{kpxc_keyfile_opt} = '';
+        $self->_updateUsage(1);
+    }
     return \%hash;
 }
 
-sub reload {
+sub listEntries {
     my $self = shift;
-    my $force = shift // 0;
-    my $cfg = shift // $$self{cfg};
-
-    return 1 unless $force || ! scalar(@{$$self{entries}});
-    $$self{entries} = [];
-
-    my $KEEPASS = KeePass->new;
-    eval {$KEEPASS->load_db($$cfg{'database'}, $$cfg{'password'})};
-    if ($@) {
-        _wMessage(undef, "ERROR: Could not open '$$cfg{database}' for reading as KeePass Database file:\n$@");
-        return wantarray ? undef : 0;
-    }
-    $KEEPASS->unlock;
-
-    foreach my $hash ($KEEPASS->find_entries({'title =~' => qr/.*/}) ) {
-        next if (exists $$hash{'binary'}{'bin-stream'} && $$hash{'comment'} eq 'KPX_CUSTOM_ICONS_4');
-        Encode::_utf8_on($$hash{title});
-        Encode::_utf8_on($$hash{url});
-        Encode::_utf8_on($$hash{username});
-        Encode::_utf8_on($$hash{password});
-        Encode::_utf8_on($$hash{created});
-        Encode::_utf8_on($$hash{comment});
-        push(@{$$self{entries}}, {
-            title => $$hash{title},
-            url => $$hash{url},
-            username => $$hash{username},
-            password => $$hash{password},
-            created => $$hash{created},
-            comment => $$hash{comment}
-        });
+    my $parent = shift;
+    my ($mp,$list,%w,$entry);
+
+    if (!$KPXC_MP) {
+        # Get Password user
+        if ($$self{cfg}{password}) {
+            $KPXC_MP = $$self{cfg}{password};
+            $ENV{'KPXC_MP'} = $$self{cfg}{password};
+        } else {
+            getMasterPassword($self, $parent);
+        }
     }
-    undef $KEEPASS;
+    # Create the dialog window,
+    $w{window}{data} = Gtk3::Dialog->new_with_buttons(
+        "KeePassXC Search",
+        $parent,
+        'modal',
+        'gtk-cancel' => 'cancel',
+        'gtk-ok' => 'ok'
+    );
+    # and setup some dialog properties.
+    $w{window}{data}->set_default_response('ok');
+    $w{window}{data}->set_icon_name('asbru-app-big');
+    $w{window}{data}->set_decorated(0);
+    $w{window}{data}->get_style_context()->add_class('w-entervalue');
+    $w{window}{data}->set_default_size(600,400);
+    $w{window}{data}->set_resizable(0);
+    $w{window}{data}->set_border_width(5);
+
+    $w{window}{gui}{vbox} = Gtk3::VBox->new(0, 0);
+    $w{window}{data}->get_content_area->pack_start($w{window}{gui}{vbox}, 1, 1, 5);
+    $w{window}{gui}{vbox}->set_border_width(0);
+
+    # Create an HBox to contain a picture and a label
+    $w{window}{gui}{hbox} = Gtk3::HBox->new(0, 0);
+    $w{window}{gui}{vbox}->pack_start($w{window}{gui}{hbox}, 0, 0, 0);
+    $w{window}{gui}{hbox}->set_border_width(0);
+
+    # Create 1st label
+    $w{window}{gui}{lblsearch} = Gtk3::Label->new('Search database:');
+    $w{window}{gui}{hbox}->pack_start($w{window}{gui}{lblsearch}, 0, 0, 5);
+
+    # Search Entry
+    $w{window}{gui}{entry} = Gtk3::Entry->new();
+    $w{window}{gui}{hbox}->pack_start($w{window}{gui}{entry}, 0, 0, 0);
+    $w{window}{gui}{entry}->set_activates_default(1);
+    $w{window}{gui}{entry}->set_visibility(1);
+    $w{window}{gui}{scroll1} = Gtk3::ScrolledWindow->new();
+    $w{window}{gui}{scroll1}->set_policy('automatic', 'automatic');
+    $w{window}{gui}{vbox}->pack_start($w{window}{gui}{scroll1}, 1, 1, 1);
+
+    $w{window}{gui}{treelist} = PACTree->new('Matching entries:' => 'text');
+    $w{window}{gui}{scroll1}->add($w{window}{gui}{treelist});
+    $w{window}{gui}{treelist}->set_enable_tree_lines(0);
+    $w{window}{gui}{treelist}->set_headers_visible(1);
+    $w{window}{gui}{treelist}->set_enable_search(1);
+    $w{window}{gui}{treelist}->set_has_tooltip(0);
+    $w{window}{gui}{treelist}->set_grid_lines('GTK_TREE_VIEW_GRID_LINES_NONE');
+    $w{window}{gui}{treelist}->get_selection()->set_mode('GTK_SELECTION_SINGLE');
+    @{$w{window}{gui}{treelist}{'data'}} = ();
+
+    $w{window}{gui}{entry}->signal_connect('key_release_event' => sub {
+        my ($widget, $event) = @_;
+        my @list = ();
+
+        if (length($widget->get_text())>0) {
+            @{$w{window}{gui}{treelist}{'data'}} = ();
+            @list = $self->_locateEntries($widget->get_text());
+            foreach my $el (@list) {
+                if ($el !~ qw|^/|) {
+                    next;
+                }
+                $el =~ s/\n//g;
+                $el = decode('UTF-8', $el);
+                push(@{$w{window}{gui}{treelist}{'data'}}, {value => [ $el ], children => []});
+            }
+        }
+    });
+    $w{window}{gui}{treelist}->signal_connect('row_activated' => sub {
+        my $selection = $w{window}{gui}{treelist}->get_selection();
+        my $model = $w{window}{gui}{treelist}->get_model();
+        my @paths = _getSelectedRows($selection);
+        $entry = $model->get_value($model->get_iter($paths[0]),0);
+        $w{window}{data}->response(0);
+        return 1;
+    });
+
+    # Show the window (in a modal fashion)
+    $w{window}{data}->show_all();
 
+    my $ok = $w{window}{data}->run();
+
+    if ($ok eq 'ok') {
+        my $selection = $w{window}{gui}{treelist}->get_selection();
+        my $model = $w{window}{gui}{treelist}->get_model();
+        my @paths = _getSelectedRows($selection);
+        $entry = $model->get_value($model->get_iter($paths[0]),0);
+    }
+
+    $w{window}{data}->destroy();
+
+    while (Gtk3::events_pending) {
+        Gtk3::main_iteration();
+    }
+
+    return $entry;
+}
+
+sub setRigthClickMenuEntry {
+    my ($self, $win, $what, $input, $menu_items) = @_;
+    my ($lbl,$field);
+
+    if (!$self->getUseKeePass()) {
+        return 0;
+    } elsif (!$what) {
+        return 0;
+    }
+    foreach $field (split /,/,$what) {
+        $lbl = ucfirst($field);
+
+        push(@$menu_items, {
+            label => "Add $lbl KeePassXC",
+            tooltip => "KeePassXC $lbl",
+            code => sub {
+                my $pos = $input->get_property('cursor_position');
+                my $selection = $self->listEntries($win);
+                if ($selection) {
+                    if ($field eq 'url') {
+                        $input->set_text("<$field|$selection>");
+                    } else {
+                        $input->insert_text("<$field|$selection>", -1, $input->get_position);
+                    }
+                }
+            }
+        });
+    }
     return 1;
 }
 
-sub find {
+sub hasKeePassField {
     my $self = shift;
-    my $where = shift // 'title';
-    my $what = shift // qr/.*/;
+    my $cfg = shift;
+    my $uuid = shift;
+    my $useKeePass = $$cfg{defaults}{keepass}{use_keepass} && $uuid ne '__PAC_SHELL__';
+    my $kpxc;
+    my $auth = $$cfg{'environments'}{$uuid}{'auth type'};
+
+    if (!$useKeePass) {
+        return 0;
+    }
 
-    my @kpx = _findKP($$self{entries}, $where, $what);
+    foreach my $fieldName ('user','pass','passphrase','passphrase user','ip','proxy pass','proxy user','jump ip','jump user','jump pass','proxy ip','proxy user','proxy pass') {
+        if ($auth eq 'publickey' && ($fieldName eq 'user' || $fieldName eq 'pass')) {
+            # Skip user and pass if public key authorization
+            next;
+        } elsif ($auth ne 'publickey' && ($fieldName =~ /passphrase/)) {
+            # Skip passphrase if NOT public key authorization
+            next;
+        }
+        if ($$cfg{'environments'}{$uuid}{$fieldName} && $self->isKeePassMask($$cfg{'environments'}{$uuid}{$fieldName})) {
+            return 1;
+        }
+        if (defined $$cfg{'defaults'}{$fieldName}) {
+            if ($$cfg{'defaults'}{$fieldName} && $self->isKeePassMask($$cfg{'defaults'}{$fieldName})) {
+                return 1;
+            }
+        }
+    }
 
-    return wantarray ? @kpx : scalar(@kpx);
+    # Search for keepass mask in expects
+    foreach my $exp (@{$$cfg{'environments'}{$uuid}{'expect'}}) {
+        if ($self->isKeePassMask($$exp{'send'})) {
+            return 1;
+        }
+    }
+
+    # Search for keepass mask in global variables
+    my $gvars = $$cfg{'defaults'}{'global variables'};
+    foreach my $gvar (keys %$gvars) {
+        my $lgvars = $$cfg{'defaults'}{'global variables'}{$gvar};
+        foreach my $val (keys %$lgvars) {
+            if ($$cfg{'defaults'}{'global variables'}{$gvar}{$val} && $self->isKeePassMask($$cfg{'defaults'}{'global variables'}{$gvar}{$val})) {
+                return 1;
+            }
+        }
+    }
+
+    return 0;
 }
 
-# END: Public class methods
+# END: Public object methods
 ###################################################################
 
 ###################################################################
 # START: Private functions definitions
 
+sub _locateEntries {
+    my ($self, $str) = @_;
+    my ($pid,$cfg);
+    my $timestamp;
+    my @out;
+    my $search_command;
+    my $search_term;
+
+    if ($$self{cfg}) {
+        $cfg = $$self{cfg};
+    } else {
+        $cfg = $self->get_cfg();
+    }
+    if (version->parse($$self{kpxc_version}) >= version->parse("2.7.0")) {
+        $search_command = 'search';
+        $search_term = '';
+    } else {
+        $search_command = 'locate';
+        $search_term = '/';
+    }
+    $timestamp = stat($$cfg{database})->mtime;
+    if (!@KPXC_LIST || $$self{'last_timestamp'} != $timestamp) {
+        @KPXC_LIST = ();
+        $$self{'last_timestamp'} = $timestamp;
+        {
+            no warnings 'once';
+            open(SAVERR,">&STDERR");
+            open(STDERR,"> /dev/null");
+            $pid = open2(*Reader,*Writer,"$CLI $$self{kpxc_cli} ${search_command} $$self{kpxc_keyfile_opt} '$$cfg{database}' '${search_term}'");
+            print Writer "$KPXC_MP\n";
+            close Writer;
+            @KPXC_LIST = <Reader>;
+            # Wait so we do not create zombies
+            waitpid($pid,0);
+            close Reader;
+            open(STDERR,">&SAVERR");
+        };
+    }
+    @out = sort grep(/$str/i,@KPXC_LIST);
+    return @out;
+}
+
 sub _buildKeePassGUI {
     my $self = shift;
-
     my $cfg = $self->{cfg};
-
     my %w;
+    my $width = 150;
 
     # Build a vbox
-    $w{vbox} = Gtk3::VBox->new(0, 0);
-
-    $w{cbUseKeePass} = Gtk3::CheckButton->new('Use KeePassX');
-    $w{vbox}->pack_start($w{cbUseKeePass}, 0, 1, 0);
-
-    $w{cbKeePassAskUser} = Gtk3::CheckButton->new('Ask user when multiple matches are found');
-    $w{vbox}->pack_start($w{cbKeePassAskUser}, 0, 1, 0);
-
-    $w{hboxkpmain} = Gtk3::HBox->new(0, 0);
-    $w{vbox}->pack_start($w{hboxkpmain}, 0, 1, 0);
-
-    $w{hboxkpmain}->pack_start(Gtk3::Label->new('KeePass Database file:'), 0, 1, 0);
-
-    $w{fcbKeePassFile} = Gtk3::FileChooserButton->new('', 'GTK_FILE_CHOOSER_ACTION_OPEN');
-    $w{fcbKeePassFile}->set_show_hidden(1);
-    $w{hboxkpmain}->pack_start($w{fcbKeePassFile}, 1, 1, 0);
+    $w{vbox} = Gtk3::VBox->new(0,0);
 
-    $w{hboxkpmain}->pack_start(Gtk3::Label->new(' Master Password:'), 0, 1, 0);
+    # Attach to class attribute
+    $$self{container} = $w{vbox};
+    $$self{frame} = \%w;
 
-    $w{entryKeePassPassword} = Gtk3::Entry->new;
-    $w{hboxkpmain}->pack_start($w{entryKeePassPassword}, 0, 1, 0);
+    # Option to activate KeePass use (or not)
+    $w{cbUseKeePass} = Gtk3::CheckButton->new('Activate use of a KeePass database file');
+    $w{cbUseKeePass}->set_margin_top(10);
+    $w{cbUseKeePass}->set_margin_bottom(5);
+    $w{cbUseKeePass}->set_halign('GTK_ALIGN_START');
+
+    # Build 'help' button
+    $w{help} = Gtk3::LinkButton->new('https://docs.asbru-cm.net/Manual/Preferences/KeePassXC/');
+    $w{help}->set_halign('GTK_ALIGN_END');
+    $w{help}->set_label('');
+    $w{help}->set_tooltip_text('Open Online Help');
+    $w{help}->set_always_show_image(1);
+    $w{help}->set_image(Gtk3::Image->new_from_stock('asbru-help', 'button'));
+
+    # Hbox to arrange first
+    $w{hbox} = Gtk3::HBox->new(1,0);
+    $w{hbox}->pack_start($w{cbUseKeePass}, 0, 1, 0);
+    $w{hbox}->pack_start($w{help},0,1,0);
+    $w{vbox}->pack_start($w{hbox}, 0, 0, 0);
+
+    $w{hboxkpmain} = Gtk3::HBox->new(0, 4);
+    $w{vbox}->pack_start($w{hboxkpmain}, 0, 1, 3);
+
+    $w{dblabel} = Gtk3::Label->new('Database file');
+    $w{dblabel}->set_size_request($width,-1);
+    $w{dblabel}->set_xalign(0);
+    $w{hboxkpmain}->pack_start($w{dblabel}, 0, 0, 0);
+
+    $w{fcbKeePassFile} = Gtk3::FileChooserButton->new('','GTK_FILE_CHOOSER_ACTION_OPEN');
+    $w{fcbKeePassFile}->set_show_hidden(0);
+    $w{hboxkpmain}->pack_start($w{fcbKeePassFile}, 0, 0, 0);
+
+    $w{btnClearPassFile} = Gtk3::Button->new('Clear');
+    $w{hboxkpmain}->pack_start($w{btnClearPassFile}, 0, 1, 0);
+
+    $w{hboxkpmain}->pack_start(Gtk3::Label->new('Master Password'), 0, 1, 0);
+    $w{entryKeePassPassword} = Gtk3::Entry->new();
+    $w{hboxkpmain}->pack_start($w{entryKeePassPassword}, 1, 1, 5);
     $w{entryKeePassPassword}->set_visibility(0);
 
-    $w{frameKPList} = Gtk3::Frame->new(' Available passwords in given Database file: ');
-    $w{vbox}->pack_start($w{frameKPList}, 1, 1, 0);
-
-    $w{vbkpin} = Gtk3::VBox->new(0, 0);
-    $w{frameKPList}->add($w{vbkpin});
+    # Key file selection
+    $w{hboxkpkeyfile} = Gtk3::HBox->new(0, 3);
+    $w{keylabel} = Gtk3::Label->new('Key file');
+    $w{vbox}->pack_start($w{hboxkpkeyfile}, 0, 1, 0);
+    $w{hboxkpkeyfile}->pack_start($w{keylabel}, 0, 0, 0);
+    $w{keylabel}->set_size_request($width,-1);
+    $w{keylabel}->set_xalign(0);
+    $w{fcbKeePassKeyFile} = Gtk3::FileChooserButton->new('','GTK_FILE_CHOOSER_ACTION_OPEN');
+    $w{fcbKeePassKeyFile}->set_show_hidden(0);
+    $w{hboxkpkeyfile}->pack_start($w{fcbKeePassKeyFile}, 0, 1, 0);
+
+    $w{btnClearkeyfile} = Gtk3::Button->new('Clear');
+    $w{hboxkpkeyfile}->pack_start($w{btnClearkeyfile}, 0, 1, 0);
+
+    $w{btnClearkeyfile}->signal_connect('clicked' => sub {
+        $w{fcbKeePassKeyFile}->set_uri("file://$ENV{'HOME'}");
+        $w{fcbKeePassKeyFile}->unselect_uri("file://$ENV{'HOME'}");
+    });
+    if (!$$self{kpxc_keyfile}) {
+        $w{hboxkpkeyfile}->set_sensitive(0);
+    }
 
-    $w{btnPassRefresh} = Gtk3::Button->new_from_stock('gtk-refresh');
-    $w{vbkpin}->pack_start($w{btnPassRefresh}, 0, 1, 0);
+    # CLI binary selection
+    $w{clilabel} = Gtk3::Label->new('keepassxc-cli binary');
+    $w{clilabel}->set_size_request($width,-1);
+    $w{clilabel}->set_xalign(0);
+    $w{clilabel}->set_tooltip_text("Specify the keepassxc-cli binary file to use.\nIf not specified, the system wide keepassxc-cli will be used.");
+    $w{fcbCliFile} = Gtk3::FileChooserButton->new('','GTK_FILE_CHOOSER_ACTION_OPEN');
+    $w{fcbCliFile}->set_show_hidden(0);
+    $w{btnClearclifile} = Gtk3::Button->new('Clear');
+    $w{hboxkpclifile} = Gtk3::HBox->new(0, 3);
+    $w{hboxkpclifile}->pack_start($w{clilabel}, 0, 0, 0);
+    $w{hboxkpclifile}->pack_start($w{fcbCliFile}, 0, 1, 0);
+    $w{hboxkpclifile}->pack_start($w{btnClearclifile}, 0, 1, 0);
+    $w{vbox}->pack_start($w{hboxkpclifile}, 0, 1, 2);
+
+    # Information about the selected keepassxc-cli
+    $w{intro_usage} = Gtk3::Label->new();
+    $w{intro_usage}->set_markup("Information about <i>keepassxc-cli</i> currently in use:");
+    $w{intro_usage}->set_halign('start');
+    $w{intro_usage}->set_margin_top(24);
+    $w{usage} = Gtk3::Label->new();
+    $w{usage}->set_halign('start');
+    $w{usage}->set_margin_top(4);
+    $w{usage}->set_margin_left(8);
+    $w{vbox}->pack_start($w{intro_usage}, 0, 1, 0);
+    $w{vbox}->pack_start($w{usage}, 0, 1, 0);
+
+    $w{hboxkpmain}->set_sensitive($$self{cfg}{use_keepass});
+    $w{hboxkpclifile}->set_sensitive($$self{cfg}{use_keepass});
+    if ($$self{kpxc_keyfile}) {
+        $w{hboxkpkeyfile}->set_sensitive($$self{cfg}{use_keepass});
+    }
 
-    $w{scKeePass} = Gtk3::ScrolledWindow->new;
-    $w{scKeePass}->set_policy('automatic', 'automatic');
-    $w{vbkpin}->add($w{scKeePass});
+    _updateUsage($self);
 
-    $w{vbKeePass} = Gtk3::VBox->new(0, 0);
-    $w{scKeePass}->add_with_viewport($w{vbKeePass});
+    # Register callbacks
+    $w{cbUseKeePass}->signal_connect('toggled', sub {
+        if ($w{cbUseKeePass}->get_active()) {
+            $$self{cfg}{use_keepass} = 1;
+            $self->_setCapabilities();
+        }
+        $self->_updateUsage();
+    });
 
-    $$self{container} = $w{vbox};
-    $$self{frame} = \%w;
+    $w{btnClearPassFile}->signal_connect('clicked' => sub {
+        $w{fcbKeePassFile}->set_uri("file://$ENV{'HOME'}");
+        $w{fcbKeePassFile}->unselect_uri("file://$ENV{'HOME'}");
+        if ($KPXC_MP || $ENV{'KPXC_MP'}) {
+            $KPXC_MP = '';
+            $ENV{'KPXC_MP'} = '';
+        }
+    });
 
-    $w{entryKeePassPassword}->signal_connect('activate', sub {$w{btnPassRefresh}->clicked;});
+    $w{btnClearclifile}->signal_connect('clicked' => sub {
+        $$self{cfg}{pathcli} = '';
+        $CLI = 'keepassxc-cli';
+        $w{fcbCliFile}->set_uri("file://$ENV{'HOME'}");
+        $w{fcbCliFile}->unselect_uri("file://$ENV{'HOME'}");
+        $self->_setCapabilities();
+        $self->_updateUsage();
+    });
 
-    $w{cbUseKeePass}->signal_connect('toggled', sub {$w{hboxkpmain}->set_sensitive($w{cbUseKeePass}->get_active)});
+    $w{fcbKeePassFile}->signal_connect('selection-changed' => sub {
+        if ($KPXC_MP || $ENV{'KPXC_MP'}) {
+            $KPXC_MP = '';
+            $ENV{'KPXC_MP'} = '';
+        }
+    });
 
-    $w{btnPassRefresh}->signal_connect('clicked', sub {
-        return 1 unless $w{cbUseKeePass}->get_active;
-        $w{btnPassRefresh}->set_sensitive(0);
-        my $hash = $self->get_cfg;
-        $self->reload('force', $hash) and $self->update($hash);
-        $w{btnPassRefresh}->set_sensitive(1);
+    $w{fcbCliFile}->signal_connect('selection-changed' => sub {
+        my ($fc) = @_;
+        if (defined $fc->get_filename()) {
+            $$self{cfg}{pathcli} = decode('utf8',$fc->get_filename());
+            $CLI = decode('utf8',$fc->get_filename());
+            $self->_setCapabilities();
+            $self->_updateUsage();
+            if ($CLI ne decode('utf8',$fc->get_filename())) {
+                # Remove selected file name, setCapabilities failed with this file
+                $fc->set_uri("file://$ENV{'HOME'}");
+                $fc->unselect_uri("file://$ENV{'HOME'}");
+            }
+        }
     });
 
     return 1;
 }
 
-sub _buildVar {
+sub _updateUsage {
     my $self = shift;
-    my $title = shift;
-    my $url = shift;
-    my $user = shift;
-    my $pass = shift;
+    my $uncheck = shift;
+    my $capabilities;
+    my $w = $$self{frame};
 
-    my %w;
-
-    # Make an HBox to contain label, entry and del button
-    $w{hbox} = Gtk3::HBox->new(0, 0);
-    $w{hbox}->set_tooltip_text('Use <KPX_(title|username):title or user name> anywhere to refer to given password');
-
-    # Build label
-    $w{lbl0} = Gtk3::Label->new('Title:');
-    $w{hbox}->pack_start($w{lbl0}, 0, 1, 0);
-
-    # Build entry
-    $w{title} = Gtk3::Entry->new;
-    $w{hbox}->pack_start($w{title}, 0, 1, 0);
-    if ($title) {
-        $w{title}->set_text($title);
+    # Lets make sure there is an UI to update (asrbu_conn does not creates an UI)
+    if (!defined $w) {
+        return 0;
     }
-    $w{title}->set_editable(0);
-
-    # Build label
-    $w{lbl01} = Gtk3::Label->new('URL:');
-    $w{hbox}->pack_start($w{lbl01}, 0, 1, 0);
+    if ($$self{_VERBOSE}) {
+        print "DEBUG:KEEPASS: Update usage\n";
+    }
+    if ($$self{disable_keepassxc}) {
+        $capabilities = "<span color='red'><b>keepassxc-cli</b> Not installed, choose a working keepassxc-cli or AppImage</span>";
+    } else {
+        my $warn = '';
+        $capabilities  = "<b>Location</b>\t\t$CLI  $$self{kpxc_cli}\n$warn";
+        $capabilities .= "<b>Version</b>\t\t\t$$self{kpxc_version}\n";
+        $capabilities .= "<b>Support key file</b>\t" . ($$self{kpxc_keyfile} ? "Yes" : "No (update to latest version)") . "\n";
+        $capabilities .= "<b>Show protected</b>\t" . ($$self{kpxc_show_protected} ? "Yes" : "No") . "\n";
+    }
+    if ($uncheck) {
+        # Remove checkbox if there is not an available keepassxc-cli
+        $$w{cbUseKeePass}->set_active(0);
+    }
+    $$w{usage}->set_markup($capabilities);
+    $$w{hboxkpmain}->set_sensitive($$w{cbUseKeePass}->get_active());
+    $$w{hboxkpclifile}->set_sensitive($$w{cbUseKeePass}->get_active());
+    if ($$self{kpxc_keyfile} || $$w{cbUseKeePass}->get_active()==0 || $$self{disable_keepassxc}) {
+        $$w{hboxkpkeyfile}->set_sensitive($$w{cbUseKeePass}->get_active());
+    }
+}
 
-    # Build entry
-    $w{url} = Gtk3::Entry->new;
-    $w{hbox}->pack_start($w{url}, 0, 1, 0);
-    if ($url) {
-        $w{url}->set_text($url);
+sub _setCapabilities {
+    my $self = shift;
+    my ($c);
+
+    # Test the UI exists and is visible
+    if (ref($self) eq 'PACKeePass') {
+        # Ignore this call
+        if (!$$self{frame}{cbUseKeePass}->is_visible()) {
+            return 0;
+        }
     }
-    $w{url}->set_editable(0);
+    # Is start up or preferences are visible
+    $$self{kpxc_keyfile} = '';
+    $$self{kpxc_show_protected} = '';
+    $$self{kpxc_keyfile_opt} = '';
+    $$self{kpxc_version} = '';
+    $$self{kpxc_cli} = '';
+    $$self{disable_keepassxc} = 0;
+    if (!$$self{cfg}{use_keepass}) {
+        return 0;
+    }
+    if ($$self{_VERBOSE}) {
+        print "DEBUG:KEEPASS: testCapabilities\n";
+    }
+    if ((defined $$self{cfg})&&($$self{cfg}{pathcli})&&(-e $$self{cfg}{pathcli})) {
+        $CLI = $$self{cfg}{pathcli};
+    }
+    if (_getMagicBytes($CLI) eq '41490200') {
+        $$self{kpxc_cli} = 'cli';
+    }
+    if ($$self{_VERBOSE}) {
+        print "DEBUG:KEEPASS: $CLI $$self{kpxc_cli}\n";
+    }
+    $$self{kpxc_version} = `$ENV{'ASBRU_ENV_FOR_EXTERNAL'} $CLI $$self{kpxc_cli} -v 2>/dev/null`;
+    $$self{kpxc_version} =~ s/\n//g;
+    if ($$self{kpxc_version} !~ /[0-9]+\.[0-9]+\.[0-9]+/) {
+        # Invalid version number, user did not select a valid KeePassXC file
+        $$self{kpxc_version} = '';
+        $$self{cfg}{pathcli} = '';
+        _wMessage($PACMain::FUNCS{_CONFIG}{_WINDOWCONFIG},"<b>Error</b>\n\nFile is not a valid keepassxc-cli binary.");
+    }
+    if (!$$self{kpxc_version}) {
+        if ($CLI eq 'keepassxc-cli') {
+            # We do not have keepassxc-cli available
+            $$self{disable_keepassxc} = 1;
+            $$self{kpxc_cli} = '';
+            return 0;
+        } else {
+            # Test if we have a system wide installation
+            $$self{kpxc_cli} = '';
+            $CLI = 'keepassxc-cli';
+            $$self{kpxc_version} = `$ENV{'ASBRU_ENV_FOR_EXTERNAL'} $CLI -v 2>/dev/null`;
+            $$self{kpxc_version} =~ s/\n//g;
+            if (!$$self{kpxc_version}) {
+                # We do not have keepassxc-cli available, the user defined is not working
+                $$self{cfg}{pathcli} = '';
+                $$self{disable_keepassxc} = 1;
+                return 0;
+            }
+        }
+    }
+    $c = `$ENV{'ASBRU_ENV_FOR_EXTERNAL'} $CLI $$self{kpxc_cli} -h show 2>&1`;
+    if ($c =~ /--key-file/) {
+        $$self{kpxc_keyfile} = '--key-file';
+    }
+    if ($c =~ /--show-protected/) {
+        $$self{kpxc_show_protected} = '--show-protected';
+    }
+    if ((defined $$self{cfg})&&($$self{kpxc_keyfile})&&($$self{cfg}{keyfile})&&(-e $$self{cfg}{keyfile})) {
+        $$self{kpxc_keyfile_opt} = "$$self{kpxc_keyfile} '$$self{cfg}{keyfile}'";
+    }
+}
 
-    # Build label
-    $w{lbl1} = Gtk3::Label->new('Username:');
-    $w{hbox}->pack_start($w{lbl1}, 0, 1, 0);
+sub _hasCacheValue {
+    my ($self, $key) = @_;
+    my $cfg;
+    my $ts;
 
-    # Build entry
-    $w{var} = Gtk3::Entry->new;
-    $w{hbox}->pack_start($w{var}, 0, 1, 0);
-    if ($user) {
-        $w{var}->set_text($user);
+    # Get current modification timestamp of the KeePass database
+    if ($$self{cfg}) {
+        $cfg = $$self{cfg};
+    } else {
+        $cfg = $self->get_cfg();
     }
-    $w{var}->set_editable(0);
+    $ts = stat($$cfg{database})->mtime;
 
-    # Build label
-    $w{lbl2} = Gtk3::Label->new(' Password:');
-    $w{hbox}->pack_start($w{lbl2}, 0, 1, 0);
-
-    # Build entry
-    $w{val} = Gtk3::Entry->new;
-    $w{hbox}->pack_start($w{val}, 1, 1, 0);
-    if ($pass) {
-        $w{val}->set_text($pass);
+    # Check if the cache should be created or invalidated
+    if (!%KPXC_CACHE || ($KPXC_CACHE_TIMESTAMP && $KPXC_CACHE_TIMESTAMP < $ts)) {
+        %KPXC_CACHE = ();
+        $KPXC_CACHE_TIMESTAMP = $ts;
     }
-    $w{val}->set_editable(0);
 
-    $w{hide} = Gtk3::CheckButton->new('Hide');
-    $w{hbox}->pack_start($w{hide}, 0, 1, 0);
-    $w{hide}->set_active(1);
-    $w{hide}->signal_connect(toggled => sub {$w{val}->set_visibility(! $w{hide}->get_active);});
+    return exists($KPXC_CACHE{$key});
+}
+
+# END: Private functions definitions
+###################################################################
 
-    $w{val}->set_visibility(! $w{hide}->get_active);
+###################################################################
+# START: Other package functions
 
-    # Add built control to main container
-    $$self{frame}{vbKeePass}->pack_start($w{hbox}, 0, 1, 0);
-    $$self{frame}{vbKeePass}->show_all;
+# Check magic bytes, AppImage magic bytes : 41490200
+sub _getMagicBytes {
+    my $file = shift;
+    my ($fh,$magic_bytes,$n);
 
-    return %w;
+    if (!$file || !-e $file) {
+        return '';
+    }
+    open ($fh, '<:raw', $file) or return '';
+    $n = read($fh, $magic_bytes, 32);
+    close $fh;
+    my $data = unpack("H*",$magic_bytes);
+    return substr($data,16,8);
 }
 
-# END: Private functions definitions
+# END: Other package functions
 ###################################################################
 
 1;
+
+__END__
+
+=encoding utf8
+
+=head1 NAME
+
+PACKeePass.pm
+
+=head1 SYNOPSIS
+
+Handles integration to KeePassXC using : keepassxc-cli
+
+    $kpxc = PACKeePass->new(OPT_BG,CFG);
+    OPT_BG = [0|1]
+            1 : Create object and Build GUI to configure
+            0 : Create object to access available methods
+    CFG    = Pointer to a valid PACConfig configuration
+
+=head1 DESCRIPTION
+
+=head2
+
+Important object variables
+
+    $KPXC_MP : holds the current database master password
+
+B<Warning>
+
+    asbru_conn does not creates an UI, the code must not execute UI actions
+    test that the UI object $$self{'frame'} exists, before
+
+=head2 sub update
+
+Updates configuration settings from current selections in gui
+
+=head2 sub isKeePassMask
+
+Returns true if the given string is a mask for a KeePass entry
+
+=head2 sub getMasterPassword
+
+Routine to ask for master password to user, infinite retries or cancel to exit
+
+=head2 sub testMasterKey
+
+Connects to database with an unknown field value to test if response is:
+
+    Error : Could not connect, so password is wrong
+    Could not find XXXXXX uuid, so it could connect
+
+=head2 sub getFieldValueFromString
+
+Check if string has the correct format <field|uuid>
+
+    false: return dame string
+    true : extract field and uuid and call getFieldValue(field,uuid)
+
+=head2 sub regexTransform
+
+Use this method inside a regex expression to replace keepassxc ocurrences in a string
+
+Usage:
+
+    $str =~ s/<(.+?)\|(.+?)>/$kpxc->regexTransform($1,$2)/ge;
+
+=head2 sub getFieldValue
+
+Connect to database and query field value, return value or empty if not found
+
+=head2 sub get_cfg
+
+Recover settings from current GUI configuration
+
+=head2 sub listEntries
+
+Build a window with a search entry and a listbox, show results from search entry in the listbox
+
+    call _locateEntries on each typed key by user (3 characters are required to start the search)
+
+Allow user to select a row and return the selected key path
+
+head2 sub _locateEntries
+
+Query the complete database for a search pattern and show the entries found in a listbox
+
+=head2 sub _updateUsage
+
+Update capabilities lables, and update the UIs preferences
+
+=head2 sub _setCapabilities
+
+Get keepassxc-cli version numbers and list of available parameters
+
+    --show-protected        Older versions of keepassxc-cli showed by default clear passwords
+                            when the show command is called. Later versions requiere this option
+    --key-file              This version is capable to use a key-file
+
+=head2 sub _hasCacheValue
+
+Return true if a value already exists in the cache for the given key
+If the cache does not exist ; create a new cache structure
+ If the cache timestamp is older than the database file, invalidate the cache
+
+=head2 sub _getMagicBytes
+
+Read first 32 bytes from binary and return the position for the magic bytes for AppImages
diff --git a/lib/PACKeyBindings.pm b/lib/PACKeyBindings.pm
new file mode 100644
index 00000000..89a11fb4
--- /dev/null
+++ b/lib/PACKeyBindings.pm
@@ -0,0 +1,683 @@
+package PACKeyBindings;
+
+###############################################################################
+# This file is part of Ásbrú Connection Manager
+#
+# Copyright (C) 2017-2022 Ásbrú Connection Manager team (https://asbru-cm.net)
+# Copyright (C) 2010-2016 David Torrejon Vaquerizas
+#
+# Ásbrú Connection Manager is free software: you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Ásbrú Connection Manager 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License version 3
+# along with Ásbrú Connection Manager.
+# If not, see <http://www.gnu.org/licenses/gpl-3.0.html>.
+###############################################################################
+
+use utf8;
+binmode STDOUT, ':utf8';
+binmode STDERR, ':utf8';
+
+$|++;
+
+###################################################################
+# Import Modules
+
+# Standard
+use strict;
+use warnings;
+
+use Encode;
+use FindBin qw ($RealBin $Bin $Script);
+
+# GTK
+use Gtk3 '-init';
+
+# PAC modules
+use PACUtils;
+use PACTree;
+
+# END: Import Modules
+###################################################################
+
+###################################################################
+# Define GLOBAL CLASS variables
+
+my %EMULATIONS = (
+    #                 F1         F2         F3         F4         F5         F6         F7         F8         F9         F10        F11        F12        F13        F14        F15        F16        F17        F18        F19        F20        F21          F22          F23          F24
+    'X11R6', ['',"\x1B[11~","\x1B[12~","\x1B[13~","\x1B[14~","\x1B[15~","\x1B[17~","\x1B[18~","\x1B[19~","\x1B[20~","\x1B[21~","\x1B[23~","\x1B[24~","\x1B[25~","\x1B[26~","\x1B[28~","\x1B[29~","\x1B[31~","\x1B[32~","\x1B[33~","\x1B[34~","\x1B[20;2~","\x1B[21;2~","\x1B[23;2~","\x1B[24;2~"],
+    'VT100', ['',"\x1BOP"  ,"\x1BOQ"  ,"\x1BOR"  ,"\x1B02"],
+    'VT220', ['',""        ,""        ,""        ,""       ,""         ,"\x1B[17~","\x1B[18~","\x1B[19~","\x1B[20~","\x1B[21~","\x1B[23~","\x1B[24~"],
+    'rxvt',  ['',"\x1B[11~","\x1B[12~","\x1B[13~","\x1B[14~","\x1B[15~","\x1B[17~","\x1B[18~","\x1B[19~","\x1B[20~","\x1B[21~","\x1B[23~","\x1B[24~","\x1BO2P" ,"\x1BO2Q" ,"\x1BO2R" ,"\x1BO2S" ,"\x1B[15;2~","\x1B[17;2~","\x1B[18;2~","\x1B[19;2~","\x1B[23\$","\x1B[24\$","\x1B[11^","\x1B[12^"],
+    'MGT',   ['',"\x1BOP"  ,"\x1BOQ"  ,"\x1BOR"  ,"\x1BOS"  ,"\x1B[15~","\x1B[17~","\x1B[18~","\x1B[19~","\x1B[20~","\x1B[21~","\x1B[23~","\x1B[24~","\x1B[25~","\x1B[26~","\x1B[28~","\x1B[29~","\x1B[31~","\x1B[32~","\x1B[33~","\x1B[34~"],
+    'screen',['',"\x1BOP"  ,"\x1BOQ"  ,"\x1BOR"  ,"\x1BOS"  ,"\x1B[15~","\x1B[17~","\x1B[18~","\x1B[19~","\x1B[20~","\x1B[21~","\x1B[23~","\x1B[24~","\x1B[25~","\x1B[26~","\x1B[28~","\x1B[29~","\x1B[31~","\x1B[32~","\x1B[33~","\x1B[34~"]
+);
+
+# END: Define GLOBAL CLASS variables
+###################################################################
+
+###################################################################
+# START: Public class methods
+
+sub new {
+    my $class = shift;
+    my $self;
+
+    $self->{cfg} = shift;
+    $self->{parent} = shift;
+    $self->{container} = undef;
+    $self->{hotkey} = {};
+    $self->{verbose} = 0;
+
+    _buildGUI($self);
+
+    bless($self, $class);
+    return $self;
+}
+
+sub GetKeyMask {
+    my ($self, $widget, $event, $emulation) = @_;
+    my $keyval  = Gtk3::Gdk::keyval_name($event->keyval) // '';
+    my $unicode = Gtk3::Gdk::keyval_to_unicode($event->keyval); # 0 if not a character
+    my $state   = $event->get_state();
+    my $shift   = $state * ['shift-mask']   ? 'Shift' : '';
+    my $ctrl    = $state * ['control-mask'] ? 'Ctrl'  : '';
+    my $alt     = $state * ['mod1-mask']    ? 'Alt'   : '';
+
+    if ($self->{verbose}) {
+        print "INFO: GETKEYMASK: $keyval, $unicode, $ctrl / $shift\n";
+    }
+    # Test special keys
+    if ($keyval =~ /^KP_(.+)/) {
+        # Unify keypad and keyboard to be the same
+        my $kp = $1;
+        if ($kp =~ /\d/) {
+            $keyval = $kp;
+        } else {
+            my %kp2key = ('Add', 'plus', 'Subtract', 'minus', 'Multiply', 'asterix', 'Divide', 'slash', 'Decimal', 'period', 'Enter', 'Return');
+            if ($kp2key{$kp}) {
+                $keyval = $kp2key{$kp};
+            }
+        }
+        if (!$unicode) {
+            $unicode = 1;
+        }
+    } elsif (!$unicode && ($keyval =~ /F\d+|Page_Down|Page_Up|Home|End|Insert|Left|Right|Up|Down|Scroll_Lock|Pause|Break/)) {
+        if ("$alt$ctrl$shift") {
+            return ($keyval, 0, "$alt$ctrl$shift+$keyval");
+        } elsif ($keyval =~ /F(\d+)$/) {
+            my $pos = $1;
+            if ($emulation && @{$EMULATIONS{$emulation}}[$pos]) {
+                return ('fkey', @{$EMULATIONS{$emulation}}[$pos], $keyval);
+            }
+            return ($keyval, 0, $keyval);
+        }
+        return ($keyval, 0, '');
+    }
+
+    if (!$unicode || (!$ctrl && !$alt)) {
+        return ($keyval, $unicode, '');
+    }
+    return ($keyval, $unicode, "$alt$ctrl+$keyval");
+}
+
+sub GetAction {
+    my ($self, $window, $widget, $event, $uuid, $emulation) = @_;
+    my $cfg = $self->{cfg};
+    my $hk  = $self->{hotkey};
+
+    if (!$window) {
+        return wantarray ? (0, '') : '';
+    }
+    if (!$cfg) {
+        return wantarray ? (0, '') : '';
+    }
+    if (!defined $emulation) {
+        $emulation = 0;
+    }
+    my ($keyval, $unicode, $keymask) = $self->GetKeyMask($widget, $event, $emulation);
+    if (!$keymask) {
+        return wantarray ? ($keyval, '') : $keyval;
+    }
+    if ($$cfg{$window}{$keymask}) {
+        return wantarray ? ($$cfg{$window}{$keymask}[1], $keymask) : $$cfg{$window}{$keymask}[1];
+    } elsif ($uuid && $$hk{$uuid}{$window}{$keymask} && $$hk{$uuid}{$window}{$keymask}[1]) {
+        return wantarray ? ($$hk{$uuid}{$window}{$keymask}[1], $keymask) : $$hk{$uuid}{$window}{$keymask}[1];
+    } elsif ($$hk{$window}{$keymask} && $$hk{$window}{$keymask}[1]) {
+        return wantarray ? ($$hk{$window}{$keymask}[1], $keymask) : $$hk{$window}{$keymask}[1];
+    }
+    if ($emulation && $keyval eq 'fkey') {
+        return ('fkey', $unicode);
+    }
+    return wantarray ? ($keymask, '') : $keymask;
+}
+
+sub GetHotKeyCommand {
+    my ($self, $window, $keymask, $uuid) = @_;
+    my $hk  = $self->{hotkey};
+    my $cmd = $$hk{$window}{$keymask}[2];
+
+    if ($uuid && $$hk{$uuid}{$window}{$keymask}[2]) {
+        $cmd = $$hk{$uuid}{$window}{$keymask}[2];
+    }
+    if (defined $cmd && $cmd eq '') {
+        return (0, '');
+    }
+    if ($cmd =~ s/^\?//) {
+        return (1, $cmd);
+    }
+    return (0, $cmd);
+}
+
+sub ListKeyBindings {
+    my ($self, $window) = @_;
+    my $cfg = $self->{cfg};
+    my $kbs = $$cfg{$window};
+    my $list = "<b>Keybindings for : $window</b>\n\n<span font_family='monospace'>";
+    my $tab = '';
+
+    foreach my $kb (sort keys %$kbs) {
+        if ($kb =~ /^undef-/) {
+            next;
+        }
+        $list .= sprintf("<b>%-20s</b>$tab\t%s\n", $kb, $$kbs{$kb}[2]);
+    }
+    return "$list</span>";
+}
+
+sub GetAccelerator {
+    my ($self, $window, $action) = @_;
+    my $cfg = $self->{cfg};
+    my $kbs = $$cfg{$window};
+    my $acc = '';
+
+    foreach my $kb (sort keys %$kbs) {
+        if ($$kbs{$kb}[1] eq $action) {
+            my ($mod, $key) = split /\+/, $kb;
+            if (!$key) {
+                $key = $mod;
+            }
+            if ($kb =~ /^undef-/) {
+                next;
+            }
+            if ($kb =~ /Ctrl/) {
+                $acc .= '<control>';
+            }
+            if ($kb =~ /Alt/) {
+                $acc .= '<alt>';
+            }
+            if ($kb =~ /Shift/) {
+                $acc .= '<shift>';
+            }
+            if ($key =~ /[A-Z]/) {
+                $acc .= '<shift>';
+            }
+            $acc .= $key;
+            last;
+        }
+    }
+    return $acc;
+}
+
+sub LoadHotKeys {
+    my ($self, $cfg, $uuid) = @_;
+    my $CFG = {};
+    my @what;
+
+    if ($uuid) {
+        $CFG = $$cfg{'environments'}{$uuid};
+        @what = ('macros', 'local connected');
+    } else {
+        $CFG = $$cfg{'defaults'};
+        @what = ('remote commands', 'local commands');
+    }
+    foreach my $w (@what) {
+        foreach my $hash (@{$$CFG{$w}}) {
+            if ($$hash{keybind}) {
+                my $lf  = $$hash{intro} && $w ne 'local commands' ? "\n" : '';
+                my $ask = $$hash{confirm} ? "?" : '';
+                $self->RegisterHotKey('terminal', $$hash{keybind}, "HOTKEY_CMD:$w", "$ask$$hash{txt}$lf", $uuid);
+            }
+        }
+    }
+}
+
+# This function overwrites duplicated keybindings
+# Programmer should use HotKeyIsFree, to avoid duplicates
+sub RegisterHotKey {
+    my ($self, $window, $keymask, $action, $command, $uuid) = @_;
+    my $cfg = $self->{cfg};
+    my $hk  = $self->{hotkey};
+
+    if (!$window || !$keymask || !$action || !$command) {
+        return (0, "window, keymask, action, command : are required");
+    }
+    if ($uuid) {
+        $$hk{$uuid}{$window}{$keymask} = ['User hotkey', $action, $command];
+    } else {
+        $$hk{$window}{$keymask} = ['User hotkey', $action, $command];
+    }
+    return (1, '');
+}
+
+sub UnRegisterHotKey {
+    my ($self, $window, $keymask, $uuid) = @_;
+    my $cfg = $self->{cfg};
+    my $hk  = $self->{hotkey};
+
+    if (!$window || !$keymask) {
+        return (0, "window, keymask : are required");
+    }
+    if ($uuid) {
+        delete $$hk{$uuid}{$window}{$keymask};
+    } else {
+        delete $$hk{$window}{$keymask};
+    }
+    return (1, '');
+}
+
+sub HotKeyIsFree {
+    my ($self, $window, $keymask, $uuid, $hotkey_only) = @_;
+    my $cfg = $self->{cfg};
+    my $hk  = $self->{hotkey};
+
+    if (!$window || !$keymask) {
+        return (0, "window, keymask : are required");
+    }
+    if ($$hk{$window}{$keymask}) {
+        return (0, "<i>$keymask</i> already assigned to <b>hotkey</b>\n\n$$hk{$window}{$keymask}[2]");
+    }
+    if ($uuid && $$hk{$uuid}{$window}{$keymask}) {
+        return (0, "<i>$keymask</i> already assigned to <b>hotkey</b>\n\n$$hk{$window}{$keymask}[2]");
+    }
+    if ($hotkey_only) {
+        return (1, '');
+    }
+    # Full check other windows
+    if ($$cfg{$window}{$keymask}) {
+        return (0, "<i>$keymask</i> already assigned to <b>$$cfg{$window}{$keymask}[0]</b>\n\n$$cfg{$window}{$keymask}[2]");
+    }
+    foreach my $w (sort keys %$cfg) {
+        if ($w eq $window) {
+            next;
+        }
+        if ($$cfg{$w}{$keymask}) {
+            return (0, "<i>$keymask</i> already assigned to <b>$$cfg{$w}{$keymask}[0]</b>\n\n$$cfg{$w}{$keymask}[2]");
+        }
+    }
+    return (1, '');
+}
+
+sub update {
+    my $self = shift;
+    my $cfg = shift;
+    my $default_cfg = $self->_getDefaultConfig();
+    my %actions;
+
+    if (!$cfg && !$self->{cfg}) {
+        $cfg = $default_cfg;
+    } elsif ($cfg) {
+        $self->{cfg} = $cfg;
+    } else {
+        $cfg = $self->{cfg};
+    }
+
+    $self->_updateConfig($default_cfg);
+
+    @{$$self{frame}{keylist}{'data'}} = ();
+    foreach my $w (sort keys %$cfg) {
+        my $wk = $$cfg{$w};
+        %actions = ();
+        foreach my $k (keys %$wk) {
+            $actions{$$wk{$k}[2]} = $k;
+        }
+        foreach my $a (sort keys %actions) {
+            my $k = $actions{$a};
+            my $kb = $k;
+            if ($kb =~ /^undef-/) {
+                $kb = '';
+            }
+            push(@{$$self{frame}{keylist}{'data'}}, {value => ["<b>$$wk{$k}[0]</b>", $$wk{$k}[2], $self->stringifyKeybind($kb), $$wk{$k}[1], $w], children => []});
+        }
+    }
+}
+
+sub get_cfg {
+    my $self = shift;
+
+    return $self->{cfg};
+}
+
+sub stringifyKeybind {
+    my $self = shift;
+    my $kb = shift;
+
+    if ($kb =~ /\+[A-Z]$/) {
+        $kb = 'Shift+' . $kb;
+        $kb =~ s/(.*)\+([A-Z])$/$1\+\L$2/;
+    }
+    if ($kb =~ /CtrlShift\+/) {
+        $kb =~ s/(.*)CtrlShift\+(.*)/$1Shift\+Ctrl\+$2/;
+    }
+    if ($kb =~ /AltCtrl\+/) {
+        $kb =~ s/(.*)AltCtrl\+(.*)/$1Alt\+Ctrl\+$2/;
+    }
+    if ($kb =~ /CtrlAlt\+/) {
+        $kb =~ s/(.*)CtrlAlt\+(.*)/$1Alt\+Ctrl\+$2/;
+    }
+    if ($kb =~ /Shift\+Ctrl\+/) {
+        $kb =~ s/(.*)Shift\+Ctrl\+(.*)/$1Ctrl\+Shift\+$2/;
+    }
+
+    return $kb;
+}
+
+sub unStringifyKeybind {
+    my $self = shift;
+    my $kb = shift;
+
+    if ($kb =~ /Shift\+[a-z]$/) {
+        $kb =~ s/(.*)Shift\+([a-z])$/$1\U$2/;
+    }
+    if ($kb =~ /Ctrl\+Shift\+/) {
+        $kb =~ s/(.*)Ctrl\+Shift\+(.*)/$1Shift\+Ctrl\+$2/;
+    }
+    if ($kb =~ /Alt\+Ctrl\+/) {
+        $kb =~ s/(.*)Alt\+Ctrl\+(.*)/$1AltCtrl\+$2/;
+    }
+    if ($kb =~ /Shift\+Ctrl\+/) {
+        $kb =~ s/(.*)Shift\+Ctrl\+(.*)/$1CtrlShift\+$2/;
+    }
+
+    return $kb;
+}
+
+# END: Public class methods
+###################################################################
+
+###################################################################
+# START: Private Methods
+
+# Check if we have a new keybinding in the default configuration that needs to be added
+# This is required to add the new keybindings that were not existing when the current
+# configuration has been created.
+sub _updateConfig {
+    my $self = shift;
+    my $default_cfg = shift // $self->_getDefaultConfig();
+    my %keybindings = ();
+
+    # List all keybindings in default configurating
+    foreach my $w (keys %$default_cfg) {
+        my $wk = $$default_cfg{$w};
+        foreach my $k (keys %$wk) {
+            my $action = $$wk{$k}[1];
+            %{$keybindings{"$w-$action"}} = ('window' => $w, 'key' => $k);
+        }
+    }
+    # Remove all used keybindings defined in the current configuration
+    foreach my $w (keys %{$self->{cfg}}) {
+        my $cfg = $self->{cfg};
+        my $wk = $$cfg{$w};
+        foreach my $k (keys %$wk) {
+            my $action = $$wk{$k}[1];
+            if (defined($keybindings{"$w-$action"})) {
+                delete $keybindings{"$w-$action"};
+            }
+        }
+    }
+    # Any remaining keybinding is a newly added keybinding that needs to be added to the current configuration
+    foreach my $ka (keys %keybindings) {
+        my $k = $keybindings{$ka}{key};
+        my $w = $keybindings{$ka}{window};
+        my $wk = $$default_cfg{$w};
+        print("WARN: Adding new keybinding [$k] for [$$wk{$k}[0]]/[$$wk{$k}[2]]...\n");
+        ${$self->{cfg}}{$w}{$k} = $$wk{$k};
+    }
+}
+
+sub _newKeyBind {
+    my ($self, $appwin, $keybind, $window, $action, $desc) = @_;
+    my $cfg = $self->{cfg};
+
+    if ($self->_exists($appwin, $action)) {
+        return 0;
+    }
+    $$cfg{$appwin}{$keybind} = [$window, $action, $desc];
+}
+
+sub _exists {
+    my ($self, $appwin, $action) = @_;
+    my $cfg = $self->{cfg};
+    my $wk = $$cfg{$appwin};
+
+    if (!$wk) {
+        return 0;
+    }
+    foreach my $k (keys %$wk) {
+        if ($$wk{$k}[1] eq $action) {
+            return 1;
+        }
+    }
+    return 0;
+}
+
+sub _getDefaultConfig {
+    my $self = shift;
+    my $cfg;
+
+    #      app_window_name  keybind       User window name     action                  user description
+    $$cfg{'treeFavourites'}{'Alt+e'}   = ['Favourites Tree',  'edit_node',            'Edit selected node'];
+    $$cfg{'treeFavourites'}{'Alt+F'}   = ['Favourites Tree',  'del_favourite',        'Remove connection from favourites'];
+    $$cfg{'treeHistory'}{'Alt+e'}      = ['History Tree',     'edit_node',            'Edit selected node'];
+    $$cfg{'treeClusters'}{'Alt+e'}     = ['Clusters Tree',    'edit_node',            'Edit selected node'];
+    $$cfg{'treeConnections'}{'Alt+e'}  = ['Connections Tree', 'edit_node',            'Edit selected node'];
+    $$cfg{'treeConnections'}{'Alt+f'}  = ['Connections Tree', 'add_favourite',        'Add connection to favourites'];
+    $$cfg{'treeConnections'}{'Alt+F'}  = ['Connections Tree', 'del_favourite',        'Remove connection from favourites'];
+    $$cfg{'treeConnections'}{'Ctrl+f'} = ['Connections Tree', 'find',                 'Find in connection tree'];
+    $$cfg{'treeConnections'}{'Ctrl+r'} = ['Connections Tree', 'expand_all',           'Expand tree completely'];
+    $$cfg{'treeConnections'}{'Ctrl+t'} = ['Connections Tree', 'collaps_all',          'Collapse tree completely'];
+    $$cfg{'treeConnections'}{'Ctrl+d'} = ['Connections Tree', 'clone',                'Clone connection'];
+    $$cfg{'treeConnections'}{'Ctrl+c'} = ['Connections Tree', 'copy',                 'Copy node'];
+    $$cfg{'treeConnections'}{'Ctrl+x'} = ['Connections Tree', 'cut',                  'Cut node'];
+    $$cfg{'treeConnections'}{'Ctrl+v'} = ['Connections Tree', 'paste',                'Paste node'];
+    $$cfg{'treeConnections'}{'Alt+r'}  = ['Connections Tree', 'protection',           'Toggle protection'];
+    $$cfg{'treeConnections'}{'F2'}     = ['Connections Tree', 'rename',               'Rename node'];
+    $$cfg{'treeConnections'}{'Alt+c'}  = ['Connections Tree', 'connect_node',         'Connect selected node'];
+    $$cfg{'pactabs'}{'Ctrl+F4'}        = ['Tabs',              'close',               'Close current Tab'];
+    $$cfg{'pactabs'}{'Ctrl+Tab'}       = ['Tabs',              'last',                'Last focused Tab'];
+    $$cfg{'pactabs'}{'Ctrl+Page_Down'} = ['Tabs',              'next',                'Next Tab'];
+    $$cfg{'pactabs'}{'Ctrl+Page_Up'}   = ['Tabs',              'previous',            'Previous Tab'];
+    $$cfg{'pactabs'}{'undef-infotab'}  = ['Tabs',              'infotab',             'Got to Info Tab'];
+    $$cfg{'pacmain'}{'Ctrl+f'}         = ['Main Window',       'find',                'Find in connection tree'];
+    $$cfg{'pacmain'}{'Ctrl+q'}         = ['Main Window',       'quit',                'Exit Ásbrú'];
+    $$cfg{'pacmain'}{'Ctrl+T'}         = ['Main Window',       'localshell',          'Open a local shell'];
+    $$cfg{'pacmain'}{'Alt+n'}          = ['Main Window',       'showconnections',     'Show/Hide connections list'];
+    $$cfg{'terminal'}{'F11'}           = ['Terminal',          'fullscreen',          'Go full screen'];
+    $$cfg{'terminal'}{'Ctrl+Return'}   = ['Terminal',          'start',               'Start Terminal'];
+    $$cfg{'terminal'}{'AltCtrl+x'}     = ['Terminal',          'reset',               'Reset Terminal'];
+    $$cfg{'terminal'}{'AltCtrl+X'}     = ['Terminal',          'reset-clear',         'Reset Terminal and Clear window'];
+    $$cfg{'terminal'}{'CtrlAlt+r'}     = ['Terminal',          'remove_from_cluster', 'Remove terminal from cluster'];
+    $$cfg{'terminal'}{'Ctrl+C'}        = ['Terminal',          'copy',                'Copy selection to clipboard'];
+    $$cfg{'terminal'}{'Ctrl+V'}        = ['Terminal',          'paste',               'Paste clipboard into terminal'];
+    $$cfg{'terminal'}{'Ctrl+Insert'}   = ['Terminal',          'copy',                'Copy selection to clipboard'];
+    $$cfg{'terminal'}{'Shift+Insert'}  = ['Terminal',          'paste-primary',       'Paste selection into terminal'];
+    $$cfg{'terminal'}{'Ctrl+p'}        = ['Terminal',          'paste-passwd',        'Paste terminal password'];
+    $$cfg{'terminal'}{'Ctrl+b'}        = ['Terminal',          'paste-delete',        'Paste and regex delete'];
+    $$cfg{'terminal'}{'Ctrl+g'}        = ['Terminal',          'hostname',            'Guess hostname'];
+    $$cfg{'terminal'}{'Ctrl+w'}        = ['Terminal',          'close',               'Close Terminal'];
+    $$cfg{'terminal'}{'Ctrl+W'}        = ['Terminal',          'disconnect',          'Disconnect Terminal'];
+    $$cfg{'terminal'}{'Ctrl+q'}        = ['Terminal',          'quit',                'Exit Ásbrú'];
+    $$cfg{'terminal'}{'Ctrl+f'}        = ['Terminal',          'find',                'Find in connection tree'];
+    $$cfg{'terminal'}{'CtrlShift+F4'}  = ['Terminal',          'closealltabs',        'Close all tabs'];
+    $$cfg{'terminal'}{'Ctrl+N'}        = ['Terminal',          'close-disconected',   'Close disconnected sessions'];
+    $$cfg{'terminal'}{'Ctrl+D'}        = ['Terminal',          'duplicate',           'Duplicate connection'];
+    $$cfg{'terminal'}{'Ctrl+R'}        = ['Terminal',          'restart',             'Restart connection (close and start)'];
+    $$cfg{'terminal'}{'Ctrl+I'}        = ['Terminal',          'infotab',             'Show the Info tab'];
+    $$cfg{'terminal'}{'Ctrl+F3'}       = ['Terminal',          'find-terminal',       'Find Terminal'];
+    $$cfg{'terminal'}{'Alt+n'}         = ['Terminal',          'showconnections',     'Show/Hide connections list'];
+    $$cfg{'terminal'}{'Alt+e'}         = ['Terminal',          'edit_node',           'Edit connection'];
+    $$cfg{'terminal'}{'Ctrl+plus'}     = ['Terminal',          'zoomin',              'Zoom in text'];
+    $$cfg{'terminal'}{'Ctrl+minus'}    = ['Terminal',          'zoomout',             'Zoom out text'];
+    $$cfg{'terminal'}{'Ctrl+0'}        = ['Terminal',          'zoomreset',           'Zoom reset text'];
+    $$cfg{'terminal'}{'Ctrl+ampersand'}= ['Terminal',          'cisco',               'Send Cisco interrupt keypress'];
+    $$cfg{'terminal'}{'AltCtrl+s'}     = ['Terminal',          'sftp',                'Open SFTP session'];
+
+    return $cfg;
+}
+
+sub _buildGUI {
+    my $self = shift;
+    my %w;
+
+    # Build a vbox
+    $w{vbox} = Gtk3::VBox->new(0, 0);
+    $w{hbox} = Gtk3::HBox->new(0, 0);
+
+    # Attach to class attribute
+    $$self{container} = $w{vbox};
+    $$self{frame} = \%w;
+    $w{vbox}->pack_start($w{hbox}, 0, 1, 0);
+
+    $w{btnreset} = Gtk3::Button->new('Set default values');
+    $w{hbox}->pack_start($w{btnreset}, 0, 0, 0);
+
+    $w{help} = Gtk3::LinkButton->new('https://docs.asbru-cm.net/Manual/Preferences/KeyBindings/');
+    $w{help}->set_halign('GTK_ALIGN_END');
+    $w{help}->set_label('');
+    $w{help}->set_tooltip_text('Open Online Help');
+    $w{help}->set_always_show_image(1);
+    $w{help}->set_image(Gtk3::Image->new_from_stock('asbru-help', 'button'));
+    $w{hbox}->pack_start($w{help}, 1, 1, 0);
+
+    $w{scroll} = Gtk3::ScrolledWindow->new();
+    $w{scroll}->set_overlay_scrolling(1);
+    $w{scroll}->set_policy('automatic', 'automatic');
+    $w{vbox}->pack_start($w{scroll}, 1, 1, 1);
+
+    $w{keylist} = PACTree->new(
+        'Window'   => 'markup',
+        'Action'   => 'text',
+        'Keybind'  => 'text',
+        'kbaction' => 'hidden',
+        'pacwin'   => 'hidden',
+    );
+    $w{keylist}->set_enable_tree_lines(0);
+    $w{keylist}->set_headers_visible(1);
+    $w{keylist}->set_enable_search(0);
+    $w{keylist}->set_has_tooltip(0);
+    $w{keylist}->set_show_expanders(0);
+    $w{keylist}->set_activate_on_single_click(1);
+    $w{keylist}->set_grid_lines('GTK_TREE_VIEW_GRID_LINES_NONE');
+    $w{keylist}->get_selection()->set_mode('GTK_SELECTION_SINGLE');
+    $w{scroll}->add($w{keylist});
+    my @col = $w{keylist}->get_columns();
+    $col[2]->set_alignment(0.5);
+    my ($c) = $col[2]->get_cells();
+    $c->set_alignment(0.5, 0.5);
+
+    $w{btnreset}->signal_connect('clicked' => sub {
+        if (!_wConfirm($self->{parent}, "Reset all keybindings to there default values?")) {
+            return 1;
+        }
+        delete $self->{cfg};
+        $self->update();
+    });
+    $w{keylist}->signal_connect('key_press_event' => sub {
+        my ($widget, $event) = @_;
+        my $selection = $w{keylist}->get_selection();
+        my $model     = $w{keylist}->get_model();
+        my @paths     = _getSelectedRows($selection);
+
+        if (!@paths) {
+            return 0;
+        }
+
+        my ($window, $desc, $keybind, $action, $pacwin) = $model->get($model->get_iter($paths[0]));
+        my ($keyval, $unicode, $keymask) = $self->GetKeyMask($widget, $event);
+
+        $keybind = $self->unStringifyKeybind($keybind);
+
+        if ($self->{verbose}) {
+            print "INFO: KEY: $keyval, $unicode, $keymask\n";
+            print "INFO: ROW: $window : $desc : $keybind : $action : $pacwin\n";
+        }
+
+        if (!$keymask && ($unicode == 8 || $unicode == 127)) {
+            $self->_updateKeyBinding($selection, $model, $paths[0], "undef-$action", $pacwin, $keybind, $action);
+            return 1;
+        } elsif (!$keymask) {
+            return 0;
+        }
+
+        $self->_updateKeyBinding($selection, $model, $paths[0], $keymask, $pacwin, $keybind, $action);
+        return 1;
+    });
+}
+
+sub _updateKeyBinding {
+    my ($self, $selection, $model, $path, $keynew, $window, $keyold, $action) = @_;
+    my $cfg = $self->{cfg};
+    my $undef = $keynew =~ /^undef-/;
+
+    if ("$window$keynew" eq "$window$keyold") {
+        return 0;
+    } elsif ($$cfg{$window}{$keynew} && $undef) {
+        return 0;
+    }
+
+    if ($$cfg{$window}{$keynew}) {
+        _wMessage($self->{parent}, "<i>$keynew</i> already in use by\n\n<b>$$cfg{$window}{$keynew}[0]</b> : $$cfg{$window}{$keynew}[2]");
+        return 0;
+    } elsif (!$undef) {
+        my ($free, $msg) = $self->HotKeyIsFree('terminal', $keynew, '', 1);
+        if (!$free) {
+            _wMessage($self->{parent}, $msg);
+            return 0;
+        }
+        foreach my $w (sort keys %$cfg) {
+            if ($w eq $window) {
+                next;
+            }
+            if ($$cfg{$w}{$keynew}) {
+                my $warning = '';
+                my $other = '';
+
+                if ($$cfg{$window}{"undef-$action"}) {
+                    $other = $$cfg{$window}{"undef-$action"}[0];
+                } else {
+                    $other = $$cfg{$window}{$keyold}[0];
+                }
+
+                if ($w lt $window) {
+                    $warning = "This keybind will not be available when <b>$$cfg{$w}{$keynew}[0]</b> is visible.";
+                } else {
+                    $warning = "This keybind will not be available for window <b>$$cfg{$w}{$keynew}[0]</b>\nwhen <b>$other</b> is visible.";
+                }
+                _wMessage($self->{parent}, "<i>" . $self->stringifyKeybind($keynew) . "</i> used in\n\n<b>$$cfg{$w}{$keynew}[0]</b> : $$cfg{$w}{$keynew}[2]\n\n$warning");
+            }
+        }
+    }
+    if ($$cfg{$window}{"undef-$action"}) {
+        $$cfg{$window}{$keynew} = $$cfg{$window}{"undef-$action"};
+        delete $$cfg{$window}{"undef-$action"};
+    } else {
+        $$cfg{$window}{$keynew} = $$cfg{$window}{$keyold};
+        delete $$cfg{$window}{$keyold};
+    }
+    if ($undef) {
+        $keynew = '';
+    }
+    $model->set_value($model->get_iter($path), 2, Glib::Object::Introspection::GValueWrapper->new('Glib::String', $self->stringifyKeybind($keynew)));
+}
+
+# END: Private Methods
+###################################################################
+
+1;
diff --git a/lib/PACMain.pm b/lib/PACMain.pm
index b504e18c..4b5784b1 100644
--- a/lib/PACMain.pm
+++ b/lib/PACMain.pm
@@ -3,7 +3,7 @@ package PACMain;
 ###############################################################################
 # This file is part of Ásbrú Connection Manager
 #
-# Copyright (C) 2017-2020 Ásbrú Connection Manager team (https://asbru-cm.net)
+# Copyright (C) 2017-2022 Ásbrú Connection Manager team (https://asbru-cm.net)
 # Copyright (C) 2010-2016 David Torrejón Vaquerizas
 #
 # Ásbrú Connection Manager is free software: you can redistribute it and/or
@@ -45,21 +45,17 @@ use OSSP::uuid;
 use POSIX ":sys_wait_h";
 use POSIX qw (strftime);
 use Crypt::CBC;
+use SortedTreeStore;
+use Vte;
+
+use Config;
 
 # GTK
 use Gtk3 -init;
 
 # PAC modules
 use PACUtils;
-our $UNITY = 1;
-$@ = '';
-eval {
-    require 'PACTrayUnity.pm';
-};
-if ($@) {
-    eval { require 'PACTray.pm'; };
-    $UNITY = 0;
-}
+use PACTray;
 use PACTerminal;
 use PACEdit;
 use PACConfig;
@@ -78,41 +74,48 @@ use PACScripts;
 
 my $APPNAME = $PACUtils::APPNAME;
 my $APPVERSION = $PACUtils::APPVERSION;
-my $AUTOSTART_FILE = "$RealBin/res/pac_start.desktop";
+my $AUTOSTART_FILE = "$RealBin/res/asbru_start.desktop";
 my $RES_DIR = "$RealBin/res";
 
 # Register icons on Gtk
-&_registerPACIcons;
+#&_registerPACIcons;
 
-my $INIT_CFG_FILE = "$RealBin/res/pac.yml";
+my $VENDOR_CFG_FILE = "$RealBin/vendor/asbru-conf-default-overrides.yml";
+my $INIT_CFG_FILE = "$RealBin/res/asbru.yml";
 my $CFG_DIR = $ENV{"ASBRU_CFG"};
-my $CFG_FILE = "$CFG_DIR/pac.yml";
+my $CFG_FILE = "$CFG_DIR/asbru.yml";
+my $THEME_DIR = "$RES_DIR/themes/default";
 our $R_CFG_FILE = '';
-my $CFG_FILE_FREEZE = "$CFG_DIR/pac.freeze";
-my $CFG_FILE_NFREEZE = "$CFG_DIR/pac.nfreeze";
-my $CFG_FILE_DUMPER = "$CFG_DIR/pac.dumper";
+my $CFG_FILE_FREEZE = "$CFG_DIR/asbru.freeze";
+my $CFG_FILE_NFREEZE = "$CFG_DIR/asbru.nfreeze";
+my $CFG_FILE_DUMPER = "$CFG_DIR/asbru.dumper";
 
 my $PAC_START_PROGRESS = 0;
 my $PAC_START_TOTAL = 6;
 
 my $APPICON = "$RES_DIR/asbru-logo-64.png";
-my $AUTOCLUSTERICON = _pixBufFromFile("$RealBin/res/asbru_cluster_auto.png");
-my $CLUSTERICON = _pixBufFromFile("$RealBin/res/asbru_cluster_manager.png");
-my $GROUPICON_ROOT = _pixBufFromFile("$RealBin/res/asbru_group.png");
-my $GROUPICON = _pixBufFromFile("$RealBin/res/asbru_group_open_16x16.svg");
-my $GROUPICONOPEN = _pixBufFromFile("$RealBin/res/asbru_group_open_16x16.svg");
-my $GROUPICONCLOSED = _pixBufFromFile("$RealBin/res/asbru_group_closed_16x16.svg");
+my $AUTOCLUSTERICON;
+my $CLUSTERICON;
+my $GROUPICON_ROOT;
+my $GROUPICON;
+my $GROUPICONOPEN;
+my $GROUPICONCLOSED;
 
 my $CHECK_VERSION = 0;
 my $NEW_VERSION = 0;
 my $NEW_CHANGES = '';
 our $_NO_SPLASH = 0;
+my $SALT = '12345678';
+my $CIPHER = Crypt::CBC->new(-key => 'PAC Manager (David Torrejon Vaquerizas, david.tv@gmail.com)', -cipher => 'Blowfish', -salt => pack('Q', $SALT), -pbkdf => 'opensslv1', -nodeprecate => 1) or die "ERROR: $!";
 
-my $CIPHER = Crypt::CBC->new(-key => 'PAC Manager (David Torrejon Vaquerizas, david.tv@gmail.com)', -cipher => 'Blowfish', -salt => '12345678') or die "ERROR: $!";
+our $UNITY = 0; # Are we in a Unity environment?
+our $STRAY = 1; # Are we using a system tray icon?
 
 our %RUNNING;
 our %FUNCS;
-
+our %SOCKS5PORTS;
+my @SELECTED_UUIDS;
+my $LAST_COPIED_NODES;
 # END: Define GLOBAL CLASS variables
 ###################################################################
 
@@ -125,14 +128,8 @@ sub new {
 
     my $self = {};
 
-    print STDERR "INFO: Using config directory '$CFG_DIR'\n";
-    # Setup some signal handling
-    $SIG{'USR1'} = sub {
-        #DevNote: option currently disabled
-        #_showUpdate(&_checkREADME);
-        #$$self{_UPDATING} = 0;
-        #defined $$self{_CONFIG} and _($$self{_CONFIG}, 'btnCheckVersion')->set_sensitive(1);
-    };
+    print STDERR "INFO: Config directory is '$CFG_DIR'\n";
+
     $SIG{'TERM'} = $SIG{'STOP'} = $SIG{'QUIT'} = $SIG{'INT'} = sub {
         print STDERR "INFO: Signal '$_[0]' received. Exiting Ásbrú...\n";
         _quitProgram($self, 'force');
@@ -153,6 +150,8 @@ sub new {
     $self->{_SHOWFINDTREE} = 0;
     $self->{_READONLY} = 0;
     $self->{_HAS_FOCUS} = '';
+    $self->{_VERBOSE} = 0;
+    $self->{_Vte} = undef;
 
     @{ $self->{_UNDO} } = ();
     $$self{_GUILOCKED} = 0;
@@ -174,6 +173,15 @@ sub new {
     $self->{_PING} = Net::Ping->new('tcp');
     $self->{_PING}->tcp_service_check(1);
 
+    if (grep({ /^--verbose$/ } @{ $$self{_OPTS} })) {
+        $$self{_VERBOSE} = 1;
+    }
+
+    # Show some info about dependencies
+    if ($$self{_VERBOSE}) {
+        print STDERR "INFO: Crypt::CBC version is ${Crypt::CBC::VERSION}\n";
+    }
+
     # Read the config/connections file...
     PACUtils::_splash(1, "Reading config...", ++$PAC_START_PROGRESS, $PAC_START_TOTAL);
     _readConfiguration($self);
@@ -181,10 +189,27 @@ sub new {
     # Set conflictive layout options as early as possible
     _setSafeLayoutOptions($self,$$self{_CFG}{'defaults'}{'layout'});
 
+    # Test Vte Capabilities
+    _setVteCapabilities($self);
+
+    if ($$self{_CFG}{'defaults'}{'theme'}) {
+        $THEME_DIR = "$RES_DIR/themes/$$self{_CFG}{'defaults'}{'theme'}";
+    }
+    $$self{_THEME} = $THEME_DIR;
+    print STDERR "INFO: Theme directory is '$$self{_THEME}'\n";
+
+    _registerPACIcons($THEME_DIR);
+    $AUTOCLUSTERICON = _pixBufFromFile("$THEME_DIR/asbru_cluster_auto.png");
+    $CLUSTERICON = _pixBufFromFile("$THEME_DIR/asbru_cluster_connection.svg");
+    $GROUPICON_ROOT = _pixBufFromFile("$THEME_DIR/asbru_group.svg");
+    $GROUPICON = _pixBufFromFile("$THEME_DIR/asbru_group_open_16x16.svg");
+    $GROUPICONOPEN = _pixBufFromFile("$THEME_DIR/asbru_group_open_16x16.svg");
+    $GROUPICONCLOSED = _pixBufFromFile("$THEME_DIR/asbru_group_closed_16x16.svg");
+
     map({
     if (/^--dump-uuid=(.+)$/) {
         require Data::Dumper;
-        print Data::Dumper::Dumper($$self{_CFG}{environments}{$1 });
+        print Data::Dumper::Dumper($$self{_CFG}{environments}{$1});
         exit 0;
     } } @{ $$self{_OPTS} });
 
@@ -209,7 +234,6 @@ sub new {
     }
 
     # Start iconified is option set or command line option --iconified
-
     if (($$self{_CFG}{defaults}{'start iconified'}) || (grep({ /^--iconified$/ } @{ $$self{_OPTS} }))) {
         $$self{_CMDLINETRAY} = 1;
     }
@@ -219,22 +243,25 @@ sub new {
     if ($$self{_CFG}{'defaults'}{'use gui password'}) {
         my $pass;
         grep({ if (/^--password=(.+)$/) { $pass = $1; } } @{ $$self{_OPTS} });
-        if (! defined $pass) {
+        if (!defined $pass) {
             PACUtils::_splash(1, "Waiting for password...", $PAC_START_PROGRESS, $PAC_START_TOTAL);
-            $pass = _wEnterValue($self, 'GUI Password Protection', 'Please, enter GUI Password...', undef, 0, 'pac-protected');
+            $pass = _wEnterValue(undef, 'GUI Password Protection', 'Please, enter GUI Password...', undef, 0, 'asbru-protected');
         }
         if (!defined $pass) {
             exit 0;
         }
-        if ($CIPHER->encrypt_hex($pass) ne $$self{_CFG}{'defaults'}{'gui password'}) {
-            _wMessage($$self{_WINDOWCONFIG}, 'ERROR: Wrong password!!');
+        if (!$CIPHER->salt()) {
+            $CIPHER->salt(pack('Q',$SALT));
+        }
+        if ($pass ne $CIPHER->decrypt_hex($$self{_CFG}{'defaults'}{'gui password'})) {
+            _wMessage(undef, 'ERROR: Wrong password!!');
             exit 0;
         }
     }
 
     # Check if only one instance is allowed
 
-    if ($$self{_APP}->get_is_remote) {
+    if ($$self{_APP}->get_is_remote()) {
         print "INFO: Ásbrú is already running.\n";
 
         my $getout = 0;
@@ -262,11 +289,11 @@ sub new {
             } elsif (! $$self{_CFG}{'defaults'}{'allow more instances'}) {
                 print "INFO: No more instances allowed!\n";
                 _sendAppMessage($$self{_APP}, 'show-conn');
-                Gtk3::Gdk::notify_startup_complete;
+                Gtk3::Gdk::notify_startup_complete();
                 return 0;
             }
         } else {
-            Gtk3::Gdk::notify_startup_complete;
+            Gtk3::Gdk::notify_startup_complete();
             return 0;
         }
     }
@@ -276,17 +303,26 @@ sub new {
         $$self{_READONLY} = 1;
     }
 
-    # Check for updates in a child process
-    #DevNote: option currently disabled
-    #$$self{_CFG}{'defaults'}{'check versions at start'} and $$self{_UPDATING} = 1 and PACUtils::_getREADME($$);
-
     # Gtk style
-    my $css_provider = Gtk3::CssProvider->new;
-    $css_provider->load_from_path("$RES_DIR/asbru.css");
+    my $css_provider = Gtk3::CssProvider->new();
+    $css_provider->load_from_path("$THEME_DIR/asbru.css");
     Gtk3::StyleContext::add_provider_for_screen(Gtk3::Gdk::Screen::get_default, $css_provider, 600);
 
     # Setup known connection methods
-    %{ $$self{_METHODS} } = _getMethods($self);
+    %{ $$self{_METHODS} } = _getMethods($self,$$self{_THEME});
+
+    # Dynamically load the Tray icon class related to the current environment/settings
+    if ($ENV{'ASBRU_DESKTOP'} eq 'unity') {
+        print("INFO: Trying to loading Unity specific tray icon package...\n");
+        $@ = '';
+        $UNITY = 1;
+        eval {
+            require 'PACTrayUnity.pm';
+        };
+        if ($@) {
+            $UNITY = 0;
+        }
+    }
 
     bless($self, $class);
 
@@ -304,11 +340,17 @@ sub DESTROY {
 sub start {
     my $self = shift;
 
-    #_makeDesktopFile($$self{_CFG});
+    # Reset system tray we do not have one in gnome-shell:ubuntu
+    if ($ENV{'ASBRU_DESKTOP'} =~ /gnome-shell/ && $ENV{'ASBRU_DESKTOP'} !~ /withtray/ && !$UNITY) {
+        $STRAY = 0;
+        print "INFO: No tray available\n";
+    } else {
+        print "INFO: Using " . ($UNITY ? 'Unity' : 'Gnome') . " tray icon\n";
+    }
 
     # Build the GUI
     PACUtils::_splash(1, "Building GUI...", ++$PAC_START_PROGRESS, $PAC_START_TOTAL);
-    if (!$self->_initGUI) {
+    if (!$self->_initGUI()) {
         _splash(0);
         return 0;
     }
@@ -317,25 +359,24 @@ sub start {
     PACUtils::_splash(1, "Loading Connections...", ++$PAC_START_PROGRESS, $PAC_START_TOTAL);
     $self->_loadTreeConfiguration('__PAC__ROOT__');
 
-    if ($UNITY) {
-        $FUNCS{_TRAY}->_setTrayMenu;
-    }
+    # Enable tray menu
+    $FUNCS{_TRAY}->set_tray_menu();
 
     PACUtils::_splash(1, "Finalizing...", ++$PAC_START_PROGRESS, $PAC_START_TOTAL);
 
     # Setup callbacks
-    $self->_setupCallbacks;
+    $self->_setupCallbacks();
 
     # If version is lower than current, update and save the new one
     if ($APPVERSION gt $$self{_CFG}{defaults}{version}) {
         $$self{_CFG}{defaults}{version} = $APPVERSION;
-        $self->_saveConfiguration;
+        $self->_saveConfiguration();
     }
 
     # Load information about last expanded groups
-    $self->_loadTreeExpanded;
+    $self->_loadTreeExpanded();
 
-    Gtk3::Gdk::notify_startup_complete;
+    Gtk3::Gdk::notify_startup_complete();
     Glib::Idle->add(
         sub {
             _splash(0);
@@ -344,7 +385,9 @@ sub start {
     );
 
     # Show main interface
-    $$self{_GUI}{main}->show_all();
+    if (!$$self{_CMDLINETRAY}) {
+        $$self{_GUI}{main}->show();
+    }
 
     # Apply Layout as early as possible
     $self->_ApplyLayout($$self{_CFG}{'defaults'}{'layout'});
@@ -363,18 +406,12 @@ sub start {
     $$self{_GUI}{statistics}->update('__PAC__ROOT__', $$self{_CFG});
 
     # Is tray available (Gnome or Unity)?
-    if ($ENV{'ASBRU_DESKTOP'} eq 'gnome-shell') {
-        _($$self{_CONFIG}, 'cbCfgStartIconified')->set_tooltip_text("WARNING: Tray icon may not be available: Install Unite Extension is recomended.\nhttps://extensions.gnome.org/extension/1287/unite/");
-    }
-
     if (!$$self{_CFG}{defaults}{'start iconified'} && !$$self{_CMDLINETRAY}) {
-        $$self{_GUI}{main}->present;
+        $$self{_GUI}{main}->present();
     } else {
         $self->_hideConnectionsList();
     }
 
-    print "INFO: Using " . ($UNITY ? 'Unity' : 'Gnome') . " tray icon\n";
-
     # Auto open "Edit" dialog
     foreach my $arg (@{ $$self{_OPTS} }) {
         if ($arg =~ /^--edit-uuid=(.+)$/go) {
@@ -390,7 +427,7 @@ sub start {
     }
 
     # Auto start scripts
-    grep({ /^--start-script=(.+)$/ and $$self{_SCRIPTS}->_execScript($1); } @{ $$self{_OPTS} });
+    grep({ /^--start-script=(.+)$/ and $$self{_SCRIPTS}->_execScript($1,$$self{_GUI}{main}); } @{ $$self{_OPTS} });
 
     # Auto start Shell
     grep({ /^--start-shell$/ and $$self{_GUI}{shellBtn}->clicked(); } @{ $$self{_OPTS} });
@@ -404,10 +441,8 @@ sub start {
     # Auto start Scripts window
     grep({ /^--scripts$/ and $$self{_GUI}{scriptsBtn}->clicked(); } @{ $$self{_OPTS} });
 
-    #$self->_ApplyLayout($$self{_CFG}{'defaults'}{'layout'});
-
     # Goto GTK's event loop
-    Gtk3->main;
+    Gtk3->main();
 
     return 1;
 }
@@ -426,90 +461,106 @@ sub _initGUI {
         return 0;
     }
 
-    ##############################################
+    ############################################################################################
     # Create main window
-    ##############################################
-    $$self{_GUI}{main} = Gtk3::Window->new;
-
-    if (($$self{_CFG}{defaults}{'tabs in main window'})&&($$self{_CFG}{defaults}{'terminal transparency'} > 0)) {
+    ############################################################################################
+    # The main window is made of:
+    #  - a "command panel" with tools buttons, connections list, favorites, etc.
+    #  - a "connections panel" with info tab & tabbed connections
+    ############################################################################################
+    $$self{_GUI}{main} = Gtk3::Window->new();
+    if ($$self{_CFG}{defaults}{'tabs in main window'} && $$self{_CFG}{defaults}{'terminal support transparency'}) {
         _setWindowPaintable($$self{_GUI}{main});
     }
 
+    # DevNote: would be nice to have this inside the theme itself
+    if ($$self{_THEME} =~ /dark/) {
+        _setDefaultRGBA(56,56,56,1);
+    } else {
+        _setDefaultRGBA(240,240,240,1);
+    }
 
-    # Create a vbox1: main, status
-    $$self{_GUI}{vbox1} = Gtk3::VBox->new(0, 0);
-    $$self{_GUI}{main}->add($$self{_GUI}{vbox1});
-
-    $$self{_GUI}{hpane} = Gtk3::HPaned->new;
-    $$self{_GUI}{vbox1}->add($$self{_GUI}{hpane});
+    # Create a main horizontal box
+    $$self{_GUI}{hpane} = Gtk3::HPaned->new();
+    $$self{_GUI}{hpane}->set_wide_handle(1);  # DevNote: if not set, text selection in a terminal will not be possible near the handle
+    $$self{_GUI}{main}->add($$self{_GUI}{hpane});
 
-    # Create a vbox3: actions, connections and other tools
-    $$self{_GUI}{vbox3} = Gtk3::VBox->new(0, 0);
-    $$self{_GUI}{vbox3}->set_size_request(200, -1);
+    # Create a vboxCommandPanel: actions, connections and other tools
+    $$self{_GUI}{vboxCommandPanel} = Gtk3::VBox->new(0, 0);
+    $$self{_GUI}{vboxCommandPanel}->set_size_request(200, -1);
     if ($$self{_CFG}{defaults}{'tree on right side'}) {
-        $$self{_GUI}{hpane}->pack2($$self{_GUI}{vbox3}, 0, 0);
+        $$self{_GUI}{hpane}->pack2($$self{_GUI}{vboxCommandPanel}, 0, 0);
     } else {
-        $$self{_GUI}{hpane}->pack1($$self{_GUI}{vbox3}, 0, 0);
+        $$self{_GUI}{hpane}->pack1($$self{_GUI}{vboxCommandPanel}, 0, 0);
     }
-    $$self{_GUI}{vbox3}->set_border_width(5);
 
     # Create a hbuttonbox1: add, rename, delete, etc...
     $$self{_GUI}{hbuttonbox1} = Gtk3::HBox->new(1, 0);
-    $$self{_GUI}{vbox3}->pack_start($$self{_GUI}{hbuttonbox1}, 0, 1, 0);
+    $$self{_GUI}{vboxCommandPanel}->pack_start($$self{_GUI}{hbuttonbox1}, 0, 1, 0);
 
-    # Create groupAdd button
-    $$self{_GUI}{groupAddBtn} = Gtk3::Button->new;
-    $$self{_GUI}{groupAddBtn}->set_image(Gtk3::Image->new_from_stock('pac-group-add', 'button'));
+    # Create "Add Group" button
+    $$self{_GUI}{groupAddBtn} = Gtk3::Button->new();
+    $$self{_GUI}{groupAddBtn}->set_image(Gtk3::Image->new_from_stock('asbru-group-add', 'button'));
     $$self{_GUI}{hbuttonbox1}->pack_start($$self{_GUI}{groupAddBtn}, 1, 1, 0);
     $$self{_GUI}{groupAddBtn}->set('can-focus' => 0);
-    $$self{_GUI}{groupAddBtn}->set_tooltip_text('New GROUP');
+    $$self{_GUI}{groupAddBtn}->get_style_context()->add_class("button-cp");
+    $$self{_GUI}{groupAddBtn}->set_tooltip_text('Add a new group in the selected node');
 
-    # Create connAdd button
-    $$self{_GUI}{connAddBtn} = Gtk3::Button->new;
-    $$self{_GUI}{connAddBtn}->set_image(Gtk3::Image->new_from_stock('pac-node-add', 'button'));
+    # Create "Add Connection" button
+    $$self{_GUI}{connAddBtn} = Gtk3::Button->new();
+    $$self{_GUI}{connAddBtn}->set_image(Gtk3::Image->new_from_stock('asbru-node-add', 'button'));
     $$self{_GUI}{hbuttonbox1}->pack_start($$self{_GUI}{connAddBtn}, 1, 1, 0);
     $$self{_GUI}{connAddBtn}->set('can-focus' => 0);
-    $$self{_GUI}{connAddBtn}->set_tooltip_text('New CONNECTION');
+    $$self{_GUI}{connAddBtn}->get_style_context()->add_class("button-cp");
+    $$self{_GUI}{connAddBtn}->set_tooltip_text('Add a new connection in the selected node');
 
-    # Create connEditBtn button
-    $$self{_GUI}{connEditBtn} = Gtk3::Button->new;
+    # Create "Edit" button
+    $$self{_GUI}{connEditBtn} = Gtk3::Button->new();
     $$self{_GUI}{connEditBtn}->set_image(Gtk3::Image->new_from_stock('gtk-edit', 'button'));
     $$self{_GUI}{hbuttonbox1}->pack_start($$self{_GUI}{connEditBtn}, 1, 1, 0);
     $$self{_GUI}{connEditBtn}->set('can-focus' => 0);
-    $$self{_GUI}{connEditBtn}->set_tooltip_text('Edit this Connection');
+    $$self{_GUI}{connEditBtn}->get_style_context()->add_class("button-cp");
+    $$self{_GUI}{connEditBtn}->set_tooltip_text('Edit the currently selected node');
 
-    # Create nodeRen button
-    $$self{_GUI}{nodeRenBtn} = Gtk3::Button->new;
+    # Create "Rename" button
+    $$self{_GUI}{nodeRenBtn} = Gtk3::Button->new();
     $$self{_GUI}{nodeRenBtn}->set_image(Gtk3::Image->new_from_stock('gtk-spell-check', 'button'));
     $$self{_GUI}{hbuttonbox1}->pack_start($$self{_GUI}{nodeRenBtn}, 1, 1, 0);
     $$self{_GUI}{nodeRenBtn}->set('can-focus' => 0);
-    $$self{_GUI}{nodeRenBtn}->set_tooltip_text('Rename this node');
+    $$self{_GUI}{nodeRenBtn}->get_style_context()->add_class("button-cp");
+    $$self{_GUI}{nodeRenBtn}->set_tooltip_text('Rename the currently selected node');
 
-    # Create nodeDel button
-    $$self{_GUI}{nodeDelBtn} = Gtk3::Button->new;
+    # Create "Delete" button
+    $$self{_GUI}{nodeDelBtn} = Gtk3::Button->new();
     $$self{_GUI}{nodeDelBtn}->set_image(Gtk3::Image->new_from_stock('gtk-delete', 'button'));
     $$self{_GUI}{hbuttonbox1}->pack_start($$self{_GUI}{nodeDelBtn}, 1, 1, 0);
     $$self{_GUI}{nodeDelBtn}->set('can-focus' => 0);
+    $$self{_GUI}{nodeDelBtn}->get_style_context()->add_class("button-cp");
     $$self{_GUI}{nodeDelBtn}->set_sensitive(0);
-    $$self{_GUI}{nodeDelBtn}->set_tooltip_text('Delete this node(s)');
+    $$self{_GUI}{nodeDelBtn}->set_tooltip_text('Delete the selected node(s)');
 
-    # Put a separator
-    if ($$self{_CFG}{'defaults'}{'layout'} ne 'Compact') {
-        $$self{_GUI}{vbox3}->pack_start(Gtk3::HSeparator->new, 0, 1, 5);
+    if ($$self{_CFG}{'defaults'}{'layout'} eq 'Compact') {
+        $$self{_GUI}{main}->set_decorated(0);
+        $$self{_GUI}{nodeClose} = Gtk3::Button->new();
+        $$self{_GUI}{nodeClose}->set_image(Gtk3::Image->new_from_stock('gtk-close', 'button'));
+        $$self{_GUI}{hbuttonbox1}->pack_start($$self{_GUI}{nodeClose}, 1, 1, 0);
+        $$self{_GUI}{nodeClose}->set('can-focus' => 0);
+        $$self{_GUI}{nodeClose}->set_sensitive(1);
+        $$self{_GUI}{nodeClose}->set_tooltip_text('Close Window');
+        $$self{_GUI}{nodeClose}->get_style_context()->add_class("button-cp");
     }
 
     # Put a notebook for connections, favourites and history
-    $$self{_GUI}{nbTree} = Gtk3::Notebook->new;
-    $$self{_GUI}{vbox3}->pack_start($$self{_GUI}{nbTree}, 1, 1, 0);
+    $$self{_GUI}{nbTree} = Gtk3::Notebook->new();
+    $$self{_GUI}{vboxCommandPanel}->pack_start($$self{_GUI}{nbTree}, 1, 1, 0);
     $$self{_GUI}{nbTree}->set_scrollable(1);
-    # FIXME-HOMOGENEOUS     $$self{_GUI}{nbTree}->set('homogeneous', 0);
 
     # Create a scrolled1 scrolled window to contain the connections tree
     $$self{_GUI}{scroll1} = Gtk3::ScrolledWindow->new();
     $$self{_GUI}{scroll1}->set_overlay_scrolling($$self{_CFG}{'defaults'}{'tree overlay scrolling'});
     $$self{_GUI}{nbTreeTab} = Gtk3::HBox->new(0, 0);
     $$self{_GUI}{nbTreeTabLabel} = Gtk3::Label->new();
-    $$self{_GUI}{nbTreeTab}->pack_start(Gtk3::Image->new_from_stock('pac-treelist', 'button'), 0, 1, 0);
+    $$self{_GUI}{nbTreeTab}->pack_start(Gtk3::Image->new_from_stock('asbru-treelist', 'button'), 0, 1, 0);
     if ($$self{_CFG}{'defaults'}{'layout'} ne 'Compact') {
         $$self{_GUI}{nbTreeTab}->pack_start($$self{_GUI}{nbTreeTabLabel}, 0, 1, 0);
     }
@@ -518,10 +569,9 @@ sub _initGUI {
     $$self{_GUI}{nbTree}->append_page($$self{_GUI}{scroll1}, $$self{_GUI}{nbTreeTab});
     $$self{_GUI}{nbTree}->set_tab_reorderable($$self{_GUI}{scroll1}, 1);
     $$self{_GUI}{scroll1}->set_policy('automatic', 'automatic');
-    $$self{_GUI}{vbox3}->set_border_width(5);
 
     # Create a treeConnections treeview for connections
-    $$self{_GUI}{treeConnections} = PACTree->new (
+    $$self{_GUI}{treeConnections} = PACTree->new(
         'Icon:' => 'pixbuf',
         'Name:' => 'hidden',
         'UUID:' => 'hidden',
@@ -534,35 +584,33 @@ sub _initGUI {
     $$self{_GUI}{treeConnections}->set_has_tooltip(1);
     $$self{_GUI}{treeConnections}->set_grid_lines('GTK_TREE_VIEW_GRID_LINES_NONE');
     # Implement a "TreeModelSort" to auto-sort the data
-    my $sort_model_conn = Gtk3::TreeModelSort->new_with_model($$self{_GUI}{treeConnections}->get_model);
-    $$self{_GUI}{treeConnections}->set_model($sort_model_conn);
-    $sort_model_conn->set_default_sort_func(\&__treeSort, $$self{_CFG});
-    $$self{_GUI}{treeConnections}->get_selection->set_mode('GTK_SELECTION_MULTIPLE');
+    $$self{_GUI}{treeConnections}->set_model(SortedTreeStore->create($$self{_GUI}{treeConnections}->get_model(), $$self{_CFG}, $$self{_VERBOSE}));
+    $$self{_GUI}{treeConnections}->get_selection()->set_mode('GTK_SELECTION_MULTIPLE');
 
     @{$$self{_GUI}{treeConnections}{'data'}}=(
         {
-            value => [ $GROUPICON_ROOT, '<b>AVAILABLE CONNECTIONS</b>', '__PAC__ROOT__' ],
+            value => [ $GROUPICON_ROOT, '<b>My Connections</b>', '__PAC__ROOT__' ],
             children => []
         }
     );
 
     $$self{_GUI}{_vboxSearch} = Gtk3::VBox->new(0, 0);
-    $$self{_GUI}{vbox3}->pack_start($$self{_GUI}{_vboxSearch}, 0, 1, 0);
+    $$self{_GUI}{vboxCommandPanel}->pack_start($$self{_GUI}{_vboxSearch}, 0, 1, 0);
 
-    $$self{_GUI}{_entrySearch} = Gtk3::Entry->new;
+    $$self{_GUI}{_entrySearch} = Gtk3::Entry->new();
     $$self{_GUI}{_vboxSearch}->pack_start($$self{_GUI}{_entrySearch}, 0, 1, 0);
     $$self{_GUI}{_entrySearch}->grab_focus();
 
     $$self{_GUI}{_hboxSearch} = Gtk3::HBox->new(1, 0);
     $$self{_GUI}{_vboxSearch}->pack_start($$self{_GUI}{_hboxSearch}, 0, 1, 0);
 
-    $$self{_GUI}{_btnPrevSearch} = Gtk3::Button->new_with_mnemonic('Prev_ious');
+    $$self{_GUI}{_btnPrevSearch} = Gtk3::Button->new('Previous');
     $$self{_GUI}{_btnPrevSearch}->set_image(Gtk3::Image->new_from_stock('gtk-media-previous', 'button'));
     $$self{_GUI}{_hboxSearch}->pack_start($$self{_GUI}{_btnPrevSearch}, 0, 1, 0);
     $$self{_GUI}{_btnPrevSearch}->set('can_focus', 0);
     $$self{_GUI}{_btnPrevSearch}->set_sensitive(0);
 
-    $$self{_GUI}{_btnNextSearch} = Gtk3::Button->new_with_mnemonic('_Next');
+    $$self{_GUI}{_btnNextSearch} = Gtk3::Button->new('Next');
     $$self{_GUI}{_btnNextSearch}->set_image(Gtk3::Image->new_from_stock('gtk-media-next', 'button'));
     $$self{_GUI}{_hboxSearch}->pack_start($$self{_GUI}{_btnNextSearch}, 0, 1, 0);
     $$self{_GUI}{_btnNextSearch}->set('can_focus', 0);
@@ -579,10 +627,10 @@ sub _initGUI {
     $$self{_GUI}{_vboxSearch}->pack_start($$self{_GUI}{_rbSearchDesc}, 0, 1, 0);
 
     # Create a scrolled2 scrolled window to contain the favourites tree
-    $$self{_GUI}{scroll2} = Gtk3::ScrolledWindow->new;
+    $$self{_GUI}{scroll2} = Gtk3::ScrolledWindow->new();
     $$self{_GUI}{nbFavTab} = Gtk3::HBox->new(0, 0);
-    $$self{_GUI}{nbFavTabLabel} = Gtk3::Label->new;
-    $$self{_GUI}{nbFavTab}->pack_start(Gtk3::Image->new_from_stock('pac-favourite-on', 'button'), 0, 1, 0);
+    $$self{_GUI}{nbFavTabLabel} = Gtk3::Label->new();
+    $$self{_GUI}{nbFavTab}->pack_start(Gtk3::Image->new_from_stock('asbru-favourite-on', 'button'), 0, 1, 0);
     if ($$self{_CFG}{'defaults'}{'layout'} ne 'Compact') {
         $$self{_GUI}{nbFavTab}->pack_start($$self{_GUI}{nbFavTabLabel}, 0, 1, 0);
     }
@@ -594,7 +642,7 @@ sub _initGUI {
     $$self{_GUI}{scroll2}->set_policy('automatic', 'automatic');
 
     # Create treeFavourites
-    $$self{_GUI}{treeFavourites} = PACTree->new (
+    $$self{_GUI}{treeFavourites} = PACTree->new(
         'Icon:' => 'pixbuf',
         'Name:' => 'markup',
         'UUID:' => 'hidden',
@@ -602,21 +650,20 @@ sub _initGUI {
     $$self{_GUI}{scroll2}->add($$self{_GUI}{treeFavourites});
 
     # Implement a "TreeModelSort" to auto-sort the data
-    my $sort_modelfav = Gtk3::TreeModelSort->new_with_model($$self{_GUI}{treeFavourites}->get_model);
-    $$self{_GUI}{treeFavourites}->set_model($sort_modelfav);
-    $sort_modelfav->set_default_sort_func(\&__treeSort, $$self{_CFG});
+    $$self{_GUI}{treeFavourites}->set_model(SortedTreeStore->create($$self{_GUI}{treeFavourites}->get_model(), $$self{_CFG}, $$self{_VERBOSE}));
 
     $$self{_GUI}{treeFavourites}->set_enable_tree_lines(0);
+    $$self{_GUI}{treeFavourites}->set_show_expanders(0);
     $$self{_GUI}{treeFavourites}->set_headers_visible(0);
     $$self{_GUI}{treeFavourites}->set_enable_search(0);
     $$self{_GUI}{treeFavourites}->set_has_tooltip(1);
-    $$self{_GUI}{treeFavourites}->get_selection->set_mode('GTK_SELECTION_MULTIPLE');
+    $$self{_GUI}{treeFavourites}->get_selection()->set_mode('GTK_SELECTION_MULTIPLE');
 
     # Create a scrolled3 scrolled window to contain the history tree
-    $$self{_GUI}{scroll3} = Gtk3::ScrolledWindow->new;
+    $$self{_GUI}{scroll3} = Gtk3::ScrolledWindow->new();
     $$self{_GUI}{nbHistTab} = Gtk3::HBox->new(0, 0);
-    $$self{_GUI}{nbHistTabLabel} = Gtk3::Label->new;
-    $$self{_GUI}{nbHistTab}->pack_start(Gtk3::Image->new_from_stock('pac-history', 'button'), 0, 1, 0);
+    $$self{_GUI}{nbHistTabLabel} = Gtk3::Label->new();
+    $$self{_GUI}{nbHistTab}->pack_start(Gtk3::Image->new_from_stock('asbru-history', 'button'), 0, 1, 0);
     if ($$self{_CFG}{'defaults'}{'layout'} ne 'Compact') {
         $$self{_GUI}{nbHistTab}->pack_start($$self{_GUI}{nbHistTabLabel}, 0, 1, 0);
     }
@@ -628,7 +675,7 @@ sub _initGUI {
     $$self{_GUI}{scroll3}->set_policy('automatic', 'automatic');
 
     # Create treeHistory
-    $$self{_GUI}{treeHistory} = PACTree->new (
+    $$self{_GUI}{treeHistory} = PACTree->new(
         'Icon:' => 'pixbuf',
         'Name:' => 'markup',
         'UUID:' => 'hidden',
@@ -636,22 +683,25 @@ sub _initGUI {
     );
     $$self{_GUI}{scroll3}->add($$self{_GUI}{treeHistory});
     $$self{_GUI}{treeHistory}->set_enable_tree_lines(0);
+    $$self{_GUI}{treeHistory}->set_show_expanders(0);
     $$self{_GUI}{treeHistory}->set_headers_visible(0);
     $$self{_GUI}{treeHistory}->set_enable_search(0);
     $$self{_GUI}{treeHistory}->set_has_tooltip(1);
 
     $$self{_GUI}{vboxclu} = Gtk3::VBox->new(0, 0);
 
-    $$self{_GUI}{btneditclu} = Gtk3::Button->new_with_label(' Manage Clusters');
-    $$self{_GUI}{vboxclu}->pack_start($$self{_GUI}{btneditclu}, 0, 1, 0);
-    $$self{_GUI}{btneditclu}->set_image(Gtk3::Image->new_from_stock('pac-cluster-manager2', 'GTK_ICON_SIZE_BUTTON'));
-    $$self{_GUI}{btneditclu}->set('can-focus', 0);
+    if ($$self{_CFG}{'defaults'}{'layout'} ne 'Compact') {
+        $$self{_GUI}{btneditclu} = Gtk3::Button->new_with_label(' Manage Clusters');
+        $$self{_GUI}{vboxclu}->pack_start($$self{_GUI}{btneditclu}, 0, 1, 0);
+        $$self{_GUI}{btneditclu}->set_image(Gtk3::Image->new_from_stock('asbru-cluster-manager2', 'GTK_ICON_SIZE_BUTTON'));
+        $$self{_GUI}{btneditclu}->set('can-focus', 0);
+    }
 
     # Create a scrolledclu scrolled window to contain the clusters tree
-    $$self{_GUI}{scrolledclu} = Gtk3::ScrolledWindow->new;
+    $$self{_GUI}{scrolledclu} = Gtk3::ScrolledWindow->new();
     $$self{_GUI}{nbCluTab} = Gtk3::HBox->new(0, 0);
-    $$self{_GUI}{nbCluTabLabel} = Gtk3::Label->new;
-    $$self{_GUI}{nbCluTab}->pack_start(Gtk3::Image->new_from_stock('pac-cluster-manager', 'button'), 0, 1, 0);
+    $$self{_GUI}{nbCluTabLabel} = Gtk3::Label->new();
+    $$self{_GUI}{nbCluTab}->pack_start(Gtk3::Image->new_from_stock('asbru-cluster-manager', 'button'), 0, 1, 0);
     if ($$self{_CFG}{'defaults'}{'layout'} ne 'Compact') {
         $$self{_GUI}{nbCluTab}->pack_start($$self{_GUI}{nbCluTabLabel}, 0, 1, 0);
     }
@@ -664,51 +714,47 @@ sub _initGUI {
     $$self{_GUI}{scrolledclu}->set_policy('automatic', 'automatic');
 
     # Create treeClusters
-    $$self{_GUI}{treeClusters} = PACTree->new (
+    $$self{_GUI}{treeClusters} = PACTree->new(
         'Icon:' => 'pixbuf',
         'Name:' => 'markup'
     );
     $$self{_GUI}{scrolledclu}->add($$self{_GUI}{treeClusters});
     $$self{_GUI}{treeClusters}->set_enable_tree_lines(0);
+    $$self{_GUI}{treeClusters}->set_show_expanders(0);
     $$self{_GUI}{treeClusters}->set_headers_visible(0);
     $$self{_GUI}{treeClusters}->set_enable_search(0);
     $$self{_GUI}{treeClusters}->set_has_tooltip(0);
 
-    # Put a separator
-    if ($$self{_CFG}{'defaults'}{'layout'} ne 'Compact') {
-        $$self{_GUI}{vbox3}->pack_start(Gtk3::HSeparator->new, 0, 1, 5);
-    }
-
     # Create a hbox0: exec and clusters
     $$self{_GUI}{hbox0} = Gtk3::VBox->new(0, 0);
-    $$self{_GUI}{vbox3}->pack_start($$self{_GUI}{hbox0}, 0, 1, 0);
+    $$self{_GUI}{vboxCommandPanel}->pack_start($$self{_GUI}{hbox0}, 0, 1, 0);
 
     $$self{_GUI}{hboxsearchstart} = Gtk3::HBox->new(0, 0);
     $$self{_GUI}{hbox0}->pack_start($$self{_GUI}{hboxsearchstart}, 0, 1, 0);
 
-    # Create a connSearch button
-    $$self{_GUI}{connSearch} = Gtk3::Button->new;
+    # Create a "Search" button
+    $$self{_GUI}{connSearch} = Gtk3::Button->new();
     $$self{_GUI}{hboxsearchstart}->pack_start($$self{_GUI}{connSearch}, 0, 1, 0);
     $$self{_GUI}{connSearch}->set_image(Gtk3::Image->new_from_stock('gtk-find', 'button'));
     $$self{_GUI}{connSearch}->set('can-focus' => 0);
     $$self{_GUI}{connSearch}->set_tooltip_text('Start interactive search for connections');
 
-    # Create connExecBtn button
+    # Create "Start" button
     $$self{_GUI}{connExecBtn} = Gtk3::Button->new('Connect');
     $$self{_GUI}{hboxsearchstart}->pack_start($$self{_GUI}{connExecBtn}, 1, 1, 0);
     $$self{_GUI}{connExecBtn}->set_image(Gtk3::Image->new_from_stock('gtk-connect', 'button'));
     $$self{_GUI}{connExecBtn}->set('can-focus' => 0);
     $$self{_GUI}{connExecBtn}->set_tooltip_text('Start selected terminals/groups');
 
-    # Create connQuickBtn button
-    $$self{_GUI}{connQuickBtn} = Gtk3::Button->new;
+    # Create "Quick Connect" button
+    $$self{_GUI}{connQuickBtn} = Gtk3::Button->new();
     $$self{_GUI}{hboxsearchstart}->pack_start($$self{_GUI}{connQuickBtn}, 0, 1, 0);
-    $$self{_GUI}{connQuickBtn}->set_image(Gtk3::Image->new_from_stock('pac-quick-connect', 'button'));
+    $$self{_GUI}{connQuickBtn}->set_image(Gtk3::Image->new_from_stock('asbru-quick-connect', 'button'));
     $$self{_GUI}{connQuickBtn}->set('can-focus' => 0);
     $$self{_GUI}{connQuickBtn}->set_tooltip_text('Start a new connection, without saving it');
 
-    # Create connFavourite button
-    $$self{_GUI}{connFavourite} = Gtk3::ToggleButton->new;
+    # Create "Favourite" button
+    $$self{_GUI}{connFavourite} = Gtk3::ToggleButton->new();
     $$self{_GUI}{hboxsearchstart}->pack_start($$self{_GUI}{connFavourite}, 1, 1, 0);
     $$self{_GUI}{connFavourite}->set_image(Gtk3::Image->new_from_stock('gtk-about', 'button'));
     $$self{_GUI}{connFavourite}->set('can-focus' => 0);
@@ -717,74 +763,75 @@ sub _initGUI {
     $$self{_GUI}{hboxclusters} = Gtk3::HBox->new(0, 0);
     $$self{_GUI}{hbox0}->pack_start($$self{_GUI}{hboxclusters}, 0, 1, 0);
 
-    # Create clusterBtn button
+    # Create "Clusters" button
     if ($$self{_CFG}{'defaults'}{'layout'} eq 'Compact') {
         $$self{_GUI}{clusterBtn} = Gtk3::Button->new();
+        $$self{_GUI}{clusterBtn}->get_style_context()->add_class("button-cp");
     } else {
-        $$self{_GUI}{clusterBtn} = Gtk3::Button->new_with_mnemonic('C_lusters');
+        $$self{_GUI}{clusterBtn} = Gtk3::Button->new('Clusters');
     }
     $$self{_GUI}{hboxclusters}->pack_start($$self{_GUI}{clusterBtn}, 1, 1, 0);
-    $$self{_GUI}{clusterBtn}->set_image(Gtk3::Image->new_from_stock('pac-cluster-manager', 'button'));
+    $$self{_GUI}{clusterBtn}->set_image(Gtk3::Image->new_from_stock('asbru-cluster-manager2', 'button'));
     $$self{_GUI}{clusterBtn}->set('can-focus' => 0);
     $$self{_GUI}{clusterBtn}->set_tooltip_text('Open the Clusters Administration Console');
 
-    # Create scriptsBtn button
+    # Create "Scripts" button
     if ($$self{_CFG}{'defaults'}{'layout'} eq 'Compact') {
         $$self{_GUI}{scriptsBtn} = Gtk3::Button->new();
     } else {
-        $$self{_GUI}{scriptsBtn} = Gtk3::Button->new_with_mnemonic('Scrip_ts');
+        $$self{_GUI}{scriptsBtn} = Gtk3::Button->new('Scripts');
     }
     $$self{_GUI}{hboxclusters}->pack_start($$self{_GUI}{scriptsBtn}, 1, 1, 0);
-    $$self{_GUI}{scriptsBtn}->set_image(Gtk3::Image->new_from_stock('pac-script', 'button'));
+    $$self{_GUI}{scriptsBtn}->set_image(Gtk3::Image->new_from_stock('asbru-script', 'button'));
     $$self{_GUI}{scriptsBtn}->set('can-focus' => 0);
+    if ($$self{_CFG}{'defaults'}{'layout'} eq 'Compact') {
+        $$self{_GUI}{scriptsBtn}->get_style_context()->add_class("button-cp");
+    }
     $$self{_GUI}{scriptsBtn}->set_tooltip_text('Open the Scripts Administration Console');
 
-    # Create clusterBtn button
+    # Create "Clusters" button
     if ($$self{_CFG}{'defaults'}{'layout'} eq 'Compact') {
         $$self{_GUI}{pccBtn} = Gtk3::Button->new();
+        $$self{_GUI}{pccBtn}->get_style_context()->add_class("button-cp");
     } else {
-        $$self{_GUI}{pccBtn} = Gtk3::Button->new_with_mnemonic('PC_C');
+        $$self{_GUI}{pccBtn} = Gtk3::Button->new('PCC');
     }
     $$self{_GUI}{hboxclusters}->pack_start($$self{_GUI}{pccBtn}, 1, 1, 0);
     $$self{_GUI}{pccBtn}->set_image(Gtk3::Image->new_from_stock('gtk-justify-fill', 'GTK_ICON_SIZE_BUTTON'));
     $$self{_GUI}{pccBtn}->set('can-focus' => 0);
     $$self{_GUI}{pccBtn}->set_tooltip_text("Open the Power Clusters Controller:\nexecute commands in every clustered terminal from this single window");
 
-    # Create a vbox5: description
-    $$self{_GUI}{vbox5} = Gtk3::VBox->new(0, 0);
-    if ($$self{_CFG}{defaults}{'tabs in main window'}) {
-        $$self{_GUI}{vbox5}->set_border_width(5);
-    }
-    $$self{_GUI}{hpane}->pack2($$self{_GUI}{vbox5}, 1, 0);
+    # Create a vbox for info tab, connections (if tabbed) and button bar
+    $$self{_GUI}{vboxConnectionPanel} = Gtk3::VBox->new(0, 0);
+    $$self{_GUI}{hpane}->pack2($$self{_GUI}{vboxConnectionPanel}, 1, 0);
     if ($$self{_CFG}{defaults}{'tree on right side'}) {
-        $$self{_GUI}{hpane}->pack1($$self{_GUI}{vbox5}, 0, 0);
+        $$self{_GUI}{hpane}->pack1($$self{_GUI}{vboxConnectionPanel}, 0, 0);
     } else {
-        $$self{_GUI}{hpane}->pack2($$self{_GUI}{vbox5}, 0, 0);
+        $$self{_GUI}{hpane}->pack2($$self{_GUI}{vboxConnectionPanel}, 0, 0);
     }
 
-    # Create a notebook widget
-    my $nb = Gtk3::Notebook->new();
-    $$self{_GUI}{vbox5}->pack_start($nb, 1, 1, 0);
-    $nb->set_scrollable(1);
-    $nb->set_tab_pos($$self{_CFG}{'defaults'}{'tabs position'});
-# FIXME-HOMOGENEOUS     $nb->set('homogeneous', 0);
+    # Create a notebook for info tab and connections
+    $$self{_GUI}{nbConnectionPanel} = Gtk3::Notebook->new();
+    $$self{_GUI}{vboxConnectionPanel}->pack_start($$self{_GUI}{nbConnectionPanel}, 1, 1, 0);
+    $$self{_GUI}{nbConnectionPanel}->set_scrollable(1);
+    $$self{_GUI}{nbConnectionPanel}->set_tab_pos($$self{_CFG}{'defaults'}{'tabs position'});
 
     my $tablbl = Gtk3::HBox->new(0, 0);
-    my $eblbl = Gtk3::EventBox->new;
-    $eblbl->add(Gtk3::Label->new('Info '));
-    $tablbl->pack_start($eblbl, 0, 1, 0);
+    $tablbl->pack_start(Gtk3::Label->new('Info '), 0, 1, 0);
     $$self{_GUI}{_TABIMG} = Gtk3::Image->new_from_stock('gtk-info', 'menu');
     $tablbl->pack_start($$self{_GUI}{_TABIMG}, 0, 1, 0);
     $tablbl->show_all();
 
     # Create a vboxInfo: description
     $$self{_GUI}{vboxInfo} = Gtk3::VBox->new(0, 0);
-    $nb->append_page($$self{_GUI}{vboxInfo}, $tablbl);
+    $$self{_GUI}{nbConnectionPanel}->append_page($$self{_GUI}{vboxInfo}, $tablbl);
 
     # Create a scrolled2 scrolled window to contain the description textview
     $$self{_GUI}{scrollDescription} = Gtk3::ScrolledWindow->new();
     $$self{_GUI}{vboxInfo}->pack_start($$self{_GUI}{scrollDescription}, 1, 1, 0);
     $$self{_GUI}{scrollDescription}->set_policy('automatic', 'automatic');
+    $$self{_GUI}{scrollDescription}->set_shadow_type('GTK_SHADOW_IN');
+    $$self{_GUI}{scrollDescription}->set_border_width(5);
 
     # Create descView as a gtktextview with descBuffer
     $$self{_GUI}{descBuffer} = Gtk3::TextBuffer->new();
@@ -793,111 +840,124 @@ sub _initGUI {
     $$self{_GUI}{scrollDescription}->add($$self{_GUI}{descView});
     $$self{_GUI}{descView}->set_wrap_mode('GTK_WRAP_WORD');
     $$self{_GUI}{descView}->set_sensitive(1);
-    $$self{_GUI}{descView}->drag_dest_unset;
+    $$self{_GUI}{descView}->drag_dest_unset();
     $$self{_GUI}{descView}->modify_font(Pango::FontDescription::from_string('monospace'));
 
     # Create a frameStatistics for statistics
-    $$self{_GUI}{frameStatistics} = Gtk3::Frame->new(' STATISTICS: ');
-    $$self{_GUI}{vboxInfo}->pack_start($$self{_GUI}{frameStatistics}, 0, 1, 0);
+    $$self{_GUI}{frameStatistics} = Gtk3::Frame->new('STATISTICS ');
     $$self{_GUI}{frameStatistics}->set_border_width(5);
-
-    $$self{_GUI}{frameStatisticslbl} = Gtk3::Label->new;
-    $$self{_GUI}{frameStatisticslbl}->set_markup(' <b>STATISTICS:</b> ');
+    $$self{_GUI}{frameStatistics}->set_shadow_type('GTK_SHADOW_NONE');
+    $$self{_GUI}{frameStatisticslbl} = Gtk3::Label->new();
+    $$self{_GUI}{frameStatisticslbl}->set_markup('<b>STATISTICS</b> ');
     $$self{_GUI}{frameStatistics}->set_label_widget($$self{_GUI}{frameStatisticslbl});
-
-    $$self{_GUI}{statistics} = $$self{_SCREENSHOTS} = PACStatistics->new;
+    $$self{_GUI}{statistics} = $$self{_SCREENSHOTS} = PACStatistics->new();
     $$self{_GUI}{frameStatistics}->add($$self{_GUI}{statistics}->{container});
+    $$self{_GUI}{ebFrameStatistics} = Gtk3::EventBox->new(); # required to get motion events
+    $$self{_GUI}{ebFrameStatistics}->add_events('GDK_POINTER_MOTION_MASK');
+    $$self{_GUI}{ebFrameStatistics}->add($$self{_GUI}{frameStatistics});
+    $$self{_GUI}{vboxInfo}->pack_start($$self{_GUI}{ebFrameStatistics}, 0, 1, 0);
 
     # Create a frameScreenshot for screenshot
-    $$self{_GUI}{frameScreenshots} = Gtk3::Frame->new(' SCREENSHOTS: ');
-    $$self{_GUI}{vboxInfo}->pack_start($$self{_GUI}{frameScreenshots}, 0, 1, 0);
+    $$self{_GUI}{frameScreenshots} = Gtk3::Frame->new('SCREENSHOTS ');
     $$self{_GUI}{frameScreenshots}->set_border_width(5);
-
-    $$self{_GUI}{frameScreenshotslbl} = Gtk3::Label->new;
-    $$self{_GUI}{frameScreenshotslbl}->set_markup(' <b>SCREENSHOTS:</b> ');
+    $$self{_GUI}{frameScreenshots}->set_shadow_type('GTK_SHADOW_NONE');
+    $$self{_GUI}{frameScreenshotslbl} = Gtk3::Label->new();
+    $$self{_GUI}{frameScreenshotslbl}->set_markup('<b>SCREENSHOTS</b> ');
     $$self{_GUI}{frameScreenshots}->set_label_widget($$self{_GUI}{frameScreenshotslbl});
-
-    $$self{_GUI}{screenshots} = $$self{_SCREENSHOTS} = PACScreenshots->new;
+    $$self{_GUI}{screenshots} = $$self{_SCREENSHOTS} = PACScreenshots->new();
     $$self{_GUI}{frameScreenshots}->add($$self{_GUI}{screenshots}->{container});
+    $$self{_GUI}{ebFrameScreenshots} = Gtk3::EventBox->new(); # required to get motion events
+    $$self{_GUI}{ebFrameScreenshots}->add_events('GDK_POINTER_MOTION_MASK');
+    $$self{_GUI}{ebFrameScreenshots}->add($$self{_GUI}{frameScreenshots});
+    $$self{_GUI}{vboxInfo}->pack_start($$self{_GUI}{ebFrameScreenshots}, 0, 1, 0);
 
     # Create a hbuttonbox1: show/hide, WOL, Shell, Preferences, etc...
-    $$self{_GUI}{hbuttonbox1} = Gtk3::HBox->new;
-    $$self{_GUI}{vbox5}->pack_start($$self{_GUI}{hbuttonbox1}, 0, 1, 0);
+    $$self{_GUI}{hbuttonbox1} = Gtk3::HBox->new();
+    $$self{_GUI}{vboxConnectionPanel}->pack_start($$self{_GUI}{hbuttonbox1}, 0, 1, 0);
 
-    # Create hideConn button
-    $$self{_GUI}{showConnBtn} = Gtk3::ToggleButton->new;
-    $$self{_GUI}{showConnBtn}->set_image(Gtk3::Image->new_from_stock('pac-treelist', 'GTK_ICON_SIZE_BUTTON'));
+    # Create "Hide command panel" button
+    $$self{_GUI}{showConnBtn} = Gtk3::ToggleButton->new();
+    $$self{_GUI}{showConnBtn}->set_image(Gtk3::Image->new_from_stock('asbru-treelist', 'GTK_ICON_SIZE_BUTTON'));
     $$self{_GUI}{showConnBtn}->set_active(1);
-    $$self{_GUI}{hbuttonbox1}->pack_start($$self{_GUI}{showConnBtn}, 1, 1, 0);
     $$self{_GUI}{showConnBtn}->set('can-focus' => 0);
     $$self{_GUI}{showConnBtn}->set_tooltip_text('Show/Hide connections tree panel');
+    $$self{_GUI}{hbuttonbox1}->pack_start($$self{_GUI}{showConnBtn}, 0, 1, 0);
 
-    # Create WakeOnLan button
-    $$self{_GUI}{wolBtn} = Gtk3::Button->new_with_mnemonic('Wake On Lan');
-    $$self{_GUI}{wolBtn}->set_image(Gtk3::Image->new_from_stock('pac-wol', 'button'));
-    $$self{_GUI}{hbuttonbox1}->pack_start($$self{_GUI}{wolBtn}, 1, 1, 0);
+    # Create "Wake on LAN" button
+    $$self{_GUI}{wolBtn} = Gtk3::Button->new('Wake On Lan');
+    $$self{_GUI}{wolBtn}->set_image(Gtk3::Image->new_from_stock('asbru-wol', 'button'));
+    $$self{_GUI}{wolBtn}->set_always_show_image(1);
     $$self{_GUI}{wolBtn}->set('can-focus' => 0);
-    $$self{_GUI}{wolBtn}->set_tooltip_text('Start the Wake On Lan utility window');
+    $$self{_GUI}{wolBtn}->set_tooltip_text('Start the "Wake On LAN" utility window');
+    $$self{_GUI}{hbuttonbox1}->pack_start($$self{_GUI}{wolBtn}, 1, 1, 0);
 
-    # Create shellBtn button
-    $$self{_GUI}{shellBtn} = Gtk3::Button->new;
+    # Create "Local Shell" button
+    $$self{_GUI}{shellBtn} = Gtk3::Button->new();
     if ($$self{_CFG}{'defaults'}{'layout'} eq 'Compact') {
         $$self{_GUI}{hboxclusters}->pack_start($$self{_GUI}{shellBtn}, 1, 1, 0);
     } else {
+        $$self{_GUI}{shellBtn}->set_label('Local shell');
+        $$self{_GUI}{shellBtn}->set_always_show_image(1);
         $$self{_GUI}{hbuttonbox1}->pack_start($$self{_GUI}{shellBtn}, 1, 1, 0);
     }
-    $$self{_GUI}{shellBtn}->set_image(Gtk3::Image->new_from_stock('pac-shell', 'button'));
+    $$self{_GUI}{shellBtn}->set_image(Gtk3::Image->new_from_stock('asbru-shell', 'button'));
     $$self{_GUI}{shellBtn}->set('can-focus' => 0);
-    $$self{_GUI}{shellBtn}->set_tooltip_text('Launch new local shell <Ctrl><Shift>t');
+    if ($$self{_CFG}{'defaults'}{'layout'} eq 'Compact') {
+        $$self{_GUI}{shellBtn}->get_style_context()->add_class("button-cp");
+    }
+    $$self{_GUI}{shellBtn}->set_tooltip_text('Launch new local shell');
 
-    # Create configBtn button
+    # Create "Preferences" button
+    $$self{_GUI}{configBtn} = Gtk3::Button->new();
+    $$self{_GUI}{configBtn}->get_style_context()->add_class("button-cp");
     if ($$self{_CFG}{'defaults'}{'layout'} eq 'Compact') {
-        $$self{_GUI}{configBtn} = Gtk3::Button->new();
         $$self{_GUI}{hboxclusters}->pack_start($$self{_GUI}{configBtn}, 1, 1, 0);
     } else {
-        $$self{_GUI}{configBtn} = Gtk3::Button->new_with_mnemonic('_Preferences');
+        $$self{_GUI}{configBtn}->set_label('Preferences');
+        $$self{_GUI}{configBtn}->set_always_show_image(1);
         $$self{_GUI}{hbuttonbox1}->pack_start($$self{_GUI}{configBtn}, 1, 1, 0);
     }
     $$self{_GUI}{configBtn}->set_image(Gtk3::Image->new_from_stock('gtk-preferences', 'button'));
     $$self{_GUI}{configBtn}->set('can-focus' => 0);
     $$self{_GUI}{configBtn}->set_tooltip_text('Open the general preferences control');
 
-    # Create saveBtn button
-    $$self{_GUI}{saveBtn} = Gtk3::Button->new_with_mnemonic('_Save');
+    # Create "Save" button
+    $$self{_GUI}{saveBtn} = Gtk3::Button->new('Save');
+    $$self{_GUI}{saveBtn}->set_always_show_image(1);
     $$self{_GUI}{saveBtn}->set_image(Gtk3::Image->new_from_stock('gtk-save', 'button'));
-    $$self{_GUI}{hbuttonbox1}->pack_start($$self{_GUI}{saveBtn}, 1, 1, 0);
     $$self{_GUI}{saveBtn}->set('can-focus' => 0);
     $$self{_GUI}{saveBtn}->set_sensitive(0);
+    $$self{_GUI}{saveBtn}->set_tooltip_text('Save the latest configuration changes, see also the "Automatically save every configuration change" field under "Preferences"->"Main Options"');
+    $$self{_GUI}{hbuttonbox1}->pack_start($$self{_GUI}{saveBtn}, 1, 1, 0);
 
-    # Create [un]lockBtn button
-    $$self{_GUI}{lockPACBtn} = Gtk3::ToggleButton->new;
-    $$self{_GUI}{lockPACBtn}->set_image(Gtk3::Image->new_from_stock('pac-unprotected', 'GTK_ICON_SIZE_BUTTON'));
-    $$self{_GUI}{lockPACBtn}->set_active(0);
-    $$self{_GUI}{hbuttonbox1}->pack_start($$self{_GUI}{lockPACBtn}, 0, 1, 0);
-    $$self{_GUI}{lockPACBtn}->set('can-focus' => 0);
-    $$self{_GUI}{lockPACBtn}->set_tooltip_text('Password [un]lock GUI. In order to use this functionality, check the "Protect with password" field under "Preferences"->"Main Options"');
-
-    # Create aboutBtn button
-    $$self{_GUI}{aboutBtn} = Gtk3::Button->new;
-    $$self{_GUI}{aboutBtn}->set_image(Gtk3::Image->new_from_stock('gtk-about', 'button'));
-    $$self{_GUI}{hbuttonbox1}->pack_start($$self{_GUI}{aboutBtn}, 1, 1, 0);
+    # Create "Lock/Unlock" button
+    $$self{_GUI}{lockApplicationBtn} = Gtk3::ToggleButton->new();
+    $$self{_GUI}{lockApplicationBtn}->set_image(Gtk3::Image->new_from_stock('asbru-unprotected', 'GTK_ICON_SIZE_BUTTON'));
+    $$self{_GUI}{lockApplicationBtn}->set_active(0);
+    $$self{_GUI}{lockApplicationBtn}->set('can-focus' => 0);
+    $$self{_GUI}{lockApplicationBtn}->set_tooltip_text('Password [un]lock GUI. In order to use this functionality, check the "Protect with password" field under "Preferences"->"Main Options"');
+    $$self{_GUI}{hbuttonbox1}->pack_start($$self{_GUI}{lockApplicationBtn}, 0, 1, 0);
+
+    # Create "About" button
+    $$self{_GUI}{aboutBtn} = Gtk3::Button->new();
+    $$self{_GUI}{aboutBtn}->set_image(Gtk3::Image->new_from_stock('gtk-about', 'GTK_ICON_SIZE_BUTTON'));
     $$self{_GUI}{aboutBtn}->set('can-focus' => 0);
     $$self{_GUI}{aboutBtn}->set_tooltip_text('Show the *so needed* "About" dialog');
+    $$self{_GUI}{hbuttonbox1}->pack_start($$self{_GUI}{aboutBtn}, 0, 1, 0);
 
-    # Create quitBtn button
-    if ($$self{_CFG}{'defaults'}{'layout'} eq 'Compact') {
-        $$self{_GUI}{quitBtn} = Gtk3::Button->new();
-    } else {
-        $$self{_GUI}{quitBtn} = Gtk3::Button->new_with_mnemonic('_Quit');
-    }
-    $$self{_GUI}{quitBtn}->set_image(Gtk3::Image->new_from_stock('gtk-quit', 'button'));
+    # Create "Quit" button
+    $$self{_GUI}{quitBtn} = Gtk3::Button->new();
+    $$self{_GUI}{quitBtn}->get_style_context()->add_class("button-cp");
     if ($$self{_CFG}{'defaults'}{'layout'} eq 'Compact') {
         $$self{_GUI}{hboxclusters}->pack_start($$self{_GUI}{quitBtn}, 1, 1, 0);
     } else {
+        $$self{_GUI}{quitBtn}->set_label('Quit');
+        $$self{_GUI}{quitBtn}->set_always_show_image(1);
         $$self{_GUI}{hbuttonbox1}->pack_start($$self{_GUI}{quitBtn}, 1, 1, 0);
     }
+    $$self{_GUI}{quitBtn}->set_image(Gtk3::Image->new_from_stock('gtk-quit', 'button'));
     $$self{_GUI}{quitBtn}->set('can-focus' => 0);
-    $$self{_GUI}{quitBtn}->set_tooltip_text('Exit');
+    $$self{_GUI}{quitBtn}->set_tooltip_text('Close all terminals and terminate the application');
 
     # Setup some window properties.
     $$self{_GUI}{main}->set_title("$APPNAME" . ($$self{_READONLY} ? ' - READ ONLY MODE' : ''));
@@ -906,13 +966,17 @@ sub _initGUI {
     $$self{_GUI}{main}->set_resizable(1);
 
     # Set treeviews font
-    foreach my $tree ('Connections','Favourites','History') {
-        my @col = $$self{_GUI}{"tree$tree"}->get_columns;
+    foreach my $tree ('Connections', 'Favourites', 'History', 'Clusters') {
+        my @col = $$self{_GUI}{"tree$tree"}->get_columns();
         if ($tree eq 'Connections') {
             $col[0]->set_visible(0);
         } else {
-            my ($c) = $col[1]->get_cells;
+            my ($c) = $col[1]->get_cells();
             $c->set('font',$$self{_CFG}{defaults}{'tree font'});
+            if ($tree eq 'History') {
+                my ($c) = $col[2]->get_cells();
+                $c->set('font',$$self{_CFG}{defaults}{'tree font'});
+            }
         }
     }
 
@@ -921,28 +985,32 @@ sub _initGUI {
     ##############################################
 
     if ($$self{_CFG}{defaults}{'tabs in main window'}) {
-        $$self{_GUI}{nb} = $nb;
+        $$self{_GUI}{nb} = $$self{_GUI}{nbConnectionPanel};
         $$self{_GUI}{_PACTABS} = $$self{_GUI}{main};
     } else {
         # Create window
-        $$self{_GUI}{_PACTABS} = Gtk3::Window->new;
+        $$self{_GUI}{_PACTABS} = Gtk3::Window->new();
+        if ($$self{_CFG}{defaults}{'terminal support transparency'}) {
+            _setWindowPaintable($$self{_GUI}{_PACTABS});
+        }
         # Setup some window properties.
         $$self{_GUI}{_PACTABS}->set_title("Terminals Tabbed Window : $APPNAME (v$APPVERSION)");
         $$self{_GUI}{_PACTABS}->set_position('center');
-        Gtk3::Window::set_default_icon_from_file($APPICON);
         $$self{_GUI}{_PACTABS}->set_size_request(200, 100);
         $$self{_GUI}{_PACTABS}->set_default_size(600, 400);
         $$self{_GUI}{_PACTABS}->set_resizable(1);
-        $$self{_GUI}{_PACTABS}->maximize if $$self{_CFG}{'defaults'}{'start maximized'};
+        $$self{_GUI}{_PACTABS}->maximize() if $$self{_CFG}{'defaults'}{'start maximized'};
+        Gtk3::Window::set_default_icon_from_file($APPICON);
 
         # Create a notebook widget
         $$self{_GUI}{nb} = Gtk3::Notebook->new();
-        $$self{_GUI}{_PACTABS}->add($$self{_GUI}{nb});
         $$self{_GUI}{nb}->set_scrollable(1);
         $$self{_GUI}{nb}->set_tab_pos($$self{_CFG}{'defaults'}{'tabs position'});
+        $$self{_GUI}{_PACTABS}->add($$self{_GUI}{nb});
 
-        $nb->set_show_tabs(0);
-        $nb->set_property('show_border', 0);
+        # Hide tabs on main window
+        $$self{_GUI}{nbConnectionPanel}->set_show_tabs(0);
+        $$self{_GUI}{nbConnectionPanel}->set_property('show_border', 0);
 
         $$self{_TABSINWINDOW} = 1;
     }
@@ -951,27 +1019,41 @@ sub _initGUI {
     $$self{_GUI}{treeConnections}->grab_focus();
 
     # Load window size/position, and treeconnections size
-    $self->_loadGUIData;
-    if ($$self{_CFG}{defaults}{'start main maximized'}) {
+    $self->_loadGUIData();
+    if ($$self{_CFG}{defaults}{'start main maximized'} && $$self{_CFG}{'defaults'}{'layout'} ne 'Compact') {
         $$self{_GUI}{main}->set_position('center');
-        $$self{_GUI}{main}->maximize;
+        $$self{_GUI}{main}->maximize();
     } else {
         if (defined $$self{_GUI}{posx} && ($$self{_GUI}{posx} eq 'maximized')) {
-            $$self{_GUI}{main}->maximize;
+            $$self{_GUI}{main}->maximize();
         } else {
-            $$self{_GUI}{main}->move($$self{_GUI}{posx} // 0, $$self{_GUI}{posy} // 0);
+            # DevNote: there's no reliable way to restore the position, do only resize
+            #          (see https://wiki.gnome.org/HowDoI/SaveWindowState and https://developer.gnome.org/gtk3/stable/GtkWindow.html#gtk-window-get-position)
+            # $$self{_GUI}{main}->move($$self{_GUI}{posx} // 0, $$self{_GUI}{posy} // 0);
             $$self{_GUI}{main}->resize($$self{_GUI}{sw} // 1024, $$self{_GUI}{sh} // 768);
         }
     }
 
     # Build Config window
     $FUNCS{_CONFIG} = $$self{_CONFIG} = PACConfig->new($$self{_CFG});
+    # Set parent
+    $$self{_CONFIG}{_WINDOWCONFIG}->set_transient_for($$self{_GUI}{main});
+
     # Get the KeePass object from configuration
+    $$self{_CONFIG}{_KEEPASS}{_VERBOSE} = $$self{_VERBOSE};
     $FUNCS{_KEEPASS} = $$self{_CONFIG}{_KEEPASS};
 
+    # Get the KeyBindings object from configuration
+    $FUNCS{_KEYBINDS} = $$self{_CONFIG}{_KEYBINDS};
+
+    # Add some key bindings to existing button tooltip
+    $$self{_GUI}{shellBtn}->set_tooltip_text($$self{_GUI}{shellBtn}->get_tooltip_text() . ' (' . $PACMain::FUNCS{_KEYBINDS}->GetAccelerator('pacmain', 'localshell') . ')');
+    $$self{_GUI}{showConnBtn}->set_tooltip_text($$self{_GUI}{showConnBtn}->get_tooltip_text() . ' (' . $PACMain::FUNCS{_KEYBINDS}->GetAccelerator('pacmain', 'showconnections') . ')');
+
     # Build Edit window
-    $$self{_EDIT} = PACEdit->new($$self{_CFG});
-    $FUNCS{_EDIT} = $$self{_EDIT};
+    $FUNCS{_EDIT} = $$self{_EDIT} = PACEdit->new($$self{_CFG});
+    # Set parent
+    $$self{_EDIT}{_WINDOWEDIT}->set_transient_for($$self{_GUI}{main});
 
     # Build Cluster Administration window
     $$self{_CLUSTER} = PACCluster->new(\%RUNNING);
@@ -981,13 +1063,13 @@ sub _initGUI {
     $FUNCS{_PCC} = $$self{_PCC} = PACPCC->new(\%RUNNING);
 
     # Build Tray icon
-    $FUNCS{_TRAY} = $$self{_TRAY} = ! $UNITY ? PACTray->new($self) : PACTrayUnity->new($self);
+    $FUNCS{_TRAY} = $$self{_TRAY} = $UNITY ? PACTrayUnity->new($self) : PACTray->new($self);
 
     # Build PIPE object
     $FUNCS{_PIPE} = $$self{_PIPE} = PACPipe->new(\%RUNNING);
 
     # Build SCRIPTS object
-    $FUNCS{_SCRIPTS} = $$self{_SCRIPTS} = PACScripts->new;
+    $FUNCS{_SCRIPTS} = $$self{_SCRIPTS} = PACScripts->new();
 
     # Build the STATISTICS object
     $FUNCS{_STATS} = $$self{_GUI}{statistics};
@@ -995,8 +1077,15 @@ sub _initGUI {
     $FUNCS{_METHODS} = $$self{_METHODS};
     $FUNCS{_MAIN} = $self;
 
-    # To show_all, or not to show_all... that's the question!! :)
-    $$self{_GUI}{main}->show_all() unless $$self{_CMDLINETRAY};
+    # Show the main window if not initially hidden in the systray
+    if (!$$self{_CMDLINETRAY}) {
+        if ($$self{_CFG}{'defaults'}{'layout'} eq 'Compact') {
+            $$self{_GUI}{vboxCommandPanel}->show_all();
+            $$self{_GUI}{hpane}->show();
+        } else {
+            $$self{_GUI}{main}->show_all();
+        }
+    }
     $$self{_GUI}{hpane}->set_position($$self{_GUI}{hpanepos} // -1);
     $$self{_GUI}{_vboxSearch}->hide();
 
@@ -1009,10 +1098,27 @@ sub _initGUI {
         $self->_updateGUIFavourites();
     } elsif ($$self{_CFG}{'defaults'}{'start PAC tree on'} eq 'history') {
         $$self{_GUI}{nbTree}->set_current_page(2);
-        $self->_updateGUIClusters();
+        $self->_updateGUIHistory();
     } else {
         $$self{_GUI}{nbTree}->set_current_page(3);
-        $self->_updateGUIHistory();
+        $self->_updateClustersList();
+        $self->_updateGUIClusters();
+    }
+
+    # Ensure the window is placed near the newly created icon (in compact mode only)
+    if ($$self{_CFG}{'defaults'}{'layout'} eq 'Compact' && $$self{_TRAY}->is_visible()) {
+        # Update GUI
+        Gtk3::main_iteration() while Gtk3::events_pending();
+
+        my @geo = $$self{_TRAY}->get_geometry();
+        my $x = $geo[2]{x};
+        my $y = $geo[2]{y};
+
+        if ($x > 0 || $y > 0) {
+            $$self{_GUI}{posx} = $x;
+            $$self{_GUI}{posy} = $y;
+            $$self{_GUI}{main}->move($$self{_GUI}{posx}, $$self{_GUI}{posy});
+        }
     }
 
     return 1;
@@ -1031,8 +1137,8 @@ sub _setupCallbacks {
             $$self{_GUI}{connQuickBtn}->clicked();
         } elsif ($command eq 'start-uuid') {
             $self->_launchTerminals([ [ $message ] ]);
-        } elsif ($command eq'show-conn') {
-            $self->_showConnectionsList;
+        } elsif ($command eq 'show-conn') {
+            $self->_showConnectionsList();
         } elsif ($command eq 'edit-uuid') {
             my $uuid = $message;
             my $path = $$self{_GUI}{treeConnections}->_getPath($uuid) or next;
@@ -1051,17 +1157,23 @@ sub _setupCallbacks {
     # TREECONNECTIONS RELATED CALLBACKS
     ###################################
 
-    # Setup some drag and drop operations
-    my $drag_dest = ($$self{_CFG}{'defaults'}{'tabs in main window'}) ? $$self{_GUI}{vbox5} : $$self{_GUI}{nb};
+    # Create a structure to be managed by drag and drop operations (that can be used to start a new connection)
+    my $target_new_connection = Gtk3::TargetEntry->new('asbru/connection', ${Gtk3::TargetFlags->new (qw/same-app/)}, 0);
+
+    # Enable a drag and drop destination on which a new connection can be started
+    my $drag_dest = $$self{_CFG}{'defaults'}{'tabs in main window'} ? $$self{_GUI}{vboxConnectionPanel} : $$self{_GUI}{nb};
+    $drag_dest->drag_dest_set('GTK_DEST_DEFAULT_ALL', [ $target_new_connection ], [ 'move' ]);
 
-    my @targets = (Gtk3::TargetEntry->new('Connect', [], 0));
-    $drag_dest->drag_dest_set('GTK_DEST_DEFAULT_ALL', \@targets, [ 'copy', 'move' ]);
-    $drag_dest->signal_connect('drag_motion' => sub { $_[0]->get_parent_window->raise; return 1; });
+    # Handle drag and drop events
+    $drag_dest->signal_connect('drag_motion' => sub {
+        $_[0]->get_parent_window()->raise();
+        return 0;
+    });
     $drag_dest->signal_connect('drag_drop' => sub {
         my ($me, $context, $x, $y, $data, $info, $time) = @_;
-
         my @idx;
         my %tmp;
+
         foreach my $uuid (@{ $$self{'DND'}{'selection'} }) {
             if (($$self{_CFG}{'environments'}{$uuid}{'_is_group'}) || ($uuid eq '__PAC__ROOT__')) {
                 if (!_wConfirm($$self{_GUI}{main}, "<b>ATTENTION!!</b> You have dropped some group(s)\nAre you sure you want to start <b>ALL</b> of its child connections?")) {
@@ -1082,6 +1194,14 @@ sub _setupCallbacks {
 
     # Prepare common signalhandler for all three trees (DnD and tooltips)
     foreach my $what ('treeConnections', 'treeFavourites', 'treeHistory') {
+        # This tree ($what) will be a drag target for itself
+        my $target_tree = Gtk3::TargetEntry->new('GTK_TREE_MODEL_ROW', ${Gtk3::TargetFlags->new (qw/same-widget/)}, 1);
+        $$self{_GUI}{$what}->enable_model_drag_dest([ $target_tree ], [ 'default', 'move' ]);
+
+        # This tree will be a drag source several targets
+        $$self{_GUI}{$what}->enable_model_drag_source('GDK_BUTTON1_MASK', [ $target_new_connection, $target_tree ], [ 'default', 'move' ]);
+
+        # Render tooltip on tree nodes
         $$self{_GUI}{$what}->signal_connect('query_tooltip' => sub {
             my ($widget, $x, $y, $keyboard_tooltip, $tooltip_widget) = @_;
 
@@ -1094,7 +1214,7 @@ sub _setupCallbacks {
             if (!$path) {
                 return 0;
             }
-            my $model = $$self{_GUI}{$what}->get_model;
+            my $model = $$self{_GUI}{$what}->get_model();
             my $uuid = $model->get_value($model->get_iter($path), 2);
 
             if ($$self{_CFG}{environments}{$uuid}{_is_group} || $uuid eq '__PAC__ROOT__') {
@@ -1106,6 +1226,7 @@ sub _setupCallbacks {
             my $ip = $$self{_CFG}{'environments'}{$uuid}{'ip'};
             my $port = $$self{_CFG}{'environments'}{$uuid}{'port'};
             my $user = $$self{_CFG}{'environments'}{$uuid}{'user'};
+            my $options = $$self{_CFG}{'environments'}{$uuid}{'options'};
 
             my $total_exp = 0;
             foreach my $exp (@{$$self{_CFG}{'environments'}{$uuid}{'expect'}}) {
@@ -1114,61 +1235,80 @@ sub _setupCallbacks {
                 }
                 ++$total_exp;
             }
+            $ip =~ s/<.+?\|.+?>/******/;
+            $user =~ s/<.+?\|.+?>/******/;
             my $string = "- <b>Name</b>: @{[__($name)]}\n";
             $string .= "- <b>Method</b>: $method\n";
-            $string .= "- <b>IP / port</b>: $ip / $port\n";
-            $string .= "- <b>User</b>: $user";
+            $string .= "- <b>IP / port</b>: @{[__($ip)]}:$port\n";
+            $string .= "- <b>User</b>: @{[__($user)]}";
+            if ($method eq "SSH") {
+                my $is_L_fwd = 0;
+                my $is_R_fwd = 0;
+                foreach my $op (split(" ", $options)) {
+                    if ($op eq "-L") {
+                        $is_L_fwd = 1;
+                        next;
+                    }
+                    elsif ($op eq "-R") {
+                        $is_R_fwd = 1;
+                        next;
+                    }
+                    if ($is_L_fwd == 1) {
+                        $string .= "\n- <b>Local forwarding</b>: $op";
+                        $is_L_fwd = 0;
+                    }
+                    elsif ($is_R_fwd == 1) {
+                        $string .= "\n- <b>Remote forwarding</b>: $op";
+                        $is_R_fwd = 0;
+                    }
+                }
+            }
             if ($total_exp) {
-                $string .= "- With $total_exp active <b>Expects</b>";
+                $string .= "\n- With $total_exp active <b>Expects</b>";
             }
             $string = _subst($string, $$self{_CFG}, $uuid);
             $tooltip_widget->set_markup($string);
 
             return 1;
         });
-        $$self{_GUI}{$what}->drag_source_set('GDK_BUTTON1_MASK', \@targets, [ 'copy', 'move' ]);
-        $$self{_GUI}{$what}->signal_connect('drag_begin' => sub {
-            my ($me, $context, $x, $y, $data, $info, $time) = @_;
 
+        $$self{_GUI}{$what}->signal_connect('drag_begin' => sub {
+            my ($tree, $context) = @_;
             my @sel = $$self{_GUI}{$what}->_getSelectedUUIDs();
+
+            # No drag and drop for the root node
             if ($sel[0] eq '__PAC__ROOT__') {
-                return 0;
+                delete $$self{'DND'}{'selection'};
+                return;
             }
+
+            # Remember information about the dragged item
             $$self{'DND'}{'context'} = $context;
             $$self{'DND'}{'text'} = '';
             @{ $$self{'DND'}{'selection'} } = @sel;
-
-            $$self{'DND'}{'text'} = "<b> - Start / Chain(drop over connected Terminal):</b>";
-            foreach my $uuid (@sel) {
-                $$self{'DND'}{'text'} .= "\n" . ($$self{_CFG}{'environments'}{$uuid}{'_is_group'} ? '<b>Group:</b> ' : '<b>Connection:</b> ') . $$self{_CFG}{'environments'}{$uuid}{'name'};
-            }
-            my $icon_window = Gtk3::Window->new;
-            my $icon_label = Gtk3::Label->new;
-            $icon_label->set_markup($$self{'DND'}{'text'});
-            $icon_label->set_margin_start(3);
-            $icon_label->set_margin_end(3);
-            $icon_label->set_margin_top(3);
-            $icon_label->set_margin_bottom(3);
-            $icon_window->get_style_context->add_class('dnd-icon');
-            $icon_window->add($icon_label);
-            $icon_window->show_all();
-            my ($w, $h) = $icon_window->get_size();
-            Gtk3::drag_set_icon_widget($context, $icon_window, $w / 2, $h);
         });
 
-        $$self{_GUI}{$what}->signal_connect('drag_end' => sub { $$self{'DND'} = undef; return 1; });
         $$self{_GUI}{$what}->signal_connect('drag_failed' => sub {
             my ($w, $px, $py) = $$self{_GUI}{main}->get_window()->get_pointer();
             my $wsx = $$self{_GUI}{main}->get_window()->get_width();
             my $wsy = $$self{_GUI}{main}->get_window()->get_height();
 
-            # User cancelled the drop operation: finish
-            $_[2] eq 'user-cancelled' and return 0;
+            if ($$self{_VERBOSE}) {
+                print("drag failed $_[2] \n");
+            }
+
+            # User cancelled the drop operation (or time out), do not process further
+            # (only consider valid DnD that did not end up onto a valid target
+            if ($_[2] ne 'no-target') {
+                delete $$self{'DND'}{'selection'};
+                return 1;
+            }
 
             # Drop happened out of window: launch terminals
-            if (($px < 0) || ($py < 0) || ($px > $wsx) || ($py > $wsy)) {
+            if ($px < 0 || $py < 0 || $px > $wsx || $py > $wsy) {
                 my @idx;
                 my %tmp;
+
                 foreach my $uuid (@{ $$self{'DND'}{'selection'} }) {
                     if (($$self{_CFG}{'environments'}{$uuid}{'_is_group'}) || ($uuid eq '__PAC__ROOT__')) {
                         if (!_wConfirm($$self{_GUI}{main}, "<b>ATTENTION!!</b> You have dropped some group(s)\nAre you sure you want to start <b>ALL</b> of its child connections?")) {
@@ -1186,8 +1326,86 @@ sub _setupCallbacks {
                 delete $$self{'DND'}{'selection'};
                 return 1;
             }
+
             # Drop happened inside of window: finish
+            delete $$self{'DND'}{'selection'};
+            return 1;
+        });
+
+        $$self{_GUI}{$what}->signal_connect('drag_drop' => sub {
+            my ($tree, $context, $x, $y, $time) = @_;
+            my ($dest_path, $position) = $tree->get_dest_row_at_pos($x, $y);
+            my $model = $tree->get_model();
+            my ($src_uuid, $src, $dest_uuid, $dest);
+
+            if ($$self{'DND'}{'selection'} && @{$$self{'DND'}{'selection'}}) {
+                $src_uuid = @{$$self{'DND'}{'selection'}}[0];
+                $src = $$self{_CFG}{'environments'}{$src_uuid};
+            }
+            if ($model->get_iter($dest_path)) {
+                $dest_uuid = $model->get_value($model->get_iter($dest_path), 2);
+                $dest = $$self{_CFG}{'environments'}{$dest_uuid};
+            }
+
+            if (!$src_uuid || !$dest_uuid || $src_uuid eq $dest_uuid) {
+                # No source, no destination or they are equal, nothing to do
+                return 1;
+            }
+
+            if ($$self{_VERBOSE}) {
+                print("Drag drop on $what ; $tree ; $context ; $time ; ($dest_path, $position)\n");
+                print("--------------------------------------------\n");
+                print("Drag source:\n");
+                print("UUID = {$src_uuid}\n");
+                print("Name = [" . $$src{'name'} . "], Is Group? = [" . $$src{'_is_group'} . "]\n");
+                print("--------------------------------------------\n");
+                print("Drag destination:\n");
+                print("UUID = {$dest_uuid}\n");
+                print("Name = [" . $$dest{'name'} . "], Is Group? = [" . $$dest{'_is_group'} . "]\n");
+                print("--------------------------------------------\n");
+            }
+
+            $self->_cutNodes([ $src_uuid ]);
+
+            foreach my $copy_uuid (keys %{ $$self{_COPY}{'data'}{'__PAC__COPY__'}{'children'} }) {
+                $self->_pasteNodes($dest_uuid, $copy_uuid);
+                $tree->_setTreeFocus($copy_uuid);
+            }
+            $$self{_COPY}{'data'} = {};
+
+            return 1;
+        });
+
+    }
+
+    # Capture mouse motion and show the connections list if the cursor is near the borders of the "info" panel
+    if ($$self{_CFG}{defaults}{'tabs in main window'} && !$$self{_CFG}{'defaults'}{'prevent mouse over show tree'}) {
+        sub _autoShowConnectionsList {
+            my $self = shift;
+            my $x = shift;
+
+            if (!defined($self)) {
+                return 0;
+            }
+
+            my ($vbInfo_x, $vbInfo_y) = $$self{_GUI}{vboxInfo}->get_window()->get_origin();
+            if ($$self{_CFG}{defaults}{'tree on right side'}) {
+                my ($dummy_x, $dummy_y, $vbInfo_width, $vbInfo_height) = $$self{_GUI}{vboxInfo}->get_window()->get_geometry();
+                $$self{_GUI}{showConnBtn}->set_active($x >= $vbInfo_x + $vbInfo_width - 30);
+            } else {
+                $$self{_GUI}{showConnBtn}->set_active($x <= $vbInfo_x + 10);
+            }
             return 0;
+        }
+
+        $$self{_GUI}{vboxInfo}->signal_connect('motion_notify_event', sub {
+            _autoShowConnectionsList($self, $_[1]->x_root);
+        });
+        $$self{_GUI}{ebFrameStatistics}->signal_connect('motion_notify_event', sub {
+            _autoShowConnectionsList($self, $_[1]->x_root);
+        });
+        $$self{_GUI}{ebFrameScreenshots}->signal_connect('motion_notify_event', sub {
+            _autoShowConnectionsList($self, $_[1]->x_root);
         });
     }
 
@@ -1195,7 +1413,7 @@ sub _setupCallbacks {
     $$self{_GUI}{groupAddBtn}->signal_connect('clicked' => sub {
         my @groups = $$self{_GUI}{treeConnections}->_getSelectedUUIDs();
         my $group_uuid = $groups[0];
-        my $parent_name = $$self{_CFG}{'environments'}{$group_uuid}{'name'} // 'AVAILABLE CONNECTIONS';
+        my $parent_name = $$self{_CFG}{'environments'}{$group_uuid}{'name'} // 'My Connections';
         if (!(($group_uuid eq '__PAC__ROOT__') || $$self{_CFG}{'environments'}{$group_uuid}{'_is_group'})) {
             return 1;
         }
@@ -1206,7 +1424,7 @@ sub _setupCallbacks {
         }
 
         # Generate the UUID for the new Group
-        my $uuid = OSSP::uuid->new; $uuid->make("v4");
+        my $uuid = OSSP::uuid->new(); $uuid->make("v4");
         my $txt_uuid = $uuid->export("str");
         undef $uuid;
 
@@ -1228,16 +1446,16 @@ sub _setupCallbacks {
         # Now, expand parent's group and focus the new connection
         $$self{_GUI}{treeConnections}->_setTreeFocus($txt_uuid);
 
-        $UNITY and $FUNCS{_TRAY}->_setTrayMenu;
+        $FUNCS{_TRAY}->set_tray_menu();
         $self->_setCFGChanged(1);
         return 1;
     });
 
     # Capture 'rename node' button clicked
     $$self{_GUI}{nodeRenBtn}->signal_connect('clicked' => sub {
-        my $selection = $$self{_GUI}{treeConnections}->get_selection;
-        my $modelsort = $$self{_GUI}{treeConnections}->get_model;
-        my $model = $modelsort->get_model;
+        my $selection = $$self{_GUI}{treeConnections}->get_selection();
+        my $modelsort = $$self{_GUI}{treeConnections}->get_model();
+        my $model = $modelsort->get_model();
         my ($path) = _getSelectedRows($selection);
         if (!defined $path) {
             return 1;
@@ -1246,12 +1464,12 @@ sub _setupCallbacks {
         my $node = $$self{_CFG}{'environments'}{$node_uuid}{'name'};
 
         if ($$self{_CFG}{'environments'}{$node_uuid}{'_protected'}) {
-            return _wMessage(undef, "Can not rename selection:\nSelected node is <b>'Protected'</b>");
+            return _wMessage($$self{_GUI}{main}, "Cannot rename selection:\nSelected node is <b>Protected</b>");
         }
 
         my ($new_name, $new_title);
         if ($$self{_CFG}{'environments'}{$node_uuid}{'_is_group'}) {
-            $new_name = _wEnterValue($$self{_GUI}{main}, "<b>Renaming Group</b>", "Enter a new name for Group '$node'", $node);
+            $new_name = _wEnterValue($$self{_GUI}{main}, "<b>Renaming Group</b>", "Enter a new name for Group <b>$node</b>", $node);
             $new_title = 'x';
         } else {
             ($new_name, $new_title) = _wAddRenameNode('rename', $$self{_CFG}, $node_uuid);
@@ -1269,9 +1487,7 @@ sub _setupCallbacks {
         }
 
         $self->_setCFGChanged(1);
-        if ($UNITY) {
-            $FUNCS{_TRAY}->_setTrayMenu;
-        }
+        $FUNCS{_TRAY}->set_tray_menu();
         $self->_updateGUIWithUUID($node_uuid);
         return 1;
     });
@@ -1284,23 +1500,21 @@ sub _setupCallbacks {
             return 1;
         }
         if ($self->_hasProtectedChildren(\@del)) {
-            return _wMessage(undef, "Can not delete selection:\nThere are <b>'Protected'</b> nodes selected");
+            return _wMessage($$self{_GUI}{main}, "Cannot delete selection.\n\nThere are <b>protected</b> nodes selected.");
         }
 
         if (scalar(@del) > 1) {
-            if (!_wConfirm($$self{_GUI}{main}, "Delete <b>'" . (scalar(@del)) . "'</b> nodes and ALL of their contents?")) {
+            if (!_wConfirm($$self{_GUI}{main}, "Delete <b>" . (scalar(@del)) . "</b> nodes and ALL of their contents?")) {
                 return 1;
             }
-        } elsif (!_wConfirm($$self{_GUI}{main}, "Delete node <b>'" . __($$self{_CFG}{'environments'}{ $del[0] }{'name'}) . "'</b> and ALL of its contents?")) {
+        } elsif (!_wConfirm($$self{_GUI}{main}, "Delete node <b>" . __($$self{_CFG}{'environments'}{ $del[0] }{'name'}) . "</b> and ALL of its contents?")) {
             return 1;
         }
         # Delete selected nodes from treeConnections
         map $$self{_GUI}{treeConnections}->_delNode($_), @del;
         # Delete selected node from the configuration
         $self->_delNodes(@del);
-        if ($UNITY) {
-            $FUNCS{_TRAY}->_setTrayMenu;
-        }
+        $FUNCS{_TRAY}->set_tray_menu();
         $self->_setCFGChanged(1);
         return 1;
     });
@@ -1311,16 +1525,24 @@ sub _setupCallbacks {
         $$self{_GUI}{$what}->signal_connect('key_press_event' => sub {
             my ($widget, $event) = @_;
 
-            my $keyval = '' . ($event->keyval);
-            my $state = '' . ($event->state);
-            if (!(($event->state == [qw(mod1-mask)])&&(!$$self{_CFG}{'defaults'}{'disable ALT key bindings'}))) {
+            my @sel = $$self{_GUI}{$what}->_getSelectedUUIDs();
+            if (!@sel) {
                 return 0;
             }
-            my @sel = $$self{_GUI}{$what}->_getSelectedUUIDs();
-            # e --> Show main edit connection window
-            if (chr($keyval) eq 'e') {
-                if ($sel[0] ne '__PAC_SHELL__') {
-                    $$self{_GUI}{connEditBtn}->clicked();
+            my $action = $FUNCS{_KEYBINDS}->GetAction($what, $widget, $event);
+            if (!$action) {
+                return 0;
+            }
+            if ($action eq 'edit_node' && $sel[0] ne '__PAC_SHELL__') {
+                $$self{_GUI}{connEditBtn}->clicked();
+                return 1;
+            } elsif ($action eq 'del_favourite') {
+                if ($$self{_GUI}{connFavourite}->get_sensitive()) {
+                    my $tree = $self->_getCurrentTree();
+                    if (!$tree->_getSelectedUUIDs()) {
+                        return 1;
+                    }
+                    $self->_setFavourite(0,$tree);
                 }
                 return 1;
             }
@@ -1348,53 +1570,44 @@ sub _setupCallbacks {
     }
 
     # Capture selected element changed
-    $$self{_GUI}{treeFavourites}->get_selection->signal_connect('changed' => sub { $self->_updateGUIFavourites(); });
-    $$self{_GUI}{treeHistory}->get_selection->signal_connect('changed' => sub { $self->_updateGUIHistory(); });
+    $$self{_GUI}{treeFavourites}->get_selection()->signal_connect('changed' => sub { $self->_updateGUIFavourites(); });
+    $$self{_GUI}{treeHistory}->get_selection()->signal_connect('changed' => sub { $self->_updateGUIHistory(); });
 
-    $$self{_GUI}{btneditclu}->signal_connect('clicked' => sub { $$self{_CLUSTER}->show(1); });
+    if ($$self{_CFG}{'defaults'}{'layout'} ne 'Compact') {
+        $$self{_GUI}{btneditclu}->signal_connect('clicked' => sub {
+            $$self{_CLUSTER}->show(1);
+        });
+    }
 
     # Capture 'treeClusters' row activated
     $$self{_GUI}{treeClusters}->signal_connect('row_activated' => sub {
-        my @sel = $$self{_GUI}{treeClusters}->_getSelectedNames;
+        my @sel = $$self{_GUI}{treeClusters}->_getSelectedNames();
         $self->_startCluster($sel[0]);
     });
 
-    $$self{_GUI}{treeClusters}->get_selection->signal_connect('changed' => sub { $self->_updateGUIClusters(); });
+    $$self{_GUI}{treeClusters}->get_selection()->signal_connect('changed' => sub {
+        $self->_updateGUIClusters();
+    });
     $$self{_GUI}{treeClusters}->signal_connect('key_press_event' => sub {
         my ($widget, $event) = @_;
 
-        my $keyval = '' . ($event->keyval);
-        my $state = '' . ($event->state);
-        my @sel = $$self{_GUI}{treeClusters}->_getSelectedNames;
+        my @sel = $$self{_GUI}{treeClusters}->_getSelectedNames();
         if (!@sel) {
             return 0;
         }
-        if (($event->state == [qw(mod1-mask)])&&(!$$self{_CFG}{'defaults'}{'disable ALT key bindings'})) {
-            # e --> Show main edit connection Window
-            if (chr($keyval) eq 'e') {
-                $$self{_CLUSTER}->show($sel[0]);
-                return 1;
-            }
+        my $action = $FUNCS{_KEYBINDS}->GetAction('treeClusters', $widget, $event);
+        if (!$action) {
+            return 0;
+        }
+        if ($action eq 'edit_node') {
+            $$self{_CLUSTER}->show($sel[0]);
+            return 1;
         }
     });
 
     # Capture 'treeconnections' keypress
     $$self{_GUI}{treeConnections}->signal_connect('key_press_event' => sub {
         my ($widget, $event) = @_;
-
-        my $keyval = '' . ($event->keyval);
-        my $state = '' . ($event->state);
-        my $stateb = $event->get_state;
-        my $unicode = Gtk3::Gdk::keyval_to_unicode($event->keyval); # 0 if not a character
-        my $shift = $stateb * ['shift-mask'];
-        my $ctrl = $stateb * ['control-mask'];
-        my $alt = $stateb * ['mod1-mask'];
-        my $alt2 = $stateb * ['mod2-mask'];
-        my $alt5 = $stateb * ['mod5-mask'];
-
-        #print "TREECONNECTIONS KEYPRESS:*$state*$keyval*" . chr($keyval) . "*$unicode*\n";
-        #print "*$shift*$ctrl*$alt*$alt2*$alt5*\n";
-
         my @sel = $$self{_GUI}{treeConnections}->_getSelectedUUIDs();
 
         my $is_group = 0;
@@ -1407,84 +1620,60 @@ sub _setupCallbacks {
                 $is_group = 1;
             }
         }
+        my $action = $FUNCS{_KEYBINDS}->GetAction('treeConnections', $widget, $event);
 
-        # <Ctrl>
-        if (($ctrl) && (! $$self{_CFG}{'defaults'}{'disable CTRL key bindings'})) {
-            # <Ctrl>f --> FIND in treeView
-            if ($keyval == 102) {
-                $$self{_SHOWFINDTREE} = 1;
-                $$self{_GUI}{_vboxSearch}->show;
-                $$self{_GUI}{_entrySearch}->grab_focus();
-                return 1;
-            }
-            # r --> Expand all
-            elsif (chr($keyval) eq 'r') {
-                $$self{_GUI}{treeConnections}->expand_all;
-            }
-            # t --> Collapse all
-            elsif (chr($keyval) eq 't') {
-                $$self{_GUI}{treeConnections}->collapse_all;
-            }
-            if (scalar(@sel)==0) {
-                return 0;
-            }
-
-            # <Ctrl>d --> CLONE current connection
-            if (chr($keyval) eq 'd') {
-                $self->_copyNodes;
-                foreach my $child (keys %{ $$self{_COPY}{'data'}{'__PAC__COPY__'}{'children'} }) {
-                    $self->_pasteNodes($$self{_CFG}{'environments'}{ $sel[0] }{'parent'}, $child);
-                    $$self{_COPY}{'data'} = {};
-                };
+        if (!$action) {
+            return 0;
+        }
+        if ($action eq 'find') {
+            $$self{_SHOWFINDTREE} = 1;
+            $$self{_GUI}{_vboxSearch}->show();
+            $$self{_GUI}{_entrySearch}->grab_focus();
+        } elsif ($action eq 'expand_all') {
+            $$self{_GUI}{treeConnections}->expand_all();
+        } elsif ($action eq 'collaps_all') {
+            $$self{_GUI}{treeConnections}->collapse_all();
+        } elsif ($action eq 'clone') {
+            $self->_cloneNodes();
+        } elsif ($action eq 'copy') {
+            $self->_copyNodes();
+        } elsif ($action eq 'cut') {
+            $self->_cutNodes();
+        } elsif ($action eq 'paste') {
+            map $self->_pasteNodes($sel[0], $_), keys %{ $$self{_COPY}{'data'}{'__PAC__COPY__'}{'children'} };
+            $$self{_COPY}{'data'} = {};
+            $self->_copyNodes(0,undef,$LAST_COPIED_NODES);
+        } elsif ($action eq 'edit_node') {
+            if (!$is_root) {
+                $$self{_GUI}{connEditBtn}->clicked();
             }
-            # <Ctrl>c --> COPY current CONNECTION
-            elsif ($keyval == 99) {
-                $self->_copyNodes; return 1;
+        } elsif ($action eq 'connect_node') {
+            if (!$is_root) {
+                $$self{_GUI}{connExecBtn}->clicked();
             }
-            # <Ctrl>x --> CUT current CONNECTION
-            elsif ($keyval == 120) {
-                $self->_cutNodes;
-                return 1;
+        } elsif ($action eq 'protection') {
+            if (!$is_root) {
+                $self->__treeToggleProtection();
             }
-            # <Ctrl>v --> PASTE cut/copied CONNECTION
-            elsif ($keyval == 118) {
-                map $self->_pasteNodes($sel[0], $_), keys %{ $$self{_COPY}{'data'}{'__PAC__COPY__'}{'children'} };
-                $$self{_COPY}{'data'} = {};
-                return 1;
+        } elsif ($action eq 'rename') {
+            if ((scalar(@sel) == 1) && ($sel[0] ne '__PAC__ROOT__')) {
+                $$self{_GUI}{nodeRenBtn}->clicked();
             }
-        }
-        # <Alt>
-        elsif (($alt) && (!$$self{_CFG}{'defaults'}{'disable ALT key bindings'})) {
-            # e --> Show main edit connection window
-            if (chr($keyval) eq 'e') {
-                if (!$is_root) {
-                    $$self{_GUI}{connEditBtn}->clicked();
+        } elsif ($action eq 'add_favourite' || $action eq 'del_favourite') {
+            if ($$self{_GUI}{connFavourite}->get_sensitive()) {
+                my $tree = $self->_getCurrentTree();
+                if (!$tree->_getSelectedUUIDs()) {
+                    return 1;
                 }
-                return 1;
-            }
-            # r --> Toggle protection flag
-            elsif (chr($keyval) eq 'r') {
-                if (!$is_root) {
-                    $self->__treeToggleProtection();
+                if ($action eq 'add_favourite') {
+                    $self->_setFavourite(1,$tree);
+                } else {
+                    $self->_setFavourite(0,$tree);
                 }
-                return 1;
-            }
-            return 0;
-        }
-        # Capture 'F2' keypress to rename nodes
-        elsif ($event->keyval == 65471) {
-            if ((scalar(@sel) == 1) && ($sel[0] ne '__PAC__ROOT__')) {
-                $$self{_GUI}{nodeRenBtn}->clicked();
             }
-            return 1;
-        }
-        # Capture 'Del' keypress to delete connection
-        elsif ($event->keyval == 65535) {
+        } elsif ($action eq 'Delete') {
             $$self{_GUI}{nodeDelBtn}->clicked();
-            return 1;
-        }
-        # Capture 'left arrow'  keypress to collapse row
-        elsif ($event->keyval == 65361) {
+        } elsif ($action eq 'Left') {
             my @idx;
             foreach my $uuid (@sel) {
                 push(@idx, [ $uuid ]);
@@ -1493,8 +1682,8 @@ sub _setupCallbacks {
                 return 0;
             }
             my $tree = $$self{_GUI}{treeConnections};
-            my $selection = $tree->get_selection;
-            my $model = $tree->get_model;
+            my $selection = $tree->get_selection();
+            my $model = $tree->get_model();
             my @paths = _getSelectedRows($selection);
             my $uuid = $model->get_value($model->get_iter($paths[0]), 2);
 
@@ -1507,9 +1696,7 @@ sub _setupCallbacks {
             } else {
                 $tree->set_cursor($$self{_GUI}{treeConnections}->_getPath($$self{_CFG}{'environments'}{$uuid}{'parent'}), undef, 0);
             }
-        }
-        # Capture 'right arrow' keypress to expand row
-        elsif ($event->keyval == 65363) {
+        } elsif ($action eq 'Right') {
             my @idx;
             foreach my $uuid (@sel) {
                 push(@idx, [ $uuid ]);
@@ -1518,20 +1705,18 @@ sub _setupCallbacks {
                 return 0;
             }
             my $tree = $$self{_GUI}{treeConnections};
-            my $selection = $tree->get_selection;
-            my $model = $tree->get_model;
+            my $selection = $tree->get_selection();
+            my $model = $tree->get_model();
             my @paths = _getSelectedRows($selection);
             my $uuid = $model->get_value($model->get_iter($paths[0]), 2);
             if (!(($uuid eq '__PAC__ROOT__') || ($$self{_CFG}{'environments'}{$uuid}{'_is_group'}))) {
                 return 0;
             }
             $tree->expand_row($paths[0], 0);
-        }
-        # Capture 'intro' keypress to expand/collapse row or launch terminals
-        elsif ($event->keyval == 65293) {
+        } elsif ($action eq 'Return') {
             my $tree = $$self{_GUI}{treeConnections};
-            my $selection = $tree->get_selection;
-            my $model = $tree->get_model;
+            my $selection = $tree->get_selection();
+            my $model = $tree->get_model();
             my @paths = _getSelectedRows($selection);
             my $uuid = $model->get_value($model->get_iter($paths[0]), 2);
 
@@ -1544,27 +1729,25 @@ sub _setupCallbacks {
                 }
                 $self->_launchTerminals(\@idx);
             }
-
-            return 1;
-        }
-        # Capture 'standard ascii characters' to start custom interactive search
-        elsif (($event->keyval >= 32) && ($event->keyval <= 126)) {
+        } elsif ($action eq 'Down') {
+            return 0;
+        } elsif ($action eq 'Up') {
+            return 0;
+        } elsif (($event->keyval >= 32) && ($event->keyval <= 126)) {
+            # This does not consider other languages
             $$self{_SHOWFINDTREE} = 1;
-            $$self{_GUI}{_vboxSearch}->show;
+            $$self{_GUI}{_vboxSearch}->show();
             $$self{_GUI}{_entrySearch}->grab_focus();
             $$self{_GUI}{_entrySearch}->insert_text(chr($event->keyval), -1, 0);
             $$self{_GUI}{_entrySearch}->set_position(-1);
-            return 1;
-        } else {
-            return 0;
         }
         return 1;
     });
 
     # Capture 'treeconnections' selected element changed
-    $$self{_GUI}{treeConnections}->get_selection->signal_connect('changed' => sub {
+    $$self{_GUI}{treeConnections}->get_selection()->signal_connect('changed' => sub {
         $self->_updateGUIPreferences();
-        });
+    });
 
     # Capture row double clicking (execute selected connection)
     $$self{_GUI}{treeConnections}->signal_connect('row_activated' => sub {
@@ -1577,8 +1760,8 @@ sub _setupCallbacks {
         }
 
         my $tree = $$self{_GUI}{treeConnections};
-        my $selection = $tree->get_selection;
-        my $model = $tree->get_model;
+        my $selection = $tree->get_selection();
+        my $model = $tree->get_model();
         my @paths = _getSelectedRows($selection);
         my $uuid = $model->get_value($model->get_iter($paths[0]), 2);
 
@@ -1596,11 +1779,11 @@ sub _setupCallbacks {
     $$self{_GUI}{treeConnections}->signal_connect('row_collapsed' => sub {
         my ($tree, $iter, $path) = @_;
 
-        my $selection = $$self{_GUI}{treeConnections}->get_selection;
-        my $modelsort = $$self{_GUI}{treeConnections}->get_model;
-        my $model = $modelsort->get_model;
+        my $selection = $$self{_GUI}{treeConnections}->get_selection();
+        my $modelsort = $$self{_GUI}{treeConnections}->get_model();
+        my $model = $modelsort->get_model();
         my $group_uuid = $model->get_value($modelsort->convert_iter_to_child_iter($modelsort->get_iter($path)), 2);
-        $$self{_GUI}{treeConnections}->columns_autosize;
+        $$self{_GUI}{treeConnections}->columns_autosize();
         if ($group_uuid eq '__PAC__ROOT__') {
             return 0;
         }
@@ -1612,9 +1795,9 @@ sub _setupCallbacks {
     $$self{_GUI}{treeConnections}->signal_connect('row_expanded' => sub {
         my ($tree, $iter, $path) = @_;
 
-        my $selection = $$self{_GUI}{treeConnections}->get_selection;
-        my $modelsort = $$self{_GUI}{treeConnections}->get_model;
-        my $model = $modelsort->get_model;
+        my $selection = $$self{_GUI}{treeConnections}->get_selection();
+        my $modelsort = $$self{_GUI}{treeConnections}->get_model();
+        my $model = $modelsort->get_model();
         my $group_uuid = $model->get_value($modelsort->convert_iter_to_child_iter($modelsort->get_iter($path)), 2);
         if ($group_uuid eq '__PAC__ROOT__') {
             return 0;
@@ -1629,11 +1812,26 @@ sub _setupCallbacks {
     # Capture 'treeconnections' right click
     $$self{_GUI}{treeConnections}->signal_connect('button_press_event' => sub {
         my ($widget, $event) = @_;
+        if ($event->button eq 3) {
+            if (@SELECTED_UUIDS && $#SELECTED_UUIDS>0) {
+                # There are selected rows, abort reselecting
+                return 1;
+            }
+        }
+        return 0;
+    });
+
+    $$self{_GUI}{treeConnections}->signal_connect('button_release_event' => sub {
+        my ($widget, $event) = @_;
+
         if ($event->button ne 3) {
+            # Load selected rows from left click
+            @SELECTED_UUIDS = $$self{_GUI}{treeConnections}->_getSelectedUUIDs();
             return 0;
         }
-        if (!$$self{_GUI}{treeConnections}->_getSelectedUUIDs()) {
-            return 0;
+        if (!@SELECTED_UUIDS || $#SELECTED_UUIDS<1) {
+            # There is only one selected element, is obsolete, selecte the current one
+            @SELECTED_UUIDS = $$self{_GUI}{treeConnections}->_getSelectedUUIDs();
         }
         $self->_treeConnections_menu($event);
         return 1;
@@ -1651,7 +1849,7 @@ sub _setupCallbacks {
         if ((! defined $new_conn) || ($new_conn =~ /^\s*$/go) || ($new_conn eq '__PAC__ROOT__')) {
             return 1;
         }
-        my $uuid = OSSP::uuid->new; $uuid->make("v4");
+        my $uuid = OSSP::uuid->new(); $uuid->make("v4");
         my $txt_uuid = $uuid->export("str");
         undef $uuid;
 
@@ -1688,7 +1886,7 @@ sub _setupCallbacks {
 
         $$self{_EDIT}->show($txt_uuid, 'new');
 
-        $UNITY and $FUNCS{_TRAY}->_setTrayMenu;
+        $FUNCS{_TRAY}->set_tray_menu();
         $self->_setCFGChanged(1);
         return 1;
     });
@@ -1731,29 +1929,33 @@ sub _setupCallbacks {
     $$self{_GUI}{connSearch}->signal_connect('clicked' => sub {
         if (!$$self{_GUI}{_vboxSearch}->get_visible) {
             $$self{_SHOWFINDTREE} = 1;
-            $$self{_GUI}{_vboxSearch}->show;
+            $$self{_GUI}{_vboxSearch}->show();
             $$self{_GUI}{_entrySearch}->grab_focus();
         } else {
             $$self{_SHOWFINDTREE} = 0;
-            $$self{_GUI}{_vboxSearch}->hide;
+            $$self{_GUI}{_vboxSearch}->hide();
         }
     });
     $$self{_GUI}{_entrySearch}->signal_connect('key_press_event' => sub {
+        my ($widget, $event) = @_;
         # Capture 'escape' keypress to hide the interactive search
-        if ($_[1]->keyval == 65307) {
+
+        my $action = $FUNCS{_KEYBINDS}->GetAction('pactabs', $widget, $event);
+
+        if ($action eq 'Escape') {
             $$self{_SHOWFINDTREE} = 0;
             $$self{_GUI}{_entrySearch}->set_text('');
-            $$self{_GUI}{_vboxSearch}->hide;
+            $$self{_GUI}{_vboxSearch}->hide();
             $$self{_GUI}{treeConnections}->grab_focus();
             return 1;
         }
         # Capture 'up arrow'  keypress to move to previous ocurrence
-        elsif ($_[1]->keyval == 65362) {
+        elsif ($action eq 'Up') {
             $$self{_GUI}{_btnPrevSearch}->clicked();
             return 1;
         }
         # Capture 'down arrow'  keypress to move to next ocurrence
-        elsif ($_[1]->keyval == 65364) {
+        elsif ($action eq 'Down') {
             $$self{_GUI}{_btnNextSearch}->clicked();
             return 1;
         }
@@ -1768,7 +1970,7 @@ sub _setupCallbacks {
     });
     $$self{_GUI}{_entrySearch}->signal_connect('focus_out_event' => sub {
         $$self{_SHOWFINDTREE} = 0;
-        $$self{_GUI}{_vboxSearch}->hide;
+        $$self{_GUI}{_vboxSearch}->hide();
         $$self{_GUI}{_entrySearch}->set_text('');
     });
     foreach my $what ('Name', 'Host', 'Desc') {
@@ -1843,10 +2045,7 @@ sub _setupCallbacks {
     });
 
     $$self{_GUI}{showConnBtn}->signal_connect('toggled' => sub {
-        $$self{_GUI}{showConnBtn}->get_active() ? $$self{_GUI}{vbox3}->show : $$self{_GUI}{vbox3}->hide;
-        if ($$self{_GUI}{showConnBtn}->get_active()) {
-            $$self{_GUI}{treeConnections}->grab_focus();
-        }
+        $self->_doToggleDisplayConnectionsList();
         return 1;
     });
 
@@ -1861,7 +2060,7 @@ sub _setupCallbacks {
         } elsif ($$self{_GUI}{nbTree}->get_nth_page($pnum) eq $$self{_GUI}{scroll3}) {
             $tree = $$self{_GUI}{treeHistory};
         } else {
-            my @sel = $$self{_GUI}{treeClusters}->_getSelectedNames;
+            my @sel = $$self{_GUI}{treeClusters}->_getSelectedNames();
             $self->_startCluster($sel[0]);
             return 1;
         }
@@ -1883,19 +2082,13 @@ sub _setupCallbacks {
         map push(@idx,[$_]),keys %tmp;
         $self->_launchTerminals(\@idx);
     });
-    $$self{_GUI}{configBtn}->signal_connect('clicked' => sub { $$self{_CONFIG}->show; });
+    $$self{_GUI}{configBtn}->signal_connect('clicked' => sub {
+        $$self{_CONFIG}->show();
+    });
     $$self{_GUI}{connEditBtn}->signal_connect('clicked' => sub {
-        my $pnum = $$self{_GUI}{nbTree}->get_current_page();
-        my $tree;
-
-        if  ($pnum == 0) {
-            $tree = $$self{_GUI}{treeConnections};
-        } elsif ($pnum == 1) {
-            $tree = $$self{_GUI}{treeFavourites};
-        } else {
-            $tree = $$self{_GUI}{treeHistory};
-        }
+        my $tree = $self->_getCurrentTree();
         my @sel = $tree->_getSelectedUUIDs();
+
         if (!scalar(@sel)) {
             return 1;
         }
@@ -1911,7 +2104,7 @@ sub _setupCallbacks {
             }
         }
         if (((scalar(@sel)>1) || ((scalar(@sel)==1) && $is_group)) && ($self->_hasProtectedChildren(\@sel))) {
-            return _wMessage(undef, "Can not " . (scalar(@sel) > 1 ? 'Bulk ' : ' ') . "Edit selection:\nThere are <b>'Protected'</b> nodes selected");
+            return _wMessage($$self{_GUI}{main}, "Cannot " . (scalar(@sel) > 1 ? 'Bulk ' : ' ') . "Edit selection:\nThere are <b>Protected</b> nodes selected");
         }
 
         if ((scalar(@sel) == 1) && (! $is_group)) {
@@ -1933,35 +2126,22 @@ sub _setupCallbacks {
             $self->_setCFGChanged(1);
         }
     });
-    $$self{_GUI}{shellBtn}->signal_connect('clicked' => sub { $self->_launchTerminals([ [ '__PAC_SHELL__' ] ]); return 1; });
-    $$self{_GUI}{clusterBtn}->signal_connect('clicked' => sub { $$self{_CLUSTER}->show; });
+    $$self{_GUI}{shellBtn}->signal_connect('clicked' => sub {
+        $self->_launchTerminals([[ '__PAC_SHELL__' ]]);
+        return 1;
+    });
+    $$self{_GUI}{clusterBtn}->signal_connect('clicked' => sub {
+        $$self{_CLUSTER}->show();
+    });
     $$self{_GUI}{connFavourite}->signal_connect('toggled' => sub {
         if ($$self{_NO_PROPAGATE_FAV_TOGGLE}) {
             return 1;
         }
-        my $pnum = $$self{_GUI}{nbTree}->get_current_page();
-        my $tree;
-        if  ($pnum == 0) {
-            $tree = $$self{_GUI}{treeConnections};
-        } elsif ($pnum == 1) {
-            $tree = $$self{_GUI}{treeFavourites};
-        } else {
-            $tree = $$self{_GUI}{treeHistory};
-        }
+        my $tree = $self->_getCurrentTree();
         if (!$tree->_getSelectedUUIDs()) {
             return 1;
         }
-        map $$self{_CFG}{'environments'}{$_}{'favourite'} = $$self{_GUI}{connFavourite}->get_active(), $tree->_getSelectedUUIDs();
-        if ($$self{_GUI}{nbTree}->get_current_page() == 1) {
-            $self->_updateFavouritesList();
-            $self->_updateGUIFavourites();
-            $self->_updateGUIPreferences();
-        }
-        $$self{_GUI}{connFavourite}->set_image(Gtk3::Image->new_from_stock('pac-favourite-' . ($$self{_GUI}{connFavourite}->get_active() ? 'on' : 'off'), 'button'));
-        if ($UNITY) {
-            $FUNCS{_TRAY}->_setTrayMenu;
-        }
-        $self->_setCFGChanged(1);
+        $self->_setFavourite($$self{_GUI}{connFavourite}->get_active(),$tree);
         return 1;
     });
     $$self{_GUI}{scriptsBtn}->signal_connect('clicked' => sub { $$self{_SCRIPTS}->show(); });
@@ -1969,8 +2149,17 @@ sub _setupCallbacks {
     $$self{_GUI}{quitBtn}->signal_connect('clicked' => sub { $self->_quitProgram(); });
     $$self{_GUI}{saveBtn}->signal_connect('clicked' => sub { $self->_saveConfiguration(); });
     $$self{_GUI}{aboutBtn}->signal_connect('clicked' => sub { $self->_showAboutWindow(); });
-    $$self{_GUI}{wolBtn}->signal_connect('clicked' => sub { _wakeOnLan; });
-    $$self{_GUI}{lockPACBtn}->signal_connect('toggled' => sub { $$self{_GUI}{lockPACBtn}->get_active() ? $self->_lockPAC : $self->_unlockPAC; });
+    $$self{_GUI}{wolBtn}->signal_connect('clicked' => sub { _wakeOnLan(); });
+    $$self{_GUI}{lockApplicationBtn}->signal_connect('toggled' => sub {
+        if ($$self{_GUI}{lockApplicationBtn}->get_active()) {
+            $self->_lockAsbru();
+        } else {
+            $self->_unlockAsbru();
+        }
+    });
+    if ($$self{_CFG}{'defaults'}{'layout'} eq 'Compact') {
+        $$self{_GUI}{nodeClose}->signal_connect('clicked' => sub { $$self{_GUI}{main}->close(); });
+    }
 
     # Capture CONN TAB page switching
     $$self{_GUI}{nbTree}->signal_connect('switch_page' => sub {
@@ -1979,26 +2168,23 @@ sub _setupCallbacks {
         $$self{_NO_PROPAGATE_FAV_TOGGLE} = 1;
         $$self{_GUI}{connFavourite}->set_active(0);
         $$self{_GUI}{connFavourite}->set_sensitive(0);
-        $$self{_GUI}{connFavourite}->set_image(Gtk3::Image->new_from_stock('pac-favourite-off', 'button'));
+        $$self{_GUI}{connFavourite}->set_image(Gtk3::Image->new_from_stock('asbru-favourite-off', 'button'));
         $$self{_NO_PROPAGATE_FAV_TOGGLE} = 0;
 
         my $page = $$self{_GUI}{nbTree}->get_nth_page($pnum);
 
-        # Connections
         if ($page eq $$self{_GUI}{scroll1}) {
+            # Connections
             $self->_updateGUIPreferences();
-        }
-        # Favourites
-        elsif ($page eq $$self{_GUI}{scroll2}) {
+        } elsif ($page eq $$self{_GUI}{scroll2}) {
+            # Favourites
             $self->_updateFavouritesList();
             $self->_updateGUIFavourites();
-        }
-        # History
-        elsif ($page eq $$self{_GUI}{scroll3}) {
+        } elsif ($page eq $$self{_GUI}{scroll3}) {
+            # History
             $self->_updateGUIHistory();
-        }
-        # Clusters
-        else {
+        } else {
+            # Clusters
             $self->_updateClustersList();
             $self->_updateGUIClusters();
         }
@@ -2010,7 +2196,7 @@ sub _setupCallbacks {
         if (!defined $$self{_GUI}{_PACTABS}) {
             return 1;
         }
-        if  ($$self{_GUI}{nb}->get_n_pages == 0) {
+        if ($$self{_GUI}{nb}->get_n_pages == 0) {
             $$self{_GUI}{_PACTABS}->hide();
         } elsif ($$self{_GUI}{nb}->get_n_pages == 1) {
             $$self{_GUI}{treeConnections}->grab_focus();
@@ -2018,21 +2204,15 @@ sub _setupCallbacks {
 
             if ($$self{_CFG}{defaults}{'when no more tabs'} == 0) {
                 #nothing
-            }
-            elsif ($$self{_CFG}{defaults}{'when no more tabs'} == 1) {
+            } elsif ($$self{_CFG}{defaults}{'when no more tabs'} == 1) {
                 #quit
                 $self->_quitProgram();
-            }
-            elsif ($$self{_CFG}{defaults}{'when no more tabs'} == 2) {
+            } elsif ($$self{_CFG}{defaults}{'when no more tabs'} == 2) {
                 #hide
-                if ($UNITY) {
-                    $$self{_TRAY}{_TRAY}->set_active();
-                } else {
-                    $$self{_TRAY}{_TRAY}->set_visible(1);
-                }
+                $$self{_TRAY}->set_active();
                 # Trigger the "lock" procedure ?
                 if ($$self{_CFG}{'defaults'}{'use gui password'} && $$self{_CFG}{'defaults'}{'use gui password tray'}) {
-                    $$self{_GUI}{lockPACBtn}->set_active(1);
+                    $$self{_GUI}{lockApplicationBtn}->set_active(1);
                 }
                 # Hide main window
                 $self->_hideConnectionsList();
@@ -2043,7 +2223,7 @@ sub _setupCallbacks {
     $$self{_GUI}{nb}->signal_connect('page_added' => sub {
         if (defined $$self{_GUI}{_PACTABS}) {
             if ($$self{_GUI}{nb}->get_n_pages) {
-                $$self{_GUI}{_PACTABS}->show;
+                $$self{_GUI}{_PACTABS}->show();
             }
         }
         return 1;
@@ -2051,7 +2231,7 @@ sub _setupCallbacks {
 
     # Capture TABs window closing
     ! $$self{_CFG}{defaults}{'tabs in main window'} and $$self{_GUI}{_PACTABS}->signal_connect('delete_event' => sub {
-        if ($$self{_GUILOCKED} || ! _wConfirm(undef, "Close <b>TABBED TERMINALS</b> Window ?")) {
+        if ($$self{_GUILOCKED} || ! _wConfirm($$self{_GUI}{_PACTABS}, "Close <b>TABBED TERMINALS</b> Window ?")) {
             return 1;
         }
         foreach my $uuid (keys %RUNNING) {
@@ -2070,96 +2250,39 @@ sub _setupCallbacks {
     # Capture some keypress on TABBED window
     $$self{_GUI}{_PACTABS}->signal_connect('key_press_event' => sub {
         my ($widget, $event) = @_;
-
-        my $keyval = Gtk3::Gdk::keyval_name($event->keyval);
-        my $unicode = Gtk3::Gdk::keyval_to_unicode($event->keyval); # 0 if not a character
-        my $state = $event->get_state;
-        my $ctrl = $state * ['control-mask'];
-        my $shift = $state * ['shift-mask'];
-        my $alt = $state * ['mod1-mask'];
-
-        #print "TABBED WINDOW KEYPRESS:*$state*$keyval*" . chr($keyval) . "*$unicode*\n";
-
         # Get current page's tab number
         my $curr_page = $$self{_GUI}{nb}->get_current_page();
 
-        # Continue checking keypress only if <Ctrl> is pushed
-        if ($ctrl && $shift && (! $$self{_CFG}{'defaults'}{'disable CTRL key bindings'}) && (! $$self{_CFG}{'defaults'}{'disable SHIFT key bindings'})) {
-            if ($keyval !~ /^.*_?Tab/go) {
-                return 0;
-            }
+        my $action = $FUNCS{_KEYBINDS}->GetAction('pactabs', $widget, $event);
 
-            if ($$self{_CFG}{defaults}{'ctrl tab'} eq 'last') {
-                $$self{_GUI}{nb}->set_current_page($$self{_PREVTAB});
-            } else {
-                if ($curr_page == 0) {
-                    $$self{_GUI}{nb}->set_current_page($$self{_GUI}{nb}->get_n_pages - 1);
-                } else {
-                    $$self{_GUI}{nb}->prev_page();
-                }
-            }
-            return 1;
-        }
-        # Continue checking keypress only if <Ctrl> is pushed
-        elsif ($ctrl && (! $$self{_CFG}{'defaults'}{'disable CTRL key bindings'})) {
-            # Capture <Ctrl>PgUp/Left --> select previous tab
-            if ($keyval eq 'Page_Up' && ! $$self{_CFG}{'defaults'}{'how to switch tabs'}) {
-                if ($curr_page == 0) {
-                    $$self{_GUI}{nb}->set_current_page(-1);
-                } else {
-                    $$self{_GUI}{nb}->prev_page();
-                }
-            }
-            # Capture <Ctrl>PgDwn/Right --> select next tab
-            elsif ($keyval eq 'Page_Down' && ! $$self{_CFG}{'defaults'}{'how to switch tabs'}) {
-                if ($curr_page == $$self{_GUI}{nb}->get_n_pages - 1) {
-                    $$self{_GUI}{nb}->set_current_page(0);
-                } else {
-                    $$self{_GUI}{nb}->next_page();
-                }
-            }
-            # Capture <Ctrl>number --> select number tab
-            elsif ($keyval =~ /^\d$/go) {
-                $$self{_GUI}{nb}->set_current_page($keyval - ($$self{_CFG}{'defaults'}{'tabs in main window'} ? 0 : 1));
-            }
-            # Capture <Ctrl>TAB --> switch between tabs
-            elsif ($keyval eq 'Tab') {
-                if ($$self{_CFG}{defaults}{'ctrl tab'} eq 'last') {
-                    $$self{_GUI}{nb}->set_current_page($$self{_PREVTAB});
-                } else {
-                    if ($curr_page == $$self{_GUI}{nb}->get_n_pages - 1) {
-                        $$self{_GUI}{nb}->set_current_page(0);
-                    } else {
-                        $$self{_GUI}{nb}->next_page();
-                    }
-                }
+        if (!$action) {
+            return 0;
+        } elsif ($action eq 'infotab') {
+            $$self{_GUI}{nb}->set_current_page(0);
+        } elsif ($action eq 'last') {
+            $$self{_GUI}{nb}->set_current_page($$self{_PREVTAB});
+        } elsif ($action eq 'next') {
+            if ($curr_page == $$self{_GUI}{nb}->get_n_pages - 1) {
+                $$self{_GUI}{nb}->set_current_page(0);
             } else {
-                return 0;
+                $$self{_GUI}{nb}->next_page();
             }
-            return 1;
-        # Continue checking keypress only if <Alt> is pushed
-        } elsif ($alt && (! $$self{_CFG}{'defaults'}{'disable ALT key bindings'}) && $$self{_CFG}{'defaults'}{'how to switch tabs'}) {
-            # Capture <Alt>PgUp/Left --> select previous tab
-            if ($keyval eq 'Left') {
-                if ($curr_page == 0) {
-                    $$self{_GUI}{nb}->set_current_page(-1);
-                } else {
-                    $$self{_GUI}{nb}->prev_page();
-                }
-            }
-            # Capture <Alt>PgDwn/Right --> select next tab
-            elsif ($keyval eq 'Right') {
-                if ($curr_page == $$self{_GUI}{nb}->get_n_pages - 1) {
-                    $$self{_GUI}{nb}->set_current_page(0);
-                } else {
-                    $$self{_GUI}{nb}->next_page();
-                }
+        } elsif ($action eq 'previous') {
+            if ($curr_page == 0) {
+                $$self{_GUI}{nb}->set_current_page(-1);
             } else {
-                return 0;
+                $$self{_GUI}{nb}->prev_page();
             }
-            return 1;
+        } elsif ($action eq 'Ctrl+0') {
+            # Special case: if Ctrl+0 is not bind to an action then ignore it
+            return 0;
+        } elsif ($action =~ /^Ctrl\+(\d+)/) {
+            my $n = $1;
+            $$self{_GUI}{nb}->set_current_page($n - ($$self{_CFG}{'defaults'}{'tabs in main window'} ? 0 : 1));
+        } else {
+            return 0;
         }
-        return 0;
+        return 1;
     });
 
     # Capture some keypress on Description widget
@@ -2168,8 +2291,10 @@ sub _setupCallbacks {
         my $keyval = '' . ($event->keyval);
         my $state = '' . ($event->state);
 
+        my $action = $FUNCS{_KEYBINDS}->GetAction('pactabs', $widget, $event);
+
         # Check if <Ctrl>z is pushed
-        if (($event->state == [ qw(control-mask) ]) && (chr($keyval) eq 'z') && (scalar @{ $$self{_UNDO} })) {
+        if ($action eq 'Ctrl+z' || $action eq 'Ctrl+Z') {
             $$self{_GUI}{descBuffer}->set_text(pop(@{ $$self{_UNDO} }));
             return 1;
         }
@@ -2182,6 +2307,7 @@ sub _setupCallbacks {
         push(@{ $$self{_UNDO} }, $$self{_GUI}{descBuffer}->get_property('text'));
         return 0;
     });
+
     $$self{_GUI}{descBuffer}->signal_connect('changed' => sub {
         my @sel = $$self{_GUI}{treeConnections}->_getSelectedUUIDs();
         if (!(scalar(@sel) == 1 && $$self{_GUI}{nbTree}->get_current_page() == 0 && $$self{_GUI}{descView}->is_sensitive)) {
@@ -2197,37 +2323,12 @@ sub _setupCallbacks {
 
         $$self{_PREVTAB} = $nb->get_current_page();
 
-        my $tab_page = $nb->get_nth_page($pnum);
+        $self->_doFocusPage($pnum);
 
-        $$self{_HAS_FOCUS} = '';
-        foreach my $tmp_uuid (keys %RUNNING) {
-            my $check_gui = $RUNNING{$tmp_uuid}{terminal}{_SPLIT} ? $RUNNING{$tmp_uuid}{terminal}{_SPLIT_VPANE} : $RUNNING{$tmp_uuid}{terminal}{_GUI}{_VBOX};
+        # Show/hide the button bar
+        $$self{_GUI}{hbuttonbox1}->set_visible($pnum == 0 || !$$self{'_CFG'}{'defaults'}{'auto hide button bar'});
 
-            if ((!defined $check_gui) || ($check_gui ne $tab_page)) {
-                next;
-            }
-
-            my $uuid = $RUNNING{$tmp_uuid}{uuid};
-            my $path = $$self{_GUI}{treeConnections}->_getPath($uuid);
-            if ($path) {
-                $$self{_GUI}{treeConnections}->expand_to_path($path);
-                $$self{_GUI}{treeConnections}->set_cursor($path, undef, 0);
-            }
-
-            $RUNNING{$tmp_uuid}{terminal}->_setTabColour();
-
-            if (!$RUNNING{$tmp_uuid}{terminal}{EMBED}) {
-                eval {
-                    if (defined $RUNNING{$tmp_uuid}{terminal}{FOCUS}->get_window()) {
-                        $RUNNING{$tmp_uuid}{terminal}{FOCUS}->get_window()->focus(time);
-                    }
-                };
-                $RUNNING{$tmp_uuid}{terminal}{_GUI}{_VTE}->grab_focus();
-            }
-            $$self{_HAS_FOCUS} = $RUNNING{$tmp_uuid}{terminal}{_GUI}{_VTE};
-            last;
-        }
-        $$self{_GUI}{hbuttonbox1}->set_visible(($pnum == 0) || ($pnum && ! $$self{'_CFG'}{'defaults'}{'auto hide button bar'}));
+        # Show/hide the connections list
         if (($pnum == 0)&&($$self{_CFG}{'defaults'}{'auto hide connections list'})) {
             # Info Tab, show connection list
             $$self{_GUI}{showConnBtn}->set_active(1);
@@ -2241,17 +2342,13 @@ sub _setupCallbacks {
     $$self{_GUI}{main}->signal_connect('delete_event' => sub {
         if ($$self{_CFG}{defaults}{'close to tray'}) {
             # Show tray icon
-            if ($UNITY) {
-                $$self{_TRAY}{_TRAY}->set_active();
-            } else {
-                $$self{_TRAY}{_TRAY}->set_visible(1);
-            }
+            $$self{_TRAY}->set_active();
             # Trigger the "lock" procedure ?
             if ($$self{_CFG}{'defaults'}{'use gui password'} && $$self{_CFG}{'defaults'}{'use gui password tray'}) {
-                $$self{_GUI}{lockPACBtn}->set_active(1);
+                $$self{_GUI}{lockApplicationBtn}->set_active(1);
             }
             # Hide main window
-            if ($ENV{'ASBRU_DESKTOP'} eq 'gnome-shell') {
+            if (!$STRAY) {
                 $$self{_GUI}{main}->iconify();
             } else {
                 $self->_hideConnectionsList();
@@ -2264,49 +2361,32 @@ sub _setupCallbacks {
     $$self{_GUI}{main}->signal_connect('destroy' => sub { exit 0; });
 
     # Save GUI size/position/... *before* it hides
-    $$self{_GUI}{main}->signal_connect('unmap_event' => sub { $self->_saveGUIData; return 0; });
+    $$self{_GUI}{main}->signal_connect('unmap_event' => sub { $self->_saveGUIData(); return 0; });
 
     $$self{_GUI}{_vboxSearch}->signal_connect('map' => sub { $$self{_GUI}{_vboxSearch}->hide() unless $$self{_SHOWFINDTREE}; });
 
-    # Capture 'treeconnections' keypress
+    # Capture 'main' keypress
     $$self{_GUI}{main}->signal_connect('key_press_event' => sub {
         my ($widget, $event) = @_;
 
-        my $keyval = Gtk3::Gdk::keyval_name($event->keyval);
-        my $unicode = Gtk3::Gdk::keyval_to_unicode($event->keyval); # 0 if not a character
-        my $state = $event->get_state;
-        my $shift = $state * ['shift-mask'];
-        my $ctrl = $state * ['control-mask'];
-        my $alt = $state * ['mod1-mask'];
-        my $alt2 = $state * ['mod2-mask'];
-        my $alt5 = $state * ['mod5-mask'];
+        my $action = $FUNCS{_KEYBINDS}->GetAction('pacmain', $widget, $event);
 
-        #print "TERMINAL KEYPRESS:*$state*$keyval*" . chr($keyval) . "*$unicode*\n";
-        #print "*$shift*$ctrl*$alt*$alt2*$alt5*\n";
-
-        # <Ctrl><Shift>
-        if (!(($ctrl && $shift) && (! $$self{_CFG}{'defaults'}{'disable CTRL key bindings'})  && (! $$self{_CFG}{'defaults'}{'disable SHIFT key bindings'}))) {
+        if (!$action) {
             return 0;
-        }
-
-        # F --> FIND in treeView
-        if($_[1]->keyval == 102)  {
+        } elsif ($action eq 'find') {
             $$self{_SHOWFINDTREE} = 1;
-            $$self{_GUI}{_vboxSearch}->show;
+            $$self{_GUI}{_vboxSearch}->show();
             $$self{_GUI}{_entrySearch}->grab_focus();
-            return 1;
-        }
-        # Q --> Finish
-        elsif ($_[1]->keyval == 113) {
+        } elsif ($action eq 'quit') {
             $PACMain::FUNCS{_MAIN}->_quitProgram();
-            return 1;
-        }
-        # T --> Open local shell
-        elsif (lc $keyval eq 't') {
+        } elsif ($action eq 'localshell') {
             $$self{_GUI}{shellBtn}->clicked();
-            return 1;
+        } elsif ($action eq 'showconnections') {
+            $$self{_GUI}{showConnBtn}->clicked();
+        } else {
+            return 0;
         }
-        return 0;
+        return 1;
     });
     $$self{_SIGNALS}{_WINDOWSTATEVENT} = $$self{_GUI}{main}->signal_connect('window_state_event' => sub {
         $$self{_GUI}{maximized} = $_[1]->new_window_state eq 'maximized';
@@ -2315,12 +2395,29 @@ sub _setupCallbacks {
     return 1;
 }
 
-sub _lockPAC {
+sub _setFavourite {
+    my ($self,$b,$tree) = @_;
+
+    map $$self{_CFG}{'environments'}{$_}{'favourite'} = $b, $tree->_getSelectedUUIDs();
+    if ($$self{_GUI}{nbTree}->get_current_page() == 1) {
+        $self->_updateFavouritesList();
+        $self->_updateGUIFavourites();
+        $self->_updateGUIPreferences();
+    }
+    $$self{_GUI}{connFavourite}->set_image(Gtk3::Image->new_from_stock('asbru-favourite-' . ($b ? 'on' : 'off'), 'button'));
+    $$self{_GUI}{connFavourite}->set_active($b);
+    if ($UNITY) {
+        $FUNCS{_TRAY}->set_tray_menu();
+    }
+    $self->_setCFGChanged(1);
+}
+
+sub _lockAsbru {
     my $self = shift;
 
-    $$self{_GUI}{lockPACBtn}->set_image(Gtk3::Image->new_from_stock('pac-protected', 'GTK_ICON_SIZE_BUTTON'));
-    $$self{_GUI}{lockPACBtn}->set_active(1);
-    $$self{_GUI}{vbox3}->set_sensitive(0);
+    $$self{_GUI}{lockApplicationBtn}->set_image(Gtk3::Image->new_from_stock('asbru-protected', 'GTK_ICON_SIZE_BUTTON'));
+    $$self{_GUI}{lockApplicationBtn}->set_active(1);
+    $$self{_GUI}{vboxCommandPanel}->set_sensitive(0);
     $$self{_GUI}{showConnBtn}->set_sensitive(0);
     $$self{_GUI}{shellBtn}->set_sensitive(0);
     $$self{_GUI}{quitBtn}->set_sensitive(0);
@@ -2333,26 +2430,34 @@ sub _lockPAC {
         $$self{_GUI}{_PACTABS}->set_sensitive(0);
     }
     foreach my $tmp_uuid (keys %RUNNING) {
-        $RUNNING{$tmp_uuid}{terminal}->lock;
+        if (!defined $RUNNING{$tmp_uuid}{terminal}) {
+            next;
+        }
+        if (ref($RUNNING{$tmp_uuid}{terminal}) =~ /^PACTerminal|PACShell$/go) {
+            $RUNNING{$tmp_uuid}{terminal}->lock();
+        }
     }
     $$self{_GUILOCKED} = 1;
 
     return 1;
 }
 
-sub _unlockPAC {
+sub _unlockAsbru {
     my $self = shift;
 
-    my $pass = _wEnterValue($self, 'GUI Unlock', 'Enter current GUI Password to remove protection...', undef, 0, 'pac-protected');
-    if ((! defined $pass) || ($CIPHER->encrypt_hex($pass) ne $$self{_CFG}{'defaults'}{'gui password'})) {
-        $$self{_GUI}{lockPACBtn}->set_active(1);
+    if (!$CIPHER->salt()) {
+        $CIPHER->salt(pack('Q',$SALT));
+    }
+    my $pass = _wEnterValue($$self{_GUI}{main}, 'GUI Unlock', 'Enter current GUI Password to remove protection...', undef, 0, 'asbru-protected');
+    if ((! defined $pass) || ($pass ne $CIPHER->decrypt_hex($$self{_CFG}{'defaults'}{'gui password'}))) {
+        $$self{_GUI}{lockApplicationBtn}->set_active(1);
         _wMessage($$self{_WINDOWCONFIG}, 'ERROR: Wrong password!!');
         return 0;
     }
 
-    $$self{_GUI}{lockPACBtn}->set_image(Gtk3::Image->new_from_stock('pac-unprotected', 'GTK_ICON_SIZE_BUTTON'));
-    $$self{_GUI}{lockPACBtn}->set_active(0);
-    $$self{_GUI}{vbox3}->set_sensitive(1);
+    $$self{_GUI}{lockApplicationBtn}->set_image(Gtk3::Image->new_from_stock('asbru-unprotected', 'GTK_ICON_SIZE_BUTTON'));
+    $$self{_GUI}{lockApplicationBtn}->set_active(0);
+    $$self{_GUI}{vboxCommandPanel}->set_sensitive(1);
     $$self{_GUI}{showConnBtn}->set_sensitive(1);
     $$self{_GUI}{shellBtn}->set_sensitive(1);
     $$self{_GUI}{quitBtn}->set_sensitive(1);
@@ -2361,9 +2466,16 @@ sub _unlockPAC {
     $$self{_GUI}{aboutBtn}->set_sensitive(1);
     $$self{_GUI}{wolBtn}->set_sensitive(1);
 
-    $$self{_TABSINWINDOW} and $$self{_GUI}{_PACTABS}->set_sensitive(1);
+    if ($$self{_TABSINWINDOW}) {
+        $$self{_GUI}{_PACTABS}->set_sensitive(1);
+    }
     foreach my $tmp_uuid (keys %RUNNING) {
-        $RUNNING{$tmp_uuid}{terminal}->unlock;
+        if (!defined $RUNNING{$tmp_uuid}{terminal}) {
+            next;
+        }
+        if (ref($RUNNING{$tmp_uuid}{terminal}) =~ /^PACTerminal|PACShell$/go) {
+            $RUNNING{$tmp_uuid}{terminal}->unlock();
+        }
     }
     $$self{_GUILOCKED} = 0;
 
@@ -2377,7 +2489,7 @@ sub __search {
     my $where = shift // 'name';
 
     my @result;
-    my $model = $tree->get_model;
+    my $model = $tree->get_model();
     $model->foreach(sub {
         my ($store, $path, $iter) = @_;
         my $elem_uuid = $model->get_value($model->get_iter($path), 2);
@@ -2394,43 +2506,6 @@ sub __search {
     return \@result;
 }
 
-sub __treeSort {
-    my ($treestore, $a_iter, $b_iter, $cfg) = @_;
-
-    my $groups_1st = $$cfg{'defaults'}{'sort groups first'} // 1;
-    my $b_uuid = $treestore->get_value($b_iter, 2);
-    if (!defined $b_uuid) {
-        return 0;
-    }
-    # __PAC__ROOT__ must always be the first node!!
-    if ($b_uuid eq '__PAC__ROOT__') {
-        return 1;
-    }
-
-    my $a_uuid = $treestore->get_value($a_iter, 2);
-    if (!defined $a_uuid) {
-        return 1;
-    }
-    # __PAC__ROOT__ must always be the first node!!
-    if ($a_uuid eq '__PAC__ROOT__') {
-        return -1;
-    }
-
-    # Groups first...
-    if ($groups_1st) {
-        my $a_is_group = $$cfg{'environments'}{ $a_uuid }{'_is_group'};
-        my $b_is_group = $$cfg{'environments'}{ $b_uuid }{'_is_group'};
-        if ($a_is_group && ! $b_is_group){
-            return -1;
-        }
-        if (! $a_is_group && $b_is_group){
-            return 1;
-        }
-    }
-    # ... then alphabetically
-    return lc($$cfg{'environments'}{$a_uuid}{name}) cmp lc($$cfg{'environments'}{$b_uuid}{name});
-}
-
 sub __treeBuildNodeName {
     my $self = shift;
     my $uuid = shift;
@@ -2441,7 +2516,9 @@ sub __treeBuildNodeName {
     my $is_group = $$self{_CFG}{'environments'}{$uuid}{'_is_group'} // 0;
     my $protected = ($$self{_CFG}{'environments'}{$uuid}{'_protected'} // 0) || 0;
     my $p_set = $$self{_CFG}{defaults}{'protected set'};
+    my $p_unset = $$self{_CFG}{defaults}{'unprotected set'} // 'foreground';
     my $p_color = $$self{_CFG}{defaults}{'protected color'};
+    my $p_uncolor = $$self{_CFG}{defaults}{'unprotected color'} // '#000000';
 
     if ($name) {
         $name = __($name);
@@ -2453,8 +2530,10 @@ sub __treeBuildNodeName {
     }
     if ($protected) {
         $pset = "$p_set='$p_color'";
+    } else {
+        $pset = "$p_unset='$p_uncolor'";
     }
-    $name = "<span $pset$bold font='$$self{_CFG}{defaults}{'tree font'}'>$name</span>";
+    $name = "<span $pset$bold font='$$self{_CFG}{defaults}{'tree font'}'> $name</span>";
 
     return $name;
 }
@@ -2487,9 +2566,9 @@ sub _hasProtectedChildren {
 sub __treeToggleProtection {
     my $self = shift;
 
-    my $selection = $$self{_GUI}{treeConnections}->get_selection;
-    my $modelsort = $$self{_GUI}{treeConnections}->get_model;
-    my $model = $modelsort->get_model;
+    my $selection = $$self{_GUI}{treeConnections}->get_selection();
+    my $modelsort = $$self{_GUI}{treeConnections}->get_model();
+    my $model = $modelsort->get_model();
     my @sel = $$self{_GUI}{treeConnections}->_getSelectedUUIDs();
 
     foreach my $uuid (@sel) {
@@ -2497,6 +2576,7 @@ sub __treeToggleProtection {
         my $gui_name = $self->__treeBuildNodeName($uuid);
         $model->set($modelsort->convert_iter_to_child_iter($modelsort->get_iter($$self{_GUI}{treeConnections}->_getPath($uuid))), 1, $gui_name);
     }
+    $self->_updateGUIPreferences();
     $self->_setCFGChanged(1);
 }
 
@@ -2518,7 +2598,6 @@ sub _treeConnections_menu_lite {
         push(@tree_menu_items, {
             label => 'Edit connection',
             stockicon => 'gtk-edit',
-            shortcut => '<alt>e',
             tooltip => "Edit this connection\'s data",
             sensitive => $sel[0] ne '__PAC_SHELL__',
             code => sub { $$self{_GUI}{connEditBtn}->clicked(); }
@@ -2529,7 +2608,6 @@ sub _treeConnections_menu_lite {
         push(@tree_menu_items, {
             label => 'Bulk Edit connections...',
             stockicon => 'gtk-edit',
-            shortcut => '<alt>e',
             tooltip => "Bulk edit some values of selected connection\'s",
             sensitive => 1,
             code => sub { $$self{_GUI}{connEditBtn}->clicked(); }
@@ -2539,7 +2617,7 @@ sub _treeConnections_menu_lite {
     # Quick Edit variables
     my @var_submenu;
     my $i = 0;
-    foreach my $var (map{ $_->{txt} // '' } @{ $$self{_CFG}{'environments'}{$sel[0]}{'variables'} }) {
+    foreach my $var (map{ ($_->{hide} ? '<hidden>' : $_->{txt}) // '' } @{ $$self{_CFG}{'environments'}{$sel[0]}{'variables'} }) {
         my $j = $i;
         push(@var_submenu, {
             label => '<V:' . $j . '> = ' . $var,
@@ -2572,7 +2650,7 @@ sub _treeConnections_menu_lite {
     if ($sel[0] ne '__PAC_SHELL__') {
         push(@tree_menu_items, {
             label => 'Wake On LAN...' . ($$self{_CFG}{'environments'}{$sel[0]}{'use proxy'} || $$self{_CFG}{'defaults'}{'use proxy'} ? '(can\'t, PROXY configured!!)' : ''),
-            stockicon => 'pac-wol',
+            stockicon => 'asbru-wol',
             sensitive => ! ($$self{_CFG}{'environments'}{$sel[0]}{'use proxy'} || $$self{_CFG}{'defaults'}{'use proxy'}) && (scalar(@sel) >= 1) && (scalar(@sel) == 1) && (! ($$self{_CFG}{'environments'}{$sel[0]}{'_is_group'} || $sel[0] eq '__PAC__ROOT__')),
             code => sub { $self->_setCFGChanged(_wakeOnLan($$self{_CFG}{'environments'}{$sel[0]}, $sel[0])); }
         });
@@ -2610,10 +2688,9 @@ sub _treeConnections_menu_lite {
     push(@tree_menu_items, {
         label => 'Execute in New Cluster...',
         stockicon => 'gtk-new',
-        shortcut => '',
         sensitive => scalar @sel >= 1,
         code => sub {
-            my $cluster = _wEnterValue($self, 'Enter a name for the <b>New Cluster</b>');
+            my $cluster = _wEnterValue($$self{_GUI}{main}, 'Enter a name for the <b>New Cluster</b>');
             if ((!defined $cluster) || ($cluster =~ /^\s*$/go)){
                 return 1;
             }
@@ -2632,7 +2709,7 @@ sub _treeConnections_menu_lite {
     my @submenu_cluster;
     my %clusters;
     foreach my $uuid_tmp (keys %RUNNING) {
-        if ($RUNNING{$uuid_tmp}{terminal}{_CLUSTER} eq '') {
+        if (!$RUNNING{$uuid_tmp}{terminal}{_CLUSTER}) {
             next;
         }
         $clusters{$RUNNING{$uuid_tmp}{terminal}{_CLUSTER}}{total}++;
@@ -2676,46 +2753,61 @@ sub _treeConnections_menu {
     my $p = '';
     my $clip = scalar (keys %{$$self{_COPY}{'data'}{'__PAC__COPY__'}{'children'}});
 
-    my @sel = $$self{_GUI}{treeConnections}->_getSelectedUUIDs();
+    my @sel = @SELECTED_UUIDS;
     if (scalar(@sel) == 0) {
         return 1;
     } elsif ((scalar(@sel)>1)||($clip > 1)) {
         $p = 's';
     }
-    my $with_protected = $self->_hasProtectedChildren(\@sel);
-    my $with_groups = 0;
-    foreach my $uuid (@sel) {
-        if ($with_groups = $$self{_CFG}{'environments'}{ $uuid }{'_is_group'}) {
-            last;
-        }
-    }
+    # Unique ID of parent node
+    my $parent_uuid = $$self{_CFG}{'environments'}{$sel[0]}{'parent'};
+    # Main selected node is protected
+    my $is_protected = $$self{_CFG}{'environments'}{$sel[0]}{'_protected'};
+    # Any of the selected node is protected
+    my $has_protected_children = $self->_hasProtectedChildren(\@sel);
+    # Parent of selected node is protected
+    my $protected_parent = $$self{_CFG}{'environments'}{$parent_uuid}{'_protected'};
 
     my @tree_menu_items;
+
+    # Show keyboard shortcuts
+    push(@tree_menu_items, {
+        label => "Show Keybindings",
+        stockicon => 'gtk-help',
+        sensitive => 1,
+        code => sub {
+            _wMessage($$self{_GUI}{main},$PACMain::FUNCS{_KEYBINDS}->ListKeyBindings('treeConnections'),1,0,'w-info');
+        }
+    });
+
+    # Separator
+    push(@tree_menu_items, { separator => 1 });
+
     # Expand All
     push(@tree_menu_items, {
         label => 'Expand all',
         stockicon => 'gtk-add',
-        shortcut => '<ctrl>r',
+        shortcut => $PACMain::FUNCS{_KEYBINDS}->GetAccelerator('treeConnections','expand_all'),
         tooltip => 'Expand ALL (including sub-nodes)',
         sensitive => 1,
-        code => sub { $$self{_GUI}{treeConnections}->expand_all; }
+        code => sub { $$self{_GUI}{treeConnections}->expand_all(); }
     });
     # Collapse All
     push(@tree_menu_items, {
         label => 'Collapse all',
         stockicon => 'gtk-remove',
-        shortcut => '<ctrl>t',
+        shortcut => $PACMain::FUNCS{_KEYBINDS}->GetAccelerator('treeConnections','collaps_all'),
         tooltip => 'Collapse ALL (including sub-nodes)',
         sensitive => 1,
-        code => sub { $$self{_GUI}{treeConnections}->collapse_all; }
+        code => sub { $$self{_GUI}{treeConnections}->collapse_all(); }
     });
     push(@tree_menu_items, { separator => 1 });
     # Toggle Protect
     if (scalar(@sel) >= 1 && $sel[0] ne '__PAC__ROOT__') {
         push(@tree_menu_items, {
-            label => scalar(@sel) > 1 ? ('Toggle Protected state') : (($$self{_CFG}{'environments'}{ $sel[0] }{'_protected'} ? 'Un-' : '') . 'Protect'),
-            stockicon => 'pac-' . ($$self{_CFG}{'environments'}{ $sel[0] }{'_protected'} ? 'un' : '') . 'protected',
-            shortcut => '<alt>r',
+            label => scalar(@sel) > 1 ? ('Toggle Protected state') : (($is_protected ? 'Un-' : '') . 'Protect'),
+            stockicon => 'asbru-' . ($is_protected ? 'un' : '') . 'protected',
+            shortcut => $PACMain::FUNCS{_KEYBINDS}->GetAccelerator('treeConnections','protection'),
             tooltip => "Protect or not this node, in order to avoid any changes (Edit, Delete, Rename, ...)",
             sensitive => 1,
             code => sub { $self->__treeToggleProtection(); }
@@ -2726,7 +2818,7 @@ sub _treeConnections_menu {
         push(@tree_menu_items, {
             label => "Edit connection$p",
             stockicon => 'gtk-edit',
-            shortcut => '<alt>e',
+            shortcut => $PACMain::FUNCS{_KEYBINDS}->GetAccelerator('treeConnections','edit_node'),
             tooltip => "Edit this connection\'s data",
             sensitive => 1,
             code => sub { $$self{_GUI}{connEditBtn}->clicked(); }
@@ -2737,7 +2829,7 @@ sub _treeConnections_menu {
         push(@tree_menu_items, {
             label => 'Copy Password',
             stockicon => 'gtk-copy',
-            shortcut => '',
+            shortcut => $PACMain::FUNCS{_KEYBINDS}->GetAccelerator('treeConnections','copy'),
             sensitive => 1,
             code => sub {
                 _copyPass($sel[0]);
@@ -2749,7 +2841,7 @@ sub _treeConnections_menu {
         push(@tree_menu_items, {
             label => 'Bulk Edit connections...',
             stockicon => 'gtk-edit',
-            shortcut => '<alt>e',
+            shortcut => $PACMain::FUNCS{_KEYBINDS}->GetAccelerator('treeConnections','edit_node'),
             tooltip => "Bulk edit some values of selected connection\'s",
             sensitive => 1,
             code => sub { $$self{_GUI}{connEditBtn}->clicked(); }
@@ -2759,22 +2851,21 @@ sub _treeConnections_menu {
     push(@tree_menu_items, {
         label => 'Export ' . ($sel[0] eq '__PAC__ROOT__' ? 'ALL' : 'SELECTED') . ' connection(s)...',
         stockicon => 'gtk-save-as',
-        shortcut => '',
         tooltip => 'Export connection(s) to a YAML file',
         sensitive =>  scalar @sel >= 1,
         code => sub {
             if ($sel[0] eq '__PAC__ROOT__') {
-                $$self{_GUI}{treeConnections}->get_selection->unselect_path(Gtk3::TreePath->new_from_string('0'));
+                $$self{_GUI}{treeConnections}->get_selection()->unselect_path(Gtk3::TreePath->new_from_string('0'));
                 for my $i (1 .. 65535) {
-                    $$self{_GUI}{treeConnections}->get_selection->select_path(Gtk3::TreePath->new_from_string("$i"));
+                    $$self{_GUI}{treeConnections}->get_selection()->select_path(Gtk3::TreePath->new_from_string("$i"));
                 }
-                $self->__exportNodes;
+                $self->__exportNodes();
                 for my $i (1 .. 65535) {
-                    $$self{_GUI}{treeConnections}->get_selection->unselect_path(Gtk3::TreePath->new_from_string("$i"));
+                    $$self{_GUI}{treeConnections}->get_selection()->unselect_path(Gtk3::TreePath->new_from_string("$i"));
                 }
                 $$self{_GUI}{treeConnections}->set_cursor(Gtk3::TreePath->new_from_string('0'), undef, 0);
             } else {
-                $self->__exportNodes;
+                $self->__exportNodes();
             }
         }
     });
@@ -2782,26 +2873,14 @@ sub _treeConnections_menu {
     push(@tree_menu_items, {
         label => 'Import connection(s)...',
         stockicon => 'gtk-open',
-        shortcut => '',
         tooltip => 'Import connection(s) from a file',
         sensitive =>  (scalar(@sel) == 1) && ($$self{_CFG}{'environments'}{$sel[0]}{'_is_group'} || $sel[0] eq '__PAC__ROOT__'),
         code => sub { $self->__importNodes }
     });
-    if ($ENV{'ASBRU_DESKTOP'} eq 'gnome-shell') {
-        # Display settings options in gnome-shell, there is no tray icon to access it
-        push(@tree_menu_items, {
-            label => 'Settings...',
-            stockicon => 'gtk-preferences',
-            shortcut => '',
-            tooltip => 'Settings',
-            sensitive =>  1,
-            code => sub { $$self{_GUI}{configBtn}->clicked(); }
-        });
-    }
     # Quick Edit variables
     my @var_submenu;
     my $i = 0;
-    foreach my $var (map{ $_->{txt} // '' } @{ $$self{_CFG}{'environments'}{$sel[0]}{'variables'} }) {
+    foreach my $var (map{ ($_->{hide} ? '<hidden>' : $_->{txt}) // '' } @{ $$self{_CFG}{'environments'}{$sel[0]}{'variables'} }) {
         my $j = $i;
         push(@var_submenu, {
             label => '<V:' . $j . '> = ' . $var,
@@ -2824,68 +2903,90 @@ sub _treeConnections_menu {
         push(@tree_menu_items, {
             label => 'Edit Local Variables',
             stockicon => 'gtk-dialog-question',
-            sensitive => ! $with_protected,
+            sensitive => ! $has_protected_children,
             submenu => \@var_submenu
         });
     }
 
+    # Separator
     push(@tree_menu_items, { separator => 1 });
+
+    # Start all connections of the selected group
+    if (scalar @sel == 1 && $$self{_CFG}{'environments'}{$sel[0]}{'_is_group'}) {
+        push(@tree_menu_items, {
+            label => 'Start Group',
+            stockicon => 'asbru-group-connect',
+            shortcut => $PACMain::FUNCS{_KEYBINDS}->GetAccelerator('treeConnections', 'connect'),
+            tooltip => "Start all connections of this group",
+            code => sub{
+                $$self{_GUI}{connExecBtn}->clicked();
+            }
+        });
+    }
     # Add connection/group
-    if ((scalar @sel == 1) && ($$self{_CFG}{'environments'}{$sel[0]}{'_is_group'} || $sel[0] eq '__PAC__ROOT__')) {
+    if (scalar @sel == 1 && ($$self{_CFG}{'environments'}{$sel[0]}{'_is_group'} || $sel[0] eq '__PAC__ROOT__')) {
         # Add Connection
         push(@tree_menu_items, {
             label => 'Add Connection',
-            stockicon => 'pac-node-add',
-            tooltip => "Create a new CONNECTION under '" . ($sel[0] eq '__PAC__ROOT__' ? 'ROOT' : $$self{_CFG}{'environments'}{$sel[0]}{'name'}) . "'",
-            code => sub{ $$self{_GUI}{connAddBtn}->clicked(); }
+            stockicon => 'asbru-node-add',
+            tooltip => "Create a new connection under '" . ($sel[0] eq '__PAC__ROOT__' ? 'ROOT' : $$self{_CFG}{'environments'}{$sel[0]}{'name'}) . "'",
+            sensitive => !$is_protected,
+            code => sub{
+                $$self{_GUI}{connAddBtn}->clicked();
+            }
         });
         # Add Group
         push(@tree_menu_items, {
             label => 'Add Group',
-            stockicon => 'pac-group-add',
-            tooltip => "Create a new GROUP under '" . ($sel[0] eq '__PAC__ROOT__' ? 'ROOT' : $$self{_CFG}{'environments'}{$sel[0]}{'name'}) . "'",
-            code => sub{ $$self{_GUI}{groupAddBtn}->clicked(); }
+            stockicon => 'asbru-group-add',
+            tooltip => "Create a new group under '" . ($sel[0] eq '__PAC__ROOT__' ? 'ROOT' : $$self{_CFG}{'environments'}{$sel[0]}{'name'}) . "'",
+            sensitive => !$is_protected,
+            code => sub{
+                $$self{_GUI}{groupAddBtn}->clicked();
+            }
         });
     }
     # Rename
     push(@tree_menu_items, {
         label => 'Rename ' . ($$self{_CFG}{'environments'}{$sel[0]}{'_is_group'} || $sel[0] eq '__PAC__ROOT__' ? 'Group' : 'Connection'),
         stockicon => 'gtk-spell-check',
-        shortcut => 'F2',
-        sensitive => (scalar(@sel) == 1) && $sel[0] ne '__PAC__ROOT__' && ! $with_protected,
-        code => sub { $$self{_GUI}{nodeRenBtn}->clicked(); }
+        shortcut => $PACMain::FUNCS{_KEYBINDS}->GetAccelerator('treeConnections', 'rename'),
+        sensitive => (scalar(@sel) == 1) && $sel[0] ne '__PAC__ROOT__' && !$has_protected_children && !$is_protected && !$protected_parent,
+        code => sub {
+            $$self{_GUI}{nodeRenBtn}->clicked();
+        }
     });
     # Delete
     push(@tree_menu_items, {
         label => 'Delete...',
         stockicon => 'gtk-delete',
-        sensitive => (scalar(@sel) >= 1) && $sel[0] ne '__PAC__ROOT__' && ! $with_protected,
-        code => sub { $$self{_GUI}{nodeDelBtn}->clicked(); }
+        sensitive => (scalar(@sel) >= 1) && $sel[0] ne '__PAC__ROOT__' && !$has_protected_children && !$is_protected && !$protected_parent,
+        code => sub {
+            $$self{_GUI}{nodeDelBtn}->clicked();
+        }
     });
 
+    # Separator
     push(@tree_menu_items, { separator => 1 });
+
     # Clone connection
     push(@tree_menu_items, {
         label => "Clone connection$p",
         stockicon => 'gtk-copy',
-        shortcut => '<control>d',
-        sensitive => ((scalar(@sel) == 1) && ! ($$self{_CFG}{'environments'}{$sel[0]}{'_is_group'} || $sel[0] eq '__PAC__ROOT__')),
+        shortcut => $PACMain::FUNCS{_KEYBINDS}->GetAccelerator('treeConnections','clone'),
+        sensitive => scalar(@sel) == 1 && $sel[0] ne '__PAC__ROOT__' && !$protected_parent,
         code => sub {
-            $self->_copyNodes;
-            foreach my $child (keys %{ $$self{_COPY}{'data'}{'__PAC__COPY__'}{'children'} }) {
-                $self->_pasteNodes($$self{_CFG}{'environments'}{ $sel[0] }{'parent'}, $child);
-            }
-            $$self{_COPY}{'data'} = {};
+            $self->_cloneNodes();
         }
     });
     # Copy
     push(@tree_menu_items, {
         label => "Copy node$p",
         stockicon => 'gtk-copy',
-        shortcut => '<control>c',
-        sensitive => ((scalar @sel >= 1) && ($sel[0] ne '__PAC__ROOT__')),
+        shortcut => $PACMain::FUNCS{_KEYBINDS}->GetAccelerator('treeConnections','copy'),
+        sensitive => scalar @sel >= 1 && $sel[0] ne '__PAC__ROOT__',
         code => sub{
-            $self->_copyNodes;
+            $self->_copyNodes();
             # Unselect nodes after copy
             $$self{_GUI}{treeConnections}->get_selection()->unselect_all();
         }
@@ -2894,21 +2995,23 @@ sub _treeConnections_menu {
     push(@tree_menu_items, {
         label => "Cut node$p",
         stockicon => 'gtk-cut',
-        shortcut => '<control>x',
-        sensitive => ((scalar @sel >= 1) && ($sel[0] ne '__PAC__ROOT__') && (! $with_protected)),
-        code => sub{  $self->_cutNodes; }
+        shortcut => $PACMain::FUNCS{_KEYBINDS}->GetAccelerator('treeConnections','cut'),
+        sensitive => scalar @sel >= 1 && $sel[0] ne '__PAC__ROOT__' && !$is_protected && !$has_protected_children && !$protected_parent,
+        code => sub{
+            $self->_cutNodes();
+        }
     });
     push(@tree_menu_items, {
         label => "Paste node$p",
         stockicon => 'gtk-paste',
-        shortcut => '<control>v',
-        #sensitive => scalar(keys %{ $$self{_COPY}{'data'} }) && (scalar @sel == 1) && (($sel[0] eq '__PAC__ROOT__') || ($$self{_CFG}{'environments'}{$sel[0]}{'_is_group'})),
-        sensitive => (($clip)&&(scalar @sel == 1)) ? 1 : 0,
+        shortcut => $PACMain::FUNCS{_KEYBINDS}->GetAccelerator('treeConnections','paste'),
+        sensitive => ($clip && scalar @sel == 1 ? 1 : 0) && !$is_protected,
         code => sub {
             foreach my $child (keys %{ $$self{_COPY}{'data'}{'__PAC__COPY__'}{'children'} }) {
                 $self->_pasteNodes($sel[0], $child);
             }
             $$self{_COPY}{'data'} = {};
+            $self->_copyNodes(0,undef,$LAST_COPIED_NODES);
             return 1;
         }
     });
@@ -2919,7 +3022,7 @@ sub _treeConnections_menu {
     push(@tree_menu_items, {
 
         label => 'Wake On LAN...' . ($$self{_CFG}{'environments'}{$sel[0]}{'use proxy'} || $$self{_CFG}{'defaults'}{'use proxy'} ? '(can\'t, PROXY configured!!)' : ''),
-        stockicon => 'pac-wol',
+        stockicon => 'asbru-wol',
         sensitive => ! ($$self{_CFG}{'environments'}{$sel[0]}{'use proxy'} || $$self{_CFG}{'defaults'}{'use proxy'}) && (scalar(@sel) >= 1) && (scalar(@sel) == 1) && (! ($$self{_CFG}{'environments'}{$sel[0]}{'_is_group'} || $sel[0] eq '__PAC__ROOT__')),
         code => sub { $self->_setCFGChanged(_wakeOnLan($$self{_CFG}{'environments'}{$sel[0]}, $sel[0])); }
     });
@@ -2954,10 +3057,9 @@ sub _treeConnections_menu {
     push(@tree_menu_items, {
         label => 'Execute in New Cluster...',
         stockicon => 'gtk-new',
-        shortcut => '',
         sensitive => ((scalar @sel >= 1) && ($sel[0] ne '__PAC__ROOT__')),
         code => sub {
-            my $cluster = _wEnterValue($self, 'Enter a name for the <b>New Cluster</b>');
+            my $cluster = _wEnterValue($$self{_GUI}{main}, 'Enter a name for the <b>New Cluster</b>');
             if ((! defined $cluster) || ($cluster =~ /^\s*$/go)) {
                 return 1;
             }
@@ -2983,7 +3085,7 @@ sub _treeConnections_menu {
     my @submenu_cluster;
     my %clusters;
     foreach my $uuid_tmp (keys %RUNNING) {
-        if ($RUNNING{$uuid_tmp}{terminal}{_CLUSTER} eq '') {
+        if (!$RUNNING{$uuid_tmp}{terminal}{_CLUSTER}) {
             next;
         }
         $clusters{$RUNNING{$uuid_tmp}{terminal}{_CLUSTER}}{total}++;
@@ -3035,12 +3137,12 @@ sub _showAboutWindow {
         "program_name" => '',  # name is shown in the logo
         "version" => "v$APPVERSION",
         "logo" => _pixBufFromFile("$RES_DIR/asbru-logo-400.png"),
-        "copyright" => "Copyright (C) 2017-2020 Ásbrú Connection Manager team\nCopyright 2010-2016 David Torrejón Vaquerizas",
+        "copyright" => "Copyright (C) 2017-2026 Ásbrú Connection Manager team\nCopyright 2010-2016 David Torrejón Vaquerizas",
         "website" => 'https://asbru-cm.net/',
         "license" => "
 Ásbrú Connection Manager
 
-Copyright (C) 2017-2020 Ásbrú Connection Manager team <https://asbru-cm.net>
+Copyright (C) 2017-2022 Ásbrú Connection Manager team <https://asbru-cm.net>
 Copyright (C) 2010-2016 David Torrejón Vaquerizas
 
 This program is free software: you can redistribute it and/or modify
@@ -3066,7 +3168,7 @@ sub _startCluster {
     my $cluster = shift;
 
     my @idx;
-    my $clulist = $$self{_CLUSTER}->getCFGClusters;
+    my $clulist = $$self{_CLUSTER}->getCFGClusters();
 
     if (defined $$self{_CFG}{defaults}{'auto cluster'}{$cluster}) {
         my $name = qr/$$self{_CFG}{defaults}{'auto cluster'}{$cluster}{name}/;
@@ -3113,13 +3215,16 @@ sub _launchTerminals {
 
     my @new_terminals;
     if (defined $$self{_GUI} && defined $$self{_GUI}{main}) {
-        $$self{_GUI}{main}->get_window()->set_cursor(Gtk3::Gdk::Cursor->new('watch'));
+        my $window = $$self{_GUI}{main}->get_window();
+        if ($window) {
+            $window->set_cursor(Gtk3::Gdk::Cursor->new('watch'));
+        }
         $$self{_GUI}{main}->set_sensitive(0);
     }
 
     # Check if user wants main window to be close when a terminal comes up
     if ($$self{_CFG}{'defaults'}{'hide on connect'} && ! $$self{_CFG}{'defaults'}{'tabs in main window'}) {
-        if ($ENV{'ASBRU_DESKTOP'} eq 'gnome-shell') {
+        if (!$STRAY) {
             $$self{_GUI}{main}->iconify();
         } else {
             $self->_hideConnectionsList();
@@ -3133,17 +3238,19 @@ sub _launchTerminals {
     }
 
     my $wtmp;
-    scalar(@{ $terminals }) > 1 and $wtmp = _wMessage($$self{_GUI}{main}, "Starting '<b><big>". (scalar(@{ $terminals })) . "</big></b>' terminals...", 0);
+    scalar(@{ $terminals }) > 1 and $wtmp = _wMessage($$self{_GUI}{main}, "Starting <b><big>". (scalar(@{ $terminals })) . "</big></b> terminals...", 0);
     $$self{_NTERMINALS} = scalar(@{ $terminals });
 
     # Create all selected terminals
     foreach my $sel (@{ $terminals }) {
         my $uuid = $$sel[0];
-        if (! defined $$self{_CFG}{'environments'}{$uuid}) {
+        if (!defined $$self{_CFG}{'environments'}{$uuid}) {
             _wMessage($$self{_GUI}{main}, "ERROR: UUID <b>$uuid</b> does not exist in DDBB\nNot starting connection!", 1);
             next;
         } elsif ($$self{_CFG}{'environments'}{$uuid}{_is_group} || ($uuid eq '__PAC__ROOT__')) {
-            _wMessage($$self{_GUI}{main}, "ERROR: UUID <b>$uuid</b> is a GROUP\nNot starting anything!", 1);
+            if ($$self{_VERBOSE}) {
+                print STDERR "DEBUG: Ignoring group [{$uuid} while trying to launch a terminal.\n";
+            }
             next;
         }
         my $pset = $$self{_CFG}{'environments'}{$uuid}{'terminal options'}{'open in tab'} ? 'tab' : 'window';
@@ -3169,13 +3276,16 @@ sub _launchTerminals {
 
     # Start all created terminals
     foreach my $t (@new_terminals) {
-        $$self{_GUI}{_PACTABS}->present if $$t{_TABBED};
-        if (! $t->start($keys_buffer)) {
+        if ($$t{_TABBED} && !$$self{_CMDLINETRAY}) {
+            $$self{_GUI}{_PACTABS}->present();
+        }
+
+        if (!$t->start($keys_buffer)) {
             _wMessage($$self{_GUI}{main}, __("ERROR: Could not start terminal '$$self{_CFG}{environments}{ $$t{_UUID} }{title}':\n$$t{ERROR}"), 1);
             next;
         }
         my $uuid = $$t{_UUID};
-        my $icon = $uuid eq '__PAC_SHELL__' ? Gtk3::Gdk::Pixbuf->new_from_file_at_scale($RES_DIR . '/asbru_shell.png', 16, 16, 0) : $$self{_METHODS}{ $$self{_CFG}{'environments'}{$uuid}{'method'} }{'icon'};
+        my $icon = $uuid eq '__PAC_SHELL__' ? Gtk3::Gdk::Pixbuf->new_from_file_at_scale("$THEME_DIR/asbru_shell.svg", 16, 16, 0) : $$self{_METHODS}{ $$self{_CFG}{'environments'}{$uuid}{'method'} }{'icon'};
         my $name = __($$self{_CFG}{'environments'}{$uuid}{'name'});
         unshift(@{ $$self{_GUI}{treeHistory}{data} }, ({ value => [ $icon, $name, $uuid,  strftime("%H:%M:%S %d-%m-%Y", localtime($FUNCS{_STATS}{statistics}{$uuid}{start})) ] }));
     }
@@ -3185,11 +3295,14 @@ sub _launchTerminals {
     }
 
     if (defined $$self{_GUI} && defined $$self{_GUI}{main}) {
-        $$self{_GUI}{main}->get_window()->set_cursor(Gtk3::Gdk::Cursor->new('left-ptr'));
+        my $window = $$self{_GUI}{main}->get_window();
+        if ($window) {
+            $window->set_cursor(Gtk3::Gdk::Cursor->new('left-ptr'));
+        }
         $$self{_GUI}{main}->set_sensitive(1);
     }
 
-    if ($$self{_CFG}{'defaults'}{'open connections in tabs'} && $$self{_CFG}{'defaults'}{'tabs in main window'}) {
+    if (!$$self{_CMDLINETRAY} && $$self{_CFG}{'defaults'}{'open connections in tabs'} && $$self{_CFG}{'defaults'}{'tabs in main window'}) {
         $self->_showConnectionsList(0);
     }
     if (@new_terminals) {
@@ -3217,11 +3330,11 @@ sub _quitProgram {
         my $string = "Are you sure you want to <b>exit</b> $APPNAME ?";
         $rc and $string .= "\n\n(" . ($rc > 1 ? "there are $rc open terminals" : "there is $rc open terminal")  . ")";
         if ($$self{_CFG}{'defaults'}{'confirm exit'} || $rc) {
-            if (!_wConfirm($$self{_GUI}{main}, $string)) {
+            if (!_wConfirm($$self{_GUI}{main}, $string, 'yes')) {
                 return 1;
             }
         };
-        if ($changed && (! $$self{_CFG}{defaults}{'save on exit'})) {
+        if ($changed && (!$$self{_CFG}{defaults}{'save on exit'})) {
             my $opt = _wYesNoCancel($$self{_GUI}{main}, "<b>Configuration has changed.</b>\n\nSave changes?");
             $save = $opt eq 'yes';
             if ($opt eq 'cancel') {
@@ -3238,11 +3351,7 @@ sub _quitProgram {
     $$self{_GUI}{main}->signal_handler_disconnect($$self{_SIGNALS}{_WINDOWSTATEVENT}) if $$self{_SIGNALS}{_WINDOWSTATEVENT};
 
     # Hide every GUI component has already finished
-    if ($UNITY) {
-        $$self{_TRAY}{_TRAY}->set_passive;
-    } else {
-        $$self{_TRAY}{_TRAY}->set_visible(0);     # Hide tray icon?
-    }
+    $$self{_TRAY}->set_passive();
     $$self{_SCRIPTS}{_WINDOWSCRIPTS}{main}->hide();    # Hide scripts window
     $$self{_CLUSTER}{_WINDOWCLUSTER}{main}->hide();    # Hide clusters window
     $$self{_PCC}{_WINDOWPCC}{main}->hide();    # Hide PCC window
@@ -3250,7 +3359,7 @@ sub _quitProgram {
     $$self{_GUI}{_PACTABS}->hide();    # Hide TABs window
 
     if ($$self{_READONLY}) {
-        Gtk3->main_quit;
+        Gtk3->main_quit();
         return 1;
     }
 
@@ -3264,22 +3373,22 @@ sub _quitProgram {
         }
     }
 
-    Gtk3::main_iteration while Gtk3::events_pending;   # Update GUI
+    Gtk3::main_iteration() while Gtk3::events_pending();   # Update GUI
     # Once everything is hidden, we may last any time in our final I/O
     delete $$self{_CFG}{environments}{'__PAC_SHELL__'};    # Delete PACShell environment
     delete $$self{_CFG}{environments}{'__PAC__QUICK__CONNECT__'}; # Delete quick connect environment
-    $self->_saveTreeExpanded;          # Save Tree opened/closed  groups
-    $self->_saveConfiguration if $save;       # Save config, if applies
+    $self->_saveTreeExpanded();                       # Save Tree opened/closed  groups
+    $self->_saveConfiguration() if $save;             # Save config, if applies
     $$self{_GUI}{statistics}->purge($$self{_CFG});    # Purge trash statistics
-    $$self{_GUI}{statistics}->saveStats;       # Save statistics
+    $$self{_GUI}{statistics}->saveStats();            # Save statistics
     unless (grep(/^--no-backup$/, @{ $$self{_OPTS} })) {
-        $$self{_CONFIG}->_exporter('yaml', $CFG_FILE);   # Export as YAML file
+        $$self{_CONFIG}->_exporter('yaml', $CFG_FILE);        # Export as YAML file
         $$self{_CONFIG}->_exporter('perl', $CFG_FILE_DUMPER); # Export as Perl data
     };
-    chdir(${CFG_DIR}) and system("rm -rf sockets/* tmp/*");  # Delete temporal files
+    chdir(${CFG_DIR}) and system("$ENV{'ASBRU_ENV_FOR_EXTERNAL'} rm -rf sockets/* tmp/*");  # Delete temporal files
 
     # And finish every GUI
-    Gtk3->main_quit;
+    Gtk3->main_quit();
 
     return 1;
 }
@@ -3288,18 +3397,30 @@ sub _saveConfiguration {
     my $self = shift;
     my $cfg = shift // $$self{_CFG};
     my $normal = shift // 1;
+    my %tmp_sessions;
 
+    # Purge screenshots
     _purgeUnusedOrMissingScreenshots($cfg);
+    # Keep a reference to the temporary sessions
+    # (since they will be deleted by _cfgSanityCheck as we don't want to persist those on disk)
+    %tmp_sessions = _cfgGetTmpSessions($cfg);
+    # Cleanup the configuration before saving (sanityu check + remove of temporary sessions)
     _cfgSanityCheck($cfg);
+    # Do not keep passwords in plain text in the configuration
     _cipherCFG($cfg);
+    # Do store the configuration on disk
     nstore($cfg, $CFG_FILE_NFREEZE) or _wMessage($$self{_GUI}{main}, "ERROR: Could not save config file '$CFG_FILE_NFREEZE':\n\n$!");
     if ($R_CFG_FILE) {
         nstore($cfg, $R_CFG_FILE) or _wMessage($$self{_GUI}{main}, "ERROR: Could not save config file '$R_CFG_FILE':\n\n$!\n\nLocal copy saved at '$CFG_FILE_NFREEZE'");
     }
+    # Restore passwords
     _decipherCFG($cfg);
-
-    $self->_saveTreeExpanded;
-    $$self{_GUI}{statistics}->saveStats;
+    # Restore the temporary sessions
+    _cfgAddSessions($cfg, \%tmp_sessions);
+    # Save tree positions
+    $self->_saveTreeExpanded();
+    # Save satistics
+    $$self{_GUI}{statistics}->saveStats();
 
     $normal and $self->_setCFGChanged(0);
 
@@ -3396,7 +3517,7 @@ sub _readConfiguration {
     if ($continue && (! -f "${CFG_FILE}.prev3") && (-f $CFG_FILE)) {
         print STDERR "INFO: Migrating config file to v3...\n";
         PACUtils::_splash(1, "$APPNAME (v$APPVERSION):Migrating config...", ++$PAC_START_PROGRESS, $PAC_START_TOTAL);
-        $$self{_CFG} = _cfgCheckMigrationV3;
+        $$self{_CFG} = _cfgCheckMigrationV3();
         copy($CFG_FILE, "${CFG_FILE}.prev3") or die "ERROR: Could not copy pre v.3 cfg file '$CFG_FILE' to '$CFG_FILE.prev3': $!";
         nstore($$self{_CFG}, $CFG_FILE_NFREEZE) or die"ERROR: Could not save config file '$CFG_FILE_NFREEZE': $!";
         if ($R_CFG_FILE) {
@@ -3406,6 +3527,21 @@ sub _readConfiguration {
     }
     # END of removing
 
+    # Default partial vendor config, but since it is partial, do not set $continue to 0.
+    if ($continue && -f "${VENDOR_CFG_FILE}") {
+        my $temp_cfg;
+        if (! ($temp_cfg = YAML::LoadFile($VENDOR_CFG_FILE))) {
+            print STDERR "WARNING: Could not load vendor config file '$VENDOR_CFG_FILE': $!\n";
+        } else {
+            print STDERR "INFO: Using vendor config file '$VENDOR_CFG_FILE'\n";
+            $$self{_CFG} //= {};
+            foreach my $config (keys %{ $temp_cfg->{'__PAC__EXPORTED__PARTIAL_CONF'} }) {
+                $$self{_CFG}{$config} = $temp_cfg->{'__PAC__EXPORTED__PARTIAL_CONF'}{$config};
+            }
+            print STDERR "INFO: Used vendor config file '$VENDOR_CFG_FILE'\n";
+        }
+    }
+
     if ($R_CFG_FILE && $continue) {
          print STDERR "WARN: No configuration file in (remote) '$CFG_DIR', creating a new one...\n";
     }
@@ -3429,7 +3565,7 @@ sub _loadTreeConfiguration {
 
     @{ $$self{_GUI}{treeConnections}{'data'} } =
     ({
-        value => [ $GROUPICON_ROOT, '<b>AVAILABLE CONNECTIONS</b>', '__PAC__ROOT__' ],
+        value => [ $GROUPICON_ROOT, '<b>My Connections</b>', '__PAC__ROOT__' ],
         children => []
     });
     foreach my $child (keys %{ $$self{_CFG}{environments}{'__PAC__ROOT__'}{children} }) {
@@ -3472,9 +3608,9 @@ sub _saveTreeExpanded {
     my $self = shift;
     my $tree = shift // $$self{_GUI}{treeConnections};
 
-    my $selection = $tree->get_selection;
-    my $modelsort = $tree->get_model;
-    my $model = $modelsort->get_model;
+    my $selection = $tree->get_selection();
+    my $modelsort = $tree->get_model();
+    my $model = $modelsort->get_model();
 
     open(F,">:utf8","$CFG_FILE.tree") or die "ERROR: Could not save Tree Config file '$CFG_FILE.tree': $!";
     $modelsort->foreach(sub {
@@ -3559,6 +3695,10 @@ sub _saveGUIData {
         my ($x, $y) = $$self{_GUI}{main}->get_position();
         my ($w, $h) = $$self{_GUI}{main}->get_size();
         print F $x . ':' . $y . ':' . $w . ':' . $h;
+
+        if ($$self{_VERBOSE}) {
+            print STDERR "DEBUG: Saving window position = ($x, $y) ; window size ($w, $h)\n";
+        }
     }
     print F "\n";
 
@@ -3589,6 +3729,10 @@ sub _loadGUIData {
         ? ('maximized', 'maximized', 'maximized', 'maximized')
         : split(':', $win);
 
+    if ($$self{_VERBOSE}) {
+        print STDERR "DEBUG: Starting window position = ($$self{_GUI}{posx}, $$self{_GUI}{posy}} ; window size ($$self{_GUI}{sw}, $$self{_GUI}{sh})\n";
+    }
+
     # Read connections list width
     my $tree = <F> // '-1';
     chomp $tree;
@@ -3612,13 +3756,13 @@ sub _updateGUIWithUUID {
 
  - To create a New GROUP of Connections:
 
-   1- 'click' over 'AVAILABLE CONNECTIONS' (to create it at root) or any other GROUP
+   1- 'click' over 'My Connections' (to create it at root) or any other GROUP
    2- 'click' on the most left icon over the connections tree (or right-click over selected GROUP)
    3- Follow instructions
 
  - To create a New CONNECTION in a selected Group or at root:
 
-   1- Select the container group to create the new connection into (or 'AVAILABLE CONNECTIONS' to create it at root)
+   1- Select the container group to create the new connection into (or 'My Connections' to create it at root)
    2- 'click' on the second most left icon over the connections tree (or right-click over selected GROUP)
    3- Follow instructions
 
@@ -3634,7 +3778,7 @@ sub _updateGUIWithUUID {
 
     if ($$self{_CFG}{'defaults'}{'show statistics'}) {
         $$self{_GUI}{statistics}->update($uuid, $$self{_CFG});
-        $$self{_GUI}{frameStatistics}->show;
+        $$self{_GUI}{frameStatistics}->show();
     } else {
         $$self{_GUI}{frameStatistics}->hide();
     }
@@ -3649,6 +3793,15 @@ sub _updateGUIWithUUID {
     return 1;
 }
 
+sub _clearLeftMenuTabLabels {
+    my $self = shift;
+
+    $$self{_GUI}{nbTreeTabLabel}->set_text('');
+    $$self{_GUI}{nbFavTabLabel}->set_text('');
+    $$self{_GUI}{nbHistTabLabel}->set_text('');
+    $$self{_GUI}{nbCluTabLabel}->set_text('');
+}
+
 sub _updateGUIPreferences {
     my $self = shift;
 
@@ -3667,14 +3820,13 @@ sub _updateGUIPreferences {
         $$self{_CFG}{'environments'}{$uuid}{'_protected'} and $protected = 1;
     }
 
-    $$self{_GUI}{nbTreeTabLabel}->set_text(' Connections');
-    $$self{_GUI}{nbFavTabLabel}->set_text('');
-    $$self{_GUI}{nbHistTabLabel}->set_text('');
-    $$self{_GUI}{nbCluTabLabel}->set_text('');
-
+    $self->_clearLeftMenuTabLabels();
+    if ($$self{_CFG}{defaults}{'show tree titles'}) {
+        $$self{_GUI}{nbTreeTabLabel}->set_text(' Connections');
+    }
     $$self{_GUI}{connSearch}->set_sensitive(1);
-    $$self{_GUI}{groupAddBtn}->set_sensitive($total eq 1 && ($is_group || $is_root));
-    $$self{_GUI}{connAddBtn}->set_sensitive($total eq 1 && ($is_group || $is_root));
+    $$self{_GUI}{groupAddBtn}->set_sensitive($total eq 1 && ($is_group || $is_root) && !$protected);
+    $$self{_GUI}{connAddBtn}->set_sensitive($total eq 1 && ($is_group || $is_root) && !$protected);
     $$self{_GUI}{connEditBtn}->set_sensitive($total >= 1 && ! $is_root);
     $$self{_GUI}{nodeRenBtn}->set_sensitive($total eq 1 && ! $is_root && ! $protected);
     $$self{_GUI}{nodeDelBtn}->set_sensitive($total >= 1 && ! $is_root && ! $protected);
@@ -3685,7 +3837,7 @@ sub _updateGUIPreferences {
     $$self{_GUI}{connFavourite}->set_sensitive($total >= 1 && ! ($is_root || $is_group));
     $$self{_NO_PROPAGATE_FAV_TOGGLE} = 1;
     $$self{_GUI}{connFavourite}->set_active($total eq 1 && ! ($is_root || $is_group) && $$self{_CFG}{'environments'}{$uuid}{'favourite'});
-    $$self{_GUI}{connFavourite}->set_image(Gtk3::Image->new_from_stock('pac-favourite-' . ($$self{_CFG}{'environments'}{$uuid}{'favourite'} ? 'on' : 'off'), 'button'));
+    $$self{_GUI}{connFavourite}->set_image(Gtk3::Image->new_from_stock('asbru-favourite-' . ($$self{_CFG}{'environments'}{$uuid}{'favourite'} ? 'on' : 'off'), 'button'));
     $$self{_NO_PROPAGATE_FAV_TOGGLE} = 0;
 
     $$self{_GUI}{nb}->set_tab_pos($$self{_CFG}{'defaults'}{'tabs position'});
@@ -3693,13 +3845,9 @@ sub _updateGUIPreferences {
     $$self{_GUI}{scroll1}->set_overlay_scrolling($$self{_CFG}{'defaults'}{'tree overlay scrolling'});
     $$self{_GUI}{descView}->modify_font(Pango::FontDescription::from_string($$self{_CFG}{'defaults'}{'info font'}));
 
-    if ($UNITY) {
-        (! $$self{_GUI}{main}->get_visible || $$self{_CFG}{defaults}{'show tray icon'}) ? $$self{_TRAY}{_TRAY}->set_active() : $$self{_TRAY}{_TRAY}->set_passive();
-    } else {
-        $$self{_TRAY}{_TRAY}->set_visible(! $$self{_GUI}{main}->get_visible || $$self{_CFG}{defaults}{'show tray icon'});
-    }
+    !$$self{_GUI}{main}->get_visible() || $$self{_CFG}{defaults}{'show tray icon'} ? $$self{_TRAY}->set_active() : $$self{_TRAY}->set_passive();
 
-    $$self{_GUI}{lockPACBtn}->set_sensitive($$self{_CFG}{'defaults'}{'use gui password'});
+    $$self{_GUI}{lockApplicationBtn}->set_sensitive($$self{_CFG}{'defaults'}{'use gui password'});
 
     $self->_updateGUIWithUUID($sel_uuids[0]) if $total == 1;
 
@@ -3713,10 +3861,10 @@ sub _updateGUIFavourites {
     my $total = scalar(@sel_uuids);
     my $uuid = $sel_uuids[0];
 
-    $$self{_GUI}{nbTreeTabLabel}->set_text('');
-    $$self{_GUI}{nbFavTabLabel}->set_text(' Favourites');
-    $$self{_GUI}{nbHistTabLabel}->set_text('');
-    $$self{_GUI}{nbCluTabLabel}->set_text('');
+    $self->_clearLeftMenuTabLabels();
+    if ($$self{_CFG}{defaults}{'show tree titles'}) {
+        $$self{_GUI}{nbFavTabLabel}->set_text(' Favourites');
+    }
 
     $$self{_GUI}{connSearch}->set_sensitive(0);
     $$self{_GUI}{groupAddBtn}->set_sensitive(0);
@@ -3731,7 +3879,7 @@ sub _updateGUIFavourites {
     $$self{_GUI}{connFavourite}->set_sensitive(1 && $uuid ne '__PAC__ROOT__');
     $$self{_NO_PROPAGATE_FAV_TOGGLE} = 1;
     $$self{_GUI}{connFavourite}->set_active($uuid ne '__PAC__ROOT__');
-    $$self{_GUI}{connFavourite}->set_image(Gtk3::Image->new_from_stock('pac-favourite-on', 'button'));
+    $$self{_GUI}{connFavourite}->set_image(Gtk3::Image->new_from_stock('asbru-favourite-on', 'button'));
     $$self{_NO_PROPAGATE_FAV_TOGGLE} = 0;
 
     if ($total == 1) {
@@ -3748,11 +3896,10 @@ sub _updateGUIHistory {
     my $total = scalar(@sel_uuids);
     my $uuid = $sel_uuids[0];
 
-    $$self{_GUI}{nbTreeTabLabel}->set_text('');
-    $$self{_GUI}{nbFavTabLabel}->set_text('');
-    $$self{_GUI}{nbHistTabLabel}->set_text(' History');
-    $$self{_GUI}{nbCluTabLabel}->set_text('');
-
+    $self->_clearLeftMenuTabLabels();
+    if ($$self{_CFG}{defaults}{'show tree titles'}) {
+        $$self{_GUI}{nbHistTabLabel}->set_text(' History');
+    }
     $$self{_GUI}{connSearch}->set_sensitive(0);
     $$self{_GUI}{groupAddBtn}->set_sensitive(0);
     $$self{_GUI}{connAddBtn}->set_sensitive(0);
@@ -3766,7 +3913,7 @@ sub _updateGUIHistory {
     $$self{_GUI}{connFavourite}->set_sensitive(0);
     $$self{_NO_PROPAGATE_FAV_TOGGLE} = 1;
     $$self{_GUI}{connFavourite}->set_active($$self{_CFG}{'environments'}{$uuid}{'favourite'});
-    $$self{_GUI}{connFavourite}->set_image(Gtk3::Image->new_from_stock('pac-favourite-' . ($$self{_CFG}{'environments'}{$uuid}{'favourite'} ? 'on' : 'off'), 'button'));
+    $$self{_GUI}{connFavourite}->set_image(Gtk3::Image->new_from_stock('asbru-favourite-' . ($$self{_CFG}{'environments'}{$uuid}{'favourite'} ? 'on' : 'off'), 'button'));
     $$self{_NO_PROPAGATE_FAV_TOGGLE} = 0;
 
     $self->_updateGUIWithUUID($sel_uuids[0]) if $total == 1;
@@ -3777,15 +3924,14 @@ sub _updateGUIHistory {
 sub _updateGUIClusters {
     my $self = shift;
 
-    my @sel_uuids = $$self{_GUI}{treeClusters}->_getSelectedNames;
+    my @sel_uuids = $$self{_GUI}{treeClusters}->_getSelectedNames();
     my $total = scalar(@sel_uuids);
     my $uuid = $sel_uuids[0];
 
-    $$self{_GUI}{nbTreeTabLabel}->set_text('');
-    $$self{_GUI}{nbFavTabLabel}->set_text('');
-    $$self{_GUI}{nbHistTabLabel}->set_text('');
-    $$self{_GUI}{nbCluTabLabel}->set_text(' Clusters');
-
+    $self->_clearLeftMenuTabLabels();
+    if ($$self{_CFG}{defaults}{'show tree titles'}) {
+        $$self{_GUI}{nbCluTabLabel}->set_text(' Clusters');
+    }
     $$self{_GUI}{connSearch}->set_sensitive(0);
     $$self{_GUI}{groupAddBtn}->set_sensitive(0);
     $$self{_GUI}{connAddBtn}->set_sensitive(0);
@@ -3813,7 +3959,7 @@ sub _updateClustersList {
     foreach my $ac (sort { $a cmp $b } keys %{ $$self{_CFG}{defaults}{'auto cluster'} }) {
         push(@{ $$self{_GUI}{treeClusters}{data} }, ({ value => [ $AUTOCLUSTERICON, $ac ]}));
     }
-    foreach my $cluster (sort { $a cmp $b } keys %{ $$self{_CLUSTER}->getCFGClusters }) {
+    foreach my $cluster (sort { $a cmp $b } keys %{ $$self{_CLUSTER}->getCFGClusters() }) {
         push(@{ $$self{_GUI}{treeClusters}{data} }, ({ value => [ $CLUSTERICON, $cluster ]}));
     }
 
@@ -3876,13 +4022,32 @@ sub _delNodes {
 
 sub _showConnectionsList {
     my $self = shift;
-    my $move = shift // 1;
+    my $force = shift // 1;
+
+    if ($force) {
+        # Force hidden state so that the show operation is properly handled
+        # (otherwise the window may remain in the 'scratchpad' / 'withdrawn' state, as with i3wm)
+        $$self{_GUI}{main}->hide();
+        $$self{_GUI}{main}->show();
+    }
+
+    # Ensure compact panel is shown (could still be hidden if started iconified)
+    if ($$self{_CFG}{'defaults'}{'layout'} eq 'Compact') {
+        $$self{_GUI}{vboxCommandPanel}->show_all();
+        $$self{_GUI}{hpane}->show();
+    }
+
+    # The first first display when started iconified must be a show_all
+    if ($$self{_CMDLINETRAY} == 1) {
+        $$self{_GUI}{main}->show_all();
+        $$self{_CMDLINETRAY} = 2;
+    }
 
-    $$self{_GUI}{main}->show;
-    #$$self{_GUI}{main}->present_with_time(time);
-    $$self{_GUI}{main}->present;
 
-    if ($move) {
+    # Do show the main window
+    $$self{_GUI}{main}->present();
+
+    if ($force) {
         $$self{_GUI}{main}->move($$self{_GUI}{posx} // 0, $$self{_GUI}{posy} // 0);
     }
 }
@@ -3890,13 +4055,50 @@ sub _showConnectionsList {
 sub _hideConnectionsList {
     my $self = shift;
 
-    ($$self{_GUI}{posx}, $$self{_GUI}{posy}) = $$self{_GUI}{main}->get_position();
+    if ($$self{_GUI}{main}->get_visible()) {
+        my ($x, $y) = $$self{_GUI}{main}->get_position();
+        if ($x > 0 || $y > 0) {
+            ($$self{_GUI}{posx}, $$self{_GUI}{posy}) = ($x, $y);
+        }
+    }
+
     $$self{_GUI}{main}->hide();
 }
 
 sub _toggleConnectionsList {
     my $self = shift;
-    $$self{_GUI}{showConnBtn}->set_active(! $$self{_GUI}{showConnBtn}->get_active());
+    $$self{_GUI}{showConnBtn}->set_active(!$$self{_GUI}{showConnBtn}->get_active());
+}
+
+sub _doToggleDisplayConnectionsList {
+    my $self = shift;
+
+    if ($$self{_CFG}{'defaults'}{'layout'} eq 'Compact') {
+        if ($$self{_GUI}{showConnBtn}->get_active()) {
+            $PACMain::FUNCS{_MAIN}->_showConnectionsList();
+        } else {
+            $PACMain::FUNCS{_MAIN}->_hideConnectionsList();
+        }
+    } else {
+        if ($$self{_GUI}{showConnBtn}->get_active()) {
+            $$self{_GUI}{vboxCommandPanel}->show();
+        } else {
+            $$self{_GUI}{vboxCommandPanel}->hide();
+        }
+        if ($$self{_GUI}{showConnBtn}->get_active()) {
+            # Remeber that no VTE has te focus anymore
+            $$self{_HAS_FOCUS} = '';
+            # Get the currently displayed tray and move keyboard focus to it
+            my $tree = $self->_getCurrentTree();
+            if ($tree) {
+                $tree->grab_focus();
+            }
+        } else {
+            # Look for the current tab page and move keyboard focus to it
+            my $pnum = $$self{_GUI}{nb}->get_current_page();
+            $self->_doFocusPage($pnum);
+        }
+    }
 }
 
 sub _copyNodes {
@@ -3905,6 +4107,7 @@ sub _copyNodes {
     my $parent = shift // '__PAC__COPY__';
     my $sel_uuids = shift // [ $$self{_GUI}{treeConnections}->_getSelectedUUIDs() ];
 
+    $LAST_COPIED_NODES = [@{ $sel_uuids }];
     # Empty the copy-vault
     $$self{_COPY}{'data'} = {};
     $$self{_COPY}{'cut'} = $cut;
@@ -3926,16 +4129,37 @@ sub _cutNodes {
     my @sel_uuids = $$self{_GUI}{treeConnections}->_getSelectedUUIDs();
     my $total = scalar(@sel_uuids);
 
-    if (!$total || ($sel_uuids[0] eq '__PAC__ROOT__')) {
+    if (!$total) {
+        print("ERROR: Nothing to cut\n");
+        return 1;
+    }
+    if ($sel_uuids[0] eq '__PAC__ROOT__') {
+        print("ERROR: Cannot cut the root node\n");
         return 1;
     }
     if ($self->_hasProtectedChildren(\@sel_uuids)) {
-        return _wMessage(undef, "Can not CUT selection:\nThere are <b>'Protected'</b> nodes selected");
+        return _wMessage($$self{_GUI}{main}, "Cannot cut selection.\n\nThere are <b>protected</b> nodes selected.");
+    }
+
+    # Check that the cut node is not protected
+    if ($$self{_CFG}{'environments'}{$sel_uuids[0]}{'_is_group'} && $$self{_CFG}{'environments'}{$sel_uuids[0]}{'_protected'}) {
+        print("ERROR: Cannot cut a protected folder [$$self{_CFG}{'environments'}{$sel_uuids[0]}{name}]\n");
+        return _wMessage($$self{_GUI}{main}, "Cannot cut a protected folder:\n\n\t<b>$$self{_CFG}{'environments'}{$sel_uuids[0]}{name}</b>");
+    }
+
+    # Check that parent node is not protected
+    foreach my $uuid (@sel_uuids) {
+        my $parent =  $$self{_CFG}{'environments'}{$uuid}{'parent'};
+        if ($$self{_CFG}{'environments'}{$parent}{'_is_group'} && $$self{_CFG}{'environments'}{$parent}{'_protected'}) {
+            print("ERROR: Cannot cut from a protected folder [$$self{_CFG}{'environments'}{$parent}{name}]\n");
+            return _wMessage($$self{_GUI}{main}, "Cannot cut from a protected folder:\n\n\t<b>$$self{_CFG}{'environments'}{$parent}{name}</b>");
+        }
     }
 
     # Copy the selected nodes
-    $self->_copyNodes('cut');
+    $self->_copyNodes('cut', '__PAC__COPY__', \@sel_uuids);
     if (! scalar(keys %{ $$self{_COPY}{'data'} })) {
+        print("ERROR: Failed to copy-cut selected data\n");
         return 1;
     }
 
@@ -3947,7 +4171,6 @@ sub _cutNodes {
     # Delete selected nodes from the configuration
     $self->_delNodes(@sel_uuids);
 
-    #$$self{_CFG}{tmp}{changed} = 1;
     $self->_setCFGChanged(1);
     return 1;
 };
@@ -3959,12 +4182,19 @@ sub _pasteNodes {
     my $first = shift // 1;
 
     if (!scalar(keys %{ $$self{_COPY}{'data'} })) {
+        print("ERROR: No data to copy...\n");
         return 1;
     }
-    if ((!$$self{_CFG}{'environments'}{$parent}{'_is_group'}) && ($parent ne '__PAC__ROOT__')) {
+    if (!$$self{_CFG}{'environments'}{$parent}{'_is_group'} && $parent ne '__PAC__ROOT__') {
+        print("ERROR: Cannot paste outside of root parent\n");
         return 1;
     }
 
+    if ($$self{_CFG}{'environments'}{$parent}{'_is_group'} && $$self{_CFG}{'environments'}{$parent}{'_protected'}) {
+        print("ERROR: Cannot paste into a protected folder [$$self{_CFG}{'environments'}{$parent}{name}]\n");
+        return _wMessage($$self{_GUI}{main}, "Cannot paste into a protected folder:\n\n\t<b>$$self{_CFG}{'environments'}{$parent}{name}</b>");
+    }
+
     if ($parent ne $$self{_COPY}{'data'}{$uuid}{'original_parent'}) {
         # If paste is under different parent, remove copy message, it is not necessary
         $$self{_COPY}{'data'}{$uuid}{'name'} =~ s/ - copy//;
@@ -3976,6 +4206,8 @@ sub _pasteNodes {
     $$self{_CFG}{'environments'}{$uuid} = $$self{_COPY}{'data'}{$uuid};
     $$self{_CFG}{'environments'}{$uuid}{'parent'} = $parent;
     $$self{_CFG}{'environments'}{$parent}{'children'}{$uuid} = 1;
+    # DevNote: a pasted folder cannot be protected otherwise recursiveness will likely fail
+    $$self{_CFG}{'environments'}{$uuid}{'_protected'} = $$self{_CFG}{'environments'}{$uuid}{'_protected'} && !$$self{_CFG}{'environments'}{$uuid}{'_is_group'};
 
     # Add new node to Connections Tree
     $$self{_GUI}{treeConnections}->_addNode(
@@ -3992,11 +4224,10 @@ sub _pasteNodes {
         delete $$self{_COPY}{'data'}{$uuid};
     }
 
-    if ($first and $UNITY) {
-        $FUNCS{_TRAY}->_setTrayMenu;
+    if ($first) {
+        $FUNCS{_TRAY}->set_tray_menu();
     }
 
-    #$$self{_CFG}{tmp}{changed} = 1;
     $self->_setCFGChanged(1);
     return 1;
 };
@@ -4009,7 +4240,7 @@ sub __dupNodes {
     my $cut = shift // '0';
 
     # Generate a new UUID for the copied element
-    my $new_uuid = OSSP::uuid->new; $new_uuid->make("v4");
+    my $new_uuid = OSSP::uuid->new(); $new_uuid->make("v4");
     my $new_txt_uuid = $new_uuid->export("str");
     undef $new_uuid;
 
@@ -4023,6 +4254,8 @@ sub __dupNodes {
         $$cfg{$new_txt_uuid}{'name'} = "$$self{_CFG}{'environments'}{$uuid}{'name'} - copy";
     }
     $$cfg{$parent}{'children'}{$new_txt_uuid} = 1;
+    $$cfg{$new_txt_uuid}{'cluster'} = [];
+    $$cfg{$new_txt_uuid}{'_protected'} = 0;
 
     # Delete screenshots and statistics on duplicated node
     $$cfg{$new_txt_uuid}{'screenshots'} = ();
@@ -4038,6 +4271,31 @@ sub __dupNodes {
     return $cfg;
 }
 
+sub _cloneNodes {
+    my $self = shift;
+    my @sel = $$self{_GUI}{treeConnections}->_getSelectedUUIDs();
+    if (scalar(@sel) != 1) {
+        # We can only clone a single selection
+        return;
+    }
+
+    # The parent node
+    my $parent_uuid = $$self{_CFG}{'environments'}{$sel[0]}{'parent'};
+
+    # Prevent cloning into a protected folder
+    if (!defined($parent_uuid) || $$self{_CFG}{'environments'}{$parent_uuid}{_protected}) {
+        print("ERROR: " . (defined($parent_uuid) ? "Cannot duplicate into a protected folder [$$self{_CFG}{'environments'}{$parent_uuid}{name}]\n" : "Cannot duplicate the root folder.\n"));
+        return _wMessage($$self{_GUI}{main}, (defined($parent_uuid) ? "Cannot duplicate into a protected folder:\n\n\t<b>$$self{_CFG}{'environments'}{$parent_uuid}{name}</b>" : "Cannot duplicate the root folder."));
+    }
+
+    # Actually perform cloning
+    $self->_copyNodes();
+    foreach my $child (keys %{ $$self{_COPY}{'data'}{'__PAC__COPY__'}{'children'} }) {
+        $self->_pasteNodes($parent_uuid, $child);
+    };
+    $$self{_COPY}{'data'} = {};
+}
+
 sub __exportNodes {
     my $self = shift;
     my $sel = shift // [ $$self{_GUI}{treeConnections}->_getSelectedUUIDs() ];
@@ -4057,10 +4315,10 @@ sub __exportNodes {
     );
     $choose->set_do_overwrite_confirmation(1);
     $choose->set_current_folder($ENV{'HOME'} // '/tmp');
-    $choose->set_current_name("pac_export.yml");
+    $choose->set_current_name("asbru_export.yml");
 
-    my $out = $choose->run;
-    my $file = $choose->get_filename;
+    my $out = $choose->run();
+    my $file = $choose->get_filename();
     $file =~ /^(.+)\.yml$/ or $file .= '.yml';
     $choose->destroy();
 
@@ -4068,8 +4326,8 @@ sub __exportNodes {
         return 1;
     }
 
-    my $w = _wMessage($$self{_WINDOWCONFIG}, "Please, wait while file '$file' is being exported...", 0);
-    Gtk3::main_iteration while Gtk3::events_pending;
+    my $w = _wMessage($$self{_WINDOWCONFIG}, "Please, wait while file <b>$file</b> is being exported...", 0);
+    Gtk3::main_iteration() while Gtk3::events_pending();
 
     # Make a backup of the original CFG
     my $backup_cfg = dclone($$self{_CFG}{'environments'});
@@ -4096,7 +4354,7 @@ sub __exportNodes {
         _wMessage($$self{_WINDOWCONFIG}, "Connection(s) succesfully exported to:\n\n$file");
     } else {
         $w->destroy();
-        _wMessage($$self{_WINDOWCONFIG}, "ERROR: Could not export connection(s) to file '$file':\n\n$!");
+        _wMessage($$self{_WINDOWCONFIG}, "ERROR: Could not export connection(s) to file <b>$file</b>:\n\n$!");
     }
 
     return 1;
@@ -4119,31 +4377,31 @@ sub __importNodes {
     );
     $choose->set_do_overwrite_confirmation(1);
     $choose->set_current_folder($ENV{'HOME'} // '/tmp');
-    my $filter = Gtk3::FileFilter->new;
+    my $filter = Gtk3::FileFilter->new();
     $filter->set_name('YAML Files');
     $filter->add_pattern('*.yml');
     $choose->add_filter($filter);
 
-    my $out = $choose->run;
-    my $file = $choose->get_filename;
+    my $out = $choose->run();
+    my $file = $choose->get_filename();
     $choose->destroy();
     if (($out ne 'accept') || (!-f $file) || ($file !~ /^(.+)\.yml$/go)) {
         return 1;
     }
 
-    my $w = _wMessage($$self{_GUI}{main}, "Please, wait while file '$file' is being imported...", 0);
-    Gtk3::main_iteration while Gtk3::events_pending;
+    my $w = _wMessage($$self{_GUI}{main}, "Please, wait while file <b>$file</b> is being imported...", 0);
+    Gtk3::main_iteration() while Gtk3::events_pending();
 
     require YAML;
-    Gtk3::main_iteration while Gtk3::events_pending;
+    Gtk3::main_iteration() while Gtk3::events_pending();
     eval { $$self{_COPY}{'data'} = YAML::LoadFile($file); };
     if ($@) {
         $w->destroy();
-        _wMessage($$self{_WINDOWCONFIG}, "ERROR: Could not import connection from file '$file':\n\n$@");
+        _wMessage($$self{_WINDOWCONFIG}, "ERROR: Could not import connection from file <b>$file</b>:\n\n$@");
         return 1;
     }
 
-    Gtk3::main_iteration while Gtk3::events_pending;
+    Gtk3::main_iteration() while Gtk3::events_pending();
 
     # Full export file? (including config!)
     if (defined $$self{_COPY}{'data'}{'__PAC__EXPORTED__FULL__'}) {
@@ -4153,13 +4411,13 @@ sub __importNodes {
             return 1;
         }
 
-        Gtk3::main_iteration while Gtk3::events_pending;
+        Gtk3::main_iteration() while Gtk3::events_pending();
         @{ $$self{_GUI}{treeConnections}{'data'} } = ();
         @{ $$self{_GUI}{treeConnections}{'data'} } = ({
-            value => [ $GROUPICON_ROOT, '<b>AVAILABLE CONNECTIONS</b>', '__PAC__ROOT__' ],
+            value => [ $GROUPICON_ROOT, '<b>My Connections</b>', '__PAC__ROOT__' ],
             children => []
         });
-        Gtk3::main_iteration while Gtk3::events_pending;
+        Gtk3::main_iteration() while Gtk3::events_pending();
 
         copy($file, $CFG_FILE) and unlink $CFG_FILE_NFREEZE;
         delete $$self{_CFG};
@@ -4170,16 +4428,22 @@ sub __importNodes {
         $self->_setCFGChanged(1);
         delete $$self{_CFG}{'__PAC__EXPORTED__'};
         delete $$self{_CFG}{'__PAC__EXPORTED__FULL__'};
-        _wMessage($$self{_WINDOWCONFIG}, "File '$file' succesfully imported.\n now <b>restarting</b> (wait 3 seconds...)", 0);
-        system("(sleep 3; $0) &");
-        sleep 2;
-        exit 0;
+        _wMessage($$self{_WINDOWCONFIG}, "File <b>$file</b> succesfully imported.\n now <b>restarting</b>!", 0);
+        sleep 1;
+        Gtk3::main_iteration() while Gtk3::events_pending();
+        sleep 1;
+        Gtk3::main_iteration() while Gtk3::events_pending();
+        sleep 1;
+        Gtk3::main_iteration() while Gtk3::events_pending();
+        print STDERR "[DEBUG] Restarting using executable '$^X' with arg '$0'";
+        exec($^X, $0) or print STDERR "[ERROR] Couldn't exec {$^X} $0: $!";
+        exit 1;
 
     # Bad export file
     } elsif (! defined $$self{_COPY}{'data'}{'__PAC__EXPORTED__'}) {
         delete $$self{_COPY}{'data'}{'children'};
         $w->destroy();
-        _wMessage($$self{_WINDOWCONFIG}, "File '$file' does not look like a valid exported connection!");
+        _wMessage($$self{_WINDOWCONFIG}, "File <b>$file</b> does not look like a valid exported connection!");
         return 1;
 
     # Correct partial export file
@@ -4192,15 +4456,13 @@ sub __importNodes {
         $$self{_COPY}{'data'} = {};
         _decipherCFG($$self{_CFG});
         $w->destroy();
-        _wMessage($$self{_WINDOWCONFIG}, "File '<b>$file</b>' succesfully imported:\n<b>$i</b> element(s) added");
+        _wMessage($$self{_WINDOWCONFIG}, "File <b>$file</b> succesfully imported:\n<b>$i</b> element(s) added");
         delete $$self{_CFG}{'__PAC__EXPORTED__'};
         delete $$self{_CFG}{'__PAC__EXPORTED__FULL__'};
         $self->_setCFGChanged(1);
     }
 
-    if ($UNITY) {
-        $FUNCS{_TRAY}->_setTrayMenu;
-    }
+    $FUNCS{_TRAY}->set_tray_menu();
 
     return 1;
 }
@@ -4242,15 +4504,15 @@ sub _bulkEdit {
     $w{gui}{imgUP} = Gtk3::Image-> new_from_stock('gtk-edit', 'dialog');
     $w{gui}{hboxIconLabel}->pack_start($w{gui}{imgUP}, 0, 1, 0);
 
-    $w{gui}{lblUP} = Gtk3::Label->new;
+    $w{gui}{lblUP} = Gtk3::Label->new();
     $w{gui}{lblUP}->set_markup($label);
     $w{gui}{hboxIconLabel}->pack_start($w{gui}{lblUP}, 0, 1, 0);
 
     $w{data}->get_content_area->pack_start(Gtk3::HSeparator->new, 0, 1, 0);
 
     #$w{gui}{frameAffect} = Gtk3::Frame->new(' There are GROUP(S) in the selection. Apply to: ');
-    $w{gui}{frameAffect} = Gtk3::Frame->new;
-    my $lblaffect = Gtk3::Label->new;
+    $w{gui}{frameAffect} = Gtk3::Frame->new();
+    my $lblaffect = Gtk3::Label->new();
     $lblaffect->set_markup(' There are <b>GROUP(S)</b> in the selection. Apply to: ');
     $w{gui}{frameAffect}->set_label_widget($lblaffect);
     $w{data}->get_content_area->pack_start($w{gui}{frameAffect}, 0, 1, 0);
@@ -4267,8 +4529,8 @@ sub _bulkEdit {
     $w{gui}{vboxlist} = Gtk3::VBox->new(0, 0);
     $w{data}->get_content_area->pack_start($w{gui}{vboxlist}, 1, 1, 0);
 
-    $w{gui}{framecommon} = Gtk3::Frame->new;
-    my $lblcom = Gtk3::Label->new;
+    $w{gui}{framecommon} = Gtk3::Frame->new();
+    my $lblcom = Gtk3::Label->new();
     $lblcom->set_markup(' <b><span foreground="orange">COMMON</span></b> entries: ');
     $w{gui}{framecommon}->set_label_widget($lblcom);
     $w{data}->get_content_area->pack_start($w{gui}{framecommon}, 0, 1, 0);
@@ -4290,14 +4552,14 @@ sub _bulkEdit {
 
         $w{gui}{"hboxre$key"}->pack_start(Gtk3::Label->new('change '), 0, 1, 0);
 
-        $w{gui}{"entryWhat$key"} = Gtk3::Entry->new;
+        $w{gui}{"entryWhat$key"} = Gtk3::Entry->new();
         $w{gui}{"hboxre$key"}->pack_start($w{gui}{"entryWhat$key"}, 1, 1, 0);
         $w{gui}{"entryWhat$key"}->set_activates_default(1);
         $w{gui}{"entryWhat$key"}->hide();
 
         $w{gui}{"hboxre$key"}->pack_start(Gtk3::Label->new(' with '), 0, 1, 0);
 
-        $w{gui}{"entry$key"} = Gtk3::Entry->new;
+        $w{gui}{"entry$key"} = Gtk3::Entry->new();
         $w{gui}{"hb$key"}->pack_start($w{gui}{"entry$key"}, 1, 1, 0);
         $w{gui}{"entry$key"}->set_activates_default(1);
 
@@ -4312,7 +4574,7 @@ sub _bulkEdit {
         # And setup some signals
         $w{gui}{"entry$key"}->signal_connect('changed', sub { $w{gui}{"cb$key"}->set_active($w{gui}{"entry$key"}->get_chars(0, -1) ne ''); });
         $w{gui}{"cb$key"}->signal_connect('toggled', sub { $w{gui}{"image$key"}->set_from_stock(($w{gui}{"cb$key"}->get_active() ? 'gtk-ok' : 'gtk-edit'), 'button'); });
-        $w{gui}{"cbRE$key"}->signal_connect('toggled', sub { $w{gui}{"cbRE$key"}->get_active() ? $w{gui}{"hboxre$key"}->show : $w{gui}{"hboxre$key"}->hide(); });
+        $w{gui}{"cbRE$key"}->signal_connect('toggled', sub { $w{gui}{"cbRE$key"}->get_active() ? $w{gui}{"hboxre$key"}->show() : $w{gui}{"hboxre$key"}->hide(); });
 
         # Asign a callback to populate this entry with its own context menu
         $w{gui}{"entry$key"}->signal_connect('button_press_event' => sub {
@@ -4338,6 +4600,10 @@ sub _bulkEdit {
                 # Populate with environment variables
                 my @environment_menu;
                 foreach my $key (sort { $a cmp $b } keys %ENV) {
+                    # Do not offer Master Password, or any other environment variable with word PRIVATE, TOKEN
+                    if ($key =~ /KPXC|PRIVATE|TOKEN/i) {
+                        next;
+                    }
                     my $value = $ENV{$key};
                     push(@environment_menu, {
                         label => "<ENV:$key>",
@@ -4378,47 +4644,6 @@ sub _bulkEdit {
                         $w{gui}{"entry$key"}->select_region($pos + 5, $pos + 22);
                     }
                 });
-                # Populate with <KPX_(title|username|url):*> special string
-                if ($PACMain::FUNCS{_MAIN}{_CFG}{'defaults'}{'keepass'}{'use_keepass'}) {
-                    my (@titles, @usernames, @urls);
-                    foreach my $hash ($PACMain::FUNCS{_KEEPASS}->find) {
-                        push(@titles, {
-                            label => "<KPX_title:$$hash{title}>",
-                            tooltip => "$$hash{password}",
-                            code => sub { $w{gui}{"entry$key"}->insert_text("<KPX_title:$$hash{title}>", -1, $w{gui}{"entry$key"}->get_position()); }
-                        });
-                        push(@usernames, {
-                            label => "<KPX_username:$$hash{username}>",
-                            tooltip => "$$hash{password}",
-                            code => sub { $w{gui}{"entry$key"}->insert_text("<KPX_username:$$hash{username}>", -1, $w{gui}{"entry$key"}->get_position()); }
-                        });
-                        push(@urls, {
-                            label => "<KPX_url:$$hash{url}>",
-                            tooltip => "$$hash{password}",
-                            code => sub { $w{gui}{"entry$key"}->insert_text("<KPX_url:$$hash{url}>", -1, $w{gui}{"entry$key"}->get_position()); }
-                        });
-                    }
-                    push(@menu_items, {
-                        label => 'KeePassX',
-                        stockicon => 'pac-keepass',
-                        submenu => [
-                            {
-                                label => 'KeePassX title values',
-                                submenu => \@titles
-                            }, {
-                                label => 'KeePassX username values',
-                                submenu => \@usernames
-                            }, {
-                                label => 'KeePassX URL values',
-                                submenu => \@urls
-                            }, {
-                                label => "KeePass Extended Query",
-                                tooltip => "This allows you to select the value to be returned, based on another value's match againt a Perl Regular Expression",
-                                code => sub { $w{gui}{"entry$key"}->insert_text("<KPXRE_GET_(title|username|password|url)_WHERE_(title|username|password|url)==Your_RegExp_here==>", -1, $w{gui}{"entry$key"}->get_position()); }
-                            }
-                        ]
-                    });
-                }
 
                 _wPopUpMenu(\@menu_items, $event);
 
@@ -4426,8 +4651,8 @@ sub _bulkEdit {
         });
     }
 
-    $w{gui}{frameExpect} = Gtk3::Frame->new;
-    my $lblexp = Gtk3::Label->new;
+    $w{gui}{frameExpect} = Gtk3::Frame->new();
+    my $lblexp = Gtk3::Label->new();
     $lblexp->set_markup(' <b><span foreground="orange">EXPECT</span></b> entries: ');
     $w{gui}{frameExpect}->set_label_widget($lblexp);
     $w{data}->get_content_area->pack_start($w{gui}{frameExpect}, 0, 1, 0);
@@ -4449,14 +4674,14 @@ sub _bulkEdit {
 
         $w{gui}{"hboxre$key"}->pack_start(Gtk3::Label->new('change '), 0, 1, 0);
 
-        $w{gui}{"entryWhat$key"} = Gtk3::Entry->new;
+        $w{gui}{"entryWhat$key"} = Gtk3::Entry->new();
         $w{gui}{"hboxre$key"}->pack_start($w{gui}{"entryWhat$key"}, 1, 1, 0);
         $w{gui}{"entryWhat$key"}->set_activates_default(1);
         $w{gui}{"entryWhat$key"}->hide();
 
         $w{gui}{"hboxre$key"}->pack_start(Gtk3::Label->new(' with '), 0, 1, 0);
 
-        $w{gui}{"entry$key"} = Gtk3::Entry->new;
+        $w{gui}{"entry$key"} = Gtk3::Entry->new();
         $w{gui}{"hb$key"}->pack_start($w{gui}{"entry$key"}, 1, 1, 0);
         $w{gui}{"entry$key"}->set_activates_default(1);
 
@@ -4471,7 +4696,7 @@ sub _bulkEdit {
         # And setup some signals
         $w{gui}{"entry$key"}->signal_connect('changed', sub { $w{gui}{"cb$key"}->set_active($w{gui}{"entry$key"}->get_chars(0, -1) ne ''); });
         $w{gui}{"cb$key"}->signal_connect('toggled', sub { $w{gui}{"image$key"}->set_from_stock(($w{gui}{"cb$key"}->get_active() ? 'gtk-ok' : 'gtk-edit'), 'button'); });
-        $w{gui}{"cbRE$key"}->signal_connect('toggled', sub { $w{gui}{"cbRE$key"}->get_active() ? $w{gui}{"hboxre$key"}->show : $w{gui}{"hboxre$key"}->hide(); });
+        $w{gui}{"cbRE$key"}->signal_connect('toggled', sub { $w{gui}{"cbRE$key"}->get_active() ? $w{gui}{"hboxre$key"}->show() : $w{gui}{"hboxre$key"}->hide(); });
 
         # Asign a callback to populate this entry with its own context menu
         $w{gui}{"entry$key"}->signal_connect('button_press_event' => sub {
@@ -4498,6 +4723,10 @@ sub _bulkEdit {
             # Populate with environment variables
             my @environment_menu;
             foreach my $key (sort { $a cmp $b } keys %ENV) {
+                # Do not offer Master Password, or any other environment variable with word PRIVATE, TOKEN
+                if ($key =~ /KPXC|PRIVATE|TOKEN/i) {
+                    next;
+                }
                 my $value = $ENV{$key};
                 push(@environment_menu, {
                     label => "<ENV:$key>",
@@ -4542,49 +4771,6 @@ sub _bulkEdit {
                 }
             });
 
-            # Populate with <KPX_(title|username|url):*> special string
-            if ($PACMain::FUNCS{_MAIN}{_CFG}{'defaults'}{'keepass'}{'use_keepass'}) {
-                my (@titles, @usernames, @urls);
-                foreach my $hash ($PACMain::FUNCS{_KEEPASS}->find) {
-                    push(@titles, {
-                        label => "<KPX_title:$$hash{title}>",
-                        tooltip => "$$hash{password}",
-                        code => sub { $w{gui}{"entry$key"}->insert_text("<KPX_title:$$hash{title}>", -1, $w{gui}{"entry$key"}->get_position()); }
-                    });
-                    push(@usernames, {
-                        label => "<KPX_username:$$hash{username}>",
-                        tooltip => "$$hash{password}",
-                        code => sub { $w{gui}{"entry$key"}->insert_text("<KPX_username:$$hash{username}>", -1, $w{gui}{"entry$key"}->get_position()); }
-                    });
-                    push(@urls, {
-                        label => "<KPX_url:$$hash{url}>",
-                        tooltip => "$$hash{password}",
-                        code => sub { $w{gui}{"entry$key"}->insert_text("<KPX_url:$$hash{url}>", -1, $w{gui}{"entry$key"}->get_position()); }
-                    });
-                }
-
-                push(@menu_items, {
-                    label => 'KeePassX',
-                    stockicon => 'pac-keepass',
-                    submenu => [
-                        {
-                            label => 'KeePassX title values',
-                            submenu => \@titles
-                        }, {
-                            label => 'KeePassX username values',
-                            submenu => \@usernames
-                        }, {
-                            label => 'KeePassX URL values',
-                            submenu => \@urls
-                        }, {
-                            label => "KeePass Extended Query",
-                            tooltip => "This allows you to select the value to be returned, based on another value's match againt a Perl Regular Expression",
-                            code => sub { $w{gui}{"entry$key"}->insert_text("<KPXRE_GET_(title|username|password|url)_WHERE_(title|username|password|url)==Your_RegExp_here==>", -1, $w{gui}{"entry$key"}->get_position()); }
-                        }
-                    ]
-                });
-            }
-
             _wPopUpMenu(\@menu_items, $event);
 
             return 1;
@@ -4665,7 +4851,7 @@ sub _setSafeLayoutOptions {
         # This layout to work implies some configuration settings to work correctly
         $$self{_CFG}{'defaults'}{'tabs in main window'} = 0;
         $$self{_CFG}{'defaults'}{'auto hide connections list'} = 0;
-        if ($ENV{'ASBRU_DESKTOP'} eq 'gnome-shell') {
+        if (!$STRAY) {
             $$self{_CFG}{'defaults'}{'start iconified'} = 0;
         } else {
             $$self{_CFG}{'defaults'}{'close to tray'} = 1;
@@ -4695,21 +4881,135 @@ sub _ApplyLayout {
     my ($self,$layout) = @_;
 
     if ($layout eq 'Compact') {
+        my $H = Gtk3::Gdk::Screen::get_default()->get_height()-100;
+        $$self{wheight} = 600;
+
+        if ($H < $$self{wheight}) {
+            # Set a good height on smaller screens
+            $$self{wheight} = int($H*0.8);
+        }
         # This layout to work implies some configuration settings to work correctly
-        foreach my $e ('hbuttonbox1','connSearch','connExecBtn','connQuickBtn','connFavourite','vbox5','vboxInfo') {
+        foreach my $e ('hbuttonbox1','connSearch','connExecBtn','connQuickBtn','connFavourite','vboxConnectionPanel','vboxInfo') {
             $$self{_GUI}{$e}->hide();
         }
-        if ($ENV{'ASBRU_DESKTOP'} eq 'gnome-shell') {
-            if (!$$self{_GUI}{main}->get_visible) {
-                $self->_showConnectionsList;
+        if (!$STRAY) {
+            if (!$$self{_GUI}{main}->get_visible()) {
+                $self->_showConnectionsList();
             }
         } else {
-            if ($$self{_GUI}{main}->get_visible) {
+            if ($$self{_GUI}{main}->get_visible()) {
                 $self->_hideConnectionsList();
             }
+            $$self{_GUI}{main}->set_type_hint('popup-menu');
+        }
+        $$self{_GUI}{main}->set_default_size(220, $$self{wheight});
+        $$self{_GUI}{main}->resize(220, $$self{wheight});
+    }
+}
+
+# Test various options supported by the VTE library
+# to centralize all tests concerning VTE into a single function
+sub _setVteCapabilities {
+    my $self = shift;
+    my $vte = Vte::Terminal->new();
+
+    local $SIG{__WARN__} = sub {};
+    $$self{_Vte}{major_version} = Vte::get_major_version();
+    $$self{_Vte}{minor_version} = Vte::get_minor_version();
+
+    # Does VTE supports 'set_bold_is_bright'
+    # (supposingly added in v0.52)
+    eval {
+        $vte->set_bold_is_bright(0);
+    };
+    if ($@) {
+        $$self{_Vte}{has_bright} = 0;
+    } else {
+        $$self{_Vte}{has_bright} = 1;
+    }
+
+    # Does VTE supports 1 or 2 parameters for 'feed_child'
+    # (supposingly 1 parameter as of v0.52 but some distros have a special patched version of v0.52 that
+    #  still requires 2 parameters; so let's discover this by trying ;
+    #  See https://bugs.launchpad.net/ubuntu/+source/ubuntu-release-upgrader/+bug/1780501)
+    $$self{_Vte}{vte_feed_child} = 0;
+    eval {
+        local $SIG{__WARN__} = sub { die @_ };
+        $vte->feed_child('abc', 3);
+        1;
+    } or do {
+        $$self{_Vte}{vte_feed_child} = 1;
+    };
+
+    # Does VTE supports 1 or 2 parameters for 'feed_child_binary'
+    # (1 parameter as of v0.46)
+    $$self{_Vte}{vte_feed_binary} = 0;
+    if ($$self{_Vte}{major_version} >= 1 or $$self{_Vte}{minor_version} >= 46) {
+        $$self{_Vte}{vte_feed_binary} = 1;
+    }
+
+    # Tell the world what we found out
+    print STDERR "INFO: Virtual terminal emulator (VTE) version is $$self{_Vte}{major_version}.$$self{_Vte}{minor_version}\n";
+    if ($$self{_VERBOSE}) {
+        foreach my $k (sort keys %{$$self{_Vte}}) {
+            print STDERR "       - $k = $$self{_Vte}{$k}\n";
         }
-        $$self{_GUI}{main}->set_default_size(220,600);
-        $$self{_GUI}{main}->resize(220,600);
+    }
+}
+
+# Returns the currently selected tree
+sub _getCurrentTree {
+    my $self = shift;
+    my $pnum = $$self{_GUI}{nbTree}->get_current_page();
+    my $page = $$self{_GUI}{nbTree}->get_nth_page($pnum);
+    my $tree;
+
+    # Search for the PACTree into the selected tab
+    $page->foreach(sub {
+        my $child = shift;
+        if (ref($child) eq 'PACTree') {
+            $tree = $child;
+        }
+    });
+
+    return $tree;
+}
+
+# Forces focus to the terminal inside the focused page
+sub _doFocusPage {
+    my $self = shift;
+    my $pnum = shift;
+    my $tab_page = $$self{_GUI}{nb}->get_nth_page($pnum);
+
+    $$self{_HAS_FOCUS} = '';
+    foreach my $tmp_uuid (keys %RUNNING) {
+        my $check_gui = $RUNNING{$tmp_uuid}{terminal}{_SPLIT} ? $RUNNING{$tmp_uuid}{terminal}{_SPLIT_VPANE} : $RUNNING{$tmp_uuid}{terminal}{_GUI}{_VBOX};
+
+        if (!defined($check_gui) || ($check_gui ne $tab_page)) {
+            next;
+        }
+
+        my $uuid = $RUNNING{$tmp_uuid}{uuid};
+        my $path = $$self{_GUI}{treeConnections}->_getPath($uuid);
+        if ($path) {
+            $$self{_GUI}{treeConnections}->expand_to_path($path);
+            $$self{_GUI}{treeConnections}->set_cursor($path, undef, 0);
+        }
+
+        $RUNNING{$tmp_uuid}{terminal}->_setTabColour();
+
+        if (!$RUNNING{$tmp_uuid}{terminal}{EMBED}) {
+            eval {
+                if (defined $RUNNING{$tmp_uuid}{terminal}{FOCUS}->get_window()) {
+                    $RUNNING{$tmp_uuid}{terminal}{FOCUS}->get_window()->focus(time);
+                }
+            };
+            $RUNNING{$tmp_uuid}{terminal}{_GUI}{_VTE}->grab_focus();
+        }
+        $$self{_HAS_FOCUS} = $RUNNING{$tmp_uuid}{terminal}{_GUI}{_VTE};
+
+        # When found, do not process further
+        last;
     }
 }
 
@@ -4741,7 +5041,7 @@ B<@ARGV> : List of command line parameters (perldoc asbru-cm)
     %RUNNING :  Table of PACTerminal Objects. $RUNNING{UUID}
                 For a description of Terminal objects (perldoc PACTerminal.pm)
 
-B<UUID> = 'pac_PID' + I<pid number> + '_n' + I<Counter>
+B<UUID> = 'asbru_PID' + I<pid number> + '_n' + I<Counter>
 
 =head2 PACMain Internal Variables
 
@@ -4798,15 +5098,15 @@ Creates the main window and elements
 
 Sets up all callbacks to elements in the window
 
-=head2 sub _lockPAC
+=head2 sub _lockAsbru
 
-Locks Pack to leave unatended.
+Locks the application to leave unattended.
 
 Sets different objects property sesitive = 0
 
-=head2 sub _unlockPAC
+=head2 sub _unlockAsbru
 
-Asks for a GUI Password to unlock variables
+Asks for a GUI password to unlock the application
 
 If password OK, set sensitive = 1
 
@@ -4818,10 +5118,6 @@ Search action over nodes : {CFG}{environments}{uuid}{name,ip,description}
     tree    gtk tree object to search from
     where   name , host or desc
 
-=head2 sub __treeSort ()
-
-Sorts nodes tree by alphaetical order
-
 =head2 sub __treeBuildNodeName (uuid)
 
 Gets node name as html tags applied with color depending on protected status
@@ -4951,7 +5247,13 @@ Hides the Connections list
 
 =head2 sub _toggleConnectionsList
 
-Toggles Connection Lista (active, inactie)
+Activates or deactivate the button to toggle the display of the connections list.
+
+=head2 sub _doToggleConnectionsList
+
+Actually show or hide the connections list.
+Do not call this function directly but use _toggleConnectionsList that will also correctly
+set the corresponding button state.
 
 =head2 sub _copyNodes (cut [0,'cut'], parent, @selected_uuids)
 
@@ -5002,3 +5304,10 @@ Updates runtime Configuration changes that affect the Main GUI: Readonly, Auto S
 
 Pending
 
+=head2 sub _getCurrentTree
+
+Returns the currently selected tree (from the left menu)
+
+=head2 sub _doFocusPage
+
+Forces focus to the terminal inside the focused page
diff --git a/lib/PACPCC.pm b/lib/PACPCC.pm
index e62ea50d..7da5068a 100644
--- a/lib/PACPCC.pm
+++ b/lib/PACPCC.pm
@@ -3,7 +3,7 @@ package PACPCC;
 ###############################################################################
 # This file is part of Ásbrú Connection Manager
 #
-# Copyright (C) 2017-2020 Ásbrú Connection Manager team (https://asbru-cm.net)
+# Copyright (C) 2017-2022 Ásbrú Connection Manager team (https://asbru-cm.net)
 # Copyright (C) 2010-2016 David Torrejon Vaquerizas
 #
 # Ásbrú Connection Manager is free software: you can redistribute it and/or
@@ -98,10 +98,10 @@ sub new {
     _setupCallbacks($self);
 
     # Autoload any text
-    #if (($$self{_WINDOWPCC}{cbAutoSave}->get_active // 1) && (open(F, "$CFG_DIR/pac.pcc") ))
+    #if (($$self{_WINDOWPCC}{cbAutoSave}->get_active // 1) && (open(F, "$CFG_DIR/asbru.pcc") ))
 
     my @content;
-    if (open(F,"<:utf8","$CFG_DIR/pac.pcc") ) {
+    if (open(F,"<:utf8","$CFG_DIR/asbru.pcc") ) {
         @content = <F>;
         close F;
 
@@ -365,8 +365,8 @@ sub _initGUI {
     $$self{_WINDOWPCC}{btnSelection}->set_image(Gtk3::Image->new_from_stock('gtk-select-all', 'button') );
     $$self{_WINDOWPCC}{btnSelection}->set('can_focus', 0);
     $hbbox0->pack_start($$self{_WINDOWPCC}{btnSelection}, 0, 1, 0);
-    $$self{_WINDOWPCC}{cbSubstitute} = Gtk3::CheckButton->new_with_label('Use PAC variables');
-    $$self{_WINDOWPCC}{cbSubstitute}->set_tooltip_text('Allow PAC to replace standard known variables (ie: <GV:var_name>, <CMD:command>, ...)');
+    $$self{_WINDOWPCC}{cbSubstitute} = Gtk3::CheckButton->new_with_label('Use Ásbrú variables');
+    $$self{_WINDOWPCC}{cbSubstitute}->set_tooltip_text('Allow Ásbrú to replace standard known variables (ie: <GV:var_name>, <CMD:command>, ...)');
     $$self{_WINDOWPCC}{cbSubstitute}->set_active(1);
     $$self{_WINDOWPCC}{cbSubstitute}->set('can_focus', 0);
     $hbbox0->pack_start($$self{_WINDOWPCC}{cbSubstitute}, 0, 1, 0);
@@ -380,7 +380,7 @@ sub _initGUI {
     $$self{_WINDOWPCC}{btnClose}->set('can_focus', 0);
     $$self{_WINDOWPCC}{btnClusterAdmin} = Gtk3::Button->new_with_mnemonic('Cl_usters');
     $$self{_WINDOWPCC}{btnClusterAdmin}->set('can_focus', 0);
-    $$self{_WINDOWPCC}{btnClusterAdmin}->set_image(Gtk3::Image->new_from_stock('pac-cluster-manager', 'button') );
+    $$self{_WINDOWPCC}{btnClusterAdmin}->set_image(Gtk3::Image->new_from_stock('asbru-cluster-manager', 'button') );
     $$self{_WINDOWPCC}{btnSeparate} = Gtk3::Button->new_with_mnemonic('_Explode');
     $$self{_WINDOWPCC}{btnSeparate}->set('can_focus', 0);
     $$self{_WINDOWPCC}{btnSeparate}->set_tooltip_text("Separate and resize clustered windows to fit screen");
@@ -527,13 +527,13 @@ sub _setupCallbacks {
         if ($event->button ne 1) {
             return 0;
         }
-        $$self{_WINDOWPCC}{btnSelection}->set_sensitive($$self{_WINDOWPCC}{multiTextView}->get_clipboard(Gtk3::Gdk::Atom::intern_static_string('PRIMARY') )->wait_is_text_available);
+        $$self{_WINDOWPCC}{btnSelection}->set_sensitive($$self{_WINDOWPCC}{multiTextView}->get_clipboard(Gtk3::Gdk::Atom::intern_static_string('PRIMARY') )->wait_is_text_available());
         $$self{_WINDOWPCC}{btnBlock}->set_sensitive($self->_getCurrentBlock($$self{_WINDOWPCC}{multiTextBuffer}) );
         return 0;
     });
 
     $$self{_WINDOWPCC}{multiTextView}->signal_connect('key_release_event' => sub {
-        $$self{_WINDOWPCC}{btnSelection}->set_sensitive($$self{_WINDOWPCC}{multiTextView}->get_clipboard(Gtk3::Gdk::Atom::intern_static_string('PRIMARY') )->wait_is_text_available);
+        $$self{_WINDOWPCC}{btnSelection}->set_sensitive($$self{_WINDOWPCC}{multiTextView}->get_clipboard(Gtk3::Gdk::Atom::intern_static_string('PRIMARY') )->wait_is_text_available());
         $$self{_WINDOWPCC}{btnBlock}->set_sensitive($self->_getCurrentBlock($$self{_WINDOWPCC}{multiTextBuffer}) );
         return 0;
     });
@@ -568,6 +568,10 @@ sub _setupCallbacks {
         # Populate with environment variables
         my @environment_menu;
         foreach my $key (sort {$a cmp $b} keys %ENV) {
+            # Do not offer Master Password, or any other environment variable with word PRIVATE, TOKEN
+            if ($key =~ /KPXC|PRIVATE|TOKEN/i) {
+                next;
+            }
             my $value = $ENV{$key};
             push(@environment_menu,
             {
@@ -820,25 +824,34 @@ sub _setupCallbacks {
         return 1;
     });
 
-    # Capture 'Separate' button clicked
+    # Capture 'Explode' button clicked
     $$self{_WINDOWPCC}{btnSeparate}->signal_connect('clicked' => sub {
-        my $screen = Gtk3::Gdk::Screen::get_default;
-        my $sw = $screen->get_width;
-        my $sh = $screen->get_height-100;
-        my $cluster = $$self{_WINDOWPCC}{comboTerminals}->get_active_text // '';
-        my $total = scalar(keys %{$$self{_WINDOWPCC}{cbSendToAll}->get_active ? $$self{_RUNNING} : $$self{_CLUSTERS}{$cluster}}) or return 1;
+        my $screen = Gtk3::Gdk::Screen::get_default();
+        my $sw = $screen->get_width();
+        my $sh = $screen->get_height() - 100;
+        my $cluster = $$self{_WINDOWPCC}{comboTerminals}->get_active_text() // '';
+        my $total = scalar(keys %{$$self{_WINDOWPCC}{cbSendToAll}->get_active() ? $$self{_RUNNING} : $$self{_CLUSTERS}{$cluster}}) or return 1;
 
         my $conns_per_row = $total < 5 ? 2 : 3;
         my $rows = POSIX::ceil($total / $conns_per_row) || 1;
-        my $defw=int($sw / (POSIX::ceil($total / $rows)));
-        my $defh=int($sh / (POSIX::ceil($total / $rows)));
+        my $defw = int($sw / (POSIX::ceil($total / $rows)));
+        my $defh = int($sh / (POSIX::ceil($total / $rows)));
 
 
         my $col = 0;
         my $row = 0;
-        my @list = keys %{$$self{_WINDOWPCC}{cbSendToAll}->get_active ? $$self{_RUNNING} : $$self{_CLUSTERS}{$cluster}};
+        my @list = keys %{$$self{_WINDOWPCC}{cbSendToAll}->get_active() ? $$self{_RUNNING} : $$self{_CLUSTERS}{$cluster}};
         foreach my $uuid (@list) {
             my $terminal = $$self{_RUNNING}{$uuid}{'terminal'};
+
+            # Check that these are valid terminals
+            if (!defined($$self{_RUNNING}{$uuid}{terminal})) {
+                next;
+            }
+            if (ref($$self{_RUNNING}{$uuid}{terminal}) !~ /^PACTerminal|PACShell$/go) {
+                next;
+            }
+
             if ($col == $conns_per_row) {
                 $row++; $col = 0;
             }
@@ -849,9 +862,9 @@ sub _setupCallbacks {
                 $$terminal{_WINDOWTERMINAL}->resize($defw, $defh);
             }
             # Move it to its corresponding position
-            $$terminal{_WINDOWTERMINAL}->move(($col*$defw+3),5+($row*$defh+($row*50)));
+            $$terminal{_WINDOWTERMINAL}->move(($col*$defw+3), 5+($row*$defh+($row*50)));
             $col++;
-            if ($col==$conns_per_row) {
+            if ($col == $conns_per_row) {
                 $row++;
                 $col=0;
             }
@@ -860,23 +873,33 @@ sub _setupCallbacks {
     });
     # Capture 'Separate' button clicked
     $$self{_WINDOWPCC}{btnShowPipe}->signal_connect('clicked' => sub {$PACMain::FUNCS{_PIPE}->show;});
+
+    # Capture 'ReTab' button clicked
     $$self{_WINDOWPCC}{btnReTab}->signal_connect('clicked' => sub {
         my $cluster = $$self{_WINDOWPCC}{comboTerminals}->get_active_text // '';
         my @list = keys %{$$self{_WINDOWPCC}{cbSendToAll}->get_active ? $$self{_RUNNING} : $$self{_CLUSTERS}{$cluster}};
         foreach my $uuid (@list) {
+            # Check that these are valid terminals
+            if (!defined($$self{_RUNNING}{$uuid}{terminal})) {
+                next;
+            }
+            if (ref($$self{_RUNNING}{$uuid}{terminal}) !~ /^PACTerminal|PACShell$/go) {
+                next;
+            }
+
             if (!$$self{_RUNNING}{$uuid}{'terminal'}{_TABBED}) {
-                $$self{_RUNNING}{$uuid}{'terminal'}->_winToTab;
+                $$self{_RUNNING}{$uuid}{'terminal'}->_winToTab();
             }
         }
     });
 
     # Capture 'Close All' button clicked
     $$self{_WINDOWPCC}{btnCloseAll}->signal_connect('clicked' => sub {
-        my $cluster = $$self{_WINDOWPCC}{comboTerminals}->get_active_text // '';
-        my @list = keys %{$$self{_WINDOWPCC}{cbSendToAll}->get_active ? $$self{_RUNNING} : $$self{_CLUSTERS}{$cluster}};
+        my $cluster = $$self{_WINDOWPCC}{comboTerminals}->get_active_text() // '';
+        my @list = keys %{$$self{_WINDOWPCC}{cbSendToAll}->get_active() ? $$self{_RUNNING} : $$self{_CLUSTERS}{$cluster}};
         return 1 unless scalar(@list) && _wConfirm($$self{_WINDOWPCC}{main}, "Are you sure you want to CLOSE <b>every</b> terminal" . ($cluster ne '' ? " in cluster '$cluster'" : '') . "?");
         foreach my $uuid (@list) {
-            if (defined $$self{_RUNNING}{$uuid}{'terminal'}) {
+            if (defined($$self{_RUNNING}{$uuid}{'terminal'}) && ref($$self{_RUNNING}{$uuid}{terminal}) =~ /^PACTerminal|PACShell$/go) {
                 $$self{_RUNNING}{$uuid}{'terminal'}->stop('force', 'deep');
             }
         }
@@ -890,7 +913,7 @@ sub _setupCallbacks {
                 $$self{_RUNNING}{$uuid}{'terminal'}{_PROPAGATE} = 1;
             }
         }
-        open(F,">:utf8","$CFG_DIR/pac.pcc");
+        open(F,">:utf8","$CFG_DIR/asbru.pcc");
         my ($x, $y) = $$self{_WINDOWPCC}{main}->get_position;
         my ($w, $h) = $$self{_WINDOWPCC}{main}->get_size;
         ($$self{_W}, $$self{_H}) = ($w, $h) if $$self{_WINDOWPCC}{cbShowMultiText}->get_active;
diff --git a/lib/PACPipe.pm b/lib/PACPipe.pm
index f759a925..c8df99c9 100644
--- a/lib/PACPipe.pm
+++ b/lib/PACPipe.pm
@@ -3,7 +3,7 @@ package PACPipe;
 ###############################################################################
 # This file is part of Ásbrú Connection Manager
 #
-# Copyright (C) 2017-2020 Ásbrú Connection Manager team (https://asbru-cm.net)
+# Copyright (C) 2017-2022 Ásbrú Connection Manager team (https://asbru-cm.net)
 # Copyright (C) 2010-2016 David Torrejon Vaquerizas
 #
 # Ásbrú Connection Manager is free software: you can redistribute it and/or
diff --git a/lib/PACScreenshots.pm b/lib/PACScreenshots.pm
index 5f95a969..c8356a5a 100644
--- a/lib/PACScreenshots.pm
+++ b/lib/PACScreenshots.pm
@@ -3,7 +3,7 @@ package PACScreenshots;
 ###############################################################################
 # This file is part of Ásbrú Connection Manager
 #
-# Copyright (C) 2017-2020 Ásbrú Connection Manager team (https://asbru-cm.net)
+# Copyright (C) 2017-2022 Ásbrú Connection Manager team (https://asbru-cm.net)
 # Copyright (C) 2010-2016 David Torrejon Vaquerizas
 #
 # Ásbrú Connection Manager is free software: you can redistribute it and/or
@@ -90,7 +90,9 @@ sub update {
     }
 
     # Destroy previous widgets
-    $$self{frame}{hbscreenshots}->foreach(sub {$_[0]->destroy();});
+    $$self{frame}{hbscreenshots}->foreach(sub {
+        $_[0]->destroy();
+    });
 
     # Empty parent widgets' list
     $$self{list} = [];
@@ -114,22 +116,22 @@ sub add {
     }
 
     if (! _pixBufFromFile($file) ) {
-        _wMessage(undef, "File '$file' could not be loaded as a screenshot file");
+        _wMessage($PACMain::FUNCS{_MAIN}{_GUI}{main}, "File '$file' could not be loaded as a screenshot file");
         return 0;
     }
 
     my $screenshot_file = '';
     my $rn = rand(123456789);
-    $screenshot_file = "$CFG_DIR/screenshots/pac_screenshot_$rn.png";
-    while(-f $screenshot_file) {
+    $screenshot_file = "$CFG_DIR/screenshots/asbru_screenshot_$rn.png";
+    while (-f $screenshot_file) {
         $rn = rand(123456789);
-        $screenshot_file = "$CFG_DIR/screenshots/pac_screenshot_$rn.png";
+        $screenshot_file = "$CFG_DIR/screenshots/asbru_screenshot_$rn.png";
     }
 
     copy($file, $screenshot_file);
 
     push(@{$$new_cfg{screenshots}}, $screenshot_file);
-    $self->update;
+    $self->update();
     $PACMain::FUNCS{_MAIN}->_setCFGChanged(1);
 
     return 1;
@@ -154,7 +156,7 @@ sub _buildScreenshotsGUI {
 
     # Build a buttonbox for widgets actions (add, etc.)
     $w{bbox} = Gtk3::VButtonBox->new();
-    $w{hbox}->pack_start($w{bbox}, 0, 1, 0);
+    $w{hbox}->pack_start($w{bbox}, 0, 1, 5);
     $w{bbox}->set_layout('GTK_BUTTONBOX_SPREAD');
 
     # Build 'add' button
@@ -182,10 +184,6 @@ sub _buildScreenshotsGUI {
 
     $w{bbox}->add($w{btnopenfolder});
 
-    # Build a separator
-    $w{sep} = Gtk3::VSeparator->new();
-    $w{hbox}->pack_start($w{sep}, 0, 1, 5);
-
     # Build a scrolled window
     $w{sw} = Gtk3::ScrolledWindow->new();
     $w{hbox}->pack_start($w{sw}, 1, 1, 0);
@@ -205,14 +203,13 @@ sub _buildScreenshotsGUI {
     $$self{frame} = \%w;
 
     # Button(s) callback(s)
-
     $w{btnadd}->signal_connect('clicked', sub {
         # Save current cfg
         my $file = $self->_chooseScreenshot;
         if ($file) {
             my $screenshot_file = '';
-            $screenshot_file = $CFG_DIR . '/screenshots/pac_screenshot_' . rand(123456789). '.png';
-            while(-f $screenshot_file) {$screenshot_file = $CFG_DIR . '/screenshots/pac_screenshot_' . rand(123456789). '.png';}
+            $screenshot_file = $CFG_DIR . '/screenshots/asbru_screenshot_' . rand(123456789). '.png';
+            while(-f $screenshot_file) {$screenshot_file = $CFG_DIR . '/screenshots/asbru_screenshot_' . rand(123456789). '.png';}
             _pixBufFromFile($file)->save($screenshot_file, 'png');
 
             push(@{$$self{cfg}{screenshots}}, $screenshot_file) and $self->update();
@@ -221,7 +218,9 @@ sub _buildScreenshotsGUI {
         return 1;
     });
 
-    $w{btnopenfolder}->signal_connect('clicked', sub {system("/usr/bin/xdg-open $CFG_DIR/screenshots");});
+    $w{btnopenfolder}->signal_connect('clicked', sub {
+        system("$ENV{'ASBRU_ENV_FOR_EXTERNAL'} /usr/bin/xdg-open $CFG_DIR/screenshots");}
+    );
 
     my @targets = (Gtk3::TargetEntry->new('STRING', [], 0) );
     $w{hbox}->drag_dest_set('all', \@targets, ['copy', 'move']);
@@ -258,10 +257,10 @@ sub _buildScreenshots {
     $w{position} = scalar @{$$self{list}};
 
     # Create an eventbox for the image
-    $w{ebScreenshot} = Gtk3::EventBox->new;
+    $w{ebScreenshot} = Gtk3::EventBox->new();
 
     # Create a gtkImage to contain the screenshot
-    $w{imageScreenshot} = Gtk3::Image->new;
+    $w{imageScreenshot} = Gtk3::Image->new();
     -f $file and $w{imageScreenshot}->set_from_pixbuf(_scale($file, 200, 200, 1) );
     $w{ebScreenshot}->add($w{imageScreenshot});
 
@@ -355,7 +354,7 @@ sub _buildScreenshots {
 sub _chooseScreenshot {
     my $self = shift;
 
-    my $filter_images = Gtk3::FileFilter->new;
+    my $filter_images = Gtk3::FileFilter->new();
     $filter_images->set_name('Images');
     $filter_images->add_pixbuf_formats;
 
@@ -403,7 +402,7 @@ sub _preview {
         return 1;
     }
 
-    my $preview = Gtk3::Image->new;
+    my $preview = Gtk3::Image->new();
     $dialog->set_preview_widget($preview);
 
     my $preview_pixbuf = Gtk3::Gdk::Pixbuf->new_from_file_at_size($file, 256, 256);
@@ -418,7 +417,7 @@ sub _showImage {
     my $file = shift;
 
     if ($PACMain::FUNCS{_MAIN}{_CFG}{'defaults'}{'screenshots use external viewer'}) {
-        system($PACMain::FUNCS{_MAIN}{_CFG}{'defaults'}{'screenshots external viewer'},$file);
+        system("$ENV{'ASBRU_ENV_FOR_EXTERNAL'} " . $PACMain::FUNCS{_MAIN}{_CFG}{'defaults'}{'screenshots external viewer'}, $file);
         return 1;
     }
 
@@ -428,7 +427,7 @@ sub _showImage {
 
     my $window = Gtk3::Dialog->new_with_buttons(
         "$APPNAME (v$APPVERSION) : Screenshot '$file'",
-        undef,
+        $PACMain::FUNCS{_MAIN}{_GUI}{main},
         'GTK_DIALOG_DESTROY_WITH_PARENT',
         'gtk-close' => 'close',
     );
@@ -439,7 +438,7 @@ sub _showImage {
     $window->set_size_request(320, 200);
     $window->set_resizable(1);
 
-    my $sc = Gtk3::ScrolledWindow->new;
+    my $sc = Gtk3::ScrolledWindow->new();
     my $pb = _pixBufFromFile($file);
     my $image = Gtk3::Image->new_from_pixbuf($pb);
     my $pw = $pb->get_width + 30;
diff --git a/lib/PACScripts.pm b/lib/PACScripts.pm
index 8bf5adcd..2fcae4fd 100644
--- a/lib/PACScripts.pm
+++ b/lib/PACScripts.pm
@@ -3,7 +3,7 @@ package PACScripts;
 ###############################################################################
 # This file is part of Ásbrú Connection Manager
 #
-# Copyright (C) 2017-2020 Ásbrú Connection Manager team (https://asbru-cm.net)
+# Copyright (C) 2017-2022 Ásbrú Connection Manager team (https://asbru-cm.net)
 # Copyright (C) 2010-2016 David Torrejon Vaquerizas
 #
 # Ásbrú Connection Manager is free software: you can redistribute it and/or
@@ -37,12 +37,11 @@ use Encode qw (encode);
 use File::Copy;
 use File::Basename;
 use Storable qw (dclone nstore_fd);
+use Config;
 
 eval {require Gtk3::SourceView2;};
 my $SOURCEVIEW = ! $@;
 
-my $PERL = `which perl 2>&1`;
-
 # GTK
 use Gtk3 '-init';
 
@@ -62,7 +61,7 @@ my $CFG_DIR = $ENV{"ASBRU_CFG"};
 my $SCRIPTS_DIR = $CFG_DIR . '/scripts';
 
 # PAC Help
-my $PAC_SCRIPTS_HELP = '#PAC Scripts are simple Perl programs, so:
+my $PAC_SCRIPTS_HELP = '#Ásbrú Scripts are simple Perl programs, so:
 use strict;        # Get serious :)
 use warnings;    # Really serious! ;)
 
@@ -70,7 +69,7 @@ use warnings;    # Really serious! ;)
 # It is *MANDATORY* to declare them (as "our" or "local")
 
 our %SHARED;    # Hash to pass data from SESSION to CONNECTION
-our %COMMON;    # Common PAC utilities (substitutions, etc...) to be used *ANYWHERE* in script
+our %COMMON;    # Common Ásbrú utilities (substitutions, etc...) to be used *ANYWHERE* in script
 our %PAC;        # GUI/Terminals manipulation to be used under *SESSION* subroutine
 our %TERMINAL;    # Command/Prompt manipulation to be used under *CONNECTION* subroutine
 
@@ -100,7 +99,7 @@ our %TERMINAL;    # Command/Prompt manipulation to be used under *CONNECTION* su
 
 %{$cfg} = $COMMON{cfg}([0|1]);
 # Retrieve a copy (0->default) or a reference (1) to *whole* PAC\'s configuration
-# *ATTENTION* Retrieving a REFERENCE (1) to PAC\'s config may lead to PAC misconfiguration!!
+# *ATTENTION* Retrieving a REFERENCE (1) to PAC\'s config may lead to Ásbrú misconfiguration!!
 # NOT RECOMMENDED!! USE AT YOUR VERY OWN RISK!!!!!!
 
 $txt = $COMMON{subst}(<text>);
@@ -113,7 +112,7 @@ $txt = $COMMON{del_esc}(<text>)
 
 $COMMON{cfg_sanity}(\%cfg);
 # Perform a sanity check for given %cfg (reference!), which may be empty, in which case it will
-# construct an empty PAC cfg skeleton over *referenced* %cfg variable
+# construct an empty Ásbrú cfg skeleton over *referenced* %cfg variable
 # Returns a string
 
 ####################################################
@@ -165,11 +164,11 @@ $PAC{to_tab}(<$tmp_uuid>);
 # Retab given connection
 
 $file = $PAC{cfg_save}();
-# Save current PAC cfg to standard PAC config file.
+# Save current Ásbrú cfg to standard Ásbrú config file.
 # Returns the name of such file
 
 $file = $PAC{cfg_export}([file]);
-# Save current PAC cfg to given file (or ask for a file through a GUI if no file provided)
+# Save current Ásbrú cfg to given file (or ask for a file through a GUI if no file provided)
 # in YAML format, suitable to be imported in any PAC instance
 # Returns the name of saved file
 
@@ -344,7 +343,7 @@ sub show {
     $self->_updateGUI;
 
     # Setup a timer to check syntax of selected script
-    (! defined $$self{_TIMER_CHECK} && $PERL) and $$self{_TIMER_CHECK} = Glib::Timeout->add_seconds(1, sub {
+    (! defined $$self{_TIMER_CHECK}) and $$self{_TIMER_CHECK} = Glib::Timeout->add_seconds(1, sub {
         return 1 unless $$self{_WINDOWSCRIPTS}{main}->get_property('has-toplevel-focus') && $$self{_SYNTAX_CHANGED};
 
         my $selection = $$self{_WINDOWSCRIPTS}{treeScripts}->get_selection;
@@ -363,7 +362,7 @@ sub show {
         my $tmpfile = $CFG_DIR . '/tmp/' . $name . '.check';
         $self->_saveFile($sel[0], $tmpfile);
 
-        my @lines = `perl -cw $tmpfile 2>&1`;
+        my @lines = `'$^X' -cw $tmpfile 2>&1`;
         my $err = $?;
         my $result = pop(@lines); chomp $result;
         $result =~ s/^\Q$tmpfile\E\s+(.+)$/$1/g;
@@ -423,7 +422,7 @@ sub _initGUI {
                     );
 
                     $$self{_WINDOWSCRIPTS}{gui}{scroll2}->add($$self{_WINDOWSCRIPTS}{treeScripts});
-                    $$self{_WINDOWSCRIPTS}{treeScripts}->set_tooltip_text('PAC Scripts. You may Drag \'n Drop Perl (.pl) files here to import them.');
+                    $$self{_WINDOWSCRIPTS}{treeScripts}->set_tooltip_text('Ásbrú Scripts. You may Drag \'n Drop Perl (.pl) files here to import them.');
                     $$self{_WINDOWSCRIPTS}{treeScripts}->set_headers_visible(1);
                     $$self{_WINDOWSCRIPTS}{treeScripts}->get_selection->set_mode('GTK_SELECTION_MULTIPLE');
 
@@ -435,7 +434,7 @@ sub _initGUI {
 
                     my $tablbl = Gtk3::HBox->new(0, 0);
                     $tablbl->pack_start(Gtk3::Label->new(' Script Editor '), 1, 1, 0);
-                    $tablbl->pack_start(Gtk3::Image->new_from_stock('pac-script', 'menu'), 0, 1, 0);
+                    $tablbl->pack_start(Gtk3::Image->new_from_stock('asbru-script', 'menu'), 0, 1, 0);
                     $tablbl->show_all;
 
                     $$self{_WINDOWSCRIPTS}{gui}{hpanededitfunc} = Gtk3::HPaned->new;
@@ -535,7 +534,7 @@ sub _initGUI {
                     # PAC Script Help
 
                     my $tablbl2 = Gtk3::HBox->new(0, 0);
-                    $tablbl2->pack_start(Gtk3::Label->new(' PAC Script Help '), 1, 1, 0);
+                    $tablbl2->pack_start(Gtk3::Label->new(' Ásbrú Script Help '), 1, 1, 0);
                     $tablbl2->pack_start(Gtk3::Image->new_from_stock('gtk-help', 'menu'), 0, 1, 0);
                     $tablbl2->show_all;
 
@@ -661,9 +660,9 @@ sub _setupCallbacks {
 
         push(@comm_menu_items,
         {
-            label => 'Get PAC Config ($COMMON{cfg}([0|1]) )',
+            label => 'Get Ásbrú Config ($COMMON{cfg}([0|1]) )',
             tooltip => "Retrieve a copy (0->default) or a reference (1) to *whole* PAC's configuration
-*ATTENTION* Retrieving a REFERENCE (1) to PAC's config may lead to PAC misconfiguration!!
+*ATTENTION* Retrieving a REFERENCE (1) to PAC's config may lead to Ásbrú misconfiguration!!
 NOT RECOMMENDED!! USE AT YOUR VERY OWN RISK!!!!!!",
             code => sub {$$self{_WINDOWSCRIPTS}{multiTextBuffer}->insert_at_cursor("\$COMMON{cfg}([0|1]) ");}
         });
@@ -678,7 +677,7 @@ NOT RECOMMENDED!! USE AT YOUR VERY OWN RISK!!!!!!",
         push(@menu_items,
         {
             label => 'COMMON methods',
-            stockicon => 'pac-script',
+            stockicon => 'asbru-script',
             submenu => \@comm_menu_items
         });
 
@@ -770,22 +769,22 @@ NOT RECOMMENDED!! USE AT YOUR VERY OWN RISK!!!!!!",
 
         push(@session_menu_items,
         {
-            label => 'Save current PAC CFG($PAC{cfg_save}())',
-            tooltip => "Save current PAC cfg to standard PAC config file",
+            label => 'Save current Ásbrú CFG($PAC{cfg_save}())',
+            tooltip => "Save current Ásbrú cfg to standard Ásbrú config file",
             code => sub {$$self{_WINDOWSCRIPTS}{multiTextBuffer}->insert_at_cursor("\$PAC{cfg_save}()");}
         });
 
         push(@session_menu_items,
         {
-            label => 'Export PAC CFG to file($PAC{cfg_export}([file]) )',
-            tooltip => "Save current PAC cfg to given file (or ask for a file through a GUI if no file provided)",
+            label => 'Export Ásbrú CFG to file($PAC{cfg_export}([file]) )',
+            tooltip => "Save current Ásbrú cfg to given file (or ask for a file through a GUI if no file provided)",
             code => sub {$$self{_WINDOWSCRIPTS}{multiTextBuffer}->insert_at_cursor("\$PAC{cfg_export}([file])");}
         });
 
         push(@menu_items,
         {
-            label => 'PAC methods',
-            stockicon => 'pac-tab',
+            label => 'Ásbrú methods',
+            stockicon => 'asbru-tab',
             submenu => \@session_menu_items
         });
 
@@ -884,7 +883,7 @@ All $CONNECTIONS{error|out1|out2} are resetted every time a SEND command is exec
         push(@menu_items,
         {
             label => 'TERMINAL methods',
-            stockicon => 'pac-shell',
+            stockicon => 'asbru-shell',
             submenu => \@connection_menu_items
         });
 
@@ -912,6 +911,10 @@ All $CONNECTIONS{error|out1|out2} are resetted every time a SEND command is exec
         my @environment_menu;
         foreach my $key (sort {$a cmp $b} keys %ENV)
         {
+            # Do not offer Master Password, or any other environment variable with word PRIVATE, TOKEN
+            if ($key =~ /KPXC|PRIVATE|TOKEN/i) {
+                next;
+            }
             my $value = $ENV{$key};
             push(@environment_menu,
             {
@@ -949,56 +952,6 @@ All $CONNECTIONS{error|out1|out2} are resetted every time a SEND command is exec
             code => sub {$$self{_WINDOWSCRIPTS}{multiTextBuffer}->insert_at_cursor("\$SUBST('<CMD:command_to_launch>')");}
         });
 
-        # Populate with <KPX_(title|username|url):*> special string
-        if ($PACMain::FUNCS{_MAIN}{_CFG}{'defaults'}{'keepass'}{'use_keepass'})
-        {
-            my (@titles, @usernames, @urls);
-            foreach my $hash ($PACMain::FUNCS{_KEEPASS}->find)
-            {
-                push(@titles,
-                {
-                    label => "<KPX_title:$$hash{title}>",
-                    tooltip => "The given command line will be substituted real-timefor it's corresponding KeePassX value",
-                    code => sub {$$self{_WINDOWSCRIPTS}{multiTextBuffer}->insert_at_cursor("\$SUBST(<KPX_title:$$hash{title}>)");}
-                });
-                push(@usernames,
-                {
-                    label => "<KPX_username:$$hash{username}>",
-                    tooltip => "The given command line will be substituted real-timefor it's corresponding KeePassX value",
-                    code => sub {$$self{_WINDOWSCRIPTS}{multiTextBuffer}->insert_at_cursor("\$SUBST(<KPX_username:$$hash{username}>)");}
-                });
-                push(@urls,
-                {
-                    label => "<KPX_url:$$hash{url}>",
-                    tooltip => "The given command line will be substituted real-timefor it's corresponding KeePassX value",
-                    code => sub {$$self{_WINDOWSCRIPTS}{multiTextBuffer}->insert_at_cursor("\$SUBST(<KPX_url:$$hash{url}>)");}
-                });
-            }
-
-            push(@menu_items,
-            {
-                label => 'KeePassX',
-                stockicon => 'pac-keepass',
-                submenu =>
-                [
-                    {
-                        label => 'KeePassX title values',
-                        submenu => \@titles
-                    }, {
-                        label => 'KeePassX username values',
-                        submenu => \@usernames
-                    }, {
-                        label => 'KeePassX URL values',
-                        submenu => \@urls
-                    }, {
-                        label => "KeePass Extended Query",
-                        tooltip => "This allows you to select the value to be returned, based on another value's match againt a Perl Regular Expression",
-                        code => sub {$$self{_WINDOWSCRIPTS}{multiTextBuffer}->insert_at_cursor("<KPXRE_GET_(title|username|password|url)_WHERE_(title|username|password|url)==Your_RegExp_here==>");}
-                    }
-                ]
-            });
-        }
-
         _wPopUpMenu(\@menu_items, $event);
 
         return 1;
@@ -1107,12 +1060,12 @@ All $CONNECTIONS{error|out1|out2} are resetted every time a SEND command is exec
         return 1 unless scalar @sel == 1;
 
         my $name = $model->get_value($model->get_iter($sel[0]), 1);
-        $self->_execScript($name);
+        $self->_execScript($name,$$self{_WINDOWSCRIPTS}{main});
 
         return 1;
     });
     $$self{_WINDOWSCRIPTS}{gui}{btnadd}->signal_connect('clicked' => sub {
-        my $name = _wEnterValue($$self{_WINDOWSCRIPTS}{main}, "<b>Creating new Script</b>"  , "Enter a name for the new PAC Script");
+        my $name = _wEnterValue($$self{_WINDOWSCRIPTS}{main}, "<b>Creating new Script</b>"  , "Enter a name for the new Ásbrú Script");
         return 1 if ((! defined $name) || ($name =~ /^\s*$/go) );
         return 1 if -f "$SCRIPTS_DIR/$name.pl" && ! _wConfirm($$self{_WINDOWSCRIPTS}{main}, "File '$name.pl' already exists. Overwrite it?");
 
@@ -1162,7 +1115,7 @@ All $CONNECTIONS{error|out1|out2} are resetted every time a SEND command is exec
     $$self{_WINDOWSCRIPTS}{gui}{btnclose}->signal_connect('clicked' => sub {
         if ($$self{_WINDOWSCRIPTS}{multiTextBuffer}->get_modified) {
             my $name = $$self{_WINDOWSCRIPTS}{treeScripts}->get_model->get_value($$self{_WINDOWSCRIPTS}{treeScripts}->get_model->get_iter($$self{_SELECTED}), 0);
-            my $out = _wYesNoCancel($$self{_WINDOWSCRIPTS}{main}, "PAC Script '$name' has changed.\nSave data before closing PAC Script window?");
+            my $out = _wYesNoCancel($$self{_WINDOWSCRIPTS}{main}, "Ásbrú Script '$name' has changed.\nSave data before closing Ásbrú Script window?");
             $out eq 'yes' and $self->_saveFile($$self{_SELECTED});
             $out eq 'cancel' and return 1;
             $out eq 'no' and $self->_loadFile($$self{_SELECTED});
@@ -1179,16 +1132,16 @@ All $CONNECTIONS{error|out1|out2} are resetted every time a SEND command is exec
         # Check for changes before removing
         if ($$self{_WINDOWSCRIPTS}{multiTextBuffer}->get_modified) {
             my $name = $model->get_value($model->get_iter($$self{_SELECTED}), 0);
-            $self->_saveFile($$self{_SELECTED}) if _wConfirm($$self{_WINDOWSCRIPTS}{main}, "PAC Script '$name' has changed.\nSave data before loading another script?");
+            $self->_saveFile($$self{_SELECTED}) if _wConfirm($$self{_WINDOWSCRIPTS}{main}, "Ásbrú Script '$name' has changed.\nSave data before loading another script?");
         }
 
         my @sel = _getSelectedRows($selection);
         return 1 unless scalar(@sel);
-        return 1 unless _wConfirm($$self{_WINDOWSCRIPTS}{main}, "Are you sure you want to remove ". (scalar(@sel) ) . " PAC Scripts?");
-
+        return 1 unless _wConfirm($$self{_WINDOWSCRIPTS}{main}, "Are you sure you want to remove ". (scalar(@sel) ) . " Ásbrú Scripts?");        
+        
         # Delete selected files
         foreach my $path (@sel) {
-            my ($file, $name) = $model->get_value($model->get_iter($path) );
+            my ($file, $name) = $model->get_value($model->get_iter($path), 0);
             unlink($file);
         }
 
@@ -1309,7 +1262,7 @@ sub _reloadDir {
     # Check for changes before reloading
     if ($$self{_WINDOWSCRIPTS}{multiTextBuffer}->get_modified && $$self{_SELECTED}) {
         my $name = $$self{_WINDOWSCRIPTS}{treeScripts}->get_model->get_value($$self{_WINDOWSCRIPTS}{treeScripts}->get_model->get_iter($$self{_SELECTED}), 0);
-        $self->_saveFile($$self{_SELECTED}) if _wConfirm($$self{_WINDOWSCRIPTS}{main}, "PAC Script '$name' has changed.\nSave data before loading another script?");
+        $self->_saveFile($$self{_SELECTED}) if _wConfirm($$self{_WINDOWSCRIPTS}{main}, "Ásbrú Script '$name' has changed.\nSave data before loading another script?");
     }
 
     my $dh;
@@ -1348,18 +1301,18 @@ sub _updateGUI {
 
     my @sel = _getSelectedRows($$self{_WINDOWSCRIPTS}{treeScripts}->get_selection);
 
-    my $default = "* PAC Scripts *\n
-- Take a look at PAC example scripts to see how they work\n
+    my $default = "* Ásbrú Scripts *\n
+- Take a look at Ásbrú example scripts to see how they work\n
 - Now, 'Import' or create your own brand 'New' scripts, and 'Execute' them!\n
 - You may also 'Import' scripts by Drag and Drop Perl '.pl' files to the scripts list on the left side of this window\n
 - Remember: only one script can be executed at a time, and while executing, connection will be user-unresponsive (non-interactive)
 
-Feel free to send me any PAC Script you may find useful to the community!";
+Feel free to send me any Ásbrú Script you may find useful to the community!";
 
     if (! scalar(@sel) ) {
         if ($$self{_SELECTED} && $$self{_WINDOWSCRIPTS}{multiTextBuffer}->get_modified) {
             my $name = $$self{_WINDOWSCRIPTS}{treeScripts}->get_model->get_value($$self{_WINDOWSCRIPTS}{treeScripts}->get_model->get_iter($$self{_SELECTED}), 0);
-            $self->_saveFile($$self{_SELECTED}) if _wConfirm($$self{_WINDOWSCRIPTS}{main}, "PAC Script '$name' has changed.\nSave data before loading another script?");
+            $self->_saveFile($$self{_SELECTED}) if _wConfirm($$self{_WINDOWSCRIPTS}{main}, "Ásbrú Script '$name' has changed.\nSave data before loading another script?");
         }
 
         $SOURCEVIEW and $$self{_WINDOWSCRIPTS}{multiTextBuffer}->begin_not_undoable_action;
@@ -1385,7 +1338,7 @@ Feel free to send me any PAC Script you may find useful to the community!";
         my $name = $$self{_WINDOWSCRIPTS}{treeScripts}->get_model->get_value($$self{_WINDOWSCRIPTS}{treeScripts}->get_model->get_iter($sel[0]), 0);
 
         if ($$self{_WINDOWSCRIPTS}{multiTextBuffer}->get_modified && ($sel[0] ne $$self{_SELECTED}) ) {
-            $self->_saveFile($$self{_SELECTED}) if _wConfirm($$self{_WINDOWSCRIPTS}{main}, "PAC Script '$name' has changed.\nSave data before loading another script?");
+            $self->_saveFile($$self{_SELECTED}) if _wConfirm($$self{_WINDOWSCRIPTS}{main}, "Ásbrú Script '$name' has changed.\nSave data before loading another script?");
         }
         $$self{_SELECTED} = $sel[0];
         $$self{_WINDOWSCRIPTS}{gui}{textScript}->set_sensitive(! $PACMain::FUNCS{_MAIN}{_READONLY});
@@ -1400,7 +1353,7 @@ Feel free to send me any PAC Script you may find useful to the community!";
     } elsif (scalar(@sel) > 1) {
         if ($$self{_SELECTED} && $$self{_WINDOWSCRIPTS}{multiTextBuffer}->get_modified) {
             my $name = $$self{_WINDOWSCRIPTS}{treeScripts}->get_model->get_value($$self{_WINDOWSCRIPTS}{treeScripts}->get_model->get_iter($$self{_SELECTED}), 0);
-            $self->_saveFile($$self{_SELECTED}) if _wConfirm($$self{_WINDOWSCRIPTS}{main}, "PAC Script '$name' has changed.\nSave data before loading another script?");
+            $self->_saveFile($$self{_SELECTED}) if _wConfirm($$self{_WINDOWSCRIPTS}{main}, "Ásbrú Script '$name' has changed.\nSave data before loading another script?");
         }
 
         $SOURCEVIEW and $$self{_WINDOWSCRIPTS}{multiTextBuffer}->begin_not_undoable_action;
@@ -1429,6 +1382,7 @@ Feel free to send me any PAC Script you may find useful to the community!";
 sub _execScript {
     my $self = shift;
     my $name = shift;
+    my $parentWindow = shift;
 
     my @uuid_tmps = @_;
 
@@ -1601,7 +1555,7 @@ sub _execScript {
                 $PAC{_msg_wid}->destroy;
                 delete $PAC{_msg_wid};
             }
-            $PAC{_msg_wid} = _wMessage($PACMain::FUNCS{_MAIN}{_GUI}{main}, __($msg), $modal);
+            $PAC{_msg_wid} = _wMessage($parentWindow, __($msg), $modal);
         } else {
             $PAC{_msg_wid}->destroy if defined $PAC{_msg_wid};
             undef $PAC{_msg_wid};
@@ -1612,7 +1566,7 @@ sub _execScript {
 
     defined &SESSION and undef &SESSION;
     if (! open(F,"<:utf8",$file)) {
-        _wMessage(undef, "Could not open PAC Script file '$file' for reading: $!");
+        _wMessage($parentWindow, "Could not open Ásbrú Script file '$file' for reading: $!");
         return 1;
     }
     my @lines = <F>;
@@ -1622,7 +1576,7 @@ sub _execScript {
     no warnings ('redefine');
     eval $txt;
     use warnings;
-    if ($@) {_wMessage(undef, "Error parsing PAC Script: $@"); $PAC{msg}(); return 0;}
+    if ($@) {_wMessage($parentWindow, "Error parsing Ásbrú Script: $@"); $PAC{msg}(); return 0;}
 
     # SESSION execution (local)
     if (scalar @uuid_tmps) {
@@ -1632,23 +1586,23 @@ sub _execScript {
         }
     } else {
         if (! defined &SESSION) {
-            _wMessage(undef, "Error executing PAC Script:\nNo 'SESSION' function declaration found, and script not being executed directly from any Terminal!");
+            _wMessage($parentWindow, "Error executing Ásbrú Script:\nNo 'SESSION' function declaration found, and script not being executed directly from any Terminal!");
             $PAC{msg}();
             return 0;
         } else {
             eval {&SESSION;};
-            if ($@) {_wMessage(undef, "Error executing PAC Script: $@"); $PAC{msg}(); return 0;}
+            if ($@) {_wMessage($parentWindow, "Error executing Ásbrú Script: $@"); $PAC{msg}(); return 0;}
         }
     }
 
     # Save the list of started connections in $SHARED{_list_}
     $SHARED{_list_} = $PAC{list};
 
-    # CONNECTION execution (pac_conn)
+    # CONNECTION execution (asbru_conn)
     foreach my $tmp_uuid (keys %{$PAC{list}}) {
         next unless defined $PACMain::RUNNING{$tmp_uuid};
         if ($PACMain::RUNNING{$tmp_uuid}{terminal}{_SCRIPT_STATUS} ne 'STOP') {
-            _wMessage(undef, "ERROR: Can not start a new PAC Script while another one is still running:\nTerminal '$PACMain::RUNNING{$tmp_uuid}{terminal}{_NAME}' is running '$PACMain::RUNNING{$tmp_uuid}{terminal}{_SCRIPT_NAME}'", 1) ;
+            _wMessage($parentWindow, "ERROR: Can not start a new Ásbrú Script while another one is still running:\nTerminal '$PACMain::RUNNING{$tmp_uuid}{terminal}{_NAME}' is running '$PACMain::RUNNING{$tmp_uuid}{terminal}{_SCRIPT_NAME}'", 1) ;
             next;
         }
 
@@ -1660,7 +1614,7 @@ sub _execScript {
             # Skip if this tmp_uuid was not properly connected (for some reason)
             return 0 unless $PACMain::RUNNING{$tmp_uuid}{terminal}{CONNECTED};
 
-            # Advise pac_conn to receive script name
+            # Advise asbru_conn to receive script name
             kill(12, $PACMain::RUNNING{$tmp_uuid}{terminal}{_PID});
             my %tmp;
             $tmp{name} = $name;
diff --git a/lib/PACStatistics.pm b/lib/PACStatistics.pm
index a5931db6..e13534d4 100644
--- a/lib/PACStatistics.pm
+++ b/lib/PACStatistics.pm
@@ -3,7 +3,7 @@ package PACStatistics;
 ###############################################################################
 # This file is part of Ásbrú Connection Manager
 #
-# Copyright (C) 2017-2020 Ásbrú Connection Manager team (https://asbru-cm.net)
+# Copyright (C) 2017-2022 Ásbrú Connection Manager team (https://asbru-cm.net)
 # Copyright (C) 2010-2016 David Torrejon Vaquerizas
 #
 # Ásbrú Connection Manager is free software: you can redistribute it and/or
@@ -54,7 +54,7 @@ my $APPNAME = $PACUtils::APPNAME;
 my $APPVERSION = $PACUtils::APPVERSION;
 my $APPICON = $RealBin . '/res/asbru-logo-64.png';
 my $CFG_DIR = $ENV{"ASBRU_CFG"};
-my $STATS_FILE = $CFG_DIR . '/pac_stats.nfreeze';
+my $STATS_FILE = $CFG_DIR . '/asbru_stats.nfreeze';
 
 # END: Define GLOBAL CLASS variables
 ###################################################################
@@ -69,7 +69,6 @@ sub new {
 
     $self->{cfg} = shift;
     $self->{statistics} = {};
-
     $self->{container} = undef;
     $self->{frame} = {};
 
@@ -94,15 +93,15 @@ sub update {
     $$self{frame}{lblPR}->set_markup('');
     $$self{frame}{lblPG}->set_markup('');
     $$self{frame}{lblPN}->set_markup('');
-    $$self{frame}{hboxPACRoot}->hide;
-    $$self{frame}{hboxPACGroup}->hide;
-    $$self{frame}{hboxPACNode}->hide;
+    $$self{frame}{hboxPACRoot}->hide();
+    $$self{frame}{hboxPACGroup}->hide();
+    $$self{frame}{hboxPACNode}->hide();
 
     # Show/Hide widgets
     if ($uuid eq '__PAC__ROOT__') {
-        $$self{frame}{hboxPACRoot}->show;
-        $$self{frame}{hboxPACGroup}->hide;
-        $$self{frame}{hboxPACNode}->hide;
+        $$self{frame}{hboxPACRoot}->show();
+        $$self{frame}{hboxPACGroup}->hide();
+        $$self{frame}{hboxPACNode}->hide();
 
         my $groups = 0;
         my $nodes = 0;
@@ -110,12 +109,16 @@ sub update {
         my $total_time = 0;
 
         foreach my $tmpuuid (keys %{$$cfg{'environments'}}) {
-            next if $tmpuuid eq '__PAC__ROOT__';
+            if ($tmpuuid eq '__PAC__ROOT__') {
+                next;
+            }
             if ($$cfg{'environments'}{$tmpuuid}{_is_group}) {
                 $groups++;
                 $total_conn += ($$self{statistics}{$tmpuuid}{total_connections} // 0);
             } else {
-                $nodes++ unless $tmpuuid eq '__PAC_SHELL__';
+                if ($tmpuuid ne '__PAC_SHELL__') {
+                    $nodes++;
+                }
                 $total_time += ($$self{statistics}{$tmpuuid}{total_time} // 0);
                 $total_conn += ($$self{statistics}{$tmpuuid}{total_conn} // 0);
             }
@@ -123,23 +126,22 @@ sub update {
 
         # Prepare STRINGIFIED data
         my $str_total_time = '';
-        $str_total_time .= int($total_time / 86400)    . ' days, ';
-        $str_total_time .= ($total_time / 3600) % 24    . ' hours, ';
-        $str_total_time .= ($total_time / 60) % 60    . ' minutes, ';
-        $str_total_time .= $total_time % 60                . ' seconds';
+        $str_total_time .= int($total_time / 86400) . ' days, ';
+        $str_total_time .= ($total_time / 3600) % 24 . ' hours, ';
+        $str_total_time .= ($total_time / 60) % 60 . ' minutes, ';
+        $str_total_time .= $total_time % 60 . ' seconds';
 
         $$self{frame}{lblPR}->set_markup(
-            "<span $font>" .
-                "Total groups:                  <b>$groups</b>"            . "\n" .
-                "Total nodes:                   <b>$nodes</b>"            . "\n" .
-                "Total connections established: <b>$total_conn</b>"        . "\n" .
-                "Total time connected:          <b>$str_total_time</b>" .
-            "</span>"
+            "<span $font><b>All connections</b>\n" .
+            "Total groups:                  <b>$groups</b>\n" .
+            "Total nodes:                   <b>$nodes</b>\n" .
+            "Total connections established: <b>$total_conn</b>\n" .
+            "Total time connected:          <b>$str_total_time</b></span>"
         );
     } elsif ($$cfg{environments}{$uuid}{_is_group}) {
-        $$self{frame}{hboxPACRoot}->hide;
-        $$self{frame}{hboxPACGroup}->show;
-        $$self{frame}{hboxPACNode}->hide;
+        $$self{frame}{hboxPACRoot}->hide();
+        $$self{frame}{hboxPACGroup}->show();
+        $$self{frame}{hboxPACNode}->hide();
 
         my $groups = 0;
         my $nodes = 0;
@@ -159,23 +161,22 @@ sub update {
 
         # Prepare STRINGIFIED data
         my $str_total_time = '';
-        $str_total_time .= int($total_time / 86400)    . ' days, ';
-        $str_total_time .= ($total_time / 3600) % 24    . ' hours, ';
-        $str_total_time .= ($total_time / 60) % 60    . ' minutes, ';
-        $str_total_time .= $total_time % 60                . ' seconds';
+        $str_total_time .= int($total_time / 86400) . ' days, ';
+        $str_total_time .= ($total_time / 3600) % 24 . ' hours, ';
+        $str_total_time .= ($total_time / 60) % 60 . ' minutes, ';
+        $str_total_time .= $total_time % 60 . ' seconds';
 
         $$self{frame}{lblPG}->set_markup(
-            "<span $font>" .
-                "Total sub-groups:              <b>$groups</b>"            . "\n" .
-                "Total contained nodes:         <b>$nodes</b>"            . "\n" .
-                "Total connections established: <b>$total_conn</b>"        . "\n" .
-                "Total time connected:          <b>$str_total_time</b>" .
-            "</span>"
+            "<span $font><b>Group: @{[__($name)]}</b>\n" .
+            "Total sub-groups:              <b>$groups</b>\n" .
+            "Total contained nodes:         <b>$nodes</b>\n" .
+            "Total connections established: <b>$total_conn</b>\n" .
+            "Total time connected:          <b>$str_total_time</b></span>"
         );
     } else {
-        $$self{frame}{hboxPACRoot}->hide;
-        $$self{frame}{hboxPACGroup}->hide;
-        $$self{frame}{hboxPACNode}->show;
+        $$self{frame}{hboxPACRoot}->hide();
+        $$self{frame}{hboxPACGroup}->hide();
+        $$self{frame}{hboxPACNode}->show();
 
         my $groups = 0;
         my $nodes = 0;
@@ -191,34 +192,29 @@ sub update {
             $$self{statistics}{$uuid}{total_time} = 0;
         }
 
-        $start = $$self{statistics}{$uuid}{start}        // 0;
-        $stop = $$self{statistics}{$uuid}{stop}        // 0;
-        $total_conn = $$self{statistics}{$uuid}{total_conn}    // 0;
-        $total_time = $$self{statistics}{$uuid}{total_time}    // 0;
+        $start = $$self{statistics}{$uuid}{start} // 0;
+        $stop = $$self{statistics}{$uuid}{stop} // 0;
+        $total_conn = $$self{statistics}{$uuid}{total_conn} // 0;
+        $total_time = $$self{statistics}{$uuid}{total_time} // 0;
 
         my $str_start = $start ? strftime("%Y-%m-%d %H:%M:%S", localtime($$self{statistics}{$uuid}{start}) ) : 'NO DATA AVAILABLE';
         my $str_stop = $stop ? strftime("%Y-%m-%d %H:%M:%S", localtime($$self{statistics}{$uuid}{stop}) ) : 'NO DATA AVAILABLE';
 
         # Prepare STRINGIFIED data
         my $str_total_time = '';
-        $str_total_time .= int($total_time / 86400)    . ' days, ';
-        $str_total_time .= ($total_time / 3600) % 24    . ' hours, ';
-        $str_total_time .= ($total_time / 60) % 60    . ' minutes, ';
-        $str_total_time .= $total_time % 60                . ' seconds';
+        $str_total_time .= int($total_time / 86400) . ' days, ';
+        $str_total_time .= ($total_time / 3600) % 24 . ' hours, ';
+        $str_total_time .= ($total_time / 60) % 60 . ' minutes, ';
+        $str_total_time .= $total_time % 60 . ' seconds';
 
         $$self{frame}{lblPN}->set_markup(
-            "<span $font>" .
-                "Total time connected:          <b>$str_total_time</b>"    . "\n" .
-                "Total connections established: <b>$total_conn</b>"        . "\n" .
-                "Last connection:               <b>$str_start</b>" .
-            "</span>"
+            "<span $font><b>Connection: @{[__($name)]}</b>\n\n" .
+            "Total connections established: <b>$total_conn</b>\n" .
+            "Last connection:               <b>$str_start</b>\n" .
+            "Total time connected:          <b>$str_total_time</b></span>"
         );
     }
 
-    if ($uuid eq '__PAC__ROOT__')                        {$$self{frame}{btnReset}->set_label("Reset Statistics for\n'all connections'...");}
-    elsif ($$cfg{'environments'}{$uuid}{_is_group})    {$$self{frame}{btnReset}->set_label("Reset statistics for group\n'$name'...");}
-    else                                                {$$self{frame}{btnReset}->set_label("Reset statistics for\n'$name'...");}
-
     return 1;
 }
 
@@ -278,72 +274,80 @@ sub _buildStatisticsGUI {
     # Build a vbox for:buttons, separator and image widgets
     $w{hbox} = Gtk3::HBox->new(0, 0);
 
-        $w{btnReset} = Gtk3::Button->new_with_label('Reset Statistics...');
-        $w{btnReset}->set_image(Gtk3::Image->new_from_stock('gtk-refresh', 'button') );
-        $w{btnReset}->set('can-focus', 0);
-        $w{hbox}->pack_start($w{btnReset}, 0, 1, 0);
+    $w{hboxReset} = Gtk3::HBox->new(0, 5);
+    $w{hboxReset}->pack_start(Gtk3::Image->new_from_stock('gtk-refresh', 'menu'), 0, 1, 5);
+    $w{hboxReset}->pack_start(Gtk3::Label->new("Reset\nStatistics"), 0, 1, 5);
+    $w{btnReset} = Gtk3::Button->new();
+    $w{btnReset}->set_size_request(155, 0);
+    $w{btnReset}->set_valign('GTK_ALIGN_CENTER');
+    $w{btnReset}->set('can_focus', 0);
+    $w{btnReset}->add($w{hboxReset});
+    $w{hbox}->pack_start($w{btnReset}, 0, 0, 5);
 
-        $w{hbox}->pack_start(Gtk3::VSeparator->new, 0, 1, 5);
+    $w{vbox} = Gtk3::VBox->new(0, 0);
+    $w{hbox}->pack_start($w{vbox}, 1, 1, 0);
 
-        $w{vbox} = Gtk3::VBox->new(0, 0);
-        $w{hbox}->pack_start($w{vbox}, 1, 1, 0);
+    $w{hboxPACRoot} = Gtk3::HBox->new(0, 0);
+    $w{vbox}->pack_start($w{hboxPACRoot}, 0, 1, 0);
 
-            $w{hboxPACRoot} = Gtk3::HBox->new(0, 0);
-            $w{vbox}->pack_start($w{hboxPACRoot}, 0, 1, 0);
+    $w{lblPR} = Gtk3::Label->new();
+    $w{lblPR}->set_justify('left');
+    $w{lblPR}->set_line_wrap(1);
+    $w{hboxPACRoot}->pack_start($w{lblPR}, 0, 1, 0);
 
-                $w{lblPR} = Gtk3::Label->new;
-                $w{lblPR}->set_justify('left');
-                $w{hboxPACRoot}->pack_start($w{lblPR}, 0, 1, 0);
+    $w{hboxPACGroup} = Gtk3::HBox->new(0, 0);
+    $w{vbox}->pack_start($w{hboxPACGroup}, 0, 1, 0);
 
-            $w{hboxPACGroup} = Gtk3::HBox->new(0, 0);
-            $w{vbox}->pack_start($w{hboxPACGroup}, 0, 1, 0);
+    $w{lblPG} = Gtk3::Label->new();
+    $w{lblPG}->set_justify('left');
+    $w{lblPG}->set_line_wrap(1);
+    $w{hboxPACGroup}->pack_start($w{lblPG}, 0, 0, 0);
 
-                $w{lblPG} = Gtk3::Label->new;
-                $w{lblPG}->set_justify('left');
-                $w{hboxPACGroup}->pack_start($w{lblPG}, 0, 1, 0);
+    $w{hboxPACNode} = Gtk3::HBox->new(0, 0);
+    $w{vbox}->pack_start($w{hboxPACNode}, 0, 1, 0);
 
-            $w{hboxPACNode} = Gtk3::HBox->new(0, 0);
-            $w{vbox}->pack_start($w{hboxPACNode}, 0, 1, 0);
-
-                $w{lblPN} = Gtk3::Label->new;
-                $w{lblPN}->set_justify('left');
-                $w{hboxPACNode}->pack_start($w{lblPN}, 0, 1, 0);
+    $w{lblPN} = Gtk3::Label->new();
+    $w{lblPN}->set_justify('left');
+    $w{lblPN}->set_line_wrap(1);
+    $w{hboxPACNode}->pack_start($w{lblPN}, 0, 1, 0);
 
     $$self{container} = $w{hbox};
     $$self{frame} = \%w;
 
     # Callback(s)
-
     $w{btnReset}->signal_connect('clicked', sub {
         my $cfg = $$self{cfg};
         my $uuid = $$self{uuid};
         my $name = $$cfg{environments}{$uuid}{name};
 
         if ($uuid eq '__PAC__ROOT__') {
-            return 1 unless _wConfirm($PACMain::FUNCS{_MAIN}{_GUI}{main}, "Are you sure you want to reset <b>ALL PAC</b> statistics?\n(This action can not be undone!)");
-            foreach my $child (keys %{$$cfg{environments}})
-            {
-                next if $child eq '__PAC__ROOT__';
-                $$self{statistics}{$child}{start} = 0;
-                $$self{statistics}{$child}{stop} = 0;
-                $$self{statistics}{$child}{total_conn} = 0;
-                $$self{statistics}{$child}{total_time} = 0;
+            if (_wConfirm($PACMain::FUNCS{_MAIN}{_GUI}{main}, "Are you sure you want to reset <b>all Ásbrú</b> statistics?\n\nThis action can not be undone!")) {
+                foreach my $child (keys %{$$cfg{environments}}) {
+                    if ($child eq '__PAC__ROOT__') {
+                        next;
+                    }
+                    $$self{statistics}{$child}{start} = 0;
+                    $$self{statistics}{$child}{stop} = 0;
+                    $$self{statistics}{$child}{total_conn} = 0;
+                    $$self{statistics}{$child}{total_time} = 0;
+                }
             }
         } elsif ($$cfg{environments}{$uuid}{_is_group}) {
-            return 1 unless _wConfirm($PACMain::FUNCS{_MAIN}{_GUI}{main}, "Are you sure you want to reset statistics for group '<b>$name</b>'?\n(This action can not be undone!)");
-            foreach my $child ($PACMain::FUNCS{_MAIN}{_GUI}{treeConnections}->_getChildren($uuid, 0, 1) )
-            {
-                $$self{statistics}{$child}{start} = 0;
-                $$self{statistics}{$child}{stop} = 0;
-                $$self{statistics}{$child}{total_conn} = 0;
-                $$self{statistics}{$child}{total_time} = 0;
+            if (_wConfirm($PACMain::FUNCS{_MAIN}{_GUI}{main}, "Are you sure you want to reset statistics for group:\n\n<b>@{[__($name)]}</b>\n\nThis action can not be undone!")) {
+                foreach my $child ($PACMain::FUNCS{_MAIN}{_GUI}{treeConnections}->_getChildren($uuid, 0, 1)) {
+                    $$self{statistics}{$child}{start} = 0;
+                    $$self{statistics}{$child}{stop} = 0;
+                    $$self{statistics}{$child}{total_conn} = 0;
+                    $$self{statistics}{$child}{total_time} = 0;
+                }
             }
         } else {
-            return 1 unless _wConfirm($PACMain::FUNCS{_MAIN}{_GUI}{main}, "Are you sure you want to reset statistics for connection '<b>$name</b>'?\n(This action can not be undone!)");
-            $$self{statistics}{$uuid}{start} = 0;
-            $$self{statistics}{$uuid}{stop} = 0;
-            $$self{statistics}{$uuid}{total_conn} = 0;
-            $$self{statistics}{$uuid}{total_time} = 0;
+            if (_wConfirm($PACMain::FUNCS{_MAIN}{_GUI}{main}, "Are you sure you want to reset statistics for connection:\n\n<b>@{[__($name)]}</b>\n\nThis action can not be undone!")) {
+                $$self{statistics}{$uuid}{start} = 0;
+                $$self{statistics}{$uuid}{stop} = 0;
+                $$self{statistics}{$uuid}{total_conn} = 0;
+                $$self{statistics}{$uuid}{total_time} = 0;
+            }
         }
 
         $self->update($uuid);
diff --git a/lib/PACTerminal.pm b/lib/PACTerminal.pm
index c349b10a..cb5aa23e 100644
--- a/lib/PACTerminal.pm
+++ b/lib/PACTerminal.pm
@@ -3,7 +3,7 @@ package PACTerminal;
 ###############################################################################
 # This file is part of Ásbrú Connection Manager
 #
-# Copyright (C) 2017-2020 Ásbrú Connection Manager team (https://asbru-cm.net)
+# Copyright (C) 2017-2022 Ásbrú Connection Manager team (https://asbru-cm.net)
 # Copyright (C) 2010-2016 David Torrejón Vaquerizas
 #
 # Ásbrú Connection Manager is free software: you can redistribute it and/or
@@ -21,8 +21,8 @@ package PACTerminal;
 # If not, see <http://www.gnu.org/licenses/gpl-3.0.html>.
 ###############################################################################
 use utf8;
-binmode STDOUT,':utf8';
-binmode STDERR,':utf8';
+binmode STDOUT, ':utf8';
+binmode STDERR, ':utf8';
 
 $|++;
 
@@ -41,7 +41,10 @@ use File::Copy;
 use Encode qw (encode decode);
 use IO::Socket::INET;
 use Time::HiRes qw (gettimeofday);
-use KeePass;
+use PACKeePass;
+use List::Util qw (min max);
+
+use Config;
 
 # GTK
 use Gtk3 '-init';
@@ -67,8 +70,7 @@ my $APPVERSION = $PACUtils::APPVERSION;
 my $APPICON = "$RealBin/res/asbru-logo-64.png";
 my $CFG_DIR = $ENV{"ASBRU_CFG"};
 
-my $PERL_BIN = '/usr/bin/perl';
-my $PAC_CONN = "$RealBin/lib/pac_conn";
+my $PAC_CONN = "$RealBin/lib/asbru_conn";
 
 my $SHELL_BIN = -x '/bin/sh' ? '/bin/sh' : '/bin/bash';
 my $SHELL_NAME = -x '/bin/sh' ? 'sh' : 'bash';
@@ -131,7 +133,7 @@ sub new {
     $self->{_SCRIPT_NAME} = '';
 
     $self->{_EXEC} = {};
-    $self->{_EXEC_LAST} = join('.', gettimeofday);
+    $self->{_EXEC_LAST} = join('.', gettimeofday());
 
     $self->{_BADEXIT} = 1;
     $self->{_GUILOCKED} = 0;
@@ -144,39 +146,44 @@ sub new {
     $self->{_FOCUSED} = 0;
     $self->{FOCUS} = 0;
     $self->{EMBED} = $self->{_CFG}{'environments'}{$$self{_UUID}}{'embed'};
+    $self->{EMBED_CHECK_COUNT} = 0;
+    $self->{EMBED_CHECK_TIMEOUT} = 250; # in milliseconds
+    $self->{EMBED_CHECK_TIMEOUT_ID} = undef;
+    $self->{VTE_EMULATION} = $self->{_CFG}{'environments'}{$$self{'_UUID'}}{'terminal options'}{'use personal settings'} ? $self->{_CFG}{'environments'}{$$self{'_UUID'}}{'terminal options'}{'terminal emulation'} // 0 : 0;
 
     ++$_C;
-    $self->{_UUID_TMP} = "pac_PID{$$}_n$_C";
+    $self->{_UUID_TMP} = "asbru_PID{$$}_n$_C";
 
+    # By default, there is no session logs
+    $self->{_LOGFILE} = '/dev/null';
+    # If enabled at the session or global level, define the session logs file accordingly
     if ($self->{_CFG}{'environments'}{$$self{_UUID}}{'save session logs'}) {
         $self->{_LOGFILE} = $self->{_CFG}{'environments'}{$$self{_UUID}}{'session logs folder'} . '/';
-        $self->{_LOGFILE} .= _subst($self->{_CFG}{'environments'}{$$self{_UUID}}{'session log pattern'}, $$self{_CFG}, $$self{_UUID});
+        $self->{_LOGFILE} .= _subst($self->{_CFG}{'environments'}{$$self{_UUID}}{'session log pattern'}, $$self{_CFG}, $$self{_UUID}, $$self{_UUID_TMP});
     } elsif ($self->{_CFG}{'defaults'}{'save session logs'}) {
         $self->{_LOGFILE} = $self->{_CFG}{'defaults'}{'session logs folder'} . '/';
-        $self->{_LOGFILE} .= _subst($self->{_CFG}{'defaults'}{'session log pattern'}, $$self{_CFG}, $$self{_UUID});
-    } else {
-        $self->{_LOGFILE} = "$CFG_DIR/tmp/$$self{_UUID_TMP}.txt";
+        $self->{_LOGFILE} .= _subst($self->{_CFG}{'defaults'}{'session log pattern'}, $$self{_CFG}, $$self{_UUID}, $$self{_UUID_TMP});
     }
     $self->{_TMPCFG} = "$CFG_DIR/tmp/$$self{_UUID_TMP}freeze";
 
-    $self->{_TMPPIPE} = "$CFG_DIR/tmp/pac_PID{$$}_n$_C.pipe";
+    $self->{_TMPPIPE} = $ENV{"ASBRU_TMP"}."/asbru_PID{$$}_n$_C.pipe";
     while (-f $$self{_TMPPIPE}) {
         ++$_C;
-        $$self{_TMPPIPE} = "$CFG_DIR/tmp/pac_PID{$$}_n$_C.pipe";
+        $$self{_TMPPIPE} = $ENV{"ASBRU_TMP"}."/asbru_PID{$$}_n$_C.pipe";
     }
     unlink $$self{_TMPPIPE};
 
-    $self->{_TMPSOCKET} = "$CFG_DIR/sockets/pac_PID{$$}_n$_C.socket";
+    $self->{_TMPSOCKET} = $ENV{"ASBRU_TMP"}."/asbru_PID{$$}_n$_C.socket";
     while (-f $$self{_TMPSOCKET}) {
         ++$_C;
-        $$self{_TMPSOCKET} = "$CFG_DIR/sockets/pac_PID{$$}_n$_C.socket";
+        $$self{_TMPSOCKET} = $ENV{"ASBRU_TMP"}."/asbru_PID{$$}_n$_C.socket";
     }
     unlink $$self{_TMPSOCKET};
 
-    $self->{_TMPSOCKETEXEC} = "$CFG_DIR/sockets/pac_PID{$$}_n$_C.exec.socket";
+    $self->{_TMPSOCKETEXEC} = $ENV{"ASBRU_TMP"}."/asbru_PID{$$}_n$_C.exec.socket";
     while (-f $$self{_TMPSOCKETEXEC}) {
         ++$_C;
-        $$self{_TMPSOCKETEXEC} = "$CFG_DIR/sockets/pac_PID{$$}_n$_C.exec.socket";
+        $$self{_TMPSOCKETEXEC} = $ENV{"ASBRU_TMP"}."/asbru_PID{$$}_n$_C.exec.socket";
     }
     unlink $$self{_TMPSOCKETEXEC};
 
@@ -189,19 +196,21 @@ sub new {
     my $name = $$self{_CFG}{'environments'}{$$self{_UUID}}{'name'};
     my $title = $$self{_CFG}{'environments'}{$$self{_UUID}}{'title'};
     $$self{_TITLE} = $title || $name;
-    $$self{_TITLE} = _subst($$self{_TITLE}, $$self{_CFG}, $$self{_UUID});
+    $$self{_TITLE} = _subst($$self{_TITLE}, $$self{_CFG}, $$self{_UUID}, $$self{_UUID_TMP});
 
     # Build the GUI
     _initGUI($self) or return 0;
     # Setup callbacks
     _setupCallbacks($self) or return 0;
     # Load connection methods
-    %{$$self{_METHODS}} = _getMethods($self) or return 0;
+    %{$$self{_METHODS}} = _getMethods($self, $PACMain::FUNCS{_MAIN}{_THEME}) or return 0;
 
     $PACMain::RUNNING{$$self{'_UUID_TMP'}}{'uuid'} = $$self{'_UUID'};
     $PACMain::RUNNING{$$self{'_UUID_TMP'}}{'terminal'} = $self;
     $PACMain::RUNNING{$$self{'_UUID_TMP'}}{'is_shell'} = 0;
 
+    $PACMain::FUNCS{_KEYBINDS}->LoadHotKeys($$self{_CFG}, $$self{_UUID});
+
     $self->{_EXPECTED} = 0;
     $self->{_PULSE} = 1;
     $self->{_TOTAL} = 0;
@@ -221,13 +230,12 @@ sub new {
         Local => $$self{_TMPSOCKETEXEC}
     ) or die "ERROR:$!";
 
-
     # Add a Glib watcher to listen to new connections (in a non-blocking fashion)
     $self->{_SOCKET_WATCH_EXEC} = Glib::IO->add_watch(fileno($self->{_SOCKET_CONN_EXEC}), ['in', 'hup', 'err'], sub {
         my ($fd, $cond, $self) = @_;
 
         my $tmp_client;
-        do {$tmp_client = $self->{_SOCKET_CONN_EXEC}->accept} until defined $tmp_client;
+        do {$tmp_client = $self->{_SOCKET_CONN_EXEC}->accept()} until defined $tmp_client;
 
         $self->{_SOCKET_CLIENT_EXEC} = $tmp_client;
         $self->{_SOCKET_CLIENT_EXEC}->blocking(0);
@@ -244,13 +252,13 @@ sub new {
             if (defined $self->{_SOCKET_CONN}) {
                 $self->{_SOCKET_CONN}->close();
             }
-            _wMessage($$self{_WINDOWTERMINAL}, 'Master socket at port ' . $self->{_SOCKET_PORT} . ' was closed !!');
+            _wMessage($$self{_PARENTWINDOW}, 'Master socket at port ' . $self->{_SOCKET_PORT} . ' was closed !!');
             return 0;
         }
 
         my $tmp_client;
         do {
-            $tmp_client = $self->{_SOCKET_CONN}->accept
+            $tmp_client = $self->{_SOCKET_CONN}->accept();
         } until defined $tmp_client;
 
         # Make sure that this client is a PAC client:
@@ -268,22 +276,11 @@ sub new {
 
     }, $self);
 
-    # If KeePass is selected, load it's database and prepare submenu for VTE right-click
-    if ($$self{_CFG}{'defaults'}{'keepass'}{'use_keepass'}) {
-        foreach my $hash ($PACMain::FUNCS{_KEEPASS}->find) {
-            push(@KPX,
-            {
-                label => "Title: '$$hash{title}', Username: '$$hash{username}'",
-                tooltip => "$$hash{password}",
-                code => sub {_vteFeedChild($$self{_GUI}{_VTE}, $$hash{password});}
-            });
-        }
-    }
     #Accessability shortcuts
     $$self{variables}=$$self{_CFG}{environments}{$$self{_UUID}}{variables};
 
     # Autohide non tabbed help terminals
-    if ((defined $$self{_WINDOWTERMINAL})&&(!$$self{_CFG}{'defaults'}{'debug'})&&(!$$self{EMBED})&&($$self{_CFG}{'environments'}{$$self{_UUID}}{'method'} =~ /freerdp|rdesktop|vnc/i)) {
+    if ((defined $$self{_WINDOWTERMINAL})&&(!$$self{_CFG}{'defaults'}{'debug'})&&(!$$self{EMBED})&&($$self{_CFG}{'environments'}{$$self{_UUID}}{'method'} =~ /vnc/i)) {
         $$self{_WINDOWTERMINAL}->hide();
     }
 
@@ -312,19 +309,34 @@ sub start {
     if ($$self{CONNECTED} || $$self{CONNECTING}) {
         return 1;
     }
-
     my $name = $$self{_CFG}{'environments'}{$$self{_UUID}}{'name'};
-    my $title = $$self{_CFG}{'environments'}{$$self{_UUID}}{'title'};
+    my $title = $$self{_TITLE};
     my $method = $$self{_CFG}{'environments'}{$$self{_UUID}}{'method'};
     my $reconnect_msg = '';
     my $reconnect_count = '';
 
+    # Check that session information is still valid
+    if (!defined($name)) {
+        # Session is invalid for some reason, ignore
+        return 0;
+    }
+
+    # If this terminal requires a KeePass database file and that we don't have a connection to a KeePass file yet; ask for the database password now
+    if (!$ENV{'KPXC_MP'} && $PACMain::FUNCS{_KEEPASS}->hasKeePassField($$self{_CFG}, $$self{_UUID})) {
+        if ($$self{_CFG}{defaults}{keepass}{password}) {
+            $ENV{'KPXC_MP'} = $$self{_CFG}{defaults}{keepass}{password};
+        } else {
+            my $kpxc = PACKeePass->new(0, $$self{_CFG}{defaults}{keepass});
+            $kpxc->getMasterPassword($$self{_PARENTWINDOW});
+        }
+    }
+
     if ($$self{'_RECONNECTS'}) {
         $reconnect_msg = 'RE';
         $reconnect_count = " ${COL_RED}attempt:$$self{'_RECONNECTS'}${COL_RESET}";
     }
-    my $string = $method eq 'generic' ? encode('UTF-8',"${COL_GREEN}${reconnect_msg}LAUNCHING${COL_RESET} ${COL_YELL}$title${COL_RESET}") : encode('UTF-8',"${COL_GREEN}${reconnect_msg}CONNECTING WITH${COL_RESET} ${COL_YELL}$title${COL_RESET}");
-    _vteFeed($$self{_GUI}{_VTE},"\r\n$string (" . (localtime(time)) . ")$reconnect_count\r\n\n");
+    my $string = $method eq 'generic' ? encode('UTF-8', "${COL_GREEN}${reconnect_msg}LAUNCHING${COL_RESET} ${COL_YELL}$title${COL_RESET}") : encode('UTF-8', "${COL_GREEN}${reconnect_msg}CONNECTING WITH${COL_RESET} ${COL_YELL}$title${COL_RESET}");
+    _vteFeed($$self{_GUI}{_VTE}, "\r\n$string (" . (localtime(time)) . ")$reconnect_count\r\n\n");
 
     $$self{_PULSE} = 1;
 
@@ -348,18 +360,25 @@ sub start {
     $$self{_CFG}{'tmp'}{'uuid'} = $$self{_UUID_TMP};
 
     if ($$self{'EMBED'}) {
+        # Reset counter
+        $self->{EMBED_CHECK_COUNT} = 0;
+
         # Create new socket window to plug the embed window from the other process (rdp, vnc, ...)
         # (remove any remaining window before starting to add a new one)
         $$self{_GUI}{_SOCKET} = Gtk3::Socket->new();
-        $$self{_GUI}{_SOCKET_PARENT_WINDOW}->foreach(sub {$$self{_GUI}{_SOCKET_PARENT_WINDOW}->remove($_[0]);});
+        $$self{_GUI}{_SOCKET_PARENT_WINDOW}->foreach(sub {
+            $$self{_GUI}{_SOCKET_PARENT_WINDOW}->remove($_[0]);
+        });
         $$self{_GUI}{_SOCKET_PARENT_WINDOW}->add_with_viewport($$self{_GUI}{_SOCKET});
 
+        # Do not show until conncection is completed
+        $$self{_GUI}{_SOCKET_PARENT_WINDOW}->hide();
+
         # Retrieve the XID of the window on which the external process will have to plug into
         if ($$self{_GUI}{_SOCKET}->get_window()) {
             $$self{_CFG}{'tmp'}{'xid'} = $$self{_GUI}{_SOCKET}->get_window()->get_xid();
             $$self{FOCUS} = $$self{_GUI}{_SOCKET};
         } else {
-            $$self{_GUI}{_SOCKET_PARENT_WINDOW}->hide();
             _vteFeed($$self{_GUI}{_VTE}, " !! ${COL_RED}ERROR${COL_RESET}: unable to created embedded window.  Terminal will be started in a separated window.\r\n\n");
         }
 
@@ -369,8 +388,11 @@ sub start {
         # Get available size for the embed window
         $$self{_CFG}{'tmp'}{'width'} = $$self{_GUI}{_VBOX}->get_allocated_width();
         $$self{_CFG}{'tmp'}{'height'} = $$self{_GUI}{_VBOX}->get_allocated_height() - $$self{_GUI}{bottombox}->get_allocated_height();
+        if (defined($$self{_GUI}{_MACROSBOX}) && $$self{_GUI}{_MACROSBOX}->get_visible()) {
+            $$self{_CFG}{'tmp'}{'height'} -= $$self{_GUI}{_MACROSBOX}->get_allocated_height();
+        }
         eval {
-            $PACMain::FUNCS{_MAIN}{_GUI}{vbox3}->get_visible or $$self{_CFG}{'tmp'}{'width'} += $PACMain::FUNCS{_MAIN}{_GUI}{vbox3}->get_allocated_width;
+            $PACMain::FUNCS{_MAIN}{_GUI}{vboxCommandPanel}->get_visible() or $$self{_CFG}{'tmp'}{'width'} += $PACMain::FUNCS{_MAIN}{_GUI}{vboxCommandPanel}->get_allocated_width();
         };
     } else {
         delete $$self{_CFG}{'tmp'}{'xid'};
@@ -378,23 +400,38 @@ sub start {
         delete $$self{_CFG}{'tmp'}{'height'};
     }
 
-    # Duplicate and dump non-persistent configuration into temporal file for 'pac_conn'
+    # Duplicate and dump non-persistent configuration into temporal file for 'asbru_conn'
     my %new_cfg;
     $new_cfg{'defaults'} = dclone($$self{_CFG}{'defaults'});
     $new_cfg{'environments'}{$$self{_UUID}} = dclone($$self{_CFG}{'environments'}{$$self{_UUID}});
     $new_cfg{'tmp'} = dclone($$self{_CFG}{'tmp'});
-    @{$new_cfg{'keepass'}} = $PACMain::FUNCS{_KEEPASS}->find;
     if (defined $$self{_MANUAL}) {
         $new_cfg{'environments'}{$$self{_UUID}}{'auth type'} = $$self{_MANUAL};
     }
-    nstore(\%new_cfg, $$self{_TMPCFG}) or die"ERROR: Could not save PAC config file '$$self{_TMPCFG}': $!";
+    if ($$self{_CFG}{'environments'}{$$self{_UUID}}{'method'} =~ /ssh/i && $$self{_CFG}{'environments'}{$$self{_UUID}}{'connection options'}{'randomSocksTunnel'}) {
+        my $SOCKS5PORT = _getLocalPort(10240 + int(rand(65535 - 10240)));
+        $PACMain::SOCKS5PORTS{$$self{_UUID_TMP}} = $SOCKS5PORT;
+        $new_cfg{'tmp'}{'randomSocksTunnel'} = $SOCKS5PORT;
+    }
+    nstore(\%new_cfg, $$self{_TMPCFG}) or die"ERROR: Could not save Ásbrú config file '$$self{_TMPCFG}': $!";
     undef %new_cfg;
 
     # Delete the oldest auto-saved session log
     if ($$self{_CFG}{'environments'}{$$self{_UUID}}{'save session logs'}) {
-        _deleteOldestSessionLog($$self{_UUID}, $$self{_CFG}{'environments'}{$$self{_UUID}}{'session logs folder'}, $$self{_CFG}{'environments'}{$$self{_UUID}}{'session logs amount'});
-    } elsif($$self{_CFG}{'defaults'}{'save session logs'}) {
-        _deleteOldestSessionLog($$self{_UUID}, $$self{_CFG}{'defaults'}{'session logs folder'},  $$self{_CFG}{'defaults'}{'session logs amount'});
+        if (-w $$self{_CFG}{'environments'}{$$self{_UUID}}{'session logs folder'}) {
+            _deleteOldestSessionLog($$self{_UUID}, $$self{_CFG}{'environments'}{$$self{_UUID}}{'session logs folder'}, $$self{_CFG}{'environments'}{$$self{_UUID}}{'session logs amount'});
+        } else {
+            print STDERR "WARN: Unable to write into the session logs folder [$$self{_CFG}{'environments'}{$$self{_UUID}}{'session logs folder'}], session logs will not be recorded.\n";
+            print STDERR "WARN: Check your terminal settings to fix the issue.\n";
+        }
+    }
+    if (!$$self{_CFG}{'environments'}{$$self{_UUID}}{'save session logs'} && $$self{_CFG}{'defaults'}{'save session logs'}) {
+        if (-w $$self{_CFG}{'defaults'}{'session logs folder'}) {
+            _deleteOldestSessionLog($$self{_UUID}, $$self{_CFG}{'defaults'}{'session logs folder'}, $$self{_CFG}{'defaults'}{'session logs amount'});
+        } else {
+            print STDERR "WARN: Unable to write into the session logs folder [$$self{_CFG}{'defaults'}{'session logs folder'}], session logs will not be recorded.\n";
+            print STDERR "WARN: Check your global preferences to fix the issue.\n";
+        }
     }
 
     $$self{CONNECTING} = 1;
@@ -402,13 +439,23 @@ sub start {
     my $isCluster = $$self{_CLUSTER} ? 1 : 0;
     # Start and fork our connector
     my @args;
+    my $spawn_env;
+    my $subCwd = $method eq 'PACShell' ? $$self{_CFG}{'defaults'}{'shell directory'} : '.';
     if ($$self{_CFG}{'defaults'}{'use login shell to connect'}) {
-        @args = [$SHELL_BIN, $SHELL_NAME, '-l', '-c', "($PERL_BIN $PAC_CONN $$self{_TMPCFG} $$self{_UUID} $isCluster; exit)"];
+        @args = [$SHELL_BIN, $SHELL_NAME, '-l', '-c', "($ENV{'ASBRU_ENV_FOR_INTERNAL'} '$^X' '$PAC_CONN' '$$self{_TMPCFG}' '$$self{_UUID}' '$isCluster'; exit)"];
+        $spawn_env = $ENV{'ASBRU_ENV_FOR_EXTERNAL'};
     } else {
-        @args = [$PERL_BIN, 'perl', $PAC_CONN, $$self{_TMPCFG}, $$self{_UUID}, $isCluster];
+        @args = [$^X, $^X, $PAC_CONN, $$self{_TMPCFG}, $$self{_UUID}, $isCluster];
+        $spawn_env = "";
     }
-    if (!$$self{_GUI}{_VTE}->spawn_sync([], $method eq 'PACShell' ? $$self{_CFG}{'defaults'}{'shell directory'} : undef, @args, undef, 'G_SPAWN_FILE_AND_ARGV_ZERO', undef, undef, undef)) {
-        $$self{ERROR} = "ERROR: VTE could not fork command '$PAC_CONN $$self{_TMPCFG} $$self{_UUID}'!!";
+    $spawn_env .= " ASBRU_SUB_CWD='$subCwd'";
+    my @arr_spawn_env = $self->_convertEnv($spawn_env);
+    my $spawnSyncResult = undef;
+    eval {
+        $spawnSyncResult = $$self{_GUI}{_VTE}->spawn_sync([], undef, @args, \@arr_spawn_env, 'G_SPAWN_FILE_AND_ARGV_ZERO', undef, undef, undef);
+    };
+    if (!$spawnSyncResult || $@) {
+        $$self{ERROR} = "ERROR: VTE could not fork command '$PAC_CONN $$self{_TMPCFG} $$self{_UUID} $isCluster $subCwd'!! at: $@";
         $$self{CONNECTING} = 0;
         return 0;
     }
@@ -433,30 +480,27 @@ sub start {
         $PACMain::FUNCS{_CLUSTER}->addToCluster($$self{_UUID_TMP}, $$self{_CLUSTER});
     }
 
-    # Create a Glib timeout to programatically send a given string to the connected terminal (if so is configured!)
-    defined $$self{_SEND_STRING} and Glib::Source->remove($$self{_SEND_STRING});
-    $$self{_CFG}{environments}{$$self{_UUID}}{'send string active'} and $$self{_SEND_STRING} = Glib::Timeout->add_seconds(
-        $$self{_CFG}{environments}{$$self{_UUID}}{'send string every'},
-        sub {
-            if (not $$self{CONNECTED} && $$self{_CFG}{environments}{$$self{_UUID}}{'send string active'}) {
-                return 1;
-            }
+    $self->_startSendStringTimeout();
 
-            my $txt = $$self{_CFG}{environments}{$$self{_UUID}}{'send string txt'};
-            my $intro = $$self{_CFG}{environments}{$$self{_UUID}}{'send string intro'};
-            $txt = _subst($txt, $$self{_CFG}, $$self{_UUID});
-            _vteFeedChild($$self{_GUI}{_VTE}, $txt . ($intro ? "\n" : ''));
-
-            return 1;
-        }
-    );
-
-    $$self{_CFG}{'environments'}{$$self{_UUID}}{'startup script'} and $PACMain::FUNCS{_SCRIPTS}->_execScript($$self{_CFG}{'environments'}{$$self{_UUID}}{'startup script name'}, $$self{_UUID_TMP});
+    $$self{_CFG}{'environments'}{$$self{_UUID}}{'startup script'} and $PACMain::FUNCS{_SCRIPTS}->_execScript($$self{_CFG}{'environments'}{$$self{_UUID}}{'startup script name'}, $self->{_PARENTWINDOW}, $$self{_UUID_TMP});
     $$self{_GUI}{_VTE}->grab_focus();
-    $$self{_GUI}{_VTE}->set_bold_is_bright($$self{_CFG}{'defaults'}{'bold is brigth'});
+    if ($PACMain::FUNCS{_MAIN}{_Vte}{has_bright}) {
+        $$self{_GUI}{_VTE}->set_bold_is_bright($$self{_CFG}{'defaults'}{'bold is brigth'});
+    }
     return 1;
 }
 
+# Converts env vars string list to array
+sub _convertEnv {
+    my $self = shift;
+    my $env_string = shift;
+    my @matches = ();
+    while ($env_string =~ /(?<envName>\w+)=(?<envValue>(?<quot>['"]?)[^']*?\k{quot})/g) {
+        push @matches, "$+{envName}=$+{envValue}";
+    }
+    return @matches;
+}
+
 # Stop and close GUI
 sub stop {
     my $self = shift;
@@ -469,6 +513,11 @@ sub stop {
     # First of all, save THIS page's widget (to prevent closing a not selected tab)
     my $p_widget = $$self{_GUI}{_VBOX};
 
+    # Set mouse pointer in case a postexec was executed
+    if ($p_widget->get_window()) {
+        $p_widget->get_window()->set_cursor(Gtk3::Gdk::Cursor->new('left-ptr'));
+    }
+
     if ($NPOSX>0) {
         $NPOSX--;
         if (($NPOSY>0)&&($NPOSX==0)) {
@@ -485,7 +534,7 @@ sub stop {
     # May be user wants to close without confirmation...
     if ((! $force) && ($self->{CONNECTED})) {
         # Ask for confirmation
-        if (!_wConfirm($$self{_WINDOWTERMINAL}, "Are you sure you want to close '" . ($$self{_SPLIT} ? 'this split tab' : __($$self{_TITLE})) . "'?")) {
+        if (!_wConfirm($$self{_WINDOWTERMINAL}, "Are you sure you want to close '" . ($$self{_SPLIT} ? 'this split tab' : __($$self{_TITLE})) . "'?", 'yes')) {
             return 1;
         }
 
@@ -500,6 +549,10 @@ sub stop {
         }
     }
 
+    if ($$self{_CLUSTER} ne '') {
+        $PACMain::FUNCS{_CLUSTER}->delFromCluster($$self{_UUID_TMP}, $$self{_CLUSTER});
+    }
+
     # Send any configured keypress to close the forked binary
     if ($$self{CONNECTED} && defined $$self{_METHODS}{$$self{_CFG}{'environments'}{$$self{_UUID}}{'method'}}{'escape'}) {
         foreach my $esc (@{$$self{_METHODS}{$$self{_CFG}{'environments'}{$$self{_UUID}}{'method'}}{'escape'}}) {
@@ -518,28 +571,8 @@ sub stop {
         $PACMain::RUNNING{$$self{_SPLIT}}{terminal}->stop(1, 0);
     }
 
-    # Finish the GUI
-    if ($$self{_TABBED}) {
-        my $p_num = -1;
-        if ($$self{_SPLIT}) {
-            $p_num = $$self{_NOTEBOOK}->page_num($p_widget->get_parent);
-        } else {
-            $p_num = $$self{_NOTEBOOK}->page_num($p_widget);
-        }
-
-        # Skip destruction if this tab does not exists after having answered to _wConfirm
-        if ($p_num >= 0) {
-            $$self{_NOTEBOOK}->remove_page($p_num);
-        }
-    } else {
-        $$self{_WINDOWTERMINAL}->destroy();
-        undef($$self{_WINDOWTERMINAL});
-    }
-
-    # Try to ensure we leave no background "pac_conn" processes running after closing the terminal
-    if ($$self{_PID}) {
-        kill(15, $$self{_PID});
-    }
+    # Try to ensure we leave no background "asbru_conn" processes running after closing the terminal
+    $self->_disconnectTerminal();
     if ($$self{_PID}) {
         $PACMain::FUNCS{_STATS}->stop($$self{_UUID});
     }
@@ -559,17 +592,33 @@ sub stop {
     if (defined $$self{_SEND_STRING}) {
         eval {
             Glib::Source->remove($$self{_SEND_STRING});
+            undef $$self{_SEND_STRING};
         };
     }
-    if (defined $$self{_EMBED_KIDNAP}) {
-        eval {
-            Glib::Source->remove($$self{_EMBED_KIDNAP});
-        };
+    $self->_stopEmbedKidnapTimeout();
+
+    # Finish the GUI
+    if ($$self{_TABBED}) {
+        my $p_num = -1;
+        if ($$self{_SPLIT}) {
+            $p_num = $$self{_NOTEBOOK}->page_num($p_widget->get_parent());
+        } else {
+            $p_num = $$self{_NOTEBOOK}->page_num($p_widget);
+        }
+
+        # Skip destruction if this tab does not exists after having answered to _wConfirm
+        if ($p_num >= 0) {
+            $$self{_NOTEBOOK}->remove_page($p_num);
+        }
+    } else {
+        $$self{_WINDOWTERMINAL}->destroy();
+        undef($$self{_WINDOWTERMINAL});
     }
 
     unlink($$self{_TMPCFG});
     unlink($$self{_TMPPIPE});
     unlink($$self{_TMPSOCKET});
+    unlink($$self{_TMPSOCKETEXEC});
     if (!($self->{_CFG}{'defaults'}{'save session logs'} || $self->{_CFG}{'environments'}{$$self{_UUID}}{'save session logs'})) {
         unlink($$self{_LOGFILE});
     }
@@ -579,6 +628,8 @@ sub stop {
         delete $$self{_CFG}{environments}{$$self{_UUID}};
     }
 
+    delete $PACMain::SOCKS5PORTS{$$self{_UUID_TMP}};
+
     # And delete ourselves
     $$self{_GUI} = undef;
     undef $self;
@@ -590,8 +641,6 @@ sub lock {
     my $self = shift;
     $$self{_TABBED} and $$self{_GUI}{_TABLBL}->set_sensitive(0);
     $$self{_GUI}{_VBOX}->set_sensitive(0);
-# FIXME-VTE $$self{_GUI}{_VTE}->set_background_transparent(1);
-# FIXME-VTE $$self{_GUI}{_VTE}->set_background_saturation(1);
     $$self{_GUILOCKED} = 1;
     return 1;
 }
@@ -611,6 +660,44 @@ sub unlock {
 ###################################################################
 # START: Private functions definitions
 
+# Create a Glib timeout to programatically send a given string to the connected terminal (if so is configured!)
+sub _startSendStringTimeout {
+    my $self = shift;
+    defined $$self{_SEND_STRING} and Glib::Source->remove($$self{_SEND_STRING});
+    $$self{_CFG}{environments}{$$self{_UUID}}{'send string active'} and $$self{_SEND_STRING} = Glib::Timeout->add_seconds(
+        $$self{_CFG}{environments}{$$self{_UUID}}{'send string every'},
+        sub {
+            if (not $$self{CONNECTED} && $$self{_CFG}{environments}{$$self{_UUID}}{'send string active'}) {
+                return 1;
+            }
+
+            my $txt = $$self{_CFG}{environments}{$$self{_UUID}}{'send string txt'};
+            my $intro = $$self{_CFG}{environments}{$$self{_UUID}}{'send string intro'};
+            $txt = _subst($txt, $$self{_CFG}, $$self{_UUID}, $$self{_UUID_TMP});
+            _vteFeedChild($$self{_GUI}{_VTE}, $txt . ($intro ? "\n" : ''));
+
+            return 1;
+        }
+    );
+}
+
+# Find out a free local TCP port
+sub _getLocalPort {
+    my $LPORT = shift;
+
+    my $PING = Net::Ping->new('tcp');
+    $PING->service_check(0);
+
+    for (my $break = 0; $break < 100; ++$break) {
+        $PING->port_number($LPORT);
+        if (!$PING->ping('localhost')) {
+            return $LPORT;
+        }
+        $LPORT++;
+    }
+    return $LPORT;
+}
+
 sub _initGUI {
     my $self = shift;
 
@@ -683,7 +770,10 @@ sub _initGUI {
         # Checkbutton to send or not to all terminals in cluster
         $$self{_GUI}{_MACROSCLUSTER} = Gtk3::CheckButton->new_with_label('Sending THIS: ');
         $$self{_GUI}{_MACROSCLUSTER}->set('can-focus', 0);
-        $$self{_GUI}{_MACROSCLUSTER}->signal_connect('toggled', sub {$$self{_GUI}{_MACROSCLUSTER}->set_label($$self{_GUI}{_MACROSCLUSTER}->get_active ? 'Sending CLUSTER: ' : 'Sending THIS: ');});
+        $$self{_GUI}{_MACROSCLUSTER}->signal_connect('toggled', sub {
+            my $str = $$self{_GUI}{_MACROSCLUSTER}->get_active() ? 'Sending CLUSTER: ' : 'Sending THIS: ';
+            $$self{_GUI}{_MACROSCLUSTER}->set_label($str);
+        });
         $$self{_GUI}{_MACROSBOX}->pack_start($$self{_GUI}{_MACROSCLUSTER}, 0, 1, 0);
 
         # Create a GtkComboBox and add it to $macrosbox
@@ -728,18 +818,15 @@ sub _initGUI {
     # Only in traditional mode, show additional buttons
     if ($$self{_CFG}{'defaults'}{'layout'} ne 'Compact') {
         # Create a checkbox to show/hide the button bar
-        $$self{_GUI}{btnShowButtonBar} = Gtk3::ToggleButton->new();
-        $$self{_GUI}{btnShowButtonBar}->set_image(Gtk3::Image->new_from_stock($$self{_CFG}{'defaults'}{'auto hide button bar'} ? 'pac-buttonbar-show' : 'pac-buttonbar-hide', 'GTK_ICON_SIZE_BUTTON'));
+        $$self{_GUI}{btnShowButtonBar} = Gtk3::Button->new();
+        $$self{_GUI}{btnShowButtonBar}->set_image(Gtk3::Image->new_from_stock($$self{_CFG}{'defaults'}{'auto hide button bar'} ? 'asbru-buttonbar-show' : 'asbru-buttonbar-hide', 'GTK_ICON_SIZE_BUTTON'));
         $$self{_GUI}{btnShowButtonBar}->set('can-focus' => 0);
         $$self{_GUI}{btnShowButtonBar}->set_tooltip_text('Show/Hide button bar');
-        $$self{_GUI}{btnShowButtonBar}->set_active($$self{_CFG}{'defaults'}{'auto hide button bar'} ? 0 : 1);
-        $$self{_GUI}{btnShowButtonBar}->set_inconsistent(0);
         $$self{_GUI}{bottombox}->pack_end($$self{_GUI}{btnShowButtonBar}, 0, 1, 4);
 
         # Create a button to show the info tab
         $$self{_GUI}{btnShowInfoTab} = Gtk3::Button->new();
         $$self{_GUI}{btnShowInfoTab}->set_image(Gtk3::Image->new_from_stock('gtk-info', 'GTK_ICON_SIZE_BUTTON'));
-        $$self{_GUI}{btnShowInfoTab}->set_tooltip_text('Show information tab (Shift+Ctrl+I)');
         $$self{_GUI}{bottombox}->pack_end($$self{_GUI}{btnShowInfoTab}, 0, 1, 4);
     }
 
@@ -762,7 +849,7 @@ sub _initGUI {
     $$self{_GUI}{bottombox}->pack_end($$self{_GUI}{status}, 1, 1, 4);
 
     # Create a status icon
-    $$self{_GUI}{statusIcon} = Gtk3::Image->new_from_stock('pac-terminal-ko-small', 'button');
+    $$self{_GUI}{statusIcon} = Gtk3::Image->new_from_stock('asbru-terminal-ko-small', 'button');
     $$self{_GUI}{statusIcon}->set_tooltip_text('Disconnected');
     $$self{_GUI}{bottombox}->pack_start($$self{_GUI}{statusIcon}, 0, 0, 4);
 
@@ -772,12 +859,13 @@ sub _initGUI {
     $$self{_GUI}{bottombox}->pack_start($$self{_GUI}{statusExpect}, 0, 0, 4);
 
     # Create a cluster icon
-    $$self{_GUI}{statusCluster} = Gtk3::Image->new_from_stock('pac-cluster-manager-off', 'button');
+    $$self{_GUI}{statusCluster} = Gtk3::Image->new_from_stock('asbru-cluster-manager-off', 'button');
     $$self{_GUI}{statusCluster}->set_tooltip_text('Unclustered');
     $$self{_GUI}{bottombox}->pack_start($$self{_GUI}{statusCluster}, 0, 0, 4);
 
     # Set the number of scrollback lines
-    $$self{_GUI}{_VTE}->set_scrollback_lines($$self{_CFG}{'defaults'}{'terminal scrollback lines'});
+    # If -2, uses the global preferences, otherwise use the value defined in terminal options
+    $$self{_GUI}{_VTE}->set_scrollback_lines($$self{_CFG}{environments}{$$self{_UUID}}{'terminal options'}{'terminal scrollback lines'} > -2 ? $$self{_CFG}{environments}{$$self{_UUID}}{'terminal options'}{'terminal scrollback lines'} : $$self{_CFG}{'defaults'}{'terminal scrollback lines'});
 
     ############################################################################
     # Check if this terminal should start in a new window or in a new tab/window
@@ -818,6 +906,7 @@ sub _initGUI {
 
         _setupTabDND($self);
 
+        # DevNote: append_page is having a side effect that shows the main window (if hidden), see #783
         $tabs->append_page($$self{_GUI}{_VBOX}, $$self{_GUI}{_TABLBL});
         $tabs->show();
         $$self{_GUI}{_VBOX}->show_all();
@@ -832,8 +921,9 @@ sub _initGUI {
             }
         }
         if ($$self{_CFG}{'defaults'}{'start maximized'}) {
-            $$self{_NOTEBOOKWINDOW}->maximize;
+            $$self{_NOTEBOOKWINDOW}->maximize();
         }
+        $self->{_PARENTWINDOW} = $$self{_NOTEBOOKWINDOW};
 
     }
     # New WINDOW:
@@ -849,16 +939,19 @@ sub _initGUI {
         my $vsize = $$self{_CFG}{environments}{$$self{_UUID}}{'terminal options'}{'use personal settings'} ? $$self{_CFG}{environments}{$$self{_UUID}}{'terminal options'}{'terminal window vsize'} : $$self{_CFG}{'defaults'}{'terminal windows vsize'};
 
         my $conns_per_row = 2;
+        my $conns_per_col = 1;
         if ($self->{_CLUSTER}) {
             if ($PACMain::FUNCS{_MAIN}{_NTERMINALS}>1) {
-                my $screen = Gtk3::Gdk::Screen::get_default;
-                my $sw = $screen->get_width;
-                my $sh = $screen->get_height-100;
+                my $screen = Gtk3::Gdk::Screen::get_default();
+                my $sw = $screen->get_width();
+                my $sh = $screen->get_height() - 100;
                 $conns_per_row = $PACMain::FUNCS{_MAIN}{_NTERMINALS} < 5 ? 2 : 3;
+                $conns_per_col = $PACMain::FUNCS{_MAIN}{_NTERMINALS} < 7 ? 2 : 3;
                 my $rows = POSIX::ceil($PACMain::FUNCS{_MAIN}{_NTERMINALS} / $conns_per_row) || 1;
-                $hsize=int($sw / (POSIX::ceil($PACMain::FUNCS{_MAIN}{_NTERMINALS} / $rows)));
+                my $cols = POSIX::ceil($PACMain::FUNCS{_MAIN}{_NTERMINALS} / $conns_per_col) || 1;
+                $hsize = int($sw / (POSIX::ceil($PACMain::FUNCS{_MAIN}{_NTERMINALS} / $rows)));
                 if ($PACMain::FUNCS{_MAIN}{_NTERMINALS}>2) {
-                    $vsize=int($sh / (POSIX::ceil($PACMain::FUNCS{_MAIN}{_NTERMINALS} / $rows)));
+                    $vsize = int($sh / (POSIX::ceil($PACMain::FUNCS{_MAIN}{_NTERMINALS} / $cols)));
                 } else {
                     $vsize = $sh;
                 }
@@ -866,23 +959,24 @@ sub _initGUI {
         }
         $$self{_WINDOWTERMINAL}->set_default_size($hsize, $vsize);
         if ($$self{_CFG}{'defaults'}{'start maximized'}) {
-            $$self{_WINDOWTERMINAL}->maximize;
+            $$self{_WINDOWTERMINAL}->maximize();
         }
         $$self{_WINDOWTERMINAL}->set_icon_name('gtk-disconnect');
         $$self{_WINDOWTERMINAL}->add($$self{_GUI}{_VBOX});
-        $$self{_WINDOWTERMINAL}->move(($NPOSX*$hsize+3),5+($NPOSY*$vsize+($NPOSY*50)));
+        $$self{_WINDOWTERMINAL}->move(($NPOSX*$hsize+3), 5+($NPOSY*$vsize+($NPOSY*50)));
 
-        if ((($$self{_CFG}{environments}{$$self{_UUID}}{'terminal options'}{'use personal settings'})&&($$self{_CFG}{environments}{$$self{_UUID}}{'terminal options'}{'terminal transparency'} > 0))||($$self{_CFG}{defaults}{'terminal transparency'} > 0)) {
+        if (($$self{_CFG}{environments}{$$self{_UUID}}{'terminal options'}{'use personal settings'} && $$self{_CFG}{environments}{$$self{_UUID}}{'terminal options'}{'terminal transparency'} > 0) || $$self{_CFG}{defaults}{'terminal support transparency'}) {
             _setWindowPaintable($$self{_WINDOWTERMINAL});
         }
 
         $$self{_WINDOWTERMINAL}->show_all();
         $$self{_WINDOWTERMINAL}->present();
         $NPOSX++;
-        if ($NPOSX==$conns_per_row) {
+        if ($NPOSX == $conns_per_row) {
             $NPOSY++;
-            $NPOSX=0;
+            $NPOSX = 0;
         }
+        $self->{_PARENTWINDOW} = $$self{_WINDOWTERMINAL};
     }
 
     _updateCFG($self);
@@ -895,13 +989,15 @@ sub _setupCallbacks {
 
     # Show Bar (if any)
     if ($$self{_GUI}{btnShowButtonBar}) {
-        $$self{_GUI}{btnShowButtonBar}->signal_connect('toggled', sub {
-            if ($$self{_GUI}{btnShowButtonBar}->get_active()) {
-                $$self{_GUI}{btnShowButtonBar}->set_image(Gtk3::Image->new_from_stock('pac-buttonbar-hide', 'GTK_ICON_SIZE_BUTTON'));
+        $$self{_GUI}{btnShowButtonBar}->signal_connect('clicked', sub {
+            if ($$self{'_CFG'}{'defaults'}{'auto hide button bar'}) {
+                $$self{_GUI}{btnShowButtonBar}->set_image(Gtk3::Image->new_from_stock('asbru-buttonbar-hide', 'GTK_ICON_SIZE_BUTTON'));
                 $PACMain::FUNCS{_MAIN}{_GUI}{hbuttonbox1}->show();
+                $$self{'_CFG'}{'defaults'}{'auto hide button bar'} = 0;
             } else {
-                $$self{_GUI}{btnShowButtonBar}->set_image(Gtk3::Image->new_from_stock('pac-buttonbar-show', 'GTK_ICON_SIZE_BUTTON'));
+                $$self{_GUI}{btnShowButtonBar}->set_image(Gtk3::Image->new_from_stock('asbru-buttonbar-show', 'GTK_ICON_SIZE_BUTTON'));
                 $PACMain::FUNCS{_MAIN}{_GUI}{hbuttonbox1}->hide();
+                $$self{'_CFG'}{'defaults'}{'auto hide button bar'} = 1;
             };
         });
     }
@@ -909,29 +1005,31 @@ sub _setupCallbacks {
     # Info button event (if any)
     if ($$self{_GUI}{btnShowInfoTab}) {
         $$self{_GUI}{btnShowInfoTab}->signal_connect('clicked', sub {
-            $self->_showInfoTab ();
+            $self->_showInfoTab();
         });
     }
 
     # Mouse move in out VTE events
-    $$self{_CFG}{defaults}{'tabs in main window'} and $$self{_GUI}{_VTE}->signal_connect('motion_notify_event', sub {
-        if ($$self{_CFG}{'defaults'}{'prevent mouse over show tree'}) {
-            return 0;
-        }
-        my @geo = $$self{_GUI}{_VTE}->get_window()->get_geometry();
-        if ($$self{_CFG}{defaults}{'tree on right side'}) {
-            if ($$self{_SPLIT_VPANE} && (($$self{_SPLIT_VPANE}->get_child1) eq $$self{_GUI}{_VBOX}) && ! $$self{_SPLIT_VERTICAL}) {
+    if ($$self{_CFG}{defaults}{'tabs in main window'}) {
+        $$self{_GUI}{_VTE}->signal_connect('motion_notify_event', sub {
+            if ($$self{_CFG}{'defaults'}{'prevent mouse over show tree'}) {
                 return 0;
             }
-            $PACMain::FUNCS{_MAIN}{_GUI}{showConnBtn}->set_active($_[1]->x >= ($geo[2] - 30));
-        } else {
-            if ($$self{_SPLIT_VPANE} && (($$self{_SPLIT_VPANE}->get_child2) eq $$self{_GUI}{_VBOX}) && ! $$self{_SPLIT_VERTICAL}) {
-                return 0;
+            my @geo = $$self{_GUI}{_VTE}->get_window()->get_geometry();
+            if ($$self{_CFG}{defaults}{'tree on right side'}) {
+                if ($$self{_SPLIT_VPANE} && (($$self{_SPLIT_VPANE}->get_child1()) eq $$self{_GUI}{_VBOX}) && !$$self{_SPLIT_VERTICAL}) {
+                    return 0;
+                }
+                $PACMain::FUNCS{_MAIN}{_GUI}{showConnBtn}->set_active($_[1]->x >= ($geo[2] - 30));
+            } else {
+                if ($$self{_SPLIT_VPANE} && (($$self{_SPLIT_VPANE}->get_child2()) eq $$self{_GUI}{_VBOX}) && !$$self{_SPLIT_VERTICAL}) {
+                    return 0;
+                }
+                $PACMain::FUNCS{_MAIN}{_GUI}{showConnBtn}->set_active($_[1]->x <= 10);
             }
-            $PACMain::FUNCS{_MAIN}{_GUI}{showConnBtn}->set_active($_[1]->x <= 10);
-        }
-        return 0;
-    });
+            return 0;
+        });
+    }
 
     # ------------------------------
     # Register callbacks from VTE
@@ -949,8 +1047,11 @@ sub _setupCallbacks {
 
     # Capture focus-in
     $$self{_GUI}{_VTE}->signal_connect('focus_in_event' => sub {
+        if($$self{_CFG}{environments}{$$self{_UUID}}{'send string only when idle'}) {
+            $self->_startSendStringTimeout();
+        }
         if ($$self{_CFG}{defaults}{'change main title'}) {
-            $PACMain::FUNCS{_MAIN}{_GUI}{main}->set_title("@{[__($$self{_TITLE})]}  - $APPNAME");
+            $$self{_NOTEBOOKWINDOW}->set_title("@{[__($$self{_TITLE})]}  - $APPNAME");
         }
     });
 
@@ -969,223 +1070,135 @@ sub _setupCallbacks {
     # Capture keypresses on VTE
     $$self{_GUI}{_VTE}->signal_connect('key_press_event' => sub {
         my ($widget, $event) = @_;
+        my ($action, $keymask);
 
-        my $keyval = Gtk3::Gdk::keyval_name($event->keyval) // '';
-        my $unicode = Gtk3::Gdk::keyval_to_unicode($event->keyval); # 0 if not a character
-        my $state = $event->get_state;
-        my $shift = $state * ['shift-mask'];
-        my $ctrl = $state * ['control-mask'];
-        my $alt = $state * ['mod1-mask'];
-        my $alt2 = $state * ['mod2-mask'];
-        my $alt5 = $state * ['mod5-mask'];
+        if($$self{_CFG}{environments}{$$self{_UUID}}{'send string only when idle'}) {
+            $self->_startSendStringTimeout();
+        }
 
         if (defined $$self{_KEYS_RECEIVE}) {
             return 1;
         }
 
-        # ENTER --> reconnect if disconnected
-        if ((($keyval eq 'Return') || ($keyval eq 'KP_Enter')) && (! $$self{CONNECTED} && ! $$self{CONNECTING})) {
-            $self->start;
+        if ($$self{_TABBED}) {
+            ($action, $keymask) = $PACMain::FUNCS{_KEYBINDS}->GetAction('pactabs', $widget, $event, $$self{_UUID});
+            if ($action eq 'close') {
+                $self->stop(undef, 1);
+                return 1;
+            }
+        }
+        ($action, $keymask) = $PACMain::FUNCS{_KEYBINDS}->GetAction('terminal', $widget, $event, $$self{_UUID}, $$self{VTE_EMULATION});
+        if ($$self{VTE_EMULATION} && $action eq 'fkey') {
+            _vteFeedChild($$self{_GUI}{_VTE}, $keymask);
             return 1;
-        } elsif (($keyval eq 'Return') || ($keyval eq 'KP_Enter')) {
-            $$self{_INTRO_PRESS} = 1;
         }
-
-        # F11 --> [un]fullscreen window
-        if (($keyval eq 'F11') && (! $$self{_CFG}{defaults}{'prevent F11'})) {
+        if (!$action) {
+            return 0;
+        } elsif ($action eq 'Return' && !$$self{CONNECTED} && !$$self{CONNECTING}) {
+            # Only consider "RETURN" if disconnected ; otherwise do not consider it as an action
+            $self->start();
+        } elsif ($action eq 'start') {
+            if (!$$self{CONNECTED} && !$$self{CONNECTING}) {
+                $self->start();
+            }
+        } elsif ($action eq 'fullscreen') {
             if ($$self{_FULLSCREEN}) {
-                $$self{_FSTOTAB} and $self->_winToTab;
+                $$self{_FSTOTAB} and $self->_winToTab();
                 $$self{_GUI}{_VBOX}->get_window()->unfullscreen();
                 $$self{_FULLSCREEN} = 0;
             } else {
                 $$self{_FSTOTAB} = $$self{_TABBED};
-                $$self{_TABBED} and $self->_tabToWin;
+                $$self{_TABBED} and $self->_tabToWin();
                 $$self{_GUI}{_VBOX}->get_window()->fullscreen();
                 $$self{_FULLSCREEN} = 1;
             }
-            return 1;
-        }
-
-        # Capture only keypresses with modifiers (ctrl, alt, etc.)
-
-        ############################################
-        # Generic VTE keystrokes
-
-        # <Shift><Ctrl><Alt>
-        if (($ctrl && $alt && $shift) && (! $$self{_CFG}{environments}{$$self{_UUID}}{'terminal options'}{'disable CTRL key bindings'})  && (! $$self{_CFG}{environments}{$$self{_UUID}}{'terminal options'}{'disable ALT key bindings'}) && (! $$self{_CFG}{environments}{$$self{_UUID}}{'terminal options'}{'disable SHIFT key bindings'})) {
-            # X --> Reset terminal
-            if (lc $keyval eq 'x') {
-                $$self{_GUI}{_VTE}->reset(1, 1);
-                return 1;
-            }
-        }
-        # <Ctrl><Alt>
-        elsif (($ctrl && $alt) && (! $$self{_CFG}{environments}{$$self{_UUID}}{'terminal options'}{'disable CTRL key bindings'})  && (! $$self{_CFG}{environments}{$$self{_UUID}}{'terminal options'}{'disable ALT key bindings'})) {
-            # r --> remove from cluster
-            if (lc $keyval eq 'r') {
-                $PACMain::FUNCS{_CLUSTER}->delFromCluster($$self{_UUID_TMP}, $$self{_CLUSTER});
-                return 1;
-            }
-        }
-        # <Ctrl><Shift>
-        if (($ctrl && $shift) && (! $$self{_CFG}{environments}{$$self{_UUID}}{'terminal options'}{'disable CTRL key bindings'})  && (! $$self{_CFG}{environments}{$$self{_UUID}}{'terminal options'}{'disable SHIFT key bindings'})) {
-            # C --> COPY
-            if (lc $keyval eq 'c') {
-                $$self{_GUI}{_VTE}->copy_clipboard;
-                return 1;
-            }
-            # V --> PASTE
-            elsif (lc $keyval eq 'v') {
-                my $txt = $$self{_GUI}{_VTE}->get_clipboard(Gtk3::Gdk::Atom::intern_static_string('CLIPBOARD'))->wait_for_text;
-                $self->_pasteToVte($txt, $$self{_CFG}{'environments'}{$$self{_UUID}}{'send slow'});
-                return 1;
-            }
-            # P --> PASTE CONNECTION PASSWORD
-            elsif ($$self{_CFG}{environments}{$$self{_UUID}}{'pass'} ne '' && lc $keyval eq 'p') {
-                $self->_pasteToVte($$self{_CFG}{environments}{$$self{_UUID}}{'pass'}, 1);
-                return 1;
-            }
-            # B --> PASTE AND DELETE
-            elsif (lc $keyval eq 'b')
-            {
-                my $text = $$self{_GUI}{_VTE}->get_clipboard(Gtk3::Gdk::Atom::intern_static_string('CLIPBOARD'))->wait_for_text;
-                my $delete = _wEnterValue(
-                    $$self{_GUI},
-                    "Enter the String/RegExp of text to be *deleted* when pasting.\nUseful for, for example, deleting 'carriage return' from the text before pasting it.",
-                    'Use string or Perl RegExps (ex: \n means "carriage return")',
-                    '\n|\f|\r'
-                ) or return 1;
-                $text =~ s/$delete//g;
-                $self->_pasteToVte($text, $$self{_CFG}{'environments'}{$$self{_UUID}}{'send slow'} || 1);
-                return 1;
-            }
-            # X --> Reset terminal
-            elsif (lc $keyval eq 'x') {
-                $$self{_GUI}{_VTE}->reset(1, 0);
-                return 1;
-            }
-            # g --> Guess hostname and set as title
-            elsif (lc $keyval eq 'g') {
-                ($$self{CONNECTED} && ! $$self{CONNECTING}) and $self->_execute('remote', '<CTRL_TITLE:hostname>', undef, undef, undef);
-                return 1;
-            }
-            # w --> Close terminal
-            elsif (lc $keyval eq 'w') {
-                $self->stop(undef, 1);
-                return 1;
-            }
-            # q --> Close PAC
-            elsif (lc $keyval eq 'q') {
-                $PACMain::FUNCS{_MAIN}->_quitProgram;
-                return 1;
-            }
-            # f --> FIND in treeView
-            elsif (lc $keyval eq 'f')
-            {
-                $PACMain::FUNCS{_MAIN}->_showConnectionsList();
-                $PACMain::FUNCS{_MAIN}{_GUI}{_vboxSearch}->show();
-                $PACMain::FUNCS{_MAIN}{_GUI}{_entrySearch}->grab_focus();
-                return 1;
-            }
-            # 6 --> Send a Cisco interrupt keypress
-            elsif ($unicode eq 38)
-            {
-                _vteFeedChildBinary($$self{_GUI}{_VTE}, "\c^x");
-                #_vteFeedChildBinary($$self{_GUI}{_VTE}, "\c^");
-                #_vteFeedChildBinary($$self{_GUI}{_VTE}, "\c]");
-                _vteFeedChildBinary($$self{_GUI}{_VTE}, chr(30) . 'x');
-                return 1;
-            }
-            # F4 --> CLOSE *ALL* opened tabs
-            elsif (($self->{_TABBED}) and ($keyval eq 'F4'))
-            {
-                $self->_closeAllTerminals();
-                return 1;
-            }
-            # n --> Close disconnected sessions
-            elsif (lc $keyval eq 'n') {
-                $self->_closeDisconnectedTerminals();
-                return 1;
-            }
-            # d --> duplicate connection
-            elsif (lc $keyval eq 'd') {
-                my $terminals = $PACMain::FUNCS{_MAIN}->_launchTerminals([[$$self{_UUID}]]);
-                $$self{_NOTEBOOK}->reorder_child ($$terminals[0]->{_GUI}{_VBOX}, $$self{_NOTEBOOK}->page_num($$self{_GUI}{_VBOX}) + 1);
-                return 1;
-            }
-            # f --> Find in history
-            #elsif (lc $keyval eq 'f') {
-                #if ($$self{_CFG}{'defaults'}{'record command history'}) {
-                    #$self->_wHistory;
-                #}
-                #return 1;
-            #}
-            # r --> Disconnect and Restart session
-            elsif (lc $keyval eq 'r') {
+        } elsif ($action eq 'disconnect') {
+            $self->_disconnectTerminal();
+        } elsif ($action eq 'sftp') {
+            $self->_openSFTP()
+        } elsif ($action eq 'reset') {
+            $$self{_GUI}{_VTE}->reset(1, 0);
+        } elsif ($action eq 'reset-clear') {
+            $$self{_GUI}{_VTE}->reset(1, 1);
+        } elsif ($action eq 'remove_from_cluster') {
+            $PACMain::FUNCS{_CLUSTER}->delFromCluster($$self{_UUID_TMP}, $$self{_CLUSTER});
+        } elsif ($action eq 'copy') {
+            $$self{_GUI}{_VTE}->copy_clipboard();
+        } elsif ($action eq 'paste') {
+            $$self{_GUI}{_VTE}->paste_clipboard();
+        } elsif ($action eq 'paste-primary') {
+            $$self{_GUI}{_VTE}->paste_primary();
+        } elsif ($action eq 'paste-passwd' && ($$self{_CFG}{environments}{$$self{_UUID}}{'pass'} ne '' || $$self{_CFG}{environments}{$$self{_UUID}}{'passphrase'} ne '')) {
+            $self->_pasteConnectionPassword();
+        } elsif ($action eq 'paste-delete') {
+            my $text = $$self{_GUI}{_VTE}->get_clipboard(Gtk3::Gdk::Atom::intern_static_string('CLIPBOARD'))->wait_for_text();
+            my $delete = _wEnterValue(
+                $$self{_PARENTWINDOW},
+                "Enter the String/RegExp of text to be *deleted* when pasting.\nUseful for, for example, deleting 'carriage return' from the text before pasting it.",
+                'Use string or Perl RegExps (ex: \n means "carriage return")',
+                '\n|\f|\r'
+            ) or return 1;
+            $text =~ s/$delete//g;
+            _vteFeedChild($$self{_GUI}{_VTE}, $text);
+        } elsif ($action eq 'hostname') {
+            ($$self{CONNECTED} && !$$self{CONNECTING}) and $self->_execute('remote', '<CTRL_TITLE:hostname>', undef, undef, undef);
+        } elsif ($action eq 'close') {
+            $self->stop(undef, 1);
+        } elsif ($action eq 'quit') {
+            $PACMain::FUNCS{_MAIN}->_quitProgram;
+        } elsif ($action eq 'find') {
+            $PACMain::FUNCS{_MAIN}->_showConnectionsList(0);
+            $PACMain::FUNCS{_MAIN}{_GUI}{_vboxSearch}->show();
+            $PACMain::FUNCS{_MAIN}{_GUI}{_entrySearch}->grab_focus();
+        } elsif ($action eq 'closealltabs') {
+            $self->_closeAllTerminals();
+        } elsif ($action eq 'close-disconected') {
+            $self->_closeDisconnectedTerminals();
+        } elsif ($action eq 'duplicate') {
+            my $terminals = $PACMain::FUNCS{_MAIN}->_launchTerminals([[$$self{_UUID}]]);
+            $$self{_NOTEBOOK}->reorder_child ($$terminals[0]->{_GUI}{_VBOX}, $$self{_NOTEBOOK}->page_num($$self{_GUI}{_VBOX}) + 1);
+        } elsif ($action eq 'restart') {
+            if ($$self{CONNECTED} || $$self{CONNECTING}) {
                 $self->_disconnectAndRestartTerminal();
-                return 1;
-            }
-            # i --> Show the information tab
-            elsif (lc $keyval eq 'i') {
-                $self->_showInfoTab();
-                return 1;
-            }
-        }
-        # <Ctrl>
-        elsif ($ctrl && (! $$self{_CFG}{environments}{$$self{_UUID}}{'terminal options'}{'disable CTRL key bindings'})) {
-            # F4 --> CLOSE current tab
-            if (($self->{_TABBED}) and ($keyval eq 'F4')) {
-                $self->stop(undef, 1);
-                return 1;
-            }
-
-            # F3 --> FIND in text buffer
-            if ($keyval eq 'F3') {
-                _wFindInTerminal($self);
-                return 1;
+            } else {
+                $self->start();
             }
-
-            # <ins> --> COPY
-            if ($keyval eq 'Insert') {
-                $$self{_GUI}{_VTE}->copy_clipboard;
-                return 1;
+        } elsif ($action eq 'infotab') {
+            $self->_showInfoTab();
+        } elsif ($action eq 'find-terminal') {
+            _wFindInTerminal($self);
+        } elsif ($action eq 'showconnections') {
+            $PACMain::FUNCS{_MAIN}->_toggleConnectionsList();
+        } elsif ($action eq 'edit_node') {
+            if (not $$self{_UUID} eq '__PAC_SHELL__') {
+                $PACMain::FUNCS{_EDIT}->show($$self{_UUID});
             }
-        }
-        # <Shift>
-        elsif ($shift && (! $$self{_CFG}{environments}{$$self{_UUID}}{'terminal options'}{'disable SHIFT key bindings'})) {
-            # <ins> --> PASTE
-            if ($keyval eq 'Insert') {
-                $$self{_GUI}{_VTE}->paste_clipboard;
-                return 1;
-            }
-        }
-        # <Alt>
-        elsif ($alt && (! $$self{_CFG}{environments}{$$self{_UUID}}{'terminal options'}{'disable ALT key bindings'})) {
-            # c | n --> Show main connections window
-            if ((lc $keyval eq 'c') || (lc $keyval eq 'n')) {
-                if (! $$self{_TABBED} || ! $$self{_CFG}{defaults}{'tabs in main window'}) {
-                    $PACMain::FUNCS{_MAIN}->_showConnectionsList();
-                } else {
-                    $PACMain::FUNCS{_MAIN}->_toggleConnectionsList();
-                }
-                return 1;
+        } elsif ($action =~ /zoom/) {
+            $self->_zoomHandler($action);
+        } elsif ($action =~ /HOTKEY_CMD:(\w+)/) {
+            my $where = $1;
+            my ($ask, $cmd) = $PACMain::FUNCS{_KEYBINDS}->GetHotKeyCommand('terminal', $keymask, $$self{_UUID});
+            if (!$cmd) {
+                return 0;
             }
-            # e --> Show main edit connection window
-            if (lc $keyval eq 'e') {
-                if (not $$self{_UUID} eq '__PAC_SHELL__') {
-                    $PACMain::FUNCS{_EDIT}->show($$self{_UUID});
+            if ($where eq 'local') {
+                $self->_execute('local', $cmd, $ask);
+            } else {
+                my $ok = $self->_execute('remote', $cmd, $ask, 1, 0, 0);
+                if (($$self{_CLUSTER})&&($ok)) {
+                    $self->_clusterCommit(undef, $cmd, undef);
                 }
-                return 1;
             }
-            # h --> Show command history window
-            #if (lc $keyval eq 'h') {
-                #if ($$self{_CFG}{'defaults'}{'record command history'}) {
-                    #$self->_wHistory;
-                #}
-                #return 1;
-            #}
+        } elsif ($action eq 'cisco') {
+            _vteFeedChildBinary($$self{_GUI}{_VTE}, "\c^x");
+            #_vteFeedChildBinary($$self{_GUI}{_VTE}, "\c^");
+            #_vteFeedChildBinary($$self{_GUI}{_VTE}, "\c]");
+            _vteFeedChildBinary($$self{_GUI}{_VTE}, chr(30) . 'x');
+            return 1;
+        } else {
+            return 0;
         }
-        return 0;
+        return 1;
     });
 
     # Right mouse click on VTE
@@ -1194,15 +1207,14 @@ sub _setupCallbacks {
             return 0;  # Bubble up, let VTE's original handler take care of it.
         }
         my ($widget, $event) = @_;
-        my $state = $event->get_state;
+        my $state = $event->get_state();
         my $shift = $state * ['shift-mask'];
 
         if ($event->button eq 2) {
             if (!$$self{_CFG}{'environments'}{$$self{_UUID}}{'send slow'}) {
                 return 0;
             }
-            my $txt = $$self{_GUI}{_VTE}->get_clipboard(Gtk3::Gdk::Atom::intern_static_string('PRIMARY'))->wait_for_text;
-            $self->_pasteToVte($txt, $$self{_CFG}{'environments'}{$$self{_UUID}}{'send slow'});
+            $$self{_GUI}{_VTE}->paste_primary();
             $$self{FOCUS}->child_focus('GTK_DIR_TAB_FORWARD');
             return 1;
         } elsif ($event->button eq 3 and $event -> type eq 'button-press') {
@@ -1213,7 +1225,8 @@ sub _setupCallbacks {
                 $handled_by_vte = $$self{_GUI}{_VTE}->event($event);
                 $right_click_deep = 0;
             }
-            if (! $handled_by_vte) {
+            if (!$handled_by_vte) {
+                $$self{FOCUS}->child_focus('GTK_DIR_TAB_FORWARD');
                 $self->_vteMenu($event);
             }
             return 1;  # One way or another, we've handled it.
@@ -1225,8 +1238,14 @@ sub _setupCallbacks {
     # Capture mouse selection on VTE
     $$self{_GUI}{_VTE}->signal_connect('selection_changed' => sub {
         if ($$self{_CFG}{defaults}{'selection to clipboard'}) {
-            if ($$self{_GUI}{_VTE}->get_has_selection) {
-                $$self{_GUI}{_VTE}->copy_clipboard;
+            if ($$self{_GUI}{_VTE}->get_has_selection()) {
+                $$self{_GUI}{_VTE}->copy_clipboard();
+                my $txt = $$self{_GUI}{_VTE}->get_clipboard(Gtk3::Gdk::Atom::intern_static_string('PRIMARY'))->wait_for_text();
+                $txt =~ s/ +$//gm;
+                use bytes;
+                my $blen = length($txt);
+                no bytes;
+                Gtk3::Clipboard::get(Gtk3::Gdk::Atom::intern('CLIPBOARD', 0))->set_text($txt, $blen);
             }
         }
         return 0;
@@ -1234,24 +1253,30 @@ sub _setupCallbacks {
     $$self{_GUI}{_VTE}->signal_connect('commit' => sub {
         $self->_clusterCommit(@_);
     });
-    $$self{_GUI}{_VTE}->signal_connect('cursor_moved' => sub {$$self{_NEW_DATA} = 1; $self->_setTabColour();});
+    $$self{_GUI}{_VTE}->signal_connect('cursor_moved' => sub {
+        $$self{_NEW_DATA} = 1;
+        if($$self{_CFG}{environments}{$$self{_UUID}}{'send string only when idle'}) {
+            $self->_startSendStringTimeout();
+        }
+        $self->_setTabColour();
+    });
 
     # Capture Drag and Drop events
-    my @targets = (Gtk3::TargetEntry->new('PAC Connect', [], 0));
+    my @targets = (Gtk3::TargetEntry->new('Ásbrú Connect', [], 0));
     $$self{_GUI}{_VTE}->drag_dest_set('GTK_DEST_DEFAULT_ALL', \@targets, ['move']);
     $$self{_GUI}{_VTE}->signal_connect('drag_drop' => sub {
         if (!$$self{CONNECTED}) {
-            _wMessage($$self{_WINDOWTERMINAL}, "This terminal is <b>DISCONNECTED</b>.\nPlease, start the connection before trying to <b>chain</b>.", 1);
+            _wMessage($$self{_PARENTWINDOW}, "This terminal is <b>DISCONNECTED</b>.\nPlease, start the connection before trying to <b>chain</b>.", 1);
             return 0;
         } elsif ($$self{CONNECTING}) {
-            _wMessage($$self{_WINDOWTERMINAL}, "Please, <b>WAIT for current chain to finish</b> before starting a new one.", 1);
+            _wMessage($$self{_PARENTWINDOW}, "Please, <b>WAIT for current chain to finish</b> before starting a new one.", 1);
             return 0;
         } elsif ($$self{CONNECTED} && (scalar @{$PACMain::{FUNCS}{_MAIN}{'DND'}{'selection'}} == 1)) {
             my $sel = shift @{$PACMain::{FUNCS}{_MAIN}{'DND'}{'selection'}};
             my $name = $$self{_CFG}{environments}{$sel}{name};
             my $title = $$self{_CFG}{environments}{$sel}{title};
             if (!$self->_wSelectChain($sel)) {
-                _wMessage($$self{_WINDOWTERMINAL}, "No '<b>Expect/Send</b>' data available in:\n<b>$name ($title)</b>\nSo, there are <b>no commands to chain</b>");
+                _wMessage($$self{_PARENTWINDOW}, "No '<b>Expect/Send</b>' data available in:\n<b>$name ($title)</b>\nSo, there are <b>no commands to chain</b>");
             }
             if ($$self{_FOCUSED}) {
                 $$self{FOCUS}->child_focus('GTK_DIR_TAB_FORWARD');
@@ -1265,7 +1290,7 @@ sub _setupCallbacks {
         }
     });
     $$self{_GUI}{_VTE}->signal_connect('drag_motion' => sub {
-        $_[0]->get_parent_window->raise; return 1;
+        $_[0]->get_parent_window()->raise(); return 1;
     });
 
     # Depending on terminal creation (window/tab), process connection closing differently
@@ -1279,9 +1304,9 @@ sub _setupCallbacks {
         });
     }
 
-    # If embedded, add a callback for the 'get focus' button
+    # If embedded, add some more callback to manage keyboard focus and messages window
     if ($$self{EMBED}) {
-        $$self{_GUI}{_BTNFOCUS}->signal_connect ('clicked' => sub {
+        $$self{_GUI}{_BTNFOCUS}->signal_connect('clicked' => sub {
             if (defined $$self{FOCUS}) {
                 $$self{FOCUS}->child_focus('GTK_DIR_TAB_FORWARD');
             }
@@ -1295,6 +1320,12 @@ sub _setupCallbacks {
                 $self->_showEmbedMessages();
             }
         });
+        $$self{_GUI}{_SOCKET_PARENT_WINDOW}->signal_connect('enter-notify-event' => sub {
+            if (defined $$self{FOCUS}) {
+                $$self{FOCUS}->child_focus('GTK_DIR_TAB_FORWARD');
+            }
+            return 0;
+        });
     }
 
     # Connect to the "map" signal of macrosbox widget to avoid showing it if so is configured
@@ -1309,7 +1340,7 @@ sub _setupCallbacks {
     # Append VTE's connection finalization with CLOSE event
     $$self{_GUI}{_VTE}->signal_connect ('child_exited' => sub {
         if (defined $$self{_GUI}{statusIcon}) {
-            $$self{_GUI}{statusIcon}->set_from_stock('pac-terminal-ko-small', 'button');
+            $$self{_GUI}{statusIcon}->set_from_stock('asbru-terminal-ko-small', 'button');
         }
         if (defined $$self{_GUI}{statusIcon}) {
             $$self{_GUI}{statusIcon}->set_tooltip_text('Disconnected');
@@ -1318,6 +1349,11 @@ sub _setupCallbacks {
             $$self{_GUI}{pb}->destroy();
         }
 
+        if (!defined $$self{_UUID}) {
+            # Signal received too late, terminal is already closed
+            return;
+        }
+
         $PACMain::RUNNING{$$self{'_UUID_TMP'}}{'stop_time'} = time();
         $PACMain::FUNCS{_STATS}->stop($$self{_UUID});
 
@@ -1326,7 +1362,14 @@ sub _setupCallbacks {
         $$self{CONNECTED} = 0;
         $$self{CONNECTING} = 0;
 
-        my $string = $$self{_CFG}{'environments'}{$$self{_UUID}}{'method'} eq 'generic' ? "EXECUTION FINISHED (PRESS <ENTER> TO EXECUTE AGAIN)" : "DISCONNECTED (PRESS <ENTER> TO RECONNECT)";
+        # Show a "reconnect" message
+        my $string = "DISCONNECTED (PRESS <ENTER> TO RECONNECT)";
+        if (!defined($$self{_CFG}{'environments'}{$$self{_UUID}}{'method'})) {
+            # Likely the session has been deleted from 'environments', there is no way to restart this session
+            $string = "THIS CONNECTION IS NOT AVAILABLE ANYMORE";
+        } elsif ($$self{_CFG}{'environments'}{$$self{_UUID}}{'method'} eq 'generic') {
+            $string = "EXECUTION FINISHED (PRESS <ENTER> TO EXECUTE AGAIN)";
+        }
         if (defined $$self{_GUI}{_VTE}) {
             _vteFeed($$self{_GUI}{_VTE}, "\r\n${COL_RED}$string (" . (localtime(time)) . ")${COL_RESET}\r\n\n");
         }
@@ -1336,22 +1379,16 @@ sub _setupCallbacks {
             $self->_showEmbedMessages();
         }
 
-        if (defined $$self{_SOCKET_CLIENT}) {
-            $$self{_SOCKET_CLIENT}->close();
-        }
         if (defined $$self{_SOCKET_CLIENT_EXEC}) {
             $$self{_SOCKET_CLIENT_EXEC}->close();
         }
         if (defined $$self{_SEND_STRING}) {
             eval {
                 Glib::Source->remove($$self{_SEND_STRING});
+                undef $$self{_SEND_STRING};
             };
         }
-        if (defined $$self{_EMBED_KIDNAP}) {
-            eval {
-                Glib::Source->remove($$self{_EMBED_KIDNAP});
-            };
-        }
+        $self->_stopEmbedKidnapTimeout();
 
         # _SOCKET_CLIENT is close so no more watch to expect
         undef $$self{_SOCKET_CLIENT_WATCH};
@@ -1363,15 +1400,21 @@ sub _setupCallbacks {
         $PACMain::FUNCS{_CLUSTER}->_updateGUI();
 
         if ($$self{_SPLIT} && $$self{_CFG}{'defaults'}{'unsplit disconnected terminals'}) {
-            $self->_unsplit;
+            $self->_unsplit();
         }
 
         $$self{_PID} = 0;
 
-        if (($$self{_RESTART})&&($$self{_RECONNECTS}<4)) {
-            sleep($$self{_RECONNECTS});
+        # Do retry on disconnect
+        if ($$self{_RESTART} && $$self{_RECONNECTS} < $$self{_CFG}{'defaults'}{'max retry on disconnect'}) {
+            if (!defined $$self{_RECONNECT_WAIT_TIME}) {
+                # Using a list of prime numbers to wait more after each retry
+                # (see http://neilk.net/blog/2000/06/01/abigails-regex-to-test-for-prime-numbers/)
+                @{$$self{_RECONNECT_WAIT_TIME}} = grep { $_ if (1 x $_) !~ /^1?$|^(11+?)\1+$/ } 1..500;
+            }
+            sleep($$self{_RECONNECT_WAIT_TIME}[min(@{$$self{_RECONNECT_WAIT_TIME}}, $$self{_RECONNECTS})]);
             $$self{_RECONNECTS}++;
-            $self->start;
+            $self->start();
         } else {
             # Check for post-connection commands execution
             $self->_wPrePostExec('local after');
@@ -1398,15 +1441,15 @@ sub _watchConnectionData {
     }
 
     # This should be as fast as possible, since we are called from a 'data-in' callback from the client socket
-    $self->_receiveData;
+    $self->_receiveData();
 
     while (my $data = shift(@{$self->{_SOCKET_BUFFER}})) {
         $data = decode('UTF-16', $data);
 
         if ($data eq 'CONNECTED') {
-            $$self{_GUI}{statusIcon}->set_from_stock('pac-terminal-ok-small', 'button');
+            $$self{_GUI}{statusIcon}->set_from_stock('asbru-terminal-ok-small', 'button');
             $$self{_GUI}{statusIcon}->set_tooltip_text('Connected');
-            $$self{_GUI}{statusExpect}->clear;
+            $$self{_GUI}{statusExpect}->clear();
             $$self{CONNECTED} = 1;
             $$self{CONNECTING} = 0;
             $$self{_BADEXIT} = 0;
@@ -1421,32 +1464,29 @@ sub _watchConnectionData {
             $self->_updateCFG();
             $data = $self->_checkSendKeystrokes($data);
 
-            if (defined $$self{_EMBED_KIDNAP}) {
-                eval {
-                    Glib::Source->remove($$self{_EMBED_KIDNAP});
-                };
-            }
+            $self->_stopEmbedKidnapTimeout();
             if ($$self{EMBED} && ($$self{_CFG}{environments}{$$self{_UUID}}{method} eq 'RDP (xfreerdp)' || $$self{_CFG}{environments}{$$self{_UUID}}{method} eq 'VNC')) {
                 $$self{_EMBED_KIDNAP} = Glib::Timeout->add(500, sub {
                     my $title = 'FreeRDP: ' . $$self{_CFG}{environments}{$$self{_UUID}}{ip} . ($$self{_CFG}{environments}{$$self{_UUID}}{port} == 3389 ? '' : ":$$self{_CFG}{environments}{$$self{_UUID}}{port}");
                     $title = $$self{_CFG}{environments}{$$self{_UUID}}{method} eq 'RDP (xfreerdp)' ?
                     "FreeRDP: $$self{_CFG}{environments}{$$self{_UUID}}{ip}" . ($$self{_CFG}{environments}{$$self{_UUID}}{port} == 3389 ? '' : ":$$self{_CFG}{environments}{$$self{_UUID}}{port}") :
                     "TightVNC: $$self{_CFG}{environments}{$$self{_UUID}}{user}";
-                    my $list = _getXWindowsList;
+                    my $list = _getXWindowsList();
                     if (grep({$_ =~ /$title/ and $title = $_;} keys %{$$list{'by_name'}})) {
                         $$self{_GUI}{_SOCKET}->add_id($$list{'by_name'}{$title}{'xid'});
                     }
+                    $$self{_EMBED_KIDNAP} = undef;
                     return 0;
                 });
             }
 
-            # Show embed window and hide messages
+            # Check that the embed window is ready and hide messages window accordingly
             if ($$self{EMBED}) {
-                $self->_hideEmbedMessages();
+                $self->_checkEmbedWindow();
             }
 
         } elsif ($data =~ /^EXPLORER:(.+)/go) {
-            system("xdg-open '$1' &");
+            system("$ENV{'ASBRU_ENV_FOR_EXTERNAL'} xdg-open '$1' &");
         } elsif ($data =~ /^PIPE_WAIT\[(.+?)\]\[(.+)\]/go) {
             my $time = $1;
             my $prompt = $2;
@@ -1467,7 +1507,12 @@ sub _watchConnectionData {
                 }
             });
         } elsif ($data =~ /^SCRIPT_(START|STOP)\[NAME:(.+)\]/go) {
-            $$self{_PULSE_TIMER} = Glib::Timeout->add (100, sub {defined $$self{_GUI}{pb} and $$self{_GUI}{pb}->pulse; return $$self{_PULSE};});
+            $$self{_PULSE_TIMER} = Glib::Timeout->add (100, sub {
+                if (defined $$self{_GUI}{pb}) {
+                    $$self{_GUI}{pb}->pulse();
+                }
+                return $$self{_PULSE};
+            });
         }
         elsif ($data =~ /^SCRIPT_(START|STOP)\[NAME:(.+)\]/go) {
             my ($status, $name) = ($1, $2);
@@ -1499,12 +1544,17 @@ sub _watchConnectionData {
             }
         } elsif ($data =~ /^SCRIPT_SUB_(.+)\[NAME:(.+)\]\[PARAMS:(.*)\]/go) {
             my ($func, $name, $params) = ($1, $2, $3);
-            $data = "PAC Script '$name' --> $func($params)";
+            $data = "Ásbrú Script '$name' --> $func($params)";
         } elsif ($data =~ /^TITLE:(.+)/go) {
-            $$self{_TITLE} = $1;
-            $self->_updateCFG();
+            my $t = $1;
+            if ($t !~ /<\w+:.+?>/) {
+                $$self{_TITLE} = $t;
+                $self->_updateCFG();
+            }
+        } elsif ($data =~ /^GET_TITLE:/go) {
+            $self->_sendData("GET_TITLE|:|$$self{_TITLE}");
         } elsif ($data =~ /^PAC_CONN_MSG:(.+)/go) {
-            _wMessage($$self{_WINDOWTERMINAL}, $1, 1);
+            _wMessage($$self{_PARENTWINDOW}, $1, 1);
             next;
         } elsif ($data eq 'RESTART') {
             $$self{_RESTART} = 1;
@@ -1526,9 +1576,12 @@ sub _watchConnectionData {
             select($rin, undef, undef, 2) or return 1;
             $$self{_EXEC}{RECEIVED} = undef;
             eval {$$self{_EXEC}{RECEIVED} = ${fd_retrieve($$self{_SOCKET_CLIENT_EXEC})};};
-            if ($@) {_wMessage($$self{_WINDOWTERMINAL}, "ERROR: Could not retrieve output from command execution:\n$@"); return 1;}
+            if ($@) {_wMessage($$self{_PARENTWINDOW}, "ERROR: Could not retrieve output from command execution:\n$@"); return 1;}
             if (defined $$self{_EXEC}{RECEIVED}) {
-                $$self{_EXEC_PROCESS} = Glib::Timeout->add(100, sub {$self->_pipeExecOutput; return 0;});
+                $$self{_EXEC_PROCESS} = Glib::Timeout->add(100, sub {
+                    $self->_pipeExecOutput();
+                    return 0;
+                });
             }
         } elsif ($data =~ /^SENDSLOW:(.+)/go) {
             my $txt = $1;
@@ -1549,15 +1602,13 @@ sub _watchConnectionData {
                 }
             });
         } elsif (($data eq 'DISCONNECTED') || ($data =~ /^CLOSE:.+/go) || ($data =~ /^TIMEOUT:.+/go) || ($data =~ /^connect\(\) failed with error '.+'$/go)) {
-            if (defined $$self{_EMBED_KIDNAP}) {
-                Glib::Source->remove($$self{_EMBED_KIDNAP});
-            }
+            $self->_stopEmbedKidnapTimeout();
             if ($$self{EMBED}) {
                 $self->_showEmbedMessages();
             }
             $$self{_GUI}{statusExpect}->clear;
             $$self{_BADEXIT} = $$self{CONNECTING};
-            $$self{_PID} and kill(15, $$self{_PID});
+            $self->_disconnectTerminal();
         } elsif ($data =~ /^EXPECT:WAITING:(.+)/go) {
             $$self{_GUI}{statusExpect}->set_from_stock('gtk-media-play', 'button');
             $$self{_GUI}{statusExpect}->set_tooltip_text("Expecting '$1'");
@@ -1569,12 +1620,19 @@ sub _watchConnectionData {
             $$self{_PID} = $2;
             $$self{CONNECTING} = 1;
             $$self{_RESTART} = 0;
-        } elsif ($data eq 'UNHIDE_TERMINAL') {
-            $$self{_BADEXIT} = 1;
-            $$self{CONNECTING} = 1;
+        } elsif ($data eq 'HIDE_TERMINAL') {
+            if (defined $$self{_WINDOWTERMINAL}) {
+                $$self{_WINDOWTERMINAL}->hide();
+            }
+        } elsif ($data =~ /^WENTER\|/) {
+            $PACMain::FUNCS{_MAIN}{_HAS_FOCUS} = '';
+            my ($cmd, $lblup, $lbldown, $default, $visible) = split /\|:\|/, $data;
+            my ($val, $pos) = _wEnterValue($$self{_PARENTWINDOW}, $lblup, $lbldown, $default, $visible);
             if (defined $$self{_WINDOWTERMINAL}) {
-                $$self{_WINDOWTERMINAL}->show();
+                $$self{_WINDOWTERMINAL}->grab_focus();
+                $PACMain::FUNCS{_MAIN}{_HAS_FOCUS} = $$self{_WINDOWTERMINAL};
             }
+            $self->_sendData("WENTER|:|$val|:|$pos");
         }
 
         $$self{_LAST_STATUS} = $data;
@@ -1624,6 +1682,16 @@ sub _receiveData {
     return 1;
 }
 
+# Send data back to the terminal or the defined socket
+sub _sendData {
+    my $self = shift;
+    my $msg = shift // '';
+    my $socket = shift // $$self{_SOCKET_CLIENT};
+
+    $msg = encode('UTF-16', $msg);
+    $socket->send("PAC_MSG_START[$msg]PAC_MSG_END");
+}
+
 sub _authClient {
     my $self = shift;
     my $socket = shift;
@@ -1648,6 +1716,14 @@ sub _vteMenu {
 
     my @vte_menu_items;
 
+    push(@vte_menu_items, {
+        label => "Show Terminal Keybindings",
+        stockicon => 'gtk-help',
+        sensitive => 1,
+        code => sub {
+            _wMessage($$self{_PARENTWINDOW}, $PACMain::FUNCS{_KEYBINDS}->ListKeyBindings('terminal'), 1, 0, 'w-info');
+        }
+    });
     # If PAC Script running, show a STOP script menuitem
     if ($$self{_SCRIPT_STATUS} ne 'STOP') {
         push(@vte_menu_items,
@@ -1655,7 +1731,9 @@ sub _vteMenu {
             label => "Stop script '$$self{_SCRIPT_NAME}'",
             stockicon => 'gtk-media-stop',
             sensitive => 1,
-            code => sub {kill(15, $$self{_PID});}
+            code => sub {
+                $self->_disconnectTerminal();
+            }
         });
 
         _wPopUpMenu(\@vte_menu_items, $event);
@@ -1666,20 +1744,24 @@ sub _vteMenu {
         # Add a submenu with available connections (including: LOCAL SHELL) and chaining connections
         push(@vte_menu_items, {
             label => 'Connection',
-            stockicon => 'pac-group',
+            stockicon => 'asbru-group',
             submenu =>
             [
                 {
                     label => 'Favourites',
-                    stockicon => 'pac-favourite-on',
+                    stockicon => 'asbru-favourite-on',
                     submenu => _menuFavouriteConnections($self)
                 },
                 {
                     label => 'All',
-                    stockicon => 'pac-treelist',
+                    stockicon => 'asbru-treelist',
                     submenu =>
                     [
-                        {label => 'Local Shell', stockicon => 'gtk-home', code => sub {$PACMain::FUNCS{_MAIN}{_GUI}{shellBtn}->clicked;}},
+                        {
+                            label => 'Local Shell', stockicon => 'gtk-home', code => sub {
+                                $PACMain::FUNCS{_MAIN}{_GUI}{shellBtn}->clicked;
+                            }
+                        },
                         {separator => 1},
                         @{_menuAvailableConnections($PACMain::FUNCS{_MAIN}{_GUI}{treeConnections}{data}, $self)}
                     ]
@@ -1707,13 +1789,17 @@ sub _vteMenu {
             {
                 label => "$i: $PACMain::RUNNING{$uuid_tmp}{terminal}{_TITLE}",
                 tooltip => "Arrange both connections ($$self{_TITLE}) and ($PACMain::RUNNING{$uuid_tmp}{terminal}{_TITLE}) into the same vertically split window.",
-                code => sub {$self->_split($uuid_tmp);}
+                code => sub {
+                    $self->_split($uuid_tmp);
+                }
             });
             push(@submenu_split_h,
             {
                 label => "$i: $PACMain::RUNNING{$uuid_tmp}{terminal}{_TITLE}",
                 tooltip => "Arrange both connections ($$self{_TITLE}) and ($PACMain::RUNNING{$uuid_tmp}{terminal}{_TITLE}) into the same horizontally split window .",
-                code => sub {$self->_split($uuid_tmp, 1);}
+                code => sub {
+                    $self->_split($uuid_tmp, 1);
+                }
             });
         }
         @submenu_split_v = sort {$$a{label} cmp $$b{label}} @submenu_split_v;
@@ -1724,8 +1810,11 @@ sub _vteMenu {
             sensitive => 1,
             label => 'Detach tab to a new Window',
             stockicon => 'gtk-fullscreen',
+            shortcut => $PACMain::FUNCS{_KEYBINDS}->GetAccelerator('terminal', 'fullscreen'),
             tooltip => 'Separate this connection window from the tabbed view, and put it in a separate window',
-            code => sub {$self->_tabToWin;}
+            code => sub {
+                $self->_tabToWin();
+            }
         });
 
         if ($$self{_SPLIT}) {
@@ -1734,14 +1823,18 @@ sub _vteMenu {
                 label => 'Unsplit',
                 stockicon => 'gtk-zoom-fit',
                 tooltip => "Remove the split view and put each connection into its own tab",
-                code => sub {$self->_unsplit;}
+                code => sub {
+                    $self->_unsplit();
+                }
             });
             push(@vte_menu_items,
             {
                 label => 'Equally resize terminals',
                 stockicon => 'gtk-zoom-fit',
                 tooltip => "Resize terminals equally",
-                code => sub {$self->_equalresize;}
+                code => sub {
+                    $self->_equalresize();
+                }
             });
         } else {
             push(@vte_menu_items,
@@ -1773,7 +1866,9 @@ sub _vteMenu {
             label => 'Attach Window to main tab bar',
             stockicon => 'gtk-leave-fullscreen',
             tooltip => 'Put this connection window into main tabbed window',
-            code => sub {_winToTab($self);}
+            code => sub {
+                _winToTab($self);
+            }
         });
         push(@vte_menu_items, {separator => 1});
     }
@@ -1785,10 +1880,9 @@ sub _vteMenu {
     {
         label => 'New Cluster...',
         stockicon => 'gtk-new',
-        shortcut => '',
         tooltip => 'Create a new cluster and put this connection in it',
         code => sub {
-            my $cluster = _wEnterValue($self, 'Enter a name for the <b>New Cluster</b>');
+            my $cluster = _wEnterValue($$self{_PARENTWINDOW}, 'Enter a name for the <b>New Cluster</b>');
             if ((! defined $cluster) || ($cluster =~ /^\s*$/go)) {
                 return 1;
             }
@@ -1796,7 +1890,7 @@ sub _vteMenu {
         }
     });
     foreach my $uuid_tmp (keys %PACMain::RUNNING) {
-        if (! defined $PACMain::RUNNING{$uuid_tmp}{terminal}{_CLUSTER} || $PACMain::RUNNING{$uuid_tmp}{terminal}{_CLUSTER} eq '') {
+        if (!defined $PACMain::RUNNING{$uuid_tmp}{terminal}{_CLUSTER} || $PACMain::RUNNING{$uuid_tmp}{terminal}{_CLUSTER} eq '') {
             next;
         }
         $clusters{$PACMain::RUNNING{$uuid_tmp}{terminal}{_CLUSTER}}{total}++;
@@ -1809,7 +1903,9 @@ sub _vteMenu {
             label => "$cluster ($clusters{$cluster}{total} terminals connected)",
             tooltip => "Add to selected cluster, with connections:\n" . $clusters{$cluster}{connections},
             sensitive => $cluster ne $$self{_CLUSTER},
-            code => sub {$PACMain::FUNCS{_CLUSTER}->addToCluster($$self{_UUID_TMP}, $tmp);}
+            code => sub {
+                $PACMain::FUNCS{_CLUSTER}->addToCluster($$self{_UUID_TMP}, $tmp);
+            }
         });
     }
     # Add to cluster
@@ -1824,11 +1920,13 @@ sub _vteMenu {
     push(@vte_menu_items,
     {
         label => 'Remove from Cluster',
-        shortcut => '<control><alt>r',
         stockicon => 'gtk-delete',
+        shortcut => $PACMain::FUNCS{_KEYBINDS}->GetAccelerator('terminal', 'remove_from_cluster'),
         tooltip => $$self{_CLUSTER} ne '' ? "Remove this connection from cluster '$$self{_CLUSTER}'" : '',
         sensitive => $$self{_CLUSTER} ne '',
-        code => sub {$PACMain::FUNCS{_CLUSTER}->delFromCluster($$self{_UUID_TMP}, $$self{_CLUSTER});}
+        code => sub {
+            $PACMain::FUNCS{_CLUSTER}->delFromCluster($$self{_UUID_TMP}, $$self{_CLUSTER});
+        }
     });
     # Show the PCC
     push(@vte_menu_items,
@@ -1837,7 +1935,9 @@ sub _vteMenu {
         stockicon => 'gtk-justify-fill',
         sensitive => 1,
         tooltip => 'Bring up the Power Cluster Controller GUI',
-        code => sub {$PACMain::FUNCS{_PCC}->show();}
+        code => sub {
+            $PACMain::FUNCS{_PCC}->show();
+        }
     });
     push(@vte_menu_items, {separator => 1});
 
@@ -1852,58 +1952,71 @@ sub _vteMenu {
             stockicon => 'gtk-execute',
             sensitive => $$self{CONNECTED},
             tooltip => "Exec the CONNECTIONS part of '$name' in this connection",
-            code => sub {$PACMain::FUNCS{_SCRIPTS}->_execScript($name, $$self{_UUID_TMP});}
+            code => sub {
+                $PACMain::FUNCS{_SCRIPTS}->_execScript($name, $self->{_PARENTWINDOW}, $$self{_UUID_TMP});
+            }
         });
     }
     push(@vte_menu_items,
     {
         label => 'Execute Script',
-        stockicon => 'pac-script',
-        tooltip => 'Execute selected PAC Script in this connection',
+        stockicon => 'asbru-script',
+        tooltip => 'Execute selected Ásbrú Script in this connection',
         submenu => \@scripts_sub_menu,
     });
 
     # Show the list of REMOTE commands to execute
     my @cmd_remote_sub_menu;
-    foreach my $hash (@{$self->{_CFG}{'environments'}{$$self{_UUID}}{'macros'}}) {
+    # Organize Remote commands by groups, Join Terminal Macros they are the same
+    my %hgs;
+    my $lg;
+    foreach my $hash (@{$$self{_CFG}{'defaults'}{'remote commands'}}, @{$self->{_CFG}{'environments'}{$$self{_UUID}}{'macros'}}) {
         my $cmd = ref($hash) ? $$hash{txt} : $hash;
         my $desc = ref($hash) ? $$hash{description} : $hash;
         my $confirm = ref($hash) ? $$hash{confirm} : 0;
+        my $intro = ref($hash) ? $$hash{intro} : 0;
         if ($cmd eq '') {
             next;
         }
-        push(@cmd_remote_sub_menu,
-        {
-            label => ($confirm ? 'CONFIRM: ' : '') . ($desc ? $desc : $cmd),
-            tooltip => $desc ? $cmd : $desc,
-            sensitive => $$self{CONNECTED},
-            stockicon => $confirm ? 'gtk-dialog-question' : '',
-            code => sub {$self->_execute('remote', $cmd, $confirm)}
-        });
-    }
-    foreach my $hash (@{$$self{_CFG}{'defaults'}{'remote commands'}}) {
-        my $cmd = ref($hash) ? $$hash{txt} : $hash;
-        my $desc = ref($hash) ? $$hash{description} : $hash;
-        my $confirm = ref($hash) ? $$hash{confirm} : 0;
-        if ($cmd eq '') {
-            next;
+        my ($g, $d) = split /:/, $desc, 2;
+        if (!$d) {
+            $d = $g;
+            $g = 'Other???';
         }
-        push(@cmd_remote_sub_menu,
-        {
-            label => ($confirm ? 'CONFIRM: ' : '') . ($desc ? $desc : $cmd),
-            tooltip => $desc ? $cmd : $desc,
+        push (@{$hgs{$g}}, {
+            label => $d,
             sensitive => $$self{CONNECTED},
+            tooltip => $cmd,
             stockicon => $confirm ? 'gtk-dialog-question' : '',
             code => sub {
-                my $ok = $self->_execute('remote', $cmd, $confirm);
+                my $ok = $self->_execute('remote', $cmd, $confirm, 1, 0, $intro);
                 if (($$self{_CLUSTER})&&($ok)) {
-                    $self->_clusterCommit(undef, $cmd . "\n", undef);
+                    if ($intro) {
+                        $intro = "\n";
+                    } else {
+                        $intro = "";
+                    }
+                    $self->_clusterCommit(undef, "$cmd$intro", undef);
                 }
             }
         });
     }
-    push(@vte_menu_items,
-    {
+    # Create submenus except 'Others'
+    foreach my $g (sort keys %hgs) {
+        if ($g eq 'Other???') {
+            next;
+        }
+        push(@cmd_remote_sub_menu, {
+            label => $g,
+            stockicon => 'gtk-execute',
+            submenu => \@{$hgs{$g}},
+        });
+    }
+    # Push Others at the end with no group
+    if ((defined $hgs{'Other???'})&&(@{$hgs{'Other???'}})) {
+        push(@cmd_remote_sub_menu, @{$hgs{'Other???'}});
+    }
+    push(@vte_menu_items, {
         label => 'Remote commands',
         stockicon => 'gtk-execute',
         tooltip => 'Send to this connection the selected command (keypresses)',
@@ -1924,7 +2037,9 @@ sub _vteMenu {
             label => ($confirm ? 'CONFIRM: ' : '') . ($desc ? $desc : $cmd),
             tooltip => $desc ? $cmd : $desc,
             stockicon => $confirm ? 'gtk-dialog-question' : '',
-            code => sub {$self->_execute('local', $cmd, $confirm)}
+            code => sub {
+                $self->_execute('local', $cmd, $confirm);
+            }
         });
     }
     foreach my $hash (@{$$self{_CFG}{'defaults'}{'local commands'}}) {
@@ -1940,7 +2055,9 @@ sub _vteMenu {
             tooltip => $desc ? $cmd : $desc,
             sensitive => $$self{CONNECTED},
             stockicon => $confirm ? 'gtk-dialog-question' : '',
-            code => sub {$self->_execute('local', $cmd, $confirm)}
+            code => sub {
+                $self->_execute('local', $cmd, $confirm);
+            }
         });
     }
     push(@vte_menu_items,
@@ -1961,10 +2078,13 @@ sub _vteMenu {
         push(@variables_menu,
         {
             #label => "<V:$j> ($value)",
-            #code => sub {_vteFeedChild($$self{_GUI}{_VTE}, _subst("<V:$j>", $$self{_CFG}, $$self{_UUID}));}
+            #code => sub {_vteFeedChild($$self{_GUI}{_VTE}, _subst("<V:$j>", $$self{_CFG}, $$self{_UUID}, $$self{_UUID_TMP}));}
             label => __($j),
             tooltip => "$j=$value",
-            code => sub {my $t = _subst("<V:$j>", $$self{_CFG}, $$self{_UUID}); _vteFeedChild($$self{_GUI}{_VTE}, $t);}
+            code => sub {
+                my $t = _subst("<V:$j>", $$self{_CFG}, $$self{_UUID}, $$self{_UUID_TMP});
+                _vteFeedChild($$self{_GUI}{_VTE}, $t);
+            }
         });
         ++$i;
     }
@@ -1983,7 +2103,10 @@ sub _vteMenu {
         {
             label => __($var),
             tooltip => "$var=$val",
-            code => sub {my $t = _subst("<GV:$var>", $$self{_CFG}, $$self{_UUID}); _vteFeedChild($$self{_GUI}{_VTE}, $t);}
+            code => sub {
+                my $t = _subst("<GV:$var>", $$self{_CFG}, $$self{_UUID}, $$self{_UUID_TMP});
+                _vteFeedChild($$self{_GUI}{_VTE}, $t);
+            }
         });
     }
     push(@insert_menu_items,
@@ -1996,12 +2119,19 @@ sub _vteMenu {
     # Populate with environment variables
     my @environment_menu;
     foreach my $key (sort {$a cmp $b} keys %ENV) {
+        # Do not offer Master Password, or any other environment variable with word PRIVATE, TOKEN
+        if ($key =~ /KPXC|PRIVATE|TOKEN/i) {
+            next;
+        }
         my $value = $ENV{$key};
         push(@environment_menu,
         {
             label => __($key),
             tooltip => "$key=$value",
-            code => sub {my $t = _subst("<ENV:$key>", $$self{_CFG}, $$self{_UUID}); _vteFeedChild($$self{_GUI}{_VTE}, $t);}
+            code => sub {
+                my $t = _subst("<ENV:$key>", $$self{_CFG}, $$self{_UUID}, $$self{_UUID_TMP});
+                _vteFeedChild($$self{_GUI}{_VTE}, $t);
+            }
         });
     }
     push(@insert_menu_items,
@@ -2010,24 +2140,6 @@ sub _vteMenu {
         submenu => \@environment_menu
     });
 
-    # Populate with KeePass entries
-    if ($$self{_CFG}{'defaults'}{'keepass'}{'use_keepass'}) {
-        my @kpx;
-        foreach my $entry ($PACMain::FUNCS{_KEEPASS}->find) {
-            push(@kpx,
-            {
-                label => "Title:$$entry{title},User:$$entry{username}",
-                tooltip => "Password:$$entry{password}",
-                code => sub {_vteFeedChild($$self{_GUI}{_VTE}, $$entry{password});}
-            });
-        }
-        push(@insert_menu_items,
-        {
-            label => 'KeePassX',
-            stockicon => 'pac-keepass',
-            submenu => \@kpx
-        });
-    }
     push(@vte_menu_items,
     {
         label => 'Insert value',
@@ -2043,15 +2155,16 @@ sub _vteMenu {
     {
         label => 'Copy',
         stockicon => 'gtk-copy',
-        shortcut => '<control><shift>c',
-        code => sub {$$self{_GUI}{_VTE}->copy_clipboard;}
+        shortcut => $PACMain::FUNCS{_KEYBINDS}->GetAccelerator('terminal', 'copy'),
+        code => sub {
+            $$self{_GUI}{_VTE}->copy_clipboard();
+        }
     });
     # Copy Connection Password
     if (($$self{_CFG}{environments}{$$self{_UUID}}{'pass'} ne '')||($$self{_CFG}{environments}{$$self{_UUID}}{'passphrase'} ne '')) {
         push(@vte_menu_items, {
             label => 'Copy Connection Password',
             stockicon => 'gtk-copy',
-            shortcut => '',
             sensitive => $$self{CONNECTED},
             code => sub {
                 _copyPass($$self{_UUID});
@@ -2063,11 +2176,10 @@ sub _vteMenu {
     {
         label => 'Paste',
         stockicon => 'gtk-paste',
-        shortcut => '<control><shift>v',
-        sensitive => $$self{CONNECTED} && $$self{_GUI}{_VTE}->get_clipboard(Gtk3::Gdk::Atom::intern_static_string('CLIPBOARD'))->wait_is_text_available,
+        shortcut => $PACMain::FUNCS{_KEYBINDS}->GetAccelerator('terminal', 'paste'),
+        sensitive => $$self{CONNECTED} && $$self{_GUI}{_VTE}->get_clipboard(Gtk3::Gdk::Atom::intern_static_string('CLIPBOARD'))->wait_is_text_available(),
         code => sub {
-            my $txt = $$self{_GUI}{_VTE}->get_clipboard(Gtk3::Gdk::Atom::intern_static_string('CLIPBOARD'))->wait_for_text;
-            $self->_pasteToVte($txt, $$self{_CFG}{environments}{$$self{_UUID}}{'send slow'});
+            $$self{_GUI}{_VTE}->paste_clipboard();
         }
     });
     # Paste Current Connection Password
@@ -2076,14 +2188,9 @@ sub _vteMenu {
         {
             label => 'Paste Connection Password',
             stockicon => 'gtk-paste',
-            sensitive => $$self{CONNECTED},
-            shortcut => '<control><shift>p',
+            shortcut => $PACMain::FUNCS{_KEYBINDS}->GetAccelerator('terminal', 'paste-passwd'),
             code => sub {
-                if ($$self{_CFG}{environments}{$$self{_UUID}}{'passphrase'} ne '') {
-                    $self->_pasteToVte($$self{_CFG}{environments}{$$self{_UUID}}{'passphrase'}, 1);
-                } else {
-                    $self->_pasteToVte($$self{_CFG}{environments}{$$self{_UUID}}{'pass'}, 1);
-                }
+                $self->_pasteConnectionPassword();
             }
         });
     };
@@ -2092,37 +2199,43 @@ sub _vteMenu {
     {
         label => 'Paste and Delete...',
         stockicon => 'gtk-paste',
-        shortcut => '<control><shift>b',
+        shortcut => $PACMain::FUNCS{_KEYBINDS}->GetAccelerator('terminal', 'paste-delete'),
         tooltip => 'Paste clipboard contents, but remove any Perl RegExp matching string from the appearing prompt GUI',
-        sensitive => $$self{CONNECTED} && $$self{_GUI}{_VTE}->get_clipboard(Gtk3::Gdk::Atom::intern_static_string('CLIPBOARD'))->wait_is_text_available,
+        sensitive => $$self{CONNECTED} && $$self{_GUI}{_VTE}->get_clipboard(Gtk3::Gdk::Atom::intern_static_string('CLIPBOARD'))->wait_is_text_available(),
         code => sub {
-            my $text = $$self{_GUI}{_VTE}->get_clipboard(Gtk3::Gdk::Atom::intern_static_string('CLIPBOARD'))->wait_for_text;
+            my $text = $$self{_GUI}{_VTE}->get_clipboard(Gtk3::Gdk::Atom::intern_static_string('CLIPBOARD'))->wait_for_text();
             my $delete = _wEnterValue(
-                $$self{_GUI},
+                $$self{_PARENTWINDOW},
                 "Enter the String/RegExp of text to be *deleted* when pasting.\nUseful for, for example, deleting 'carriage return' from the text before pasting it.",
                 'Use string or Perl RegExps (ex: \n means "carriage return")',
                 '\n|\f|\r'
             ) or return 1;
             $text =~ s/$delete//g;
-            $self->_pasteToVte($text, $$self{_CFG}{environments}{$$self{_UUID}}{'send slow'} || 1);
+            _vteFeedChild($$self{_GUI}{_VTE}, $text);
         }
     });
 
     # Add find string
     push(@vte_menu_items, {separator => 1});
-    push(@vte_menu_items, {label => 'Find...', stockicon => 'gtk-find', shortcut => '<control>F3', code => sub {$self->_wFindInTerminal; return 1;}});
+    push(@vte_menu_items, {label => 'Find...', stockicon => 'gtk-find', shortcut => $PACMain::FUNCS{_KEYBINDS}->GetAccelerator('terminal', 'find-terminal'), code => sub {
+        $self->_wFindInTerminal(); return 1;
+    }});
 
     # Add save session log
-    push(@vte_menu_items, {label => 'Save session log...', stockicon => 'gtk-save', shortcut => '', code => sub{$self->_saveSessionLog;}});
+    push(@vte_menu_items, {label => 'Save session log...', stockicon => 'gtk-save', code => sub {
+        $self->_saveSessionLog();
+    }});
 
     # Add edit session
-    push(@vte_menu_items, {label => 'Edit session...', stockicon => 'gtk-edit', shortcut => '<alt>e', sensitive => $$self{_UUID} ne '__PAC_SHELL__', code => sub{$PACMain::FUNCS{_EDIT}->show($$self{_UUID});}});
+    push(@vte_menu_items, {label => 'Edit session...', stockicon => 'gtk-edit', sensitive => $$self{_UUID} ne '__PAC_SHELL__', code => sub {
+        $PACMain::FUNCS{_EDIT}->show($$self{_UUID});
+    }});
 
     # Add change temporary tab label
     push(@vte_menu_items, {label => 'Temporary TAB Label change...', stockicon => 'gtk-edit', code => sub {
         # Prepare the input window
         my $new_label = _wEnterValue(
-            $PACMain::FUNCS{_MAIN}{_GUI}{main},
+            $$self{_PARENTWINDOW},
             "<b>Temporaly renaming label '@{[__($$self{_TITLE})]}'</b>",
             'Enter the new temporal label:', $$self{_TITLE}
         );
@@ -2133,17 +2246,21 @@ sub _vteMenu {
     }});
 
     # Change title with guessed hostname
-    push(@vte_menu_items, {label => 'Set title with guessed hostname', sensitive => ($$self{CONNECTED} && ! $$self{CONNECTING}), shortcut => '<control><shift>g', code => sub {$self->_execute('remote', '<CTRL_TITLE:hostname>', undef, undef, undef);}});
+    push(@vte_menu_items, {label => 'Set title with guessed hostname', sensitive => ($$self{CONNECTED} && ! $$self{CONNECTING}), code => sub {
+        $self->_execute('remote', '<CTRL_TITLE:hostname>', undef, undef, undef);
+    }});
 
     # Open file explorer on current directory (for PAC Shells only)
-    $$self{_UUID} eq '__PAC_SHELL__' and push(@vte_menu_items, {label => 'Open file manager on current dir', stockicon => 'gtk-open', shortcut => '', sensitive => ($$self{CONNECTED} && ! $$self{CONNECTING}), code => sub {$self->_execute('remote', 'xdg-open .', undef, undef, undef);}});
+    $$self{_UUID} eq '__PAC_SHELL__' and push(@vte_menu_items, {label => 'Open file manager on current dir', stockicon => 'gtk-open', sensitive => ($$self{CONNECTED} && ! $$self{CONNECTING}), code => sub {
+        $self->_execute('remote', 'xdg-open .', undef, undef, undef);
+    }});
 
     # Add take screenshot
     push(@vte_menu_items, {label => 'Take Screenshot', stockicon => 'gtk-media-record', sensitive => $$self{_UUID} ne '__PAC_SHELL__', code => sub {
         my $screenshot_file = '';
-        $screenshot_file = '/tmp/pac_screenshot_' . rand(123456789). '.png';
+        $screenshot_file = '/tmp/asbru_screenshot_' . rand(123456789). '.png';
         while(-f $screenshot_file) {
-            $screenshot_file = '/tmp/pac_screenshot_' . rand(123456789). '.png';
+            $screenshot_file = '/tmp/asbru_screenshot_' . rand(123456789). '.png';
         }
         select(undef, undef, undef, 0.5);
         _screenshot($$self{_GUI}{_VBOX}, $screenshot_file);
@@ -2157,18 +2274,11 @@ sub _vteMenu {
         # Open SFTP to this connection if it is SSH
         push(@vte_menu_items, {
             label => 'Open new SFTP window',
-            stockicon => 'pac-method-SFTP',
+            stockicon => 'asbru-method-SFTP',
+            shortcut => $PACMain::FUNCS{_KEYBINDS}->GetAccelerator('terminal', 'sftp'),
             sensitive => 1,
             code => sub {
-                my @idx;
-                my $newuuid = '_tmp_' . rand;
-                push(@idx, [$newuuid]);
-                $$self{_CFG}{environments}{$newuuid} = dclone($$self{_CFG}{environments}{$$self{_UUID}});
-                $$self{_CFG}{environments}{$newuuid}{method} = 'SFTP';
-                $$self{_CFG}{environments}{$newuuid}{expect} = [];
-                $$self{_CFG}{environments}{$newuuid}{options} = '';
-                $$self{_CFG}{environments}{$newuuid}{_protected} = 1;
-                $PACMain::{FUNCS}{_MAIN}->_launchTerminals(\@idx);
+                $self->_openSFTP();
             }
         });
     }
@@ -2177,23 +2287,27 @@ sub _vteMenu {
     push(@vte_menu_items,
     {
         label => 'Terminal',
-        stockicon => 'pac-shell',
+        stockicon => 'asbru-shell',
         sensitive => 1,
         submenu =>
         [
             {
                 label => 'Reset',
                 stockicon => 'gtk-refresh',
+                shortcut => $PACMain::FUNCS{_KEYBINDS}->GetAccelerator('terminal', 'reset'),
                 sensitive => 1,
-                shortcut => '<control><shift>x',
-                code => sub{$$self{_GUI}{_VTE}->reset(1, 0);}
+                code => sub {
+                    $$self{_GUI}{_VTE}->reset(1, 0);
+                }
             },
             {
                 label => 'Reset and clear',
                 stockicon => 'gtk-refresh',
+                shortcut => $PACMain::FUNCS{_KEYBINDS}->GetAccelerator('terminal', 'reset-clear'),
                 sensitive => 1,
-                shortcut => '<control><alt><shift>x',
-                code => sub{$$self{_GUI}{_VTE}->reset(1, 1);}
+                code => sub {
+                    $$self{_GUI}{_VTE}->reset(1, 1);
+                }
             }
         ]
     });
@@ -2202,7 +2316,7 @@ sub _vteMenu {
     push(@vte_menu_items,
     {
         label => 'Session',
-        stockicon => 'pac-method-' . $$self{_CFG}{environments}{$$self{_UUID}}{method},
+        stockicon => 'asbru-method-' . $$self{_CFG}{environments}{$$self{_UUID}}{method},
         sensitive => 1,
         submenu =>
         [
@@ -2217,73 +2331,85 @@ sub _vteMenu {
                         Glib::Source->remove($$self{_SEND_STRING});
                         undef $$self{_SEND_STRING};
                     } else {
-                        defined $$self{_SEND_STRING} and Glib::Source->remove($$self{_SEND_STRING});
-                        $$self{_SEND_STRING} = Glib::Timeout->add_seconds($$self{_CFG}{environments}{$$self{_UUID}}{'send string every'}, sub {
-                            if (!$$self{CONNECTED}) {
-                                return 1;
-                            }
-
-                            my $txt = $$self{_CFG}{environments}{$$self{_UUID}}{'send string txt'};
-                            my $intro = $$self{_CFG}{environments}{$$self{_UUID}}{'send string intro'};
-                            $txt = _subst($txt, $$self{_CFG}, $$self{_UUID});
-                            _vteFeedChild($$self{_GUI}{_VTE}, $txt . ($intro ? "\n" : ''));
-
-                            return 1;
-                        });
+                        $self->_startSendStringTimeout();
                     }
                 }
             },
             # Duplicate connection
             {
                 label => 'Duplicate connection',
-                shortcut => '<control><shift>d',
                 stockicon => 'gtk-copy',
-                code => sub {$PACMain::FUNCS{_MAIN}->_launchTerminals([[$$self{_UUID}]])}
+                code => sub {
+                    $PACMain::FUNCS{_MAIN}->_launchTerminals([[$$self{_UUID}]]);
+                }
             },
             # Restart session
             {
                 label => 'Restart session',
                 stockicon => 'gtk-execute',
                 sensitive => ! $$self{CONNECTED} || ! $$self{_PID},
-                code => sub{$self->start;}
+                code => sub {
+                    $self->start();
+                }
             },
             # Disconnect
             {
                 label => 'Disconnect',
                 stockicon => 'gtk-stop',
+                shortcut => $PACMain::FUNCS{_KEYBINDS}->GetAccelerator('terminal', 'disconnect'),
                 sensitive => $$self{_PID},
-                code => sub {kill(15, $$self{_PID});}
+                code => sub {
+                    $self->_disconnectTerminal();
+                }
             },
             # Disconnect and restart session
             {
                 label => 'Disconnect and Restart session',
                 stockicon => 'gtk-refresh',
-                shortcut => '<control><shift>r',
+                shortcut => $PACMain::FUNCS{_KEYBINDS}->GetAccelerator('terminal', 'restart'),
                 sensitive => $$self{CONNECTED} && $$self{_PID},
-                code => sub {$self->_disconnectAndRestartTerminal();}
+                code => sub {
+                    $self->_disconnectAndRestartTerminal();
+                }
             },
             # Close terminal
             {
                 label => 'Close Terminal',
-                shortcut => '<control>F4',
                 stockicon => 'gtk-close',
-                code => sub {$self->stop(0, 1);}
+                shortcut => $PACMain::FUNCS{_KEYBINDS}->GetAccelerator('terminal', 'close'),
+                code => sub {
+                    $self->stop(0, 1);
+                }
+            },
+            # Close other terminals
+            {
+                label => 'Close Other Terminals',
+                shortcut => $PACMain::FUNCS{_KEYBINDS}->GetAccelerator('terminal', 'closeotherterminals'),
+                stockicon => 'gtk-close',
+                sensitive => $self->_hasOtherTerminals(),
+                code => sub {
+                    $self->_closeOtherTerminals();
+                }
             },
             # Close all terminals
             {
                 label => 'Close All Terminals',
-                shortcut => '<control><shift>F4',
+                shortcut => $PACMain::FUNCS{_KEYBINDS}->GetAccelerator('terminal', 'closeallterminals'),
                 stockicon => 'gtk-close',
                 sensitive => $self->_hasOtherTerminals(),
-                code => sub {$self->_closeAllTerminals();}
+                code => sub {
+                    $self->_closeAllTerminals();
+                }
             },
             # Close disconnected terminals
             {
                 label => 'Close Disconnected Terminals',
-                shortcut => '<control><shift>n',
                 stockicon => 'gtk-close',
+                shortcut => $PACMain::FUNCS{_KEYBINDS}->GetAccelerator('terminal', 'close-disconected'),
                 sensitive => $self->_hasDisconnectedTerminals(),
-                code => sub {$self->_closeDisconnectedTerminals();}
+                code => sub {
+                    $self->_closeDisconnectedTerminals();
+                }
             }
         ]
     });
@@ -2292,26 +2418,6 @@ sub _vteMenu {
     return 1;
 }
 
-sub _pasteToVte {
-    my $self = shift;
-    my $txt = shift // '';
-    my $slow = shift // 0;
-
-    if (!$txt) {
-        return 1;
-    }
-
-    if ($slow) {
-        foreach my $char (split('', $txt)) {
-            _vteFeedChild($$self{_GUI}{_VTE}, $char);
-            Gtk3::main_iteration while Gtk3::events_pending;
-            select(undef, undef, undef, $slow / 1000);
-        }
-    } else {
-        $$self{_GUI}{_VTE}->paste_clipboard;
-    }
-}
-
 sub _setTabColour {
     my $self = shift;
     my $i = shift // 1;
@@ -2326,8 +2432,8 @@ sub _setTabColour {
                 }
 
                 my $screenshot_file = '';
-                $screenshot_file = '/tmp/pac_screenshot_' . rand(123456789). '.png';
-                while(-f $screenshot_file) {$screenshot_file = '/tmp/pac_screenshot_' . rand(123456789). '.png';}
+                $screenshot_file = '/tmp/asbru_screenshot_' . rand(123456789). '.png';
+                while(-f $screenshot_file) {$screenshot_file = '/tmp/asbru_screenshot_' . rand(123456789). '.png';}
                 _screenshot($$self{EMBED} ? $$self{FOCUS} : $$self{_GUI}{_VBOX}, $screenshot_file);
                 $PACMain::FUNCS{_MAIN}{_GUI}{screenshots}->add($screenshot_file, $$self{_CFG}{'environments'}{$$self{_UUID}});
                 $PACMain::FUNCS{_MAIN}->_updateGUIPreferences();
@@ -2374,6 +2480,12 @@ sub _setTabColour {
         defined $$self{_WINDOWTERMINAL} and $$self{_WINDOWTERMINAL}->set_icon_from_file($$self{CONNECTED} ? "$RealBin/res/asbru_terminal64x64.png" : "$RealBin/res/asbru_terminal_x64x64.png");
     }
 
+    # Set correct icon for hide/show button bar button
+    # (it may have changed in another terminal)
+    if ($$self{_GUI}{btnShowButtonBar}) {
+        $$self{_GUI}{btnShowButtonBar}->set_image(Gtk3::Image->new_from_stock($$self{_CFG}{'defaults'}{'auto hide button bar'} ? 'asbru-buttonbar-show' : 'asbru-buttonbar-hide', 'GTK_ICON_SIZE_BUTTON'));
+    }
+
     # Once checked the availability of new data, reset its value
     $$self{_NEW_DATA} = 0;
 
@@ -2382,6 +2494,23 @@ sub _setTabColour {
 
 sub _updateStatus {
     my $self = shift;
+    my $forward_ports = '';
+
+    # Show forwarding in status bar
+    if ($self->{CONNECTED} &&
+        $$self{_CFG}{environments}{$$self{_UUID}}{method} eq 'SSH' &&
+        $$self{_CFG}{defaults}{'info in status bar'}){
+        ($forward_ports) = $$self{_CFG}{environments}{$$self{_UUID}}{options} =~ /((-L|-D|-R)(.+))/;
+        if (! defined $forward_ports){
+            $forward_ports = '';
+        }
+        if ($$self{_CFG}{defaults}{'forwarding full names'}){
+            $forward_ports =~ s/-L/Local Forwarding:/;
+            $forward_ports =~ s/-R/Remote Forwarding:/;
+            $forward_ports =~ s/-D/Dynamic Forwarding:/;
+            $forward_ports =~ s/(-L|-R|-D) //g
+        }
+    }
 
     if (!defined $$self{_GUI}{status}) {
         return 1;
@@ -2393,9 +2522,9 @@ sub _updateStatus {
 
     # Control CLUSTER status
     if ($$self{_CLUSTER} ne '') {
-        $$self{_GUI}{status}->push(0, "[IN CLUSTER: $$self{_CLUSTER}] - Status: $$self{_LAST_STATUS}");
+        $$self{_GUI}{status}->push(0, "[IN CLUSTER: $$self{_CLUSTER}] - Status: $$self{_LAST_STATUS} $forward_ports");
     } else {
-        $$self{_GUI}{status}->push(0, "Status: $$self{_LAST_STATUS}");
+        $$self{_GUI}{status}->push(0, "Status: $$self{_LAST_STATUS} $forward_ports");
     }
 
     if (defined $$self{_GUI}{status}) {
@@ -2408,6 +2537,25 @@ sub _updateStatus {
     return 1;
 }
 
+sub _openSFTP {
+    my $self = shift;
+
+    if ($$self{_CFG}{environments}{$$self{_UUID}}{method} ne 'SSH') {
+        return 0;
+    }
+
+    my @idx;
+    my $newuuid = '_tmp_' . rand;
+    push(@idx, [$newuuid]);
+    $$self{_CFG}{environments}{$newuuid} = dclone($$self{_CFG}{environments}{$$self{_UUID}});
+    $$self{_CFG}{environments}{$newuuid}{method} = 'SFTP';
+    $$self{_CFG}{environments}{$newuuid}{expect} = [];
+    $$self{_CFG}{environments}{$newuuid}{options} = '';
+    $$self{_CFG}{environments}{$newuuid}{autossh} = 0;
+    $$self{_CFG}{environments}{$newuuid}{_protected} = 1;
+    $PACMain::{FUNCS}{_MAIN}->_launchTerminals(\@idx);
+}
+
 sub _clusterCommit {
     my ($self, $terminal, $string, $int) = @_;
 
@@ -2456,10 +2604,12 @@ sub _tabToWin {
             my $btnfocus = Gtk3::Button->new_with_mnemonic('Set _keyboard focus');
             $btnfocus->set_image(Gtk3::Image->new_from_icon_name('input-keyboard', 'GTK_ICON_SIZE_SMALL_TOOLBAR'));
             $btnfocus->set('can_focus', 0);
-            $btnfocus->signal_connect ('clicked' => sub {$$self{FOCUS}->child_focus('GTK_DIR_TAB_FORWARD');});
+            $btnfocus->signal_connect ('clicked' => sub {
+                $$self{FOCUS}->child_focus('GTK_DIR_TAB_FORWARD');
+            });
             $vbox->pack_start($btnfocus, 0, 1, 0);
 
-            $$self{_WINDOWTERMINAL}->set_default_size($$self{_GUI}{_VBOX}->get_allocated_width, $$self{_GUI}{_VBOX}->get_allocated_height - $$self{_GUI}{status}->get_allocated_height);
+            $$self{_WINDOWTERMINAL}->set_default_size($$self{_GUI}{_VBOX}->get_allocated_width(), $$self{_GUI}{_VBOX}->get_allocated_height() - $$self{_GUI}{status}->get_allocated_height());
             $$self{_WINDOWTERMINAL}->show_all();
             $$self{_GUI}{_SOCKET}->reparent($vp);
             $$self{_GUI}{_VBOX}->destroy();
@@ -2480,6 +2630,7 @@ sub _tabToWin {
 
     $$self{_WINDOWTERMINAL}->show();
     $$self{_WINDOWTERMINAL}->present();
+    $self->{_PARENTWINDOW} = $$self{_WINDOWTERMINAL};
 
     # Capture window close
     $$self{_WINDOWTERMINAL}->signal_connect('delete_event' => sub {
@@ -2535,6 +2686,7 @@ sub _winToTab {
     });
 
     $$self{_GUI}{_TABLBL}->show_all();
+    $self->{_PARENTWINDOW} = $$self{_NOTEBOOKWINDOW};
 
     $self->_setupTabDND();
 
@@ -2579,6 +2731,7 @@ sub _tabMenu {
 
     # Show a popup with the opened tabs (if tabbed!!)
     my @submenu_goto;
+    my %submenu_goto_labels;
     foreach my $uuid (keys %PACMain::RUNNING) {
         if (!defined $PACMain::RUNNING{$uuid}{terminal}{_SPLIT}) {
             next;
@@ -2587,11 +2740,29 @@ sub _tabMenu {
         if ($uuid eq $$self{_UUID} || $i < 0) {
             next;
         }
+        # Remember the number of times we encountered the same label
+        my $label = $PACMain::RUNNING{$uuid}{terminal}{_TITLE};
+        if (!defined $submenu_goto_labels{$label}) {
+            $submenu_goto_labels{$label} = 0;
+        }
+        $submenu_goto_labels{$label}++;
+
+        # Add new entry into the list
         push(@submenu_goto,
-        {
-            label => "$i: $PACMain::RUNNING{$uuid}{terminal}{_TITLE}",
-            code => sub {$$self{_NOTEBOOK}->set_current_page($i);}
-        });
+            {
+                label => $label,
+                page_number => $i,
+                code => sub {
+                    $$self{_NOTEBOOK}->set_current_page($i);
+                }
+            }
+        );
+    }
+    foreach my $submenu_goto_entry (@submenu_goto) {
+        # If multiple tabs with the same name, add the page number to be able to identify them
+        if ($submenu_goto_labels{$submenu_goto_entry->{label}} > 1) {
+            $submenu_goto_entry->{label} .= ' (#' . $submenu_goto_entry->{page_number} . ')';
+        }
     }
     @submenu_goto = sort {$$a{label} cmp $$b{label}} @submenu_goto;
     push(@vte_menu_items,
@@ -2609,7 +2780,9 @@ sub _tabMenu {
             label => "Stop script '$$self{_SCRIPT_NAME}'",
             stockicon => 'gtk-media-stop',
             sensitive => 1,
-            code => sub {kill(15, $$self{_PID});}
+            code => sub {
+                $self->_disconnectTerminal();
+            }
         });
 
         _wPopUpMenu(\@vte_menu_items, $event);
@@ -2635,31 +2808,42 @@ sub _tabMenu {
                 push(@submenu_split_v,
                 {
                     label => "$i: $PACMain::RUNNING{$uuid_tmp}{terminal}{_TITLE}",
-                    code => sub {$self->_split($uuid_tmp);}
+                    code => sub {
+                        $self->_split($uuid_tmp);
+                    }
                 });
                 push(@submenu_split_h,
                 {
                     label => "$i: $PACMain::RUNNING{$uuid_tmp}{terminal}{_TITLE}",
-                    code => sub {$self->_split($uuid_tmp, 1);}
+                    code => sub {
+                        $self->_split($uuid_tmp, 1);
+                    }
                 });
             }
             @submenu_split_v = sort {$$a{label} cmp $$b{label}} @submenu_split_v;
             @submenu_split_h = sort {$$a{label} cmp $$b{label}} @submenu_split_h;
 
-            push(@vte_menu_items, {label => 'Detach TAB to a new Window', stockicon => 'gtk-fullscreen', code => sub {_tabToWin($self); return 1;}});
+            push(@vte_menu_items, {label => 'Detach TAB to a new Window', stockicon => 'gtk-fullscreen', code => sub {
+                _tabToWin($self);
+                return 1;
+            }});
 
             if ($$self{_SPLIT}) {
                 push(@vte_menu_items,
                 {
                     label => 'Unsplit',
                     stockicon => 'gtk-zoom-fit',
-                    code => sub {$self->_unsplit;}
+                    code => sub {
+                        $self->_unsplit();
+                    }
                 });
                 push(@vte_menu_items,
                 {
                     label => 'Equally resize terminals',
                     stockicon => 'gtk-zoom-fit',
-                    code => sub {$self->_equalresize;}
+                    code => sub {
+                        $self->_equalresize();
+                    }
                 });
             } else {
                 push(@vte_menu_items,
@@ -2686,7 +2870,10 @@ sub _tabMenu {
             }
             push(@vte_menu_items, {separator => 1});
         } else {
-            push(@vte_menu_items, {label => 'Attach Window to main TAB bar', stockicon => 'gtk-leave-fullscreen', code => sub {_winToTab($self); return 1;}});
+            push(@vte_menu_items, {label => 'Attach Window to main TAB bar', stockicon => 'gtk-leave-fullscreen', code => sub {
+                _winToTab($self);
+                return 1;
+            }});
             push(@vte_menu_items, {separator => 1});
         }
     }
@@ -2698,9 +2885,8 @@ sub _tabMenu {
     {
         label => 'New Cluster...',
         stockicon => 'gtk-new',
-        shortcut => '',
         code => sub {
-            my $cluster = _wEnterValue($self, 'Enter a name for the <b>New Cluster</b>');
+            my $cluster = _wEnterValue($$self{_PARENTWINDOW}, 'Enter a name for the <b>New Cluster</b>');
             if ((! defined $cluster) || ($cluster =~ /^\s*$/go)) {
                 return 1;
             }
@@ -2708,13 +2894,9 @@ sub _tabMenu {
         }
     });
     foreach my $uuid_tmp (keys %PACMain::RUNNING) {
-        if (! defined $PACMain::RUNNING{$uuid_tmp}{terminal}{_CLUSTER}) {
-            next;
-        }
-        if ($PACMain::RUNNING{$uuid_tmp}{terminal}{_CLUSTER} ne '') {
+        if (!defined $PACMain::RUNNING{$uuid_tmp}{terminal}{_CLUSTER} || $PACMain::RUNNING{$uuid_tmp}{terminal}{_CLUSTER} eq '') {
             next;
         }
-
         $clusters{$PACMain::RUNNING{$uuid_tmp}{terminal}{_CLUSTER}}{total}++;
         $clusters{$PACMain::RUNNING{$uuid_tmp}{terminal}{_CLUSTER}}{connections} .= "$PACMain::RUNNING{$uuid_tmp}{terminal}{_NAME}\n";
     }
@@ -2725,7 +2907,9 @@ sub _tabMenu {
             label => "$cluster ($clusters{$cluster}{total} terminals connected)",
             tooltip => $clusters{$cluster}{connections},
             sensitive => $cluster ne $$self{_CLUSTER},
-            code => sub {$PACMain::FUNCS{_CLUSTER}->addToCluster($$self{_UUID_TMP}, $tmp);}
+            code => sub {
+                $PACMain::FUNCS{_CLUSTER}->addToCluster($$self{_UUID_TMP}, $tmp);
+            }
         });
     }
     push(@vte_menu_items,
@@ -2740,30 +2924,41 @@ sub _tabMenu {
         label => 'Remove from Cluster',
         stockicon => 'gtk-delete',
         sensitive => $$self{_CLUSTER} ne '',
-        code => sub {$PACMain::FUNCS{_CLUSTER}->delFromCluster($$self{_UUID_TMP}, $$self{_CLUSTER});}
+        code => sub {
+            $PACMain::FUNCS{_CLUSTER}->delFromCluster($$self{_UUID_TMP}, $$self{_CLUSTER});
+        }
     });
     push(@vte_menu_items,
     {
         label => 'Cluster Admin...',
         stockicon => 'gtk-justify-fill',
         sensitive => 1,
-        code => sub {$PACMain::FUNCS{_CLUSTER}->show();}
+        code => sub {
+            $PACMain::FUNCS{_CLUSTER}->show();
+        }
     });
     push(@vte_menu_items, {separator => 1});
 
-    push(@vte_menu_items, {label => 'Find...', stockicon => 'gtk-find', shortcut => '', code => sub {$self->_wFindInTerminal; return 1;}});
+    push(@vte_menu_items, {label => 'Find...', stockicon => 'gtk-find', code => sub {
+        $self->_wFindInTerminal();
+        return 1;
+    }});
 
     # Add save session log
-    push(@vte_menu_items, {label => 'Save session log...', stockicon => 'gtk-save', shortcut => '', code => sub{$self->_saveSessionLog;}});
+    push(@vte_menu_items, {label => 'Save session log...', stockicon => 'gtk-save', code => sub {
+        $self->_saveSessionLog();
+    }});
 
     # Add edit session
-    push(@vte_menu_items, {label => 'Edit session...', stockicon => 'gtk-edit', sensitive => $$self{_UUID} ne '__PAC_SHELL__', code => sub{$PACMain::FUNCS{_EDIT}->show($$self{_UUID});}});
+    push(@vte_menu_items, {label => 'Edit session...', stockicon => 'gtk-edit', sensitive => $$self{_UUID} ne '__PAC_SHELL__', code => sub {
+        $PACMain::FUNCS{_EDIT}->show($$self{_UUID});
+    }});
 
     # Add change temporary tab label
     push(@vte_menu_items, {label => 'Temporary TAB Label change...', stockicon => 'gtk-edit', code => sub {
         # Prepare the input window
         my $new_label = _wEnterValue(
-            $PACMain::FUNCS{_MAIN}{_GUI}{main},
+            $$self{_PARENTWINDOW},
             "<b>Temporaly renaming label '@{[__($$self{_TITLE})]}'</b>",
             'Enter the new temporal label:',
             $$self{_TITLE}
@@ -2780,23 +2975,27 @@ sub _tabMenu {
     push(@vte_menu_items, {label => 'New connection', stockicon => 'gtk-connect', submenu => &_menuAvailableConnections($PACMain::FUNCS{_MAIN}{_GUI}{treeConnections}{data})});
 
     # Add a 'duplicate connection' button
-    push(@vte_menu_items, {label => 'Duplicate connection', stockicon => 'gtk-copy', shortcut => '', sensitive => 1, code => sub{$PACMain::FUNCS{_MAIN}->_launchTerminals([[$$self{_UUID}]]);}});
+    push(@vte_menu_items, {label => 'Duplicate connection', stockicon => 'gtk-copy', sensitive => 1, code => sub {
+        $PACMain::FUNCS{_MAIN}->_launchTerminals([[$$self{_UUID}]]);
+    }});
 
     # Add close terminal
     push(@vte_menu_items, {separator => 1});
     # Add a 'disconnect' button to disconnect without closing the terminal
-    push(@vte_menu_items, {label => 'Disconnect session', stockicon => 'gtk-stop', sensitive => $$self{_PID}, code => sub {kill(15, $$self{_PID});}});
-    push(@vte_menu_items, {label => 'Restart session', stockicon => 'gtk-execute', sensitive => !$$self{CONNECTED} || !$$self{_PID}, code => sub {$self->start();}});
-    push(@vte_menu_items, {label => 'Close terminal', stockicon => 'gtk-close', shortcut => '<control>F4', code => sub {$self->stop(undef, 1);}});
-    push(@vte_menu_items, {label => 'Close ALL terminals', stockicon => 'gtk-close', shortcut => '<control><shift>F4', code => sub {
-        my @list = keys %PACMain::RUNNING;
-        if (!(scalar(@list) && _wConfirm($$self{_WINDOWTERMINAL}, "Are you sure you want to CLOSE <b>every</b> terminal?"))) {
-            return 1;
-        }
-        foreach my $uuid (@list) {
-            $PACMain::RUNNING{$uuid}{'terminal'}->stop('force', 'deep');
-        }
-        return 1;
+    push(@vte_menu_items, {label => 'Disconnect session', stockicon => 'gtk-stop', sensitive => $$self{_PID}, code => sub {
+        $self->_disconnectTerminal();
+    }});
+    push(@vte_menu_items, {label => 'Restart session', stockicon => 'gtk-execute', sensitive => !$$self{CONNECTED} || !$$self{_PID}, code => sub {
+        $self->start();
+    }});
+    push(@vte_menu_items, {label => 'Close terminal', stockicon => 'gtk-close', code => sub {
+        $self->stop(undef, 1);
+    }});
+    push(@vte_menu_items, {label => 'Close other terminals', stockicon => 'gtk-close', code => sub {
+        return $self->_closeOtherTerminals();
+    }});
+    push(@vte_menu_items, {label => 'Close all terminals', stockicon => 'gtk-close', code => sub {
+        return $self->_closeAllTerminals();
     }});
 
     _wPopUpMenu(\@vte_menu_items, $event);
@@ -2830,7 +3029,12 @@ sub _split {
 
     my $eblbl1 = Gtk3::EventBox->new();
     $eblbl1->add(Gtk3::Image->new_from_stock('gtk-close', 'menu'));
-    $eblbl1->signal_connect('button_release_event' => sub {$_[1]->button != 1 and return 0; $self->stop(undef, 1);});
+    $eblbl1->signal_connect('button_release_event' => sub {
+        if ($_[1]->button != 1) {
+            return 0;
+        }
+        $self->stop(undef, 1);
+    });
     $$self{_GUI}{_TABLBL}->pack_start($eblbl1, 0, 1, 0);
 
     $$self{_GUI}{_TABLBL}{_EBLBL}->signal_connect('button_press_event' => sub {
@@ -2860,12 +3064,16 @@ sub _split {
     $self->_setTabColour();
     $PACMain::RUNNING{$uuid_tmp}{terminal}->_updateCFG();
 
-    my ($x, $y) = ($$self{_SPLIT_VPANE}->get_parent->get_allocated_width, $$self{_SPLIT_VPANE}->get_parent->get_allocated_height);
-    $$self{_SPLIT_VPANE}->set_position((($vertical ? $y : $x) / 2) - 7);
+    # Force redraw to have the correct split pane size
+    Gtk3::main_iteration() while Gtk3::events_pending();
 
+    # Equal size by default
+    $self->_equalresize();
+
+    # To always force keeping equal size
     if ($$self{_CFG}{'defaults'}{'force split tabs to 50%'}) {
         $$self{_SPLIT_VPANE}->signal_connect('size-allocate', sub {
-            $self->_equalresize ();
+            $self->_equalresize();
         });
     }
 
@@ -2875,8 +3083,14 @@ sub _split {
 sub _equalresize {
     my $self = shift;
 
-    my ($x, $y) = ($$self{_SPLIT_VPANE}->get_parent->get_allocated_width, $$self{_SPLIT_VPANE}->get_parent->get_allocated_height);
-    $$self{_SPLIT_VPANE}->set_position((($$self{_SPLIT_VERTICAL} ? $y : $x) / 2) - 7);
+    my ($w, $h) = ($$self{_SPLIT_VPANE}->get_allocated_width(), $$self{_SPLIT_VPANE}->get_allocated_height());
+    my $s = (($$self{_SPLIT_VERTICAL} ? $h : $w) / 2) - 7;
+
+    # Set split position
+    $$self{_SPLIT_VPANE}->set_position($s);
+
+    # Force redraw
+    Gtk3::main_iteration() while Gtk3::events_pending();
 
     return 1;
 }
@@ -2908,7 +3122,12 @@ sub _unsplit {
 
     my $eblbl1 = Gtk3::EventBox->new();
     $eblbl1->add(Gtk3::Image->new_from_stock('gtk-close', 'menu'));
-    $eblbl1->signal_connect('button_release_event' => sub {$_[1]->button != 1 and return 0; $self->stop(undef, 1);});
+    $eblbl1->signal_connect('button_release_event' => sub {
+        if ($_[1]->button != 1) {
+            return 0;
+        }
+        $self->stop(undef, 1);
+    });
     $$self{_GUI}{_TABLBL}->pack_start($eblbl1, 0, 1, 0);
 
     $$self{_GUI}{_TABLBL}{_EBLBL}->signal_connect('button_press_event' => sub {
@@ -2943,20 +3162,25 @@ sub _unsplit {
 
     my $eblbl3 = Gtk3::EventBox->new();
     $eblbl3->add(Gtk3::Image->new_from_stock('gtk-close', 'menu'));
-    $eblbl3->signal_connect('button_release_event' => sub {$_[1]->button != 1 and return 0; $self->stop(undef, 1);});
+    $eblbl3->signal_connect('button_release_event' => sub {
+        if ($_[1]->button != 1) {
+            return 0;
+        }
+        $PACMain::RUNNING{$uuid_tmp}{terminal}->stop(undef, 1);
+    });
     $PACMain::RUNNING{$uuid_tmp}{terminal}{_GUI}{_TABLBL}->pack_start($eblbl3, 0, 1, 0);
 
     $PACMain::RUNNING{$uuid_tmp}{terminal}{_GUI}{_TABLBL}{_EBLBL}->signal_connect('button_press_event' => sub {
         my ($widget, $event) = @_;
 
         if ($event->button eq 2) {
-            $self->stop(undef, 1);
+            $PACMain::RUNNING{$uuid_tmp}{terminal}->stop(undef, 1);
             return 1;
         } elsif ($event->button ne 3) {
             return 0;
         }
 
-        $self->_tabMenu($event);
+        $PACMain::RUNNING{$uuid_tmp}{terminal}->_tabMenu($event);
         return 1;
     });
 
@@ -2990,7 +3214,7 @@ sub _setupTabDND {
     my $self = shift;
     my $widget = shift // $$self{_GUI}{_VBOX};
 
-    my @targets = (Gtk3::TargetEntry->new('PAC Tabbed', [], 0));
+    my @targets = (Gtk3::TargetEntry->new('Ásbrú Tabbed', [], 0));
     $$self{_GUI}{_TABLBL}->drag_source_set('GDK_BUTTON1_MASK', \@targets, ['move']);
     $$self{_GUI}{_TABLBL}->signal_connect('drag_begin' => sub {
         # Does not work anymore on Gtk3
@@ -2998,12 +3222,15 @@ sub _setupTabDND {
         my $i = $$self{_NOTEBOOK}->page_num($$self{_GUI}{_VBOX});
         $PACMain::FUNCS{_MAIN}{DND}{source_tab} = $$self{_NOTEBOOK}->get_nth_page($i);
     });
-    $$self{_GUI}{_TABLBL}->signal_connect('drag_end' => sub {$PACMain::FUNCS{_MAIN}{DND} = undef; return 1;});
+    $$self{_GUI}{_TABLBL}->signal_connect('drag_end' => sub {
+        $PACMain::FUNCS{_MAIN}{DND} = undef;
+        return 1;
+    });
     $$self{_GUI}{_TABLBL}->signal_connect('drag_failed' => sub {
         if ($_[2] eq 'user-cancelled') {
             return 0;
         }
-        $self->_tabToWin;
+        $self->_tabToWin();
     });
 
     $$self{_GUI}{_TABLBL}->drag_dest_set('GTK_DEST_DEFAULT_ALL', \@targets, ['move']);
@@ -3041,18 +3268,18 @@ sub _saveSessionLog {
     $new_file = $dialog->get_filename;
     $dialog->destroy();
 
-    my $confirm = _wYesNoCancel($$self{_WINDOWTERMINAL}, 'Do you want to remove escape sequences from the saved log?');
+    my $confirm = _wYesNoCancel($$self{_PARENTWINDOW}, 'Do you want to remove escape sequences from the saved log?');
 
     if ($confirm eq 'yes') {
         if (!open(F, "$$self{_LOGFILE}")) {
-            _wMessage($$self{_WINDOWTERMINAL}, "ERROR: Could not open file '$$self{_LOGFILE}' for reading!! ($!)");
+            _wMessage($$self{_PARENTWINDOW}, "ERROR: Could not open file '$$self{_LOGFILE}' for reading!! ($!)");
             return 1;
         }
         my @lines = <F>;
         close F;
 
         if (!open(F, ">$new_file")) {
-            _wMessage($$self{_WINDOWTERMINAL}, "ERROR: Could not open file '$new_file' for writting!! ($!)");
+            _wMessage($$self{_PARENTWINDOW}, "ERROR: Could not open file '$new_file' for writting!! ($!)");
             return 1;
         }
         print F _removeEscapeSeqs(join('', @lines));
@@ -3079,9 +3306,9 @@ sub _execute {
         return 0;
     }
 
-    my ($cmd, $data) = _subst($comm, $$self{_CFG}, $$self{_UUID});
+    my ($cmd, $data) = _subst($comm, $$self{_CFG}, $$self{_UUID}, $$self{_UUID_TMP});
     if (!defined $cmd) {
-        _wMessage($$self{_WINDOWTERMINAL}, "Canceled '<b>$where</b>' execution of '<b>$comm</b>'");
+        _wMessage($$self{_PARENTWINDOW}, "Canceled '<b>$where</b>' execution of '<b>$comm</b>'");
         return 0;
     }
 
@@ -3094,15 +3321,15 @@ sub _execute {
         $$self{_EXEC}{FULL_CMD} = $comm;
 
         # Prevent "Remote Executions storms" (half a second between interruptions to spawned processes)
-        my $time = join('.', gettimeofday);
+        my $time = join('.', gettimeofday());
         if (($time - $$self{_EXEC_LAST}) <= $EXEC_STORM_TIME) {
-            _wMessage($$self{_WINDOWTERMINAL}, "Please, wait at least <b>$EXEC_STORM_TIME</b> seconds between Remote Commands Executions", 1);
+            _wMessage($$self{_PARENTWINDOW}, "Please, wait at least <b>$EXEC_STORM_TIME</b> seconds between Remote Commands Executions", 1);
             return 0;
         }
         $$self{_EXEC_LAST} = $time;
 
         if (!kill('USR1', $$self{_PID})) {
-            _wMessage($$self{_WINDOWTERMINAL}, "ERROR: Could not signal process '$$self{_PID}'\nInconsistent state!\nPlease, restart PAC!!", 1);
+            _wMessage($$self{_PARENTWINDOW}, "ERROR: Could not signal process '$$self{_PID}'\nInconsistent state!\nPlease, restart PAC!!", 1);
             return 0;
         }
         my %tmp;
@@ -3114,7 +3341,7 @@ sub _execute {
         $tmp{cmd} = $cmd;
         nstore_fd(\%tmp, $$self{_SOCKET_CLIENT}) or die "ERROR:$!";
     } elsif ($where eq 'local') {
-        system($cmd . ' &');
+        system("$ENV{'ASBRU_ENV_FOR_EXTERNAL'} $cmd &");
     }
 
     return 1;
@@ -3130,10 +3357,10 @@ sub _pipeExecOutput {
         return 1;
     }
     foreach my $cmd (@{$pipe}) {
-        open(F,">:utf8",$$self{_TMPPIPE});
+        open(F, ">:utf8", $$self{_TMPPIPE});
         print F $out;
         close F;
-        $out = `cat $$self{_TMPPIPE} | $cmd 2>&1`;
+        $out = `$ENV{'ASBRU_ENV_FOR_EXTERNAL'} cat $$self{_TMPPIPE} | $ENV{'ASBRU_ENV_FOR_EXTERNAL'} $cmd 2>&1`;
     }
     $$self{_EXEC}{OUT} = $out;
     $PACMain::FUNCS{_PIPE}->show();
@@ -3219,7 +3446,7 @@ sub _wPrePostExec {
             }
 
             # Replace PAC variables with their corresponding values
-            $cmd = _subst($cmd, $$self{_CFG}, $$self{_UUID});
+            $cmd = _subst($cmd, $$self{_CFG}, $$self{_UUID}, $$self{_UUID_TMP});
 
             # Make some update to progress bar
             $ppe{window}{gui}{pb}->set_text('Executing: ' . $cmd);
@@ -3227,7 +3454,7 @@ sub _wPrePostExec {
             Gtk3::main_iteration while Gtk3::events_pending;
 
             # Launch the local command
-            system($cmd);
+            system("$ENV{'ASBRU_ENV_FOR_EXTERNAL'} $cmd");
         }
 
         # Change mouse cursor (to normal)
@@ -3245,12 +3472,11 @@ sub _wPrePostExec {
         # Create the dialog window,
         $w{window}{data} = Gtk3::Dialog->new_with_buttons(
             $self->{_NAME} . " : $APPNAME : Local execution",
-            undef,
+            $self->{_PARENTWINDOW},
             'modal',
         );
         # and setup some dialog properties.
         $w{window}{data}->set_default_response('ok');
-        $w{window}{data}->set_position('center');
         $w{window}{data}->set_icon_from_file($APPICON);
         $w{window}{data}->set_size_request(400, 300);
         $w{window}{data}->set_resizable(1);
@@ -3284,9 +3510,14 @@ sub _wPrePostExec {
 
         $w{window}{data}->signal_connect('response' => sub {
             my ($me, $response) = @_;
-            $response eq '1' and _execLocalPPE($self, \%w);
+            if ($response eq '1') {
+                _execLocalPPE($self, \%w);
+            }
             $w{window}{data}->destroy();
-            $$self{_GUI}{_VBOX}->get_window()->set_cursor(Gtk3::Gdk::Cursor->new('left-ptr'));
+            if (defined $$self{_GUI}{_VBOX}) {
+                # Change mouse pointer when pre exec, on post exec, the window might be gone already
+                $$self{_GUI}{_VBOX}->get_window()->set_cursor(Gtk3::Gdk::Cursor->new('left-ptr'));
+            }
             undef %w;
         });
 
@@ -3388,7 +3619,7 @@ sub _wSelectChain {
         if ($ppe{window}{gui}{cbExecInCluster}->get_active) {
             foreach my $cluster_uuid (keys %PACMain::RUNNING) {
                 if (! kill('HUP', $PACMain::RUNNING{$cluster_uuid}{terminal}{_PID})) {
-                    _wMessage($$self{_WINDOWTERMINAL}, "ERROR: Could not signal process '$PACMain::RUNNING{$cluster_uuid}{terminal}{_PID}'\nInconsistent state!\nPlease, restart PAC!!", 1);
+                    _wMessage($$self{_PARENTWINDOW}, "ERROR: Could not signal process '$PACMain::RUNNING{$cluster_uuid}{terminal}{_PID}'\nInconsistent state!\nPlease, restart PAC!!", 1);
                     return 0;
                 }
 
@@ -3399,7 +3630,7 @@ sub _wSelectChain {
             }
         } else {
             if (! kill('HUP', $$self{_PID})) {
-                _wMessage($$self{_WINDOWTERMINAL}, "ERROR: Could not signal process '$$self{_PID}'\nInconsistent state!\nPlease, restart PAC!!", 1);
+                _wMessage($$self{_PARENTWINDOW}, "ERROR: Could not signal process '$$self{_PID}'\nInconsistent state!\nPlease, restart PAC!!", 1);
                 return 0;
             }
 
@@ -3572,7 +3803,7 @@ sub _updateCFG {
             my $intro = $$hash{intro};
 
             my $ok = $self->_execute('remote', $cmd, $confirm, undef, undef, $intro);
-            if (($ok)&&($$self{_GUI}{_MACROSCLUSTER}->get_active)) {
+            if (($ok)&&($$self{_GUI}{_MACROSCLUSTER}->get_active())) {
                 $self->_clusterCommit(undef, $cmd . "\n", undef);
             }
             return 1;
@@ -3637,13 +3868,23 @@ sub _updateCFG {
         ###################################################################
     }
     # Build Buttons for macros
-    elsif ($$self{_CFG}{'defaults'}{'show commands box'} == 2 && defined $$self{_GUI}{_MACROSBOX})
+    elsif ($$self{_CFG}{'defaults'}{'show commands box'} == 2 && defined($$self{_GUI}{_MACROSBOX}))
     {
+        my $isCluster = $$self{_CLUSTER} ? 1 : 0;
+        my $wasMacroClusterActive = defined($$self{_GUI}{_MACROSCLUSTER}) ? $$self{_GUI}{_MACROSCLUSTER}->get_active() : $isCluster;
+
+        my $updateMacroButton = sub  {
+            my $str = 'Sending ' . ($$self{_GUI}{_MACROSCLUSTER}->get_active() ? 'CLUSTER' : 'THIS') . ':';
+            $$self{_GUI}{_MACROSCLUSTER}->set_label($str);
+        };
+
         $$self{_GUI}{_MACROSBOX}->set_sensitive($$self{CONNECTED});
-        $$self{_GUI}{_MACROSBOX}->foreach(sub {$_[0]->destroy();});
-        $$self{_GUI}{_MACROSCLUSTER} = Gtk3::CheckButton->new_with_label('Sending THIS: ');
+        $$self{_GUI}{_MACROSBOX}->foreach(sub { $_[0]->destroy(); });
+        $$self{_GUI}{_MACROSCLUSTER} = Gtk3::CheckButton->new();
         $$self{_GUI}{_MACROSCLUSTER}->set('can-focus', 0);
-        $$self{_GUI}{_MACROSCLUSTER}->signal_connect('toggled', sub {$$self{_GUI}{_MACROSCLUSTER}->set_label($$self{_GUI}{_MACROSCLUSTER}->get_active ? 'Sending CLUSTER: ' : 'Sending THIS: ');});
+        $$self{_GUI}{_MACROSCLUSTER}->signal_connect('toggled', $updateMacroButton);
+        $$self{_GUI}{_MACROSCLUSTER}->set_active($wasMacroClusterActive);
+        &$updateMacroButton();
         $$self{_GUI}{_MACROSBOX}->pack_start($$self{_GUI}{_MACROSCLUSTER}, 0, 1, 0);
 
         ###################################################################
@@ -3670,7 +3911,7 @@ sub _updateCFG {
 
             $$self{_GUI}{"_BTNMACRO_$i"}->signal_connect('clicked' => sub {
                 my $ok = $self->_execute('remote', $cmd, $confirm, undef, undef, $intro);
-                if (($ok)&&($$self{_GUI}{_MACROSCLUSTER}->get_active)) {
+                if ($ok && $$self{_GUI}{_MACROSCLUSTER}->get_active()) {
                     $self->_clusterCommit(undef, $cmd . "\n", undef);
                 }
             });
@@ -3690,6 +3931,7 @@ sub _updateCFG {
                 $$self{_GUI}{"_BTNMACRO_GLOB_$i"} = Gtk3::Button->new();
                 $$self{_GUI}{"_BTNMACRO_GLOB_$i"}->set('can-focus', 0);
                 $$self{_GUI}{"_BTNMACRO_GLOB_$i"}->set_tooltip_text($cmd);
+
                 my $btn2 = Gtk3::Label->new($desc ? $desc : $cmd);
                 $btn2->set_ellipsize('PANGO_ELLIPSIZE_END');
                 $$self{_GUI}{"_BTNMACRO_GLOB_$i"}->add($btn2);
@@ -3697,7 +3939,12 @@ sub _updateCFG {
                 $$self{_GUI}{_MACROSBOX}->pack_start($$self{_GUI}{"_BTNMACRO_GLOB_$i"}, 1, 1, 0);
                 $$self{_GUI}{_MACROSBOX}->show_all();
 
-                $$self{_GUI}{"_BTNMACRO_GLOB_$i"}->signal_connect('clicked' => sub {$self->_execute('remote', $cmd, $confirm, undef, undef, $intro);});
+                $$self{_GUI}{"_BTNMACRO_GLOB_$i"}->signal_connect('clicked' => sub {
+                    my $ok = $self->_execute('remote', $cmd, $confirm, undef, undef, $intro);
+                    if ($ok && $$self{_GUI}{_MACROSCLUSTER}->get_active()) {
+                        $self->_clusterCommit(undef, $cmd . "\n", undef);
+                    }
+                });
 
                 ++$i;
             }
@@ -3726,8 +3973,8 @@ sub _updateCFG {
     # Update some VTE options
     if (($$self{_CFG}{environments}{$$self{_UUID}}{'terminal options'}{'use personal settings'}) && (defined $$self{_GUI}{_VTE})) {
         $$self{_GUI}{_VTE}->set_colors(scalar Gtk3::Gdk::RGBA::parse($$self{_CFG}{environments}{$$self{_UUID}}{'terminal options'}{'text color'}), scalar Gtk3::Gdk::RGBA::parse($$self{_CFG}{environments}{$$self{_UUID}}{'terminal options'}{'back color'}), $colors);
-        if ($$self{_CFG}{environments}{$$self{_UUID}}{'terminal options'}{'terminal transparency'} > 0) {
-            _setTransparency($self,$$self{_CFG}{environments}{$$self{_UUID}}{'terminal options'}{'terminal transparency'},$$self{_CFG}{environments}{$$self{_UUID}}{'terminal options'}{'back color'});
+        if ($$self{_CFG}{defaults}{'terminal support transparency'} && $$self{_CFG}{environments}{$$self{_UUID}}{'terminal options'}{'terminal transparency'} > 0) {
+            _setTransparency($self, $$self{_CFG}{environments}{$$self{_UUID}}{'terminal options'}{'terminal transparency'}, $$self{_CFG}{environments}{$$self{_UUID}}{'terminal options'}{'back color'});
         } else {
             $$self{_GUI}{_VTE}->set_color_background(scalar Gtk3::Gdk::RGBA::parse($$self{_CFG}{environments}{$$self{_UUID}}{'terminal options'}{'back color'}));
         }
@@ -3741,8 +3988,8 @@ sub _updateCFG {
         $$self{_GUI}{_VTE}->set_audible_bell($$self{_CFG}{environments}{$$self{_UUID}}{'terminal options'}{'audible bell'});
     } elsif (defined $$self{_GUI}{_VTE}) {
         $$self{_GUI}{_VTE}->set_colors(scalar Gtk3::Gdk::RGBA::parse($$self{_CFG}{'defaults'}{'text color'}), scalar Gtk3::Gdk::RGBA::parse($$self{_CFG}{'defaults'}{'back color'}), $colors);
-        if ($$self{_CFG}{defaults}{'terminal transparency'} > 0) {
-            _setTransparency($self,$$self{_CFG}{defaults}{'terminal transparency'},$$self{_CFG}{'defaults'}{'back color'});
+        if ($$self{_CFG}{defaults}{'terminal support transparency'} && $$self{_CFG}{defaults}{'terminal transparency'} > 0) {
+            _setTransparency($self, $$self{_CFG}{defaults}{'terminal transparency'}, $$self{_CFG}{'defaults'}{'back color'});
         } else {
             $$self{_GUI}{_VTE}->set_color_background(scalar Gtk3::Gdk::RGBA::parse($$self{_CFG}{'defaults'}{'back color'}));
         }
@@ -3769,23 +4016,12 @@ sub _setTransparency {
     my $transparency = shift;
     my $bgcolor = shift;
     my $alpha = 1 - $transparency;
-    my ($r,$g,$b) = (0,0,0);
 
-    if (length($bgcolor)==13) {
-        ($r,$g,$b) = $bgcolor =~ m/(\w{2})\w{2}(\w{2})\w{2}(\w{2})\w{2}/;
-    } elsif (length($bgcolor) == 7) {
-        ($r,$g,$b) = $bgcolor =~ m/(\w{2})(\w{2})(\w{2})/;
-    }
-    if ($r) {
-        $r = hex($r);
-    }
-    if ($g) {
-        $g = hex($g);
-    }
-    if ($b) {
-        $b = hex($b);
+    my $color = Gtk3::Gdk::RGBA::parse($bgcolor);
+    if (!$color) {
+        $color = Gtk3::Gdk::RGBA::parse("#000000");
     }
-    my $color = Gtk3::Gdk::RGBA::parse("rgba($r,$g,$b,$alpha)");
+    $color->alpha($alpha);
     $$self{_GUI}{_VTE}->set_color_background($color);
 }
 
@@ -3798,7 +4034,7 @@ sub _wFindInTerminal {
 
     if (defined $w{window}) {
         # Load the contents of the textbuffer with the corresponding log file
-        if (open(F, "<:utf8",$$self{_LOGFILE})) {
+        if (open(F, "<:utf8", $$self{_LOGFILE})) {
             @{$$self{_TEXT}} = <F>;
             $text = _removeEscapeSeqs(join('', @{$$self{_TEXT}}));
             close F;
@@ -3807,7 +4043,7 @@ sub _wFindInTerminal {
         }
         $w{window}{buffer}->set_text($text // '');
 
-        return $w{window}{data}->present;
+        return $w{window}{data}->present();
     }
 
     # Create the 'windowFind' dialog window,
@@ -3836,7 +4072,7 @@ sub _wFindInTerminal {
     $w{window}{data}->set_position('center');
     $w{window}{data}->set_icon_from_file($APPICON);
     $w{window}{data}->set_default_size(600, 400);
-    $w{window}{data}->maximize;
+    $w{window}{data}->maximize();
     $w{window}{data}->set_resizable(1);
 
     # Create an hbox
@@ -3948,7 +4184,11 @@ sub _wFindInTerminal {
     # Put a 'close' button
     $w{window}{gui}{btnclose} = Gtk3::Button->new_from_stock('gtk-close');
     $w{window}{gui}{hbtnbox}->pack_start($w{window}{gui}{btnclose}, 0, 1, 0);
-    $w{window}{gui}{btnclose}->signal_connect('clicked' => sub {$w{window}{data}->destroy(); undef %w; return 1;});
+    $w{window}{gui}{btnclose}->signal_connect('clicked' => sub {
+        $w{window}{data}->destroy();
+        undef %w;
+        return 1;
+    });
 
     # Create frame 3
     $w{window}{gui}{frame3} = Gtk3::Frame->new();
@@ -3980,7 +4220,7 @@ sub _wFindInTerminal {
     $w{window}{gui}{hboxmain}->set_position(($w{window}{data}->get_size) / 2);
 
     # Load the contents of the textbuffer with the corresponding log file
-    if (open(F, "<:utf8",$$self{_LOGFILE})) {
+    if (open(F, "<:utf8", $$self{_LOGFILE})) {
         @{$$self{_TEXT}} = <F>;
         $text = _removeEscapeSeqs(join('', @{$$self{_TEXT}}));
         close F;
@@ -4122,27 +4362,60 @@ sub _checkSendKeystrokes {
     return $data;
 }
 
+sub _disconnectTerminal {
+    my $self = shift;
+
+    if ($self->{CONNECTED} && $$self{_PID}) {
+        # Hide the embed window to avoid unexpected updates or crashes when killing the underlying process
+        if ($$self{_GUI}{_SOCKET} && $$self{_GUI}{_SOCKET}->get_plug_window()) {
+            $self->_showEmbedMessages();
+        }
+        return kill(15, $$self{_PID});
+    }
+
+    return 0;
+}
+
 sub _disconnectAndRestartTerminal {
     my $self = shift;
 
-    if (kill(15, $$self{_PID})) {
+    if ($self->_disconnectTerminal()) {
         # If successfully killed, restart
         Glib::Timeout->add_seconds(1, sub {
-            $self->start;
+            $self->start();
             return 0;
         });
     }
 }
 
+sub _closeOtherTerminals {
+    my $self = shift;
+    my @list = keys %PACMain::RUNNING;
+
+    if (!(scalar(@list) > 1 && _wConfirm($$self{_PARENTWINDOW}, "Are you sure you want to close <b>other</b> terminals?"))) {
+        return 1;
+    }
+    foreach my $uuid (@list) {
+        if (ref($PACMain::RUNNING{$uuid}{'terminal'}) =~ /^PACTerminal|PACShell$/go) {
+            if ($self != $PACMain::RUNNING{$uuid}{'terminal'}) {
+                $PACMain::RUNNING{$uuid}{'terminal'}->stop('force', 'deep');
+            }
+        }
+    }
+    return 1;
+}
+
 sub _closeAllTerminals {
     my $self = shift;
     my @list = keys %PACMain::RUNNING;
 
-    if (!(scalar(@list) && _wConfirm($$self{_WINDOWTERMINAL}, "Are you sure you want to close <b>all</b> terminals?"))) {
+    if (!(scalar(@list) && _wConfirm($$self{_PARENTWINDOW}, "Are you sure you want to close <b>all</b> terminals?"))) {
         return 1;
     }
     foreach my $uuid (@list) {
-        $PACMain::RUNNING{$uuid}{'terminal'}->stop('force', 'deep');
+        if (ref($PACMain::RUNNING{$uuid}{'terminal'}) =~ /^PACTerminal|PACShell$/go) {
+            $PACMain::RUNNING{$uuid}{'terminal'}->stop('force', 'deep');
+        }
     }
     return 1;
 }
@@ -4159,7 +4432,7 @@ sub _closeDisconnectedTerminals {
     my @list = keys %PACMain::RUNNING;
 
     foreach my $uuid (@list) {
-        if ($PACMain::RUNNING{$uuid}{'terminal'}{_LAST_STATUS} eq 'DISCONNECTED') {
+        if (defined $PACMain::RUNNING{$uuid}{'terminal'}{_LAST_STATUS} && $PACMain::RUNNING{$uuid}{'terminal'}{_LAST_STATUS} eq 'DISCONNECTED') {
             $PACMain::RUNNING{$uuid}{'terminal'}->stop('force', 'deep');
         }
     }
@@ -4187,10 +4460,17 @@ sub _showInfoTab {
 sub _hideEmbedMessages {
     my $self = shift;
 
+    if (!$$self{_GUI}{_VTE}) {
+        # Too late, probably ; message window does not exist anymore
+        return;
+    }
+
     # Hide messages and show the embed window
     $$self{_GUI}{_VTE}->hide();
     $$self{_GUI}{_SOCKET_PARENT_WINDOW}->show_all();
-    $$self{FOCUS}->child_focus('GTK_DIR_TAB_FORWARD');
+    if ($$self{FOCUS}) {
+        $$self{FOCUS}->child_focus('GTK_DIR_TAB_FORWARD');
+    }
     $$self{_GUI}{_BTNFOCUS}->set_sensitive(1);
 
     # Next time we click on the button, it will be to hide messages
@@ -4200,6 +4480,11 @@ sub _hideEmbedMessages {
 sub _showEmbedMessages {
     my $self = shift;
 
+    if (!$$self{_GUI}{_VTE}) {
+        # Too late, probably ; message window does not exist anymore
+        return;
+    }
+
     # Show messages and hide the embed window
     $$self{_GUI}{_SOCKET_PARENT_WINDOW}->hide();
     $$self{_GUI}{_VTE}->show();
@@ -4210,6 +4495,99 @@ sub _showEmbedMessages {
     $$self{_GUI}{_BTNLOG}->set_label('Hide _messages');
 }
 
+sub _zoomHandler {
+    my $self = shift;
+    my $action = shift;
+
+    my $zoom = 0;
+    my $scale = $$self{_GUI}{_VTE}->get_font_scale();
+
+    if ($action eq 'zoomin') {
+        $zoom = 1;
+        $scale += 0.1;
+    } elsif ($action eq 'zoomout') {
+        $zoom = 1;
+        $scale -= 0.1;
+    } elsif ($action eq 'zoomreset') {
+        $zoom = 1;
+        $scale = 1;
+    }
+    if ($zoom) {
+        $$self{_GUI}{_VTE}->set_font_scale($scale);
+        return 1;
+    }
+
+    return 0;
+}
+
+sub _pasteConnectionPassword {
+    my $self = shift;
+    my $pass = '';
+
+    if ($$self{_CFG}{environments}{$$self{_UUID}}{'passphrase'} ne '') {
+        $pass = $$self{_CFG}{environments}{$$self{_UUID}}{'passphrase'};
+    } else {
+        $pass = $$self{_CFG}{environments}{$$self{_UUID}}{'pass'};
+    }
+    if ($$self{_CFG}{defaults}{'keepass'}{'use_keepass'} && PACKeePass->isKeePassMask($pass)) {
+        my $kpxc = $PACMain::FUNCS{_KEEPASS};
+        $pass = $kpxc->applyMask($pass);
+    }
+    _vteFeedChild($$self{_GUI}{_VTE}, $pass);
+}
+
+sub _checkEmbedWindow {
+    my $self = shift;
+    my $time_to_connect = $self->{_CFG}{'defaults'}{'timeout connect'};
+
+    if (!$$self{_GUI}{_SOCKET}) {
+        # Too late, the socket does not exist anymore
+        $self->{EMBED_CHECK_TIMEOUT_ID} = undef;
+        return 0;
+    }
+
+    if ($$self{_GUI}{_SOCKET}->get_plug_window()) {
+        $self->_hideEmbedMessages();
+        # We found the plugged window, stop timeout
+        $self->{EMBED_CHECK_TIMEOUT_ID} = undef;
+        return 0;
+    }
+
+    if ($time_to_connect > 0 && ($self->{EMBED_CHECK_COUNT}++) * $self->{EMBED_CHECK_TIMEOUT} > 1000 * $time_to_connect) {
+        # We waited too long, force disconnection (if still connected)
+        if ($self->{CONNECTED}) {
+            _vteFeed($$self{_GUI}{_VTE}, "\r\n\n${COL_YELL}WARNING: No window could be connected with expected timeout of $time_to_connect seconds, aborting connection...${COL_RESET}\r\n(note: this timeout can be changed in Preferences > Terminal Options)\r\n");
+            $self->_disconnectTerminal();
+        }
+        # and stop the timeout
+        $self->{EMBED_CHECK_TIMEOUT_ID} = undef;
+        return 0;
+    };
+
+    # Update GUI before querying the size of the embed window
+    Gtk3::main_iteration() while Gtk3::events_pending();
+    $self->_showEmbedMessages();
+
+    # If not yet done, start a timeout that will check again that the embed window
+    # if correctly plugged into the Ásbrú socket
+    if (!defined($self->{EMBED_CHECK_TIMEOUT_ID})) {
+        $self->{EMBED_CHECK_TIMEOUT_ID} = Glib::Timeout->add($self->{EMBED_CHECK_TIMEOUT}, sub {
+            return $self->_checkEmbedWindow();
+        });
+    }
+
+    return 1;
+}
+
+sub _stopEmbedKidnapTimeout {
+    my $self = shift;
+
+    if (defined($$self{_EMBED_KIDNAP})) {
+        Glib::Source->remove($$self{_EMBED_KIDNAP});
+        $$self{_EMBED_KIDNAP} = undef;
+    }
+}
+
 # END: Private functions definitions
 ###################################################################
 
@@ -4231,7 +4609,7 @@ Package to create a terminal object with its own windows, event handlers and men
 
 =head2 Internal Variables
 
-    $NPOSX,$NPOSY       Next coordinates to locate the next tiled window when opening a cluster in multiple windows
+    $NPOSX, $NPOSY       Next coordinates to locate the next tiled window when opening a cluster in multiple windows
 
     _CFG                Pointer to configuration object structure
     _UUID               Internal UUID of this terminal in the nodes tree in PACMain
@@ -4244,7 +4622,7 @@ Package to create a terminal object with its own windows, event handlers and men
     _FOCUS              0 No , 1 Yes
     _GUILOCKED          0 No , 1 Yes
     _FOCUSED            0 No , 1 Yes
-    _UUID_TMP           Current UUID assigned to this terminal : pac_PID{pidnumber}_n$COUNT
+    _UUID_TMP           Current UUID assigned to this terminal : asbru_PID{pidnumber}_n$COUNT
 
 =head2 sub new
 
@@ -4254,7 +4632,7 @@ Create new terminal object
     CONNECTING = 0
     Calls _initGUI
     Calls _setupCallbacks
-        _watchConnectionData : receive connection data on signals : in, hup, err
+        _watchConnectionData : receive connection from forked connectin
 
 =head2 sub DESTROY
 
@@ -4264,7 +4642,7 @@ Destroys object on exit
 
 Create the connection
 
-    Create connection using lib/pac_conn
+    Create connection using lib/asbru_conn
     Update progressbar
     CONNECTED=1
     Execute Startup scripts
@@ -4301,7 +4679,7 @@ Unlock Terminal
     else
         Create new Window and position on screen
         if Cluster
-            Calculate screen width,height
+            Calculate screen width, height
             Calculate position of next terminal
             Move terminal and size to new position
     Call _updateCFG
@@ -4317,10 +4695,10 @@ Attaches different event signals from Gui elements and the terminal to routines
 
 =head2 sub _watchConnectionData
 
-    Ignore 'hup','err' signals
+    Ignore 'hup', 'err' signals
     _receiveData    : load data into _SOCKET_BUFFER
-    Process command received
-        CONNECTED
+    Process command received from attached connection
+        CONNECTED              : inform the user we are connected, set icons messages
         EXPLORER
         PIPE_WAIT
         SCRIPT_(START|STOP)
@@ -4330,15 +4708,21 @@ Attaches different event signals from Gui elements and the terminal to routines
         CHAIN
         EXEC:RECEIVE_OUT
         SENDSLOW
-        DISCONNECTED
+        DISCONNECTED           : inform user we got disconnected
         EXPECT:WAIT
         SPAWNED
+        UNHIDE_TERMINAL        : in window mode, unhide terminals that open rdp, vnc connections
+        WENTER                 : request user to enter data and return to the forked connection
 
 
 =head2 sub _receiveData
 
 Read data from socket and save into _SOCKET_BUFFER
 
+=head2 sub _sendData
+
+Send a message to the de defined socket or the attached connection
+
 =head2 sub _authClient
 
 Validate the socket connection is from Asbru application and not some other process
@@ -4347,15 +4731,6 @@ Validate the socket connection is from Asbru application and not some other proc
 
 Display the popup Terminal menu on [shift] - right click
 
-=head2 sub _pasteToVte
-
-Takes information from the clipboard and sends it to the terminal
-
-    if slow : Use _vteFeedChild
-    else {_GUI}{_VTE}->paste_clipboard
-
-with _vteFeedChild
-
 =head2 sub _setTabColour
 
 Set the Tab title color based on the status of the terminal: green (connected) or red (disconnected)
@@ -4494,6 +4869,18 @@ For an embed connection, hide the console displaying the messages concerning the
 
 For an embed connection, show the console displaying the messages concerning the connection.
 
+=head2 sub _zoomHandler
+
+On a keypress, check if zoom factor of the terminal should be changed.
+
+=head2 sub _hasKeePassField
+
+Returns true (1) if this terminal has a least on field whose value is kept into a KeePass database file
+
+=head2 sub _pasteConnectionPassword
+
+Paste the password of the current connection into the current VTE terminal
+
 =head1 Vte::Terminal
 
 Reference to available methods are located at : https://developer.gnome.org/vte/
diff --git a/lib/PACTray.pm b/lib/PACTray.pm
index 33e2fd07..3ce1344f 100644
--- a/lib/PACTray.pm
+++ b/lib/PACTray.pm
@@ -3,7 +3,7 @@ package PACTray;
 ###############################################################################
 # This file is part of Ásbrú Connection Manager
 #
-# Copyright (C) 2017-2020 Ásbrú Connection Manager team (https://asbru-cm.net)
+# Copyright (C) 2017-2022 Ásbrú Connection Manager team (https://asbru-cm.net)
 # Copyright (C) 2010-2016 David Torrejon Vaquerizas
 #
 # Ásbrú Connection Manager is free software: you can redistribute it and/or
@@ -50,7 +50,8 @@ my $APPNAME = $PACUtils::APPNAME;
 my $APPVERSION = $PACUtils::APPVERSION;
 my $APPICON = "$RealBin/res/asbru-logo-64.png";
 my $TRAYICON = "$RealBin/res/asbru-logo-tray.png";
-my $GROUPICON_ROOT = _pixBufFromFile("$RealBin/res/asbru_group.png");
+my $GROUPICON_ROOT = _pixBufFromFile("$RealBin/res/themes/default/asbru_group.svg");
+my $CALLBACKS_INITIALIZED = 0;
 
 # END: Define GLOBAL CLASS variables
 ###################################################################
@@ -74,9 +75,6 @@ sub new {
     # Build the GUI
     _initGUI($self) or return 0;
 
-    # Setup callbacks
-    _setupCallbacks($self);
-
     bless($self, $class);
     return $self;
 }
@@ -88,6 +86,45 @@ sub DESTROY {
     return 1;
 }
 
+# Returns TRUE if the tray icon is currently visible
+sub is_visible {
+    my $self = shift;
+
+    return $$self{_TRAY}->get_visible();
+}
+
+# Returns size and placement of the tray icon
+sub get_geometry {
+    my $self = shift;
+
+    return $$self{_TRAY}->get_geometry();
+}
+
+# Enable the tray menu
+sub set_tray_menu {
+    my $self = shift;
+
+    if ($CALLBACKS_INITIALIZED) {
+        # Already done, nothing to do
+        return 0;
+    }
+
+    $self->_setupCallbacks();
+
+    $CALLBACKS_INITIALIZED = 1;
+    return 1;
+}
+
+# Make the tray icon active/inactive (aka 'shown/hidden')
+sub set_active() {
+    my $self = shift;
+    $$self{_TRAY}->set_visible(1);
+}
+sub set_passive() {
+    my $self = shift;
+    $$self{_TRAY}->set_visible(0);
+}
+
 # END: Define PUBLIC CLASS methods
 ###################################################################
 
@@ -101,7 +138,7 @@ sub _initGUI {
     # Tray available (not Gnome-shell)?
     $$self{_TRAY}->set_property('tooltip-markup', "<b>$APPNAME</b> (v.$APPVERSION)");
     $$self{_TRAY}->set_visible($$self{_MAIN}{_CFG}{defaults}{'show tray icon'});
-    $$self{_MAIN}{_CFG}{'tmp'}{'tray available'} = $$self{_TRAY}->is_embedded ? 1 : 'warning';
+    $$self{_MAIN}{_CFG}{'tmp'}{'tray available'} = $$self{_TRAY}->is_embedded() ? 1 : 'warning';
 
     return 1;
 }
@@ -112,7 +149,7 @@ sub _setupCallbacks {
     $$self{_TRAY}->signal_connect('button_press_event' => sub {
         my ($widget, $event) = @_;
 
-        if ($event->button eq 3 && !$$self{_MAIN}{_GUI}{lockPACBtn}->get_active) {
+        if ($event->button eq 3 && !$$self{_MAIN}{_GUI}{lockApplicationBtn}->get_active()) {
             $self->_trayMenu($widget, $event);
         }
 
@@ -121,30 +158,30 @@ sub _setupCallbacks {
             return 1;
         }
 
-        if ($$self{_MAIN}{_GUI}{main}->get_visible) {
+        # If main window is at top level, hides it (otherwise shows it)
+        if ($$self{_MAIN}{_GUI}{main}->get_visible() && $$self{_MAIN}{_GUI}{main}->is_active()) {
             # Trigger the "lock" procedure
             if ($$self{_MAIN}{_CFG}{'defaults'}{'use gui password'} && $$self{_MAIN}{_CFG}{'defaults'}{'use gui password tray'}) {
-                $$self{_MAIN}{_GUI}{lockPACBtn}->set_active(1);
+                $$self{_MAIN}{_GUI}{lockApplicationBtn}->set_active(1);
             }
-            $$self{_MAIN}->_hideConnectionsList;
+            $$self{_MAIN}->_hideConnectionsList();
         } else {
             # Check if show password is required
             if ($$self{_MAIN}{_CFG}{'defaults'}{'use gui password'} && $$self{_MAIN}{_CFG}{'defaults'}{'use gui password tray'}) {
                 # Trigger the "unlock" procedure
-                $$self{_MAIN}{_GUI}{lockPACBtn}->set_active(0);
-                if (! $$self{_MAIN}{_GUI}{lockPACBtn}->get_active) {
+                $$self{_MAIN}{_GUI}{lockApplicationBtn}->set_active(0);
+                if (! $$self{_MAIN}{_GUI}{lockApplicationBtn}->get_active()) {
                     $$self{_TRAY}->set_visible($$self{_MAIN}{_CFG}{defaults}{'show tray icon'});
-                    $$self{_MAIN}->_showConnectionsList;
+                    $$self{_MAIN}->_showConnectionsList();
                 }
             } else {
                 $$self{_TRAY}->set_visible($$self{_MAIN}{_CFG}{defaults}{'show tray icon'});
                 $$self{_MAIN}->_showConnectionsList();
                 if ($$self{_MAIN}{_CFG}{'defaults'}{'layout'} eq 'Compact') {
                     my ($x,$y) = $self->_pos($event);
-                    # Workaround the window manager, so it shows in the correct place all the time
-                    $$self{_MAIN}->_hideConnectionsList();
-                    $$self{_MAIN}->_showConnectionsList();
-                    $$self{_MAIN}{_GUI}{main}->move($x,$y);
+                    if ($x > 0 || $y > 0) {
+                        $$self{_MAIN}{_GUI}{main}->move($x, $y);
+                    }
                 }
             }
         }
@@ -156,11 +193,11 @@ sub _setupCallbacks {
 
 sub _pos {
     my ($self,$event) = @_;
-    my $h = $$self{_MAIN}{_GUI}{main}->size_request->height;
-    my $w = $$self{_MAIN}{_GUI}{main}->size_request->width/2;
-    my $ymax = $event->get_screen->get_height;
-    my $dy = $event->window->get_height;
-    my ($x, $y) = $event->window->get_origin;
+    my $h = $$self{_MAIN}{wheight};
+    my $w = $$self{_MAIN}{_GUI}{main}->get_preferred_size()->width/2;
+    my $ymax = $event->get_screen()->get_height();
+    my $dy = $event->window->get_height();
+    my ($x, $y) = $event->window->get_origin();
 
     # Over the event widget
     if ($dy + $y + $h > $ymax) {
@@ -182,19 +219,19 @@ sub _trayMenu {
 
     my @m;
 
-    push(@m, {label => 'Local Shell', stockicon => 'gtk-home', code => sub {$PACMain::FUNCS{_MAIN}{_GUI}{shellBtn}->clicked;}});
+    push(@m, {label => 'Local Shell', stockicon => 'gtk-home', code => sub {$PACMain::FUNCS{_MAIN}{_GUI}{shellBtn}->clicked();}});
     push(@m, {separator => 1});
-    push(@m, {label => 'Clusters', stockicon => 'pac-cluster-manager', submenu => _menuClusterConnections});
-    push(@m, {label => 'Favourites', stockicon => 'pac-favourite-on', submenu => _menuFavouriteConnections});
-    push(@m, {label => 'Connect to', stockicon => 'pac-group', submenu => _menuAvailableConnections($PACMain::FUNCS{_MAIN}{_GUI}{treeConnections}{data})});
+    push(@m, {label => 'Clusters', stockicon => 'asbru-cluster-manager', submenu => _menuClusterConnections});
+    push(@m, {label => 'Favourites', stockicon => 'asbru-favourite-on', submenu => _menuFavouriteConnections});
+    push(@m, {label => 'Connect to', stockicon => 'asbru-group', submenu => _menuAvailableConnections($PACMain::FUNCS{_MAIN}{_GUI}{treeConnections}{data})});
     push(@m, {separator => 1});
-    push(@m, {label => 'Preferences...', stockicon => 'gtk-preferences', code => sub {$$self{_MAIN}{_CONFIG}->show;}});
-    push(@m, {label => 'Clusters...', stockicon => 'gtk-justify-fill', code => sub {$$self{_MAIN}{_CLUSTER}->show;}});
-    push(@m, {label => 'PCC', stockicon => 'gtk-justify-fill', code => sub {$$self{_MAIN}{_PCC}->show;}});
-    push(@m, {label => 'Show Window', stockicon => 'gtk-home', code => sub {$$self{_MAIN}->_showConnectionsList;}});
+    push(@m, {label => 'Preferences...', stockicon => 'gtk-preferences', code => sub {$$self{_MAIN}{_CONFIG}->show();}});
+    push(@m, {label => 'Clusters...', stockicon => 'gtk-justify-fill', code => sub {$$self{_MAIN}{_CLUSTER}->show();}});
+    push(@m, {label => 'PCC', stockicon => 'gtk-justify-fill', code => sub {$$self{_MAIN}{_PCC}->show();}});
+    push(@m, {label => 'Show Window', stockicon => 'gtk-home', code => sub {$$self{_MAIN}->_showConnectionsList();}});
     push(@m, {separator => 1});
-    push(@m, {label => 'About', stockicon => 'gtk-about', code => sub {$$self{_MAIN}->_showAboutWindow;}});
-    push(@m, {label => 'Exit', stockicon => 'gtk-quit', code => sub {$$self{_MAIN}->_quitProgram;}});
+    push(@m, {label => 'About', stockicon => 'gtk-about', code => sub {$$self{_MAIN}->_showAboutWindow();}});
+    push(@m, {label => 'Exit', stockicon => 'gtk-quit', code => sub {$$self{_MAIN}->_quitProgram();}});
 
     _wPopUpMenu(\@m, $event, 'below calling widget');
 
diff --git a/lib/PACTrayUnity.pm b/lib/PACTrayUnity.pm
index adea9628..bd353ce9 100644
--- a/lib/PACTrayUnity.pm
+++ b/lib/PACTrayUnity.pm
@@ -3,7 +3,7 @@ package PACTrayUnity;
 ###############################################################################
 # This file is part of Ásbrú Connection Manager
 #
-# Copyright (C) 2017-2020 Ásbrú Connection Manager team (https://asbru-cm.net)
+# Copyright (C) 2017-2022 Ásbrú Connection Manager team (https://asbru-cm.net)
 # Copyright (C) 2010-2016 David Torrejon Vaquerizas
 #
 # Ásbrú Connection Manager is free software: you can redistribute it and/or
@@ -36,11 +36,32 @@ use FindBin qw ($RealBin $Bin $Script);
 
 # GTK
 use Gtk3 '-init';
-eval {require Gtk3::AppIndicator;}; $@ and die; # Tricky way to bypass "rpmbuild" necessity to mark this package as a depencency for the RPM... :(
 
 # PAC modules
 use PACUtils;
 
+# AppIndicator
+eval {
+    Glib::Object::Introspection->setup(
+        basename => 'AppIndicator3',
+        version  => '0.1',
+        package  => 'AppIndicator',
+    );
+};
+if ($@) {
+    eval {
+        Glib::Object::Introspection->setup(
+            basename => 'AyatanaAppIndicator3',
+            version  => '0.1',
+            package  => 'AppIndicator',
+        );
+    };
+    if ($@) {
+        warn "WARNING: AppIndicator is missing --> there might be no icon showing up in the status bar when running Unity!\n";
+        return 0;
+    }
+}
+
 # END: Import Modules
 ###################################################################
 
@@ -51,7 +72,7 @@ my $APPNAME = $PACUtils::APPNAME;
 my $APPVERSION = $PACUtils::APPVERSION;
 my $APPICON = $RealBin . '/res/asbru-logo-64.png';
 my $TRAYICON = $RealBin . '/res/asbru-logo-tray.png';
-my $GROUPICON_ROOT = _pixBufFromFile($RealBin . '/res/asbru_group.png');
+my $GROUPICON_ROOT = _pixBufFromFile($RealBin . '/res/themes/default/asbru_group.svg');
 # END: Define GLOBAL CLASS variables
 ###################################################################
 
@@ -85,6 +106,39 @@ sub DESTROY {
     return 1;
 }
 
+# Returns TRUE if the tray icon is currently visible
+sub is_visible {
+    my $self = shift;
+
+    return $$self{_TRAY}->get_status() ne 'passive';
+}
+
+# Returns size and placement of the tray icon
+sub get_geometry {
+    my $self = shift;
+
+    # DevNote: there is no way API to retrieve the place of the icon ; returns dummy values
+    return ({}, {}, {x => 0, y => 0});
+}
+
+# Enable the tray menu
+sub set_tray_menu {
+    my $self = shift;
+
+    return $self->_setTrayMenu();
+}
+
+# Make the tray icon active/inactive (aka 'shown/hidden')
+sub set_active() {
+    my $self = shift;
+    $$self{_TRAY}->set_status('active');
+}
+sub set_passive() {
+    my $self = shift;
+    $$self{_TRAY}->set_status('passive');
+}
+
+
 # END: Define PUBLIC CLASS methods
 ###################################################################
 
@@ -94,9 +148,9 @@ sub DESTROY {
 sub _initGUI {
     my $self = shift;
 
-    $$self{_TRAY} = Gtk3::AppIndicator->new('pac', $TRAYICON);
+    $$self{_TRAY} = AppIndicator::Indicator->new('asbru-cm', $TRAYICON, 'application-status');
     $$self{_TRAY}->set_icon_theme_path($RealBin . '/res');
-    $$self{_TRAY}->set_active;
+    $$self{_TRAY}->set_status('active');
     $$self{_MAIN}{_CFG}{'tmp'}{'tray available'} = ! $@;
     return 1;
 }
@@ -108,34 +162,34 @@ sub _setTrayMenu {
 
     my @m;
 
-    push(@m, {label => 'Local Shell', stockicon => $PACMain::UNITY ? '' : 'gtk-home', code => sub {$PACMain::FUNCS{_MAIN}{_GUI}{shellBtn}->clicked;} });
+    push(@m, {label => 'Local Shell', stockicon => $PACMain::UNITY ? '' : 'gtk-home', code => sub {$PACMain::FUNCS{_MAIN}{_GUI}{shellBtn}->clicked();} });
     push(@m, {separator => 1});
-    push(@m, {label => 'Clusters', stockicon => $PACMain::UNITY ? '' : 'pac-cluster-manager', submenu => _menuClusterConnections}) unless $PACMain::UNITY;
-    push(@m, {label => 'Favourites', stockicon => $PACMain::UNITY ? '' : 'pac-favourite-on', submenu => _menuFavouriteConnections});
-    push(@m, {label => 'Connect to', stockicon => 'pac-group', submenu => _menuAvailableConnections($PACMain::FUNCS{_MAIN}{_GUI}{treeConnections}{data})});
+    push(@m, {label => 'Clusters', stockicon => $PACMain::UNITY ? '' : 'asbru-cluster-manager', submenu => _menuClusterConnections}) unless $PACMain::UNITY;
+    push(@m, {label => 'Favourites', stockicon => $PACMain::UNITY ? '' : 'asbru-favourite-on', submenu => _menuFavouriteConnections});
+    push(@m, {label => 'Connect to', stockicon => 'asbru-group', submenu => _menuAvailableConnections($PACMain::FUNCS{_MAIN}{_GUI}{treeConnections}{data})});
     push(@m, {separator => 1});
-    push(@m, {label => 'Preferences...', stockicon => 'gtk-preferences', code => sub {$$self{_MAIN}{_CONFIG}->show;} });
-    push(@m, {label => 'Clusters...', stockicon => $PACMain::UNITY ? '' : 'gtk-justify-fill'    , code => sub {$$self{_MAIN}{_CLUSTER}->show;}  });
-    push(@m, {label => 'PCC', stockicon => 'gtk-justify-fill', code => sub {$$self{_MAIN}{_PCC}->show;}});
+    push(@m, {label => 'Preferences...', stockicon => 'gtk-preferences', code => sub {$$self{_MAIN}{_CONFIG}->show();} });
+    push(@m, {label => 'Clusters...', stockicon => $PACMain::UNITY ? '' : 'gtk-justify-fill'    , code => sub {$$self{_MAIN}{_CLUSTER}->show();}  });
+    push(@m, {label => 'PCC', stockicon => 'gtk-justify-fill', code => sub {$$self{_MAIN}{_PCC}->show();}});
     push(@m, {label => 'Show Window', stockicon => $PACMain::UNITY ? '' : 'gtk-home', code => sub {
         # Check if show password is required
         if ($$self{_MAIN}{_CFG}{'defaults'}{'use gui password'} && $$self{_MAIN}{_CFG}{'defaults'}{'use gui password tray'}) {
             # Trigger the "unlock" procedure
-            $$self{_MAIN}{_GUI}{lockPACBtn}->set_active(0);
-            if (! $$self{_MAIN}{_GUI}{lockPACBtn}->get_active) {
-                $$self{_MAIN}{_CFG}{defaults}{'show tray icon'} ? $$self{_TRAY}->set_active : $$self{_TRAY}->set_passive;
-                $$self{_MAIN}->_showConnectionsList;
+            $$self{_MAIN}{_GUI}{lockApplicationBtn}->set_status('passive');
+            if (! $$self{_MAIN}{_GUI}{lockApplicationBtn}->get_active()) {
+                $$self{_MAIN}{_CFG}{defaults}{'show tray icon'} ? $$self{_TRAY}->set_status('active') : $$self{_TRAY}->set_passive();
+                $$self{_MAIN}->_showConnectionsList();
             }
         } else {
-            $$self{_MAIN}{_CFG}{defaults}{'show tray icon'} ? $$self{_TRAY}->set_active : $$self{_TRAY}->set_passive;
-            $$self{_MAIN}->_showConnectionsList;
+            $$self{_MAIN}{_CFG}{defaults}{'show tray icon'} ? $$self{_TRAY}->set_status('active') : $$self{_TRAY}->set_passive();
+            $$self{_MAIN}->_showConnectionsList();
         }
     }});
     push(@m, {separator => 1});
-    push(@m, {label => 'About', stockicon => 'gtk-about', code => sub {$$self{_MAIN}->_showAboutWindow;} });
-    push(@m, {label => 'Exit', stockicon => 'gtk-quit', code => sub {$$self{_MAIN}->_quitProgram;} });
+    push(@m, {label => 'About', stockicon => 'gtk-about', code => sub {$$self{_MAIN}->_showAboutWindow();} });
+    push(@m, {label => 'Exit', stockicon => 'gtk-quit', code => sub {$$self{_MAIN}->_quitProgram();} });
 
-    $$self{_TRAY}->set_menu(_wPopUpMenu(\@m, $event, 'below calling widget', 'get_menu_ref') );
+    $$self{_TRAY}->set_menu(_wPopUpMenu(\@m, $event, 'below calling widget', 'get_menu_ref'));
 
     return 1;
 }
diff --git a/lib/PACUtils.pm b/lib/PACUtils.pm
index e816e2eb..260eb33d 100644
--- a/lib/PACUtils.pm
+++ b/lib/PACUtils.pm
@@ -3,7 +3,7 @@ package PACUtils;
 ###############################################################################
 # This file is part of Ásbrú Connection Manager
 #
-# Copyright (C) 2017-2020 Ásbrú Connection Manager team (https://asbru-cm.net)
+# Copyright (C) 2017-2022 Ásbrú Connection Manager team (https://asbru-cm.net)
 # Copyright (C) 2010-2016 David Torrejón Vaquerizas
 #
 # Ásbrú Connection Manager is free software: you can redistribute it and/or
@@ -45,7 +45,6 @@ use Net::Ping;
 use YAML;
 use OSSP::uuid;
 use Encode;
-use KeePass;
 use DynaLoader; # Required for PACTerminal and PACShell modules
 
 # GTK
@@ -81,6 +80,8 @@ require Exporter;
     _wExecEntry
     _cfgCheckMigrationV3
     _cfgSanityCheck
+    _cfgGetTmpSessions
+    _cfgAddSessions
     _updateSSHToIPv6
     _cipherCFG
     _decipherCFG
@@ -95,11 +96,8 @@ require Exporter;
     _purgeMissingScreenshots
     _splash
     _getXWindowsList
-    _getREADME
     _checkREADME
-    _showUpdate
     _getEncodings
-    _findKP
     _makeDesktopFile
     _updateWidgetColor
     _getSelectedRows
@@ -110,6 +108,8 @@ require Exporter;
     _copyPass
     _appName
     _setWindowPaintable
+    _setDefaultRGBA
+    _doShellEscape
 ); # Functions/variables to export
 
 @EXPORT_OK  = qw();
@@ -121,10 +121,10 @@ require Exporter;
 # Define GLOBAL CLASS variables
 
 our $APPNAME = 'Ásbrú Connection Manager';
-our $APPVERSION = '6.1.0rc1';
+our $APPVERSION = '6.4.2';
 our $DEBUG_LEVEL = 1;
 our $ARCH = '';
-my $ARCH_TMP = `/bin/uname -m 2>&1`;
+my $ARCH_TMP = `$ENV{'ASBRU_ENV_FOR_EXTERNAL'} /bin/uname -m 2>&1`;
 if ($ARCH_TMP =~ /x86_64/gio) {
     $ARCH = 64;
 } elsif ($ARCH_TMP =~ /ppc64/gio) {
@@ -137,15 +137,18 @@ if ($ARCH_TMP =~ /x86_64/gio) {
     $ARCH = 32;
 }
 my $RES_DIR = "$RealBin/res";
+my $THEME_DIR = "$RES_DIR/themes/default";
 my $SPLASH_IMG = "$RES_DIR/asbru-logo-400.png";
 my $CFG_DIR = $ENV{"ASBRU_CFG"};
-my $CFG_FILE = "$CFG_DIR/pac.yml";
+my $CFG_FILE = "$CFG_DIR/asbru.yml";
 my $R_CFG_FILE = $PACMain::R_CFG_FILE;
-my $CIPHER = Crypt::CBC->new(-key => 'PAC Manager (David Torrejon Vaquerizas, david.tv@gmail.com)', -cipher => 'Blowfish', -salt => '12345678') or die "ERROR: $!";
+my $SALT = '12345678';
+my $CIPHER = Crypt::CBC->new(-key => 'PAC Manager (David Torrejon Vaquerizas, david.tv@gmail.com)', -cipher => 'Blowfish', -salt => pack('Q', $SALT), -pbkdf => 'opensslv1', -nodeprecate => 1) or die "ERROR: $!";
 
 my %WINDOWSPLASH;
 my %WINDOWPROGRESS;
 my $WIDGET_POPUP;
+my ($R,$G,$B,$A);
 
 our @DONATORS_LIST = (
     'Angelo Maria Lambiasi',
@@ -214,19 +217,27 @@ our @DONATORS_LIST = (
 );
 our @PACDESKTOP = (
     '[Desktop Entry]',
-    'Name=PAC',
-    'Comment=Perl Auto Connector (auto start)',
+    'Name=Ásbrú Connection Manager',
+    'Comment=A user interface that helps organizing remote terminal sessions and automating repetitive tasks',
     'Terminal=false',
     'Icon=pac',
     'Type=Application',
-    'Exec=/usr/bin/asbru --no-splash',
+    'Exec=env GDK_BACKEND=x11 /usr/bin/asbru-cm --no-splash',
     'StartupNotify=false',
-    'Name[en_US]=PAC',
-    'Comment[en_US]=Perl Auto Connector (auto start)',
+    'Name[en_US]=Ásbrú Connection Manager',
+    'Comment[en_US]=A user interface that helps organizing remote terminal sessions and automating repetitive tasks',
     'Categories=Applications;Network;',
     'X-GNOME-Autostart-enabled=true',
 );
 
+# Default configuration on application first startup
+our $DEFAULT_COMMAND_PROMPT = '(([#%:>~\$\] ])(?!\g{-1})){3,4}|(\w[@\/]\w|sftp).*?[#%>~\$\]]|([\w\-\.]+)[%>\$\]]( |\033)|^[#%\$>\:\]~] *$';
+our $DEFAULT_USERNAME_PROMPT = '([lL]ogin|[uU]suario|([uU]ser-?)*[nN]ame.*|[uU]ser)\s*:\s*$';
+our $DEFAULT_PASSWORD_PROMPT = '([pP]ass|[pP]ass[wW]or[dt](\s+for\s+|\w+@[\w\-\.]+)*|[cC]ontrase.a|Enter passphrase for key \'.+\')\s*:\s*$';
+our $DEFAULT_HOSTKEYCHANGED_PROMPT = '^.+ontinue connecting \(([^/]+)\/([^/]+)(?:[^)]+)?\)\?\s*$';
+our $DEFAULT_PRESSANYKEY_PROMPT = '.*(any key to continue|tecla para continuar).*';
+our $DEFAULT_REMOTEHOSTCHANGED_PROMPT = '.*ffending .*key in (.+?)\:(\d+).*';
+
 # END: Define GLOBAL CLASS variables
 ###################################################################
 
@@ -253,7 +264,7 @@ sub __ {
 sub __text {
     my $str = shift // '';
 
-    $str =~ s/&amp;/\&/go;
+    while ($str =~ s/&amp;/\&/g) {}
     $str =~ s/&#124;/\|/go;
     $str =~ s/&apos;/\'/go;
     $str =~ s/&quot;/\"/go;
@@ -263,35 +274,6 @@ sub __text {
     return $str;
 };
 
-sub _findKP {
-    my $list = shift;
-    my $where = shift // 'title';
-    my $what = shift // qr/.*/;
-
-    my @kpx = ();
-    foreach my $hash (@{$list}) {
-        if (ref($what) eq 'Regexp') {
-            if ($$hash{$where} !~ /^$what$/) {
-                next;
-            }
-        # TODO : This should be elsif
-        } else {
-            if ($$hash{$where} ne $what) {
-                next;
-            }
-        }
-        push(@kpx, {
-            title => $$hash{title},
-            url => $$hash{url},
-            username => $$hash{username},
-            password => $$hash{password},
-            created => $$hash{created},
-            comment => $$hash{comment}
-        });
-    }
-    return wantarray ? @kpx : scalar(@kpx);
-}
-
 sub _splash {
     my $show = shift;
     my $txt = shift // "<b>Starting $APPNAME (v$APPVERSION)...</b>";
@@ -302,8 +284,8 @@ sub _splash {
         return 1;
     }
 
-    if (! defined $WINDOWSPLASH{_GUI}) {
-        $WINDOWSPLASH{_GUI} = Gtk3::Window->new;
+    if (!defined $WINDOWSPLASH{_GUI}) {
+        $WINDOWSPLASH{_GUI} = Gtk3::Window->new();
         $WINDOWSPLASH{_GUI}->set_type_hint('splashscreen');
         $WINDOWSPLASH{_GUI}->set_position('center');
         $WINDOWSPLASH{_GUI}->set_keep_above(1);
@@ -314,7 +296,7 @@ sub _splash {
         $WINDOWSPLASH{_IMG} = Gtk3::Image->new_from_file($SPLASH_IMG);
         $WINDOWSPLASH{_VBOX}->pack_start($WINDOWSPLASH{_IMG}, 1, 1, 0);
 
-        $WINDOWSPLASH{_LBL} = Gtk3::ProgressBar->new;
+        $WINDOWSPLASH{_LBL} = Gtk3::ProgressBar->new();
         $WINDOWSPLASH{_VBOX}->pack_start($WINDOWSPLASH{_LBL}, 1, 1, 5);
     }
 
@@ -323,14 +305,14 @@ sub _splash {
     $WINDOWSPLASH{_LBL}->set_fraction($partial / $total);
 
     if ($show) {
-        $WINDOWSPLASH{_GUI}->show_all;
-        $WINDOWSPLASH{_GUI}->present;
+        $WINDOWSPLASH{_GUI}->show_all();
+        $WINDOWSPLASH{_GUI}->present();
         while (Gtk3::events_pending) {
-            Gtk3::main_iteration;
+            Gtk3::main_iteration();
         }
     } else {
-        $WINDOWSPLASH{_GUI}->hide;
-        $WINDOWSPLASH{_GUI}->destroy;
+        $WINDOWSPLASH{_GUI}->hide();
+        $WINDOWSPLASH{_GUI}->destroy();
     }
 
     return 1;
@@ -357,6 +339,7 @@ sub _scale {
         $gdkpixbuf = ref($file) ? $file : Gtk3::Gdk::Pixbuf->new_from_file($file)
     };
     if ($@) {
+        print STDERR "WARN: Error while loading pixBuf from file '$file': $@";
         return 0;
     }
 
@@ -381,6 +364,7 @@ sub _pixBufFromFile {
     };
 
     if ($@) {
+        print STDERR "WARN: Error while loading pixBuf from file '$file': $@";
         return 0;
     }
     return $gdkpixbuf;
@@ -388,13 +372,16 @@ sub _pixBufFromFile {
 
 sub _getMethods {
     my $self = shift;
-
+    my $theme_dir = shift;
     my %methods;
 
-    `which rdesktop 1>/dev/null 2>&1`;
-    my $rdesktop = $?;
+    if ($theme_dir) {
+        $THEME_DIR = $theme_dir;
+    }
+
+    my $rdesktop = (system("$ENV{'ASBRU_ENV_FOR_EXTERNAL'} which rdesktop 1>/dev/null 2>&1") eq 0);
     $methods{'RDP (rdesktop)'} = {
-        'installed' => sub {return (! $rdesktop) ? 1 : "No 'rdesktop' binary found.\nTo use this option, please, install :'rdesktop'";},
+        'installed' => sub {return $rdesktop ? 1 : "No 'rdesktop' binary found.\nTo use this option, please, install :'rdesktop'";},
         'checkCFG' => sub {
             my $cfg = shift;
 
@@ -406,7 +393,7 @@ sub _getMethods {
             if (! _($self, 'entryPort')->get_chars(0, -1)) {
                 push(@faults, 'Port');
             }
-            if ((_($self, 'rbCfgAuthUserPass')->get_active) && (! _($self, 'cbInferUserPassKPX')->get_active)) {
+            if (_($self, 'rbCfgAuthUserPass')->get_active()) {
                 if (! _($self, 'entryUser')->get_chars(0, -1)) {
                     push(@faults, 'User (User/Password authentication method selected)');
                 }
@@ -434,38 +421,38 @@ sub _getMethods {
             _($self, 'entryUser')->set_sensitive(1);
             _($self, 'entryUser')->set_text($$cfg{user} // '');
             _($self, 'entryPassword')->set_text($$cfg{pass} // '');
-            _($self, 'cbCfgAuthFallback')->set_sensitive(0);
             _($self, 'alignAuthMethod')->set_sensitive(1);
+            _($self, 'cbCfgAuthFallback')->set_sensitive(0);
+            _($self, 'vboxAuthMethod')->set_sensitive(1);
             _($self, 'alignUserPass')->set_sensitive(1);
             _($self, 'rbCfgAuthUserPass')->set_active($$cfg{'auth type'} eq 'userpass');
             _($self, 'framePublicKey')->set_sensitive(0);
-            _($self, 'alignManual')->set_sensitive(1);
+            _($self, 'rbCfgAuthManual')->set_sensitive(1);
             _($self, 'rbCfgAuthManual')->set_active($$cfg{'auth type'} eq 'manual');
             _($self, 'entryPassphrase')->set_text('');
-            _($self, 'fileCfgPublicKey')->unselect_all;
+            _($self, 'fileCfgPublicKey')->unselect_all();
             _($self, 'frameExpect')->set_sensitive(0);
             _($self, 'frameRemoteMacros')->set_sensitive(0);
             _($self, 'frameLocalMacros')->set_sensitive(0);
             _($self, 'frameVariables')->set_sensitive(0);
             _($self, 'frameTerminalOptions')->set_sensitive(1);
-            _($self, 'labelConnOptions')->set_markup("'<b>$method</b>'");
+            _($self, 'labelConnOptions')->set_markup("<b>$method</b>");
             _($self, 'labelExpect')->set_sensitive(0);
             _($self, 'labelRemoteMacros')->set_sensitive(0);
             _($self, 'labelLocalMacros')->set_sensitive(0);
             _($self, 'labelVariables')->set_sensitive(0);
             _($self, 'labelTerminalOptions')->set_sensitive(1);
-            _($self, 'labelCmdLineOptions')->set_markup(" '<b>$method</b>' command line options: ");
+            _($self, 'labelCmdLineOptions')->set_markup(" <b>$method</b> command line options");
             _($self, 'cbAutossh')->set_sensitive(0);
             _($self, 'cbAutossh')->set_active(0);
         },
-        'icon' => Gtk3::Gdk::Pixbuf->new_from_file_at_scale("$RES_DIR/asbru_method_rdesktop.svg", 16, 16, 0),
+        'icon' => Gtk3::Gdk::Pixbuf->new_from_file_at_scale("$THEME_DIR/asbru_method_rdesktop.svg", 16, 16, 0),
         'escape' => ["\cc"]
     };
 
-    `which xfreerdp 1>/dev/null 2>&1`;
-    my $xfreerdp = $?;
+    my $xfreerdp = (system("$ENV{'ASBRU_ENV_FOR_EXTERNAL'} which xfreerdp 1>/dev/null 2>&1") eq 0);
     $methods{'RDP (xfreerdp)'} = {
-        'installed' => sub {return (! $xfreerdp) ? 1 : "No 'xfreerdp' binary found.\nTo use this option, please, install:\n'freerdp2-x11'";},
+        'installed' => sub {return $xfreerdp ? 1 : "No 'xfreerdp' binary found.\nTo use this option, please, install:\n'freerdp2-x11'";},
         'checkCFG' => sub {
             my $cfg = shift;
 
@@ -477,7 +464,7 @@ sub _getMethods {
             if (! _($self, 'entryPort')->get_chars(0, -1)) {
                 push(@faults, 'Port');
             }
-            if ((_($self, 'rbCfgAuthUserPass')->get_active) && (! _($self, 'cbInferUserPassKPX')->get_active)) {
+            if (_($self, 'rbCfgAuthUserPass')->get_active()) {
                 if (! _($self, 'entryUser')->get_chars(0, -1)) {
                     push(@faults, 'User (User/Password authentication method selected)');
                 }
@@ -505,40 +492,39 @@ sub _getMethods {
             _($self, 'entryUser')->set_sensitive(1);
             _($self, 'entryUser')->set_text($$cfg{user} // '');
             _($self, 'entryPassword')->set_text($$cfg{pass} // '');
-            _($self, 'cbCfgAuthFallback')->set_sensitive(0);
             _($self, 'alignAuthMethod')->set_sensitive(1);
+            _($self, 'cbCfgAuthFallback')->set_sensitive(0);
+            _($self, 'vboxAuthMethod')->set_sensitive(1);
             _($self, 'alignUserPass')->set_sensitive(1);
             _($self, 'rbCfgAuthUserPass')->set_active($$cfg{'auth type'} eq 'userpass');
             _($self, 'framePublicKey')->set_sensitive(0);
-            _($self, 'alignManual')->set_sensitive(1);
+            _($self, 'rbCfgAuthManual')->set_sensitive(1);
             _($self, 'rbCfgAuthManual')->set_active($$cfg{'auth type'} eq 'manual');
             _($self, 'entryPassphrase')->set_text('');
-            _($self, 'fileCfgPublicKey')->unselect_all;
+            _($self, 'fileCfgPublicKey')->unselect_all();
             _($self, 'frameExpect')->set_sensitive(0);
             _($self, 'frameRemoteMacros')->set_sensitive(0);
             _($self, 'frameLocalMacros')->set_sensitive(0);
             _($self, 'frameVariables')->set_sensitive(0);
             _($self, 'frameTerminalOptions')->set_sensitive(1);
-            _($self, 'labelConnOptions')->set_markup("'<b>$method</b>'");
+            _($self, 'labelConnOptions')->set_markup("<b>$method</b>");
             _($self, 'labelExpect')->set_sensitive(0);
             _($self, 'labelRemoteMacros')->set_sensitive(0);
             _($self, 'labelLocalMacros')->set_sensitive(0);
             _($self, 'labelVariables')->set_sensitive(0);
             _($self, 'labelTerminalOptions')->set_sensitive(1);
-            _($self, 'labelCmdLineOptions')->set_markup(" '<b>$method</b>' command line options: ");
+            _($self, 'labelCmdLineOptions')->set_markup(" <b>$method</b> command line options");
             _($self, 'cbAutossh')->set_sensitive(0);
             _($self, 'cbAutossh')->set_active(0);
         },
-        'icon' => Gtk3::Gdk::Pixbuf->new_from_file_at_scale("$RES_DIR/asbru_method_rdesktop.svg", 16, 16, 0),
+        'icon' => Gtk3::Gdk::Pixbuf->new_from_file_at_scale("$THEME_DIR/asbru_method_rdesktop.svg", 16, 16, 0),
         'escape' => ["\cc"]
     };
 
-    `which vncviewer 1>/dev/null 2>&1`;
-    my $xtightvncviewer = $?;
-    `vncviewer --help 2>&1 | /bin/grep TigerVNC`;
-    my $tigervnc = $?;
+    my $xtightvncviewer = (system("$ENV{'ASBRU_ENV_FOR_EXTERNAL'} which vncviewer 1>/dev/null 2>&1") eq 0);
+    my $tigervnc = (system("$ENV{'ASBRU_ENV_FOR_EXTERNAL'} vncviewer --help 2>&1 | /bin/grep -q TigerVNC") eq 0);
     $methods{'VNC'} = {
-        'installed' => sub {return ! $xtightvncviewer || ! $tigervnc ? 1 : "No 'vncviewer' binary found.\nTo use this option, please, install any of:\n'xtightvncviewer' or 'tigervnc'\n'tigervnc' is preferred, since it allows embedding its window into Ásbrú Connection Manager.";},
+        'installed' => sub {return $xtightvncviewer || $tigervnc ? 1 : "No 'vncviewer' binary found.\nTo use this option, please, install any of:\n'xtightvncviewer' or 'tigervnc'\n'tigervnc' is preferred, since it allows embedding its window into Ásbrú Connection Manager.";},
         'checkCFG' => sub {
 
             my $cfg = shift;
@@ -551,7 +537,7 @@ sub _getMethods {
             if (! _($self, 'entryPort')->get_chars(0, -1)) {
                 push(@faults, 'Port');
             }
-            if ((_($self, 'rbCfgAuthUserPass')->get_active) && (_($self, 'entryPassword')->get_chars(0, -1) eq '') && (! _($self, 'cbInferUserPassKPX')->get_active)) {
+            if ((_($self, 'rbCfgAuthUserPass')->get_active()) && (_($self, 'entryPassword')->get_chars(0, -1) eq '')) {
                 push(@faults, "Password (User/Password authentication method selected)");
             }
 
@@ -571,41 +557,41 @@ sub _getMethods {
             _($self, 'labelIP')->set_text('Host: ');
             _($self, 'entryIP')->set_property('tooltip-markup', 'IP or Hostname of the machine to connect to');
             _($self, 'entryIP')->set_text($$cfg{ip} // '');
-            _($self, 'alignAuthMethod')->set_sensitive(1);
+            _($self, 'vboxAuthMethod')->set_sensitive(1);
             _($self, 'entryUser')->set_sensitive(1);
             _($self, 'entryUser')->set_text($$cfg{user} // '');
             _($self, 'entryPassword')->set_text($$cfg{pass} // '');
             _($self, 'cbCfgAuthFallback')->set_sensitive(0);
+            _($self, 'alignAuthMethod')->set_sensitive(1);
             _($self, 'alignUserPass')->set_sensitive(1);
             _($self, 'rbCfgAuthUserPass')->set_active($$cfg{'auth type'} eq 'userpass');
             _($self, 'framePublicKey')->set_sensitive(0);
-            _($self, 'alignManual')->set_sensitive(1);
+            _($self, 'rbCfgAuthManual')->set_sensitive(1);
             _($self, 'rbCfgAuthManual')->set_active($$cfg{'auth type'} eq 'manual');
             _($self, 'entryPassphrase')->set_text('');
-            _($self, 'fileCfgPublicKey')->unselect_all;
+            _($self, 'fileCfgPublicKey')->unselect_all();
             _($self, 'frameExpect')->set_sensitive(0);
             _($self, 'frameRemoteMacros')->set_sensitive(0);
             _($self, 'frameLocalMacros')->set_sensitive(0);
             _($self, 'frameVariables')->set_sensitive(0);
             _($self, 'frameTerminalOptions')->set_sensitive(0);
-            _($self, 'labelConnOptions')->set_markup("'<b>$method</b>'");
+            _($self, 'labelConnOptions')->set_markup("<b>$method</b>");
             _($self, 'labelExpect')->set_sensitive(0);
             _($self, 'labelRemoteMacros')->set_sensitive(0);
             _($self, 'labelLocalMacros')->set_sensitive(0);
             _($self, 'labelVariables')->set_sensitive(0);
             _($self, 'labelTerminalOptions')->set_sensitive(0);
-            _($self, 'labelCmdLineOptions')->set_markup(" '<b>$method</b>' command line options: ");
+            _($self, 'labelCmdLineOptions')->set_markup(" <b>$method</b> command line options");
             _($self, 'cbAutossh')->set_sensitive(0);
             _($self, 'cbAutossh')->set_active(0);
         },
-        'icon' => Gtk3::Gdk::Pixbuf->new_from_file_at_scale("$RES_DIR/asbru_method_vncviewer.svg", 16, 16, 0),
+        'icon' => Gtk3::Gdk::Pixbuf->new_from_file_at_scale("$THEME_DIR/asbru_method_vncviewer.svg", 16, 16, 0),
         'escape' => ["\cc"]
     };
 
-    `which cu 1>/dev/null 2>&1`;
-    my $cu = $?;
+    my $cu = (system("$ENV{'ASBRU_ENV_FOR_EXTERNAL'} which cu 1>/dev/null 2>&1") eq 0);
     $methods{'Serial (cu)'} = {
-        'installed' => sub {return ! $cu ? 1 : "No 'cu' binary found.\nTo use this option, please, install 'cu'.";},
+        'installed' => sub {return $cu ? 1 : "No 'cu' binary found.\nTo use this option, please, install 'cu'.";},
         'checkCFG' => sub {
             my $cfg = shift;
 
@@ -629,7 +615,7 @@ sub _getMethods {
             _($self, 'entryUser')->set_text('');
             _($self, 'entryPassword')->set_text('');
             _($self, 'cbCfgAuthFallback')->set_sensitive(0);
-            _($self, 'labelConnOptions')->set_markup("'<b>$method</b>'");
+            _($self, 'labelConnOptions')->set_markup("<b>$method</b>");
             _($self, 'labelExpect')->set_sensitive(1);
             _($self, 'labelRemoteMacros')->set_sensitive(1);
             _($self, 'labelLocalMacros')->set_sensitive(1);
@@ -637,26 +623,25 @@ sub _getMethods {
             _($self, 'labelTerminalOptions')->set_sensitive(1);
             _($self, 'entryUser')->set_sensitive(0);
             _($self, 'entryPassphrase')->set_text('');
-            _($self, 'fileCfgPublicKey')->unselect_all;
+            _($self, 'fileCfgPublicKey')->unselect_all();
             _($self, 'rbCfgAuthManual')->set_active(1);
-            _($self, 'alignAuthMethod')->set_sensitive(0);
+            _($self, 'vboxAuthMethod')->set_sensitive(0);
             _($self, 'frameExpect')->set_sensitive(1);
             _($self, 'frameRemoteMacros')->set_sensitive(1);
             _($self, 'frameLocalMacros')->set_sensitive(1);
             _($self, 'frameVariables')->set_sensitive(1);
             _($self, 'frameTerminalOptions')->set_sensitive(1);
-            _($self, 'labelCmdLineOptions')->set_markup(" '<b>$method</b>' command line options: ");
+            _($self, 'labelCmdLineOptions')->set_markup(" <b>$method</b> command line options");
             _($self, 'cbAutossh')->set_sensitive(0);
             _($self, 'cbAutossh')->set_active(0);
         },
-        'icon' => Gtk3::Gdk::Pixbuf->new_from_file_at_scale("$RES_DIR/asbru_method_cu.jpg", 16, 16, 0),
+        'icon' => Gtk3::Gdk::Pixbuf->new_from_file_at_scale("$THEME_DIR/asbru_method_cu.jpg", 16, 16, 0),
         'escape' => ['~.']
     };
 
-    `which remote-tty 1>/dev/null 2>&1`;
-    my $remote_tty = $?;
+    my $remote_tty = (system("$ENV{'ASBRU_ENV_FOR_EXTERNAL'} which remote-tty 1>/dev/null 2>&1") eq 0);
     $methods{'Serial (remote-tty)'} = {
-        'installed' => sub {return ! $remote_tty ? 1 : "No 'remote-tty' binary found.\nTo use this option, please, install 'remote-tty'.";},
+        'installed' => sub {return $remote_tty ? 1 : "No 'remote-tty' binary found.\nTo use this option, please, install 'remote-tty'.";},
         'checkCFG' => sub {
             my $cfg = shift;
 
@@ -665,7 +650,7 @@ sub _getMethods {
             if (! _($self, 'entryIP')->get_chars(0, -1)) {
                 push(@faults, 'TTY Socket');
             }
-            if (_($self, 'rbCfgAuthUserPass')->get_active) {
+            if (_($self, 'rbCfgAuthUserPass')->get_active()) {
                 if (! _($self, 'entryUser')->get_chars(0, -1)) {
                     push(@faults, 'User (User/Password authentication method selected)');
                 }
@@ -693,37 +678,36 @@ sub _getMethods {
             _($self, 'entryUser')->set_text($$cfg{user} // '');
             _($self, 'entryPassword')->set_text($$cfg{pass} // '');
             _($self, 'cbCfgAuthFallback')->set_sensitive(0);
-            _($self, 'labelConnOptions')->set_markup("'<b>$method</b>'");
+            _($self, 'labelConnOptions')->set_markup("<b>$method</b>");
             _($self, 'labelExpect')->set_sensitive(1);
             _($self, 'labelRemoteMacros')->set_sensitive(1);
             _($self, 'labelLocalMacros')->set_sensitive(1);
             _($self, 'labelVariables')->set_sensitive(1);
             _($self, 'labelTerminalOptions')->set_sensitive(1);
-            _($self, 'alignAuthMethod')->set_sensitive(1);
+            _($self, 'vboxAuthMethod')->set_sensitive(1);
             _($self, 'entryUser')->set_sensitive(1);
             _($self, 'alignUserPass')->set_sensitive(1);
             _($self, 'rbCfgAuthUserPass')->set_active($$cfg{'auth type'} eq 'userpass');
             _($self, 'framePublicKey')->set_sensitive(0);
-            _($self, 'alignManual')->set_sensitive(1);
+            _($self, 'rbCfgAuthManual')->set_sensitive(1);
             _($self, 'rbCfgAuthManual')->set_active($$cfg{'auth type'} eq 'manual');
             _($self, 'entryPassphrase')->set_text('');
-            _($self, 'fileCfgPublicKey')->unselect_all;
+            _($self, 'fileCfgPublicKey')->unselect_all();
             _($self, 'frameExpect')->set_sensitive(1);
             _($self, 'frameRemoteMacros')->set_sensitive(1);
             _($self, 'frameLocalMacros')->set_sensitive(1);
             _($self, 'frameVariables')->set_sensitive(1);
             _($self, 'frameTerminalOptions')->set_sensitive(1);
-            _($self, 'labelCmdLineOptions')->set_markup(" '<b>$method</b>' command line options: ");
+            _($self, 'labelCmdLineOptions')->set_markup(" <b>$method</b> command line options");
             _($self, 'cbAutossh')->set_sensitive(0);
             _($self, 'cbAutossh')->set_active(0);
         },
-        'icon' => Gtk3::Gdk::Pixbuf->new_from_file_at_scale("$RES_DIR/asbru_method_remote-tty.jpg", 16, 16, 0)
+        'icon' => Gtk3::Gdk::Pixbuf->new_from_file_at_scale("$THEME_DIR/asbru_method_remote-tty.jpg", 16, 16, 0)
     };
 
-    `which c3270 1>/dev/null 2>&1`;
-    my $c3270 = $?;
+    my $c3270 = (system("$ENV{'ASBRU_ENV_FOR_EXTERNAL'} which c3270 1>/dev/null 2>&1") eq 0);
     $methods{'IBM 3270/5250'} = {
-        'installed' => sub {return ! $c3270 ? 1 : "No 'c3270' binary found.\nTo use this option, please, install 'c3270' or 'x3270-text'.";},
+        'installed' => sub {return $c3270 ? 1 : "No 'c3270' binary found.\nTo use this option, please, install 'c3270' or 'x3270-text'.";},
         'checkCFG' => sub {
             my $cfg = shift;
 
@@ -750,18 +734,18 @@ sub _getMethods {
             _($self, 'entryUser')->set_text('');
             _($self, 'entryPassword')->set_text('');
             _($self, 'cbCfgAuthFallback')->set_sensitive(0);
-            _($self, 'alignAuthMethod')->set_sensitive(0);
+            _($self, 'vboxAuthMethod')->set_sensitive(0);
             _($self, 'rbCfgAuthManual')->set_active(1);
             _($self, 'entryUser')->set_sensitive(0);
             _($self, 'entryPassphrase')->set_text('');
-            _($self, 'fileCfgPublicKey')->unselect_all;
-            _($self, 'labelConnOptions')->set_markup("'<b>$method</b>'");
+            _($self, 'fileCfgPublicKey')->unselect_all();
+            _($self, 'labelConnOptions')->set_markup("<b>$method</b>");
             _($self, 'labelExpect')->set_sensitive(1);
             _($self, 'labelRemoteMacros')->set_sensitive(1);
             _($self, 'labelLocalMacros')->set_sensitive(1);
             _($self, 'labelVariables')->set_sensitive(1);
             _($self, 'labelTerminalOptions')->set_sensitive(1);
-            _($self, 'labelCmdLineOptions')->set_markup(" '<b>$method</b>' command line options: ");
+            _($self, 'labelCmdLineOptions')->set_markup(" <b>$method</b> command line options");
             _($self, 'frameExpect')->set_sensitive(1);
             _($self, 'frameRemoteMacros')->set_sensitive(1);
             _($self, 'frameLocalMacros')->set_sensitive(1);
@@ -770,11 +754,10 @@ sub _getMethods {
             _($self, 'cbAutossh')->set_sensitive(0);
             _($self, 'cbAutossh')->set_active(0);
         },
-        'icon' => Gtk3::Gdk::Pixbuf->new_from_file_at_scale("$RES_DIR/asbru_method_3270.jpg", 16, 16, 0)
+        'icon' => Gtk3::Gdk::Pixbuf->new_from_file_at_scale("$THEME_DIR/asbru_method_3270.jpg", 16, 16, 0)
     };
 
-    `which autossh 1>/dev/null 2>&1`;
-    my $autossh = ! $?;
+    my $autossh = (system("$ENV{'ASBRU_ENV_FOR_EXTERNAL'} which autossh 1>/dev/null 2>&1") eq 0);
     $methods{'SSH'} = {
         'installed' => sub {return 1;},
         'checkCFG' => sub {
@@ -785,10 +768,7 @@ sub _getMethods {
             if (! _($self, 'entryIP')->get_chars(0, -1)) {
                 push(@faults, 'IP/Hostname cannot be empty');
             }
-            if (! _($self, 'entryPort')->get_chars(0, -1)) {
-                push(@faults, 'Port cannot be empty');
-            }
-            if (_($self, 'rbCfgAuthUserPass')->get_active() && !_($self, 'cbInferUserPassKPX')->get_active() && !_($self, 'entryUser')->get_chars(0, -1)) {
+            if (_($self, 'rbCfgAuthUserPass')->get_active() && !_($self, 'entryUser')->get_chars(0, -1)) {
                 push(@faults, 'User name cannot be empty if User/Password authentication method selected');
             }
 
@@ -804,44 +784,45 @@ sub _getMethods {
             _($self, 'imageConnOptions')->set_from_pixbuf($pixbuf);
             #_($self, 'vboxVarious')->set_sensitive(1);
             _($self, 'framePort')->set_sensitive(1);
+            _($self, 'entryPort')->set_range(0, 65536);
             _($self, 'entryPort')->set_value($method eq $$cfg{method} ? $$cfg{port} : 22);
             _($self, 'labelIP')->set_text('Host: ');
             _($self, 'entryIP')->set_property('tooltip-markup', 'IP or Hostname of the machine to connect to');
             _($self, 'entryUser')->set_text($$cfg{user} // '');
             _($self, 'entryPassword')->set_text($$cfg{pass} // '');
             _($self, 'cbCfgAuthFallback')->set_sensitive(1);
-            _($self, 'labelConnOptions')->set_markup("'<b>$method</b>'");
+            _($self, 'labelConnOptions')->set_markup("<b>$method</b>");
             _($self, 'labelExpect')->set_sensitive(1);
             _($self, 'labelRemoteMacros')->set_sensitive(1);
             _($self, 'labelLocalMacros')->set_sensitive(1);
             _($self, 'labelVariables')->set_sensitive(1);
             _($self, 'labelTerminalOptions')->set_sensitive(1);
-            _($self, 'alignAuthMethod')->set_sensitive(1);
+            _($self, 'vboxAuthMethod')->set_sensitive(1);
             _($self, 'entryUser')->set_sensitive(1);
+            _($self, 'alignAuthMethod')->set_sensitive(1);
             _($self, 'alignUserPass')->set_sensitive(1);
             _($self, 'rbCfgAuthUserPass')->set_active($$cfg{'auth type'} eq 'userpass');
             _($self, 'framePublicKey')->set_sensitive(1);
             _($self, 'entryPassphrase')->set_text($$cfg{passphrase} // '');
             _($self, 'rbCfgAuthPublicKey')->set_active($$cfg{'auth type'} eq 'publickey');
-            _($self, 'alignManual')->set_sensitive(1);
+            _($self, 'rbCfgAuthManual')->set_sensitive(1);
             _($self, 'rbCfgAuthUserPass')->set_active($$cfg{'auth type'} eq 'manual');
             _($self, 'frameExpect')->set_sensitive(1);
             _($self, 'frameRemoteMacros')->set_sensitive(1);
             _($self, 'frameLocalMacros')->set_sensitive(1);
             _($self, 'frameVariables')->set_sensitive(1);
             _($self, 'frameTerminalOptions')->set_sensitive(1);
-            _($self, 'labelCmdLineOptions')->set_markup(" '<b>$method</b>' command line options: ");
+            _($self, 'labelCmdLineOptions')->set_markup(" <b>$method</b> command line options");
             _($self, 'cbAutossh')->set_sensitive($autossh);
             _($self, 'cbAutossh')->set_active($$cfg{'autossh'});
         },
-        'icon' => Gtk3::Gdk::Pixbuf->new_from_file_at_scale("$RES_DIR/asbru_method_ssh.svg", 16, 16, 0),
+        'icon' => Gtk3::Gdk::Pixbuf->new_from_file_at_scale("$THEME_DIR/asbru_method_ssh.svg", 16, 16, 0),
         'escape' => ['~.']
     };
 
-    `which mosh 1>/dev/null 2>&1`;
-    my $mosh = $?;
+    my $mosh = (system("$ENV{'ASBRU_ENV_FOR_EXTERNAL'} which mosh 1>/dev/null 2>&1") eq 0);
     $methods{'MOSH'} = {
-        'installed' => sub {return ! $mosh ? 1 : "No 'mosh' binary found.\nTo use this option, please, install 'mosh'.";},
+        'installed' => sub {return $mosh ? 1 : "No 'mosh' binary found.\nTo use this option, please, install 'mosh'.";},
         'checkCFG' => sub {
             my $cfg = shift;
 
@@ -850,7 +831,7 @@ sub _getMethods {
             if (! _($self, 'entryIP')->get_chars(0, -1)) {
                 push(@faults, 'IP/Hostname');
             }
-            if ((_($self, 'rbCfgAuthUserPass')->get_active) && (! _($self, 'cbInferUserPassKPX')->get_active)) {
+            if (_($self, 'rbCfgAuthUserPass')->get_active()) {
                 if (! _($self, 'entryUser')->get_chars(0, -1)) {
                     push(@faults, 'User (User/Password authentication method selected)');
                 }
@@ -874,39 +855,39 @@ sub _getMethods {
             _($self, 'entryUser')->set_text($$cfg{user} // '');
             _($self, 'entryPassword')->set_text($$cfg{pass} // '');
             _($self, 'cbCfgAuthFallback')->set_sensitive(0);
-            _($self, 'labelConnOptions')->set_markup("'<b>$method</b>'");
+            _($self, 'labelConnOptions')->set_markup("<b>$method</b>");
             _($self, 'labelExpect')->set_sensitive(1);
             _($self, 'labelRemoteMacros')->set_sensitive(1);
             _($self, 'labelLocalMacros')->set_sensitive(1);
             _($self, 'labelVariables')->set_sensitive(1);
             _($self, 'labelTerminalOptions')->set_sensitive(1);
-            _($self, 'alignAuthMethod')->set_sensitive(1);
+            _($self, 'vboxAuthMethod')->set_sensitive(1);
             _($self, 'entryUser')->set_sensitive(1);
+            _($self, 'alignAuthMethod')->set_sensitive(1);
             _($self, 'alignUserPass')->set_sensitive(1);
             _($self, 'rbCfgAuthUserPass')->set_active($$cfg{'auth type'} eq 'userpass');
             _($self, 'framePublicKey')->set_sensitive(1);
             _($self, 'entryPassphrase')->set_text($$cfg{passphrase} // '');
             _($self, 'fileCfgPublicKey')->set_filename($$cfg{'public key'} // '');
             _($self, 'rbCfgAuthPublicKey')->set_active($$cfg{'auth type'} eq 'publickey');
-            _($self, 'alignManual')->set_sensitive(1);
+            _($self, 'rbCfgAuthManual')->set_sensitive(1);
             _($self, 'rbCfgAuthUserPass')->set_active($$cfg{'auth type'} eq 'manual');
             _($self, 'frameExpect')->set_sensitive(1);
             _($self, 'frameRemoteMacros')->set_sensitive(1);
             _($self, 'frameLocalMacros')->set_sensitive(1);
             _($self, 'frameVariables')->set_sensitive(1);
             _($self, 'frameTerminalOptions')->set_sensitive(1);
-            _($self, 'labelCmdLineOptions')->set_markup(" '<b>$method</b>' command line options: ");
+            _($self, 'labelCmdLineOptions')->set_markup(" <b>$method</b> command line options");
             _($self, 'cbAutossh')->set_sensitive(0);
             _($self, 'cbAutossh')->set_active(0);
         },
-        'icon' => Gtk3::Gdk::Pixbuf->new_from_file_at_scale("$RES_DIR/asbru_method_mosh.png", 16, 16, 0),
+        'icon' => Gtk3::Gdk::Pixbuf->new_from_file_at_scale("$THEME_DIR/asbru_method_mosh.svg", 16, 16, 0),
         'escape' => ["\c^x."]
     };
 
-    `which cadaver 1>/dev/null 2>&1`;
-    my $cadaver = $?;
+    my $cadaver = (system("$ENV{'ASBRU_ENV_FOR_EXTERNAL'} which cadaver 1>/dev/null 2>&1") eq 0);
     $methods{'WebDAV'} = {
-        'installed' => sub {return ! $cadaver ? 1 : "No 'cadaver' binary found.\nTo use this option, please, install 'cadaver'.";},
+        'installed' => sub {return $cadaver ? 1 : "No 'cadaver' binary found.\nTo use this option, please, install 'cadaver'.";},
         'checkCFG' => sub {
             my $cfg = shift;
 
@@ -915,7 +896,7 @@ sub _getMethods {
             if (! _($self, 'entryIP')->get_chars(0, -1)) {
                 push(@faults, 'IP/Hostname');
             }
-            if ((_($self, 'rbCfgAuthUserPass')->get_active) && (! _($self, 'cbInferUserPassKPX')->get_active)) {
+            if (_($self, 'rbCfgAuthUserPass')->get_active()) {
                 if (! _($self, 'entryUser')->get_chars(0, -1)) {
                     push(@faults, 'User (User/Password authentication method selected)');
                 }
@@ -939,39 +920,39 @@ sub _getMethods {
             _($self, 'entryUser')->set_text($$cfg{user} // '');
             _($self, 'entryPassword')->set_text($$cfg{pass} // '');
             _($self, 'cbCfgAuthFallback')->set_sensitive(0);
-            _($self, 'labelConnOptions')->set_markup("'<b>$method</b>'");
+            _($self, 'labelConnOptions')->set_markup("<b>$method</b>");
             _($self, 'labelExpect')->set_sensitive(1);
             _($self, 'labelRemoteMacros')->set_sensitive(1);
             _($self, 'labelLocalMacros')->set_sensitive(1);
             _($self, 'labelVariables')->set_sensitive(1);
             _($self, 'labelTerminalOptions')->set_sensitive(1);
-            _($self, 'alignAuthMethod')->set_sensitive(1);
+            _($self, 'vboxAuthMethod')->set_sensitive(1);
             _($self, 'entryUser')->set_sensitive(1);
+            _($self, 'alignAuthMethod')->set_sensitive(1);
             _($self, 'alignUserPass')->set_sensitive(1);
             _($self, 'rbCfgAuthUserPass')->set_active($$cfg{'auth type'} eq 'userpass');
             _($self, 'framePublicKey')->set_sensitive(0);
             _($self, 'entryPassphrase')->set_text($$cfg{passphrase} // '');
             _($self, 'fileCfgPublicKey')->set_filename($$cfg{'public key'} // '');
             _($self, 'rbCfgAuthPublicKey')->set_active($$cfg{'auth type'} eq 'publickey');
-            _($self, 'alignManual')->set_sensitive(1);
+            _($self, 'rbCfgAuthManual')->set_sensitive(1);
             _($self, 'rbCfgAuthUserPass')->set_active($$cfg{'auth type'} eq 'manual');
             _($self, 'frameExpect')->set_sensitive(1);
             _($self, 'frameRemoteMacros')->set_sensitive(1);
             _($self, 'frameLocalMacros')->set_sensitive(1);
             _($self, 'frameVariables')->set_sensitive(1);
             _($self, 'frameTerminalOptions')->set_sensitive(1);
-            _($self, 'labelCmdLineOptions')->set_markup(" '<b>$method</b>' command line options: ");
+            _($self, 'labelCmdLineOptions')->set_markup(" <b>$method</b> command line options");
             _($self, 'cbAutossh')->set_sensitive(0);
             _($self, 'cbAutossh')->set_active(0);
         },
-        'icon' => Gtk3::Gdk::Pixbuf->new_from_file_at_scale("$RES_DIR/asbru_method_cadaver.png", 16, 16, 0),
+        'icon' => Gtk3::Gdk::Pixbuf->new_from_file_at_scale("$THEME_DIR/asbru_method_cadaver.png", 16, 16, 0),
         'escape' => ["\cc", "quit\n"]
     };
 
-    `which telnet 1>/dev/null 2>&1`;
-    my $telnet = $?;
+    my $telnet = (system("$ENV{'ASBRU_ENV_FOR_EXTERNAL'} which telnet 1>/dev/null 2>&1") eq 0);
     $methods{'Telnet'} = {
-        'installed' => sub {return ! $telnet ? 1 : "No 'telnet' binary found.\nTo use this option, please, install 'telnet' or 'telnet-ssl'.";},
+        'installed' => sub {return $telnet ? 1 : "No 'telnet' binary found.\nTo use this option, please, install 'telnet' or 'telnet-ssl'.";},
         'checkCFG' => sub {
             my $cfg = shift;
             my @faults;
@@ -982,7 +963,7 @@ sub _getMethods {
             if (! _($self, 'entryPort')->get_chars(0, -1)) {
                 push(@faults, 'Port');
             }
-            if ((_($self, 'rbCfgAuthUserPass')->get_active) && (! _($self, 'cbInferUserPassKPX')->get_active)) {
+            if (_($self, 'rbCfgAuthUserPass')->get_active()) {
                 if (! _($self, 'entryUser')->get_chars(0, -1)) {
                     push(@faults, 'User (User/Password authentication method selected)');
                 }
@@ -1007,31 +988,32 @@ sub _getMethods {
             _($self, 'entryUser')->set_text($$cfg{user} // '');
             _($self, 'entryPassword')->set_text($$cfg{pass} // '');
             _($self, 'cbCfgAuthFallback')->set_sensitive(0);
-            _($self, 'labelConnOptions')->set_markup("'<b>$method</b>'");
+            _($self, 'labelConnOptions')->set_markup("<b>$method</b>");
             _($self, 'labelExpect')->set_sensitive(1);
             _($self, 'labelRemoteMacros')->set_sensitive(1);
             _($self, 'labelLocalMacros')->set_sensitive(1);
             _($self, 'labelVariables')->set_sensitive(1);
             _($self, 'labelTerminalOptions')->set_sensitive(1);
-            _($self, 'alignAuthMethod')->set_sensitive(1);
+            _($self, 'vboxAuthMethod')->set_sensitive(1);
             _($self, 'entryUser')->set_sensitive(1);
             _($self, 'rbCfgAuthUserPass')->set_active(1);
             _($self, 'rbCfgAuthUserPass')->set_active($$cfg{'auth type'} eq 'userpass');
             _($self, 'framePublicKey')->set_sensitive(0);
+            _($self, 'alignAuthMethod')->set_sensitive(1);
             _($self, 'rbCfgAuthManual')->set_sensitive(1);
             _($self, 'rbCfgAuthManual')->set_active($$cfg{'auth type'} eq 'manual');
             _($self, 'entryPassphrase')->set_text('');
-            _($self, 'fileCfgPublicKey')->unselect_all;
+            _($self, 'fileCfgPublicKey')->unselect_all();
             _($self, 'frameExpect')->set_sensitive(1);
             _($self, 'frameRemoteMacros')->set_sensitive(1);
             _($self, 'frameLocalMacros')->set_sensitive(1);
             _($self, 'frameVariables')->set_sensitive(1);
             _($self, 'frameTerminalOptions')->set_sensitive(1);
-            _($self, 'labelCmdLineOptions')->set_markup(" '<b>$method</b>' command line options: ");
+            _($self, 'labelCmdLineOptions')->set_markup(" <b>$method</b> command line options");
             _($self, 'cbAutossh')->set_sensitive(0);
             _($self, 'cbAutossh')->set_active(0);
         },
-        'icon' => Gtk3::Gdk::Pixbuf->new_from_file_at_scale("$RES_DIR/asbru_method_telnet.jpg", 16, 16, 0),
+        'icon' => Gtk3::Gdk::Pixbuf->new_from_file_at_scale("$THEME_DIR/asbru_method_telnet.svg", 16, 16, 0),
         'escape' => ["\c]", "quit\n"]
     };
 
@@ -1048,12 +1030,12 @@ sub _getMethods {
                 push(@faults, 'Port');
             }
             # TODO : Check if this nested "ifs" can be rewritten
-            if ((_($self, 'rbCfgAuthUserPass')->get_active) && (! _($self, 'cbInferUserPassKPX')->get_active)) {
+            if (_($self, 'rbCfgAuthUserPass')->get_active()) {
                 if (! _($self, 'entryUser')->get_chars(0, -1)) {
                     push(@faults, 'User (User/Password authentication method selected)');
                 }
-            } elsif (_($self, 'rbCfgAuthPublicKey')->get_active) {
-                if (! _($self, 'fileCfgPublicKey')->get_filename) {
+            } elsif (_($self, 'rbCfgAuthPublicKey')->get_active()) {
+                if (! _($self, 'fileCfgPublicKey')->get_filename()) {
                     push(@faults, 'Public Key File (Public Key authentication method selected)');
                 }
             }
@@ -1076,13 +1058,13 @@ sub _getMethods {
             _($self, 'entryUser')->set_text($$cfg{user} // '');
             _($self, 'entryPassword')->set_text($$cfg{pass} // '');
             _($self, 'cbCfgAuthFallback')->set_sensitive(1);
-            _($self, 'labelConnOptions')->set_markup("'<b>$method</b>'");
+            _($self, 'labelConnOptions')->set_markup("<b>$method</b>");
             _($self, 'labelExpect')->set_sensitive(1);
             _($self, 'labelRemoteMacros')->set_sensitive(1);
             _($self, 'labelLocalMacros')->set_sensitive(1);
             _($self, 'labelVariables')->set_sensitive(1);
             _($self, 'labelTerminalOptions')->set_sensitive(1);
-            _($self, 'alignAuthMethod')->set_sensitive(1);
+            _($self, 'vboxAuthMethod')->set_sensitive(1);
             _($self, 'entryUser')->set_sensitive(1);
             _($self, 'alignUserPass')->set_sensitive(1);
             _($self, 'rbCfgAuthUserPass')->set_active($$cfg{'auth type'} eq 'userpass');
@@ -1090,18 +1072,19 @@ sub _getMethods {
             _($self, 'entryPassphrase')->set_text($$cfg{passphrase} // '');
             _($self, 'fileCfgPublicKey')->set_filename($$cfg{'public key'} // '');
             _($self, 'rbCfgAuthPublicKey')->set_active($$cfg{'auth type'} eq 'publickey');
-            _($self, 'alignManual')->set_sensitive(1);
+            _($self, 'alignAuthMethod')->set_sensitive(1);
+            _($self, 'rbCfgAuthManual')->set_sensitive(1);
             _($self, 'rbCfgAuthUserPass')->set_active($$cfg{'auth type'} eq 'manual');
             _($self, 'frameExpect')->set_sensitive(1);
             _($self, 'frameRemoteMacros')->set_sensitive(1);
             _($self, 'frameLocalMacros')->set_sensitive(1);
             _($self, 'frameVariables')->set_sensitive(1);
             _($self, 'frameTerminalOptions')->set_sensitive(1);
-            _($self, 'labelCmdLineOptions')->set_markup(" '<b>$method</b>' command line options: ");
+            _($self, 'labelCmdLineOptions')->set_markup(" <b>$method</b> command line options");
             _($self, 'cbAutossh')->set_sensitive(0);
             _($self, 'cbAutossh')->set_active(0);
         },
-        'icon' => Gtk3::Gdk::Pixbuf->new_from_file_at_scale("$RES_DIR/asbru_method_sftp.jpg", 16, 16, 0)
+        'icon' => Gtk3::Gdk::Pixbuf->new_from_file_at_scale("$THEME_DIR/asbru_method_sftp.svg", 16, 16, 0)
     };
 
     $methods{'FTP'} = {
@@ -1117,7 +1100,7 @@ sub _getMethods {
             if (! _($self, 'entryPort')->get_chars(0, -1)) {
                 push(@faults, 'Port');
             }
-            if ((_($self, 'rbCfgAuthUserPass')->get_active) && (! _($self, 'cbInferUserPassKPX')->get_active)) {
+            if (_($self, 'rbCfgAuthUserPass')->get_active()) {
                 if (! _($self, 'entryUser')->get_chars(0, -1)) {
                     push(@faults, 'User (User/Password authentication method selected)');
                 }
@@ -1141,19 +1124,20 @@ sub _getMethods {
             _($self, 'entryUser')->set_text($$cfg{user} // '');
             _($self, 'entryPassword')->set_text($$cfg{pass} // '');
             _($self, 'cbCfgAuthFallback')->set_sensitive(0);
-            _($self, 'labelConnOptions')->set_markup("'<b>$method</b>'");
+            _($self, 'labelConnOptions')->set_markup("<b>$method</b>");
             _($self, 'labelExpect')->set_sensitive(1);
             _($self, 'labelRemoteMacros')->set_sensitive(1);
             _($self, 'labelLocalMacros')->set_sensitive(1);
             _($self, 'labelVariables')->set_sensitive(1);
             _($self, 'labelTerminalOptions')->set_sensitive(1);
-            _($self, 'alignAuthMethod')->set_sensitive(1);
+            _($self, 'vboxAuthMethod')->set_sensitive(1);
             _($self, 'entryUser')->set_sensitive(1);
+            _($self, 'alignAuthMethod')->set_sensitive(1);
             _($self, 'rbCfgAuthUserPass')->set_active(1);
             _($self, 'rbCfgAuthUserPass')->set_active($$cfg{'auth type'} eq 'userpass');
             _($self, 'framePublicKey')->set_sensitive(0);
             _($self, 'entryPassphrase')->set_text('');
-            _($self, 'fileCfgPublicKey')->unselect_all;
+            _($self, 'fileCfgPublicKey')->unselect_all();
             _($self, 'rbCfgAuthManual')->set_sensitive(1);
             _($self, 'rbCfgAuthManual')->set_active($$cfg{'auth type'} eq 'manual');
             _($self, 'frameExpect')->set_sensitive(1);
@@ -1161,11 +1145,11 @@ sub _getMethods {
             _($self, 'frameLocalMacros')->set_sensitive(1);
             _($self, 'frameVariables')->set_sensitive(1);
             _($self, 'frameTerminalOptions')->set_sensitive(1);
-            _($self, 'labelCmdLineOptions')->set_markup(" '<b>$method</b>' command line options: ");
+            _($self, 'labelCmdLineOptions')->set_markup(" <b>$method</b> command line options");
             _($self, 'cbAutossh')->set_sensitive(0);
             _($self, 'cbAutossh')->set_active(0);
         },
-        'icon' => Gtk3::Gdk::Pixbuf->new_from_file_at_scale("$RES_DIR/asbru_method_ftp.jpg", 16, 16, 0)
+        'icon' => Gtk3::Gdk::Pixbuf->new_from_file_at_scale("$THEME_DIR/asbru_method_ftp.svg", 16, 16, 0)
     };
 
     $methods{'Generic Command'} = {
@@ -1204,88 +1188,98 @@ sub _getMethods {
             _($self, 'rbCfgAuthManual')->set_active(1);
             _($self, 'entryUser')->set_sensitive(0);
             _($self, 'entryPassphrase')->set_text('');
-            _($self, 'fileCfgPublicKey')->unselect_all;
-            _($self, 'labelConnOptions')->set_markup("'<b>$method</b>'");
+            _($self, 'fileCfgPublicKey')->unselect_all();
+            _($self, 'labelConnOptions')->set_markup("<b>$method</b>");
             _($self, 'labelExpect')->set_sensitive(1);
             _($self, 'labelRemoteMacros')->set_sensitive(1);
             _($self, 'labelLocalMacros')->set_sensitive(1);
             _($self, 'labelVariables')->set_sensitive(1);
             _($self, 'labelTerminalOptions')->set_sensitive(1);
-            _($self, 'labelCmdLineOptions')->set_markup(" '<b>$method</b>' command line options: ");
+            _($self, 'labelCmdLineOptions')->set_markup(" <b>$method</b> command line options");
             _($self, 'cbAutossh')->set_sensitive(0);
             _($self, 'cbAutossh')->set_active(0);
         },
-        'icon' => Gtk3::Gdk::Pixbuf->new_from_file_at_scale("$RES_DIR/asbru_method_generic.jpg", 16, 16, 0)
+        'icon' => Gtk3::Gdk::Pixbuf->new_from_file_at_scale("$THEME_DIR/asbru_method_generic.svg", 16, 16, 0)
     };
 
     return %methods;
 }
 
 sub _registerPACIcons {
+    my $theme_dir = shift;
+    if ($theme_dir) {
+        $THEME_DIR = $theme_dir;
+    }
+
     my %icons = (
-        'pac-app-big' => "$RES_DIR/asbru-logo-64.png",
-        'pac-group-add' => "$RES_DIR/asbru_group_add_16x16.png",
-        'pac-node-add' => "$RES_DIR/asbru_node_add_16x16.png",
-        'pac-node-del' => "$RES_DIR/asbru_node_del_16x16.png",
-        'pac-chain' => "$RES_DIR/asbru_chain.png",
-        'pac-cluster-auto' => "$RES_DIR/asbru_cluster_auto.png",
-        'pac-cluster-manager2' => "$RES_DIR/asbru_cluster_manager2.png",
-        'pac-cluster-manager' => "$RES_DIR/asbru_cluster_manager.png",
-        'pac-cluster-manager-off' => "$RES_DIR/asbru_cluster_manager_off.png",
-        'pac-favourite-on' => "$RES_DIR/asbru_favourite_on.png",
-        'pac-favourite-off' => "$RES_DIR/asbru_favourite_off.png",
-        'pac-group-closed' => "$RES_DIR/asbru_group_closed_16x16.svg",
-        'pac-group-closed' => "$RES_DIR/asbru_group_closed_16x16.svg",
-        'pac-group-open' => "$RES_DIR/asbru_group_open_16x16.svg",
-        'pac-group' => "$RES_DIR/asbru_group.png",
-        'pac-history' => "$RES_DIR/asbru_history.png",
-        'pac-keepass' => "$RES_DIR/asbru_keepass.png",
-        'pac-method-WebDAV' => "$RES_DIR/asbru_method_cadaver.png",
-        'pac-method-MOSH' => "$RES_DIR/asbru_method_mosh.png",
-        'pac-method-IBM 3270/5250' => "$RES_DIR/asbru_method_3270.jpg",
-        'pac-method-Serial (cu)' => "$RES_DIR/asbru_method_cu.jpg",
-        'pac-method-FTP' => "$RES_DIR/asbru_method_ftp.jpg",
-        'pac-method-Generic Command' => "$RES_DIR/asbru_method_generic.jpg",
-        'pac-method-RDP (Windows)' => "$RES_DIR/asbru_method_rdesktop.svg",
-        'pac-method-RDP (rdesktop)' => "$RES_DIR/asbru_method_rdesktop.svg",
-        'pac-method-RDP (xfreerdp)' => "$RES_DIR/asbru_method_rdesktop.svg",
-        'pac-method-Serial (remote-tty)' => "$RES_DIR/asbru_method_remote-tty.jpg",
-        'pac-method-SFTP' => "$RES_DIR/asbru_method_sftp.jpg",
-        'pac-method-SSH' => "$RES_DIR/asbru_method_ssh.svg",
-        'pac-method-Telnet' => "$RES_DIR/asbru_method_telnet.jpg",
-        'pac-method-VNC' => "$RES_DIR/asbru_method_vncviewer.svg",
-        'pac-quick-connect' => "$RES_DIR/asbru_quick_connect.png",
-        'pac-script' => "$RES_DIR/asbru_script.png",
-        'pac-shell' => "$RES_DIR/asbru_shell.png",
-        'pac-tab' => "$RES_DIR/asbru_tab.png",
-        'pac-terminal-ok-small' => "$RES_DIR/asbru_terminal16x16.png",
-        'pac-terminal-ok-big' => "$RES_DIR/asbru_terminal64x64.png",
-        'pac-terminal-ko-small' => "$RES_DIR/asbru_terminal_x16x16.png",
-        'pac-terminal-ko-big' => "$RES_DIR/asbru_terminal_x64x64.png",
-        'pac-tray-bw' => "$RES_DIR/asbru_tray_bw.png",
-        'pac-tray' => "$RES_DIR/asbru-logo-tray.png",
-        'pac-treelist' => "$RES_DIR/asbru_treelist.png",
-        'pac-wol' => "$RES_DIR/asbru_wol.png",
-        'pac-prompt' => "$RES_DIR/asbru_prompt.png",
-        'pac-protected' => "$RES_DIR/asbru_protected.png",
-        'pac-unprotected' => "$RES_DIR/asbru_unprotected.png",
-        'pac-buttonbar-show' => "$RES_DIR/asbru_buttonbar_show.png",
-        'pac-buttonbar-hide' => "$RES_DIR/asbru_buttonbar_hide.png",
+        'asbru-help' => "$THEME_DIR/asbru-help.svg",
+        'gtk-edit' => "$THEME_DIR/gtk-edit.svg",
+        'gtk-delete' => "$THEME_DIR/gtk-delete.svg",
+        'gtk-find' => "$THEME_DIR/gtk-find.svg",
+        'gtk-spell-check' => "$THEME_DIR/gtk-spell-check.svg",
+        'asbru-app-big' => "$RES_DIR/asbru-logo-64.png",
+        'asbru-group-add' => "$THEME_DIR/asbru_group_add_16x16.svg",
+        'asbru-node-add' => "$THEME_DIR/asbru_node_add_16x16.svg",
+        'asbru-node-del' => "$THEME_DIR/asbru_node_del_16x16.png",
+        'asbru-chain' => "$THEME_DIR/asbru_chain.png",
+        'asbru-cluster-auto' => "$THEME_DIR/asbru_cluster_auto.png",
+        'asbru-cluster-manager2' => "$THEME_DIR/asbru_cluster_manager2.png",
+        'asbru-cluster-manager' => "$THEME_DIR/asbru_cluster_manager.svg",
+        'asbru-cluster-manager-off' => "$THEME_DIR/asbru_cluster_manager_off.svg",
+        'asbru-favourite-on' => "$THEME_DIR/asbru_favourite_on.svg",
+        'asbru-favourite-off' => "$THEME_DIR/asbru_favourite_off.svg",
+        'asbru-group-closed' => "$THEME_DIR/asbru_group_closed_16x16.svg",
+        'asbru-group-closed' => "$THEME_DIR/asbru_group_closed_16x16.svg",
+        'asbru-group-open' => "$THEME_DIR/asbru_group_open_16x16.svg",
+        'asbru-group' => "$THEME_DIR/asbru_group.svg",
+        'asbru-history' => "$THEME_DIR/asbru_history.svg",
+        'asbru-keepass' => "$THEME_DIR/asbru_keepass.png",
+        'asbru-method-WebDAV' => "$THEME_DIR/asbru_method_cadaver.png",
+        'asbru-method-MOSH' => "$THEME_DIR/asbru_method_mosh.svg",
+        'asbru-method-IBM 3270/5250' => "$THEME_DIR/asbru_method_3270.jpg",
+        'asbru-method-Serial (cu)' => "$THEME_DIR/asbru_method_cu.jpg",
+        'asbru-method-FTP' => "$THEME_DIR/asbru_method_ftp.svg",
+        'asbru-method-Generic Command' => "$THEME_DIR/asbru_method_generic.svg",
+        'asbru-method-RDP (Windows)' => "$THEME_DIR/asbru_method_rdesktop.svg",
+        'asbru-method-RDP (rdesktop)' => "$THEME_DIR/asbru_method_rdesktop.svg",
+        'asbru-method-RDP (xfreerdp)' => "$THEME_DIR/asbru_method_rdesktop.svg",
+        'asbru-method-Serial (remote-tty)' => "$THEME_DIR/asbru_method_remote-tty.jpg",
+        'asbru-method-SFTP' => "$THEME_DIR/asbru_method_sftp.svg",
+        'asbru-method-SSH' => "$THEME_DIR/asbru_method_ssh.svg",
+        'asbru-method-Telnet' => "$THEME_DIR/asbru_method_telnet.svg",
+        'asbru-method-VNC' => "$THEME_DIR/asbru_method_vncviewer.svg",
+        'asbru-quick-connect' => "$THEME_DIR/asbru_quick_connect.svg",
+        'asbru-script' => "$THEME_DIR/asbru_script.png",
+        'asbru-shell' => "$THEME_DIR/asbru_shell.svg",
+        'asbru-tab' => "$THEME_DIR/asbru_tab.png",
+        'asbru-terminal-ok-small' => "$RES_DIR/asbru_terminal16x16.png",
+        'asbru-terminal-ok-big' => "$RES_DIR/asbru_terminal64x64.png",
+        'asbru-terminal-ko-small' => "$RES_DIR/asbru_terminal_x16x16.png",
+        'asbru-terminal-ko-big' => "$RES_DIR/asbru_terminal_x64x64.png",
+        'asbru-tray-bw' => "$RES_DIR/asbru_tray_bw.png",
+        'asbru-tray' => "$RES_DIR/asbru-logo-tray.png",
+        'asbru-treelist' => "$THEME_DIR/asbru_treelist.svg",
+        'asbru-wol' => "$THEME_DIR/asbru_wol.svg",
+        'asbru-prompt' => "$THEME_DIR/asbru_prompt.png",
+        'asbru-protected' => "$THEME_DIR/asbru_protected.png",
+        'asbru-unprotected' => "$THEME_DIR/asbru_unprotected.png",
+        'asbru-buttonbar-show' => "$THEME_DIR/asbru_buttonbar_show.png",
+        'asbru-buttonbar-hide' => "$THEME_DIR/asbru_buttonbar_hide.png",
     );
 
-    my $icon_factory = Gtk3::IconFactory->new;
+    my $icon_factory = Gtk3::IconFactory->new();
 
     foreach my $icon (keys %icons) {
-        my $icon_source = Gtk3::IconSource->new;
+        my $icon_source = Gtk3::IconSource->new();
         $icon_source->set_filename($icons{$icon});
 
-        my $icon_set = Gtk3::IconSet->new;
+        my $icon_set = Gtk3::IconSet->new();
         $icon_set->add_source($icon_source);
 
         $icon_factory->add($icon, $icon_set);
     }
 
-    $icon_factory->add_default;
+    $icon_factory->add_default();
 
     return 1;
 }
@@ -1335,31 +1329,38 @@ sub _menuFavouriteConnections {
             next;
         }
 
-        my $name = $$cfg{'environments'}{$uuid}{'name'};
+        my $group = $$cfg{'environments'}{$uuid}{'parent'} ? "$$cfg{'environments'}{$$cfg{'environments'}{$uuid}{'parent'}}{'name'} : " : '';
+        my $name = "$group$$cfg{'environments'}{$uuid}{'name'}";
 
         if ($terminal) {
             push(@fav, {
                 label => $name,
-                stockicon => $PACMain::UNITY ? '' : "pac-method-$$cfg{'environments'}{$uuid}{'method'}",
+                stockicon => $PACMain::UNITY ? '' : "asbru-method-$$cfg{'environments'}{$uuid}{'method'}",
                 tooltip => $$cfg{'environments'}{$uuid}{'description'},
                 submenu => [
                     {label => 'Start',
                         stockicon => $PACMain::UNITY ? '' : 'gtk-media-play',
-                        code => sub {$PACMain::FUNCS{_MAIN}->_launchTerminals([[$uuid]]);}
+                        code => sub {
+                            $PACMain::FUNCS{_MAIN}->_launchTerminals([[$uuid]]);
+                        }
                     }, {
                         label => "Chain with '$$terminal{_NAME}'",
-                        stockicon => $PACMain::UNITY ? '' : 'pac-chain',
+                        stockicon => $PACMain::UNITY ? '' : 'asbru-chain',
                         sensitive => $$terminal{CONNECTED},
-                        code => sub {$terminal->_wSelectChain($uuid);}
+                        code => sub {
+                            $terminal->_wSelectChain($uuid);
+                        }
                     }
                 ]
             });
         } else {
             push(@fav, {
                 label => $name,
-                stockicon => $PACMain::UNITY ? '' : "pac-method-$$cfg{'environments'}{$uuid}{'method'}",
+                stockicon => $PACMain::UNITY ? '' : "asbru-method-$$cfg{'environments'}{$uuid}{'method'}",
                 tooltip => $$cfg{'environments'}{$uuid}{'description'},
-                code => sub {$PACMain::FUNCS{_MAIN}->_launchTerminals([[$uuid]]);}
+                code => sub {
+                    $PACMain::FUNCS{_MAIN}->_launchTerminals([[$uuid]]);
+                }
             });
         }
     }
@@ -1374,7 +1375,7 @@ sub _menuClusterConnections {
     foreach my $ac (sort {lc($a) cmp lc($b)} keys %{$PACMain::FUNCS{_MAIN}{_CFG}{defaults}{'auto cluster'}}) {
         push(@fav, {
             label => $ac,
-            stockicon => $PACMain::UNITY ? '' : 'pac-cluster-auto',
+            stockicon => $PACMain::UNITY ? '' : 'asbru-cluster-auto',
             code => sub {$PACMain::FUNCS{_MAIN}->_startCluster($ac);}
         });
     }
@@ -1382,7 +1383,7 @@ sub _menuClusterConnections {
     foreach my $cluster (sort {lc($a) cmp lc($b)} keys %{$PACMain::FUNCS{_MAIN}{_CLUSTER}->getCFGClusters}) {
         push(@fav, {
             label => $cluster,
-            stockicon => $PACMain::UNITY ? '' : 'pac-cluster-manager2',
+            stockicon => $PACMain::UNITY ? '' : 'asbru-cluster-manager2',
             code => sub {$PACMain::FUNCS{_MAIN}->_startCluster($cluster);}
         });
     }
@@ -1412,33 +1413,39 @@ sub _menuAvailableConnections {
         if (scalar(@{$$elem_hash{'children'}})) {
             push(@tray_menu_items, {
                 label => $this_name,
-                stockicon => $PACMain::UNITY ? '' : 'pac-group-closed',
+                stockicon => $PACMain::UNITY ? '' : 'asbru-group-closed',
                 tooltip => $$cfg{'environments'}{$this_uuid}{'description'} // '',
                 submenu => _menuAvailableConnections($$elem_hash{'children'}, $terminal)
             });
         } elsif ($terminal) {
             push(@tray_menu_items, {
                 label => $this_name,
-                stockicon => $PACMain::UNITY ? '' : "pac-method-$$cfg{'environments'}{$this_uuid}{'method'}",
+                stockicon => $PACMain::UNITY ? '' : "asbru-method-$$cfg{'environments'}{$this_uuid}{'method'}",
                 tooltip => $$cfg{'environments'}{$this_uuid}{'description'},
                 submenu => [{
                         label => 'Start',
                         stockicon => $PACMain::UNITY ? '' : 'gtk-media-play',
-                        code => sub {$PACMain::FUNCS{_MAIN}->_launchTerminals([[$this_uuid]]);}
+                        code => sub {
+                            $PACMain::FUNCS{_MAIN}->_launchTerminals([[$this_uuid]]);
+                        }
                     }, {
                         label => "Chain with '$$terminal{_NAME}'",
-                        stockicon => $PACMain::UNITY ? '' : 'pac-chain',
+                        stockicon => $PACMain::UNITY ? '' : 'asbru-chain',
                         sensitive => $$terminal{CONNECTED},
-                        code => sub {$terminal->_wSelectChain($this_uuid);}
+                        code => sub {
+                            $terminal->_wSelectChain($this_uuid);
+                        }
                     }
                 ]
             });
         } else {
             push(@tray_menu_items, {
                 label => $this_name,
-                stockicon => $PACMain::UNITY ? '' : "pac-method-$$cfg{'environments'}{$this_uuid}{'method'}",
+                stockicon => $PACMain::UNITY ? '' : "asbru-method-$$cfg{'environments'}{$this_uuid}{'method'}",
                 tooltip => $$cfg{'environments'}{$this_uuid}{'description'},
-                code => sub {$PACMain::FUNCS{_MAIN}->_launchTerminals([[$this_uuid]]);}
+                code => sub {
+                    $PACMain::FUNCS{_MAIN}->_launchTerminals([[$this_uuid]]);
+                }
             });
         }
     }
@@ -1447,63 +1454,86 @@ sub _menuAvailableConnections {
 }
 
 sub _wEnterValue {
-    my $self = shift;
+    my $parent = shift;
     my $lblup = shift;
     my $lbldown = shift;
     my $default = shift;
     my $visible = shift // 1;
-    my $stock_icon = shift // 'gtk-edit';
-
+    my $stock_icon = shift // 'asbru-help';
+    my $entry;
     my @list;
     my $pos = -1;
+    my %w;
 
-    if (! defined $default) {
+    if (!defined $default) {
         $default = '';
     } elsif (ref($default)) {
         @list = @{$default};
+    } elsif ($default =~ /.+?\|.+?\|/) {
+        @list = split /\|/,$default;
     }
 
-    my %w;
-
+    # If no parent given, try to use an existing "global" window (main window or splash screen)
+    if (defined $parent && ref $parent ne 'Gtk3::Window') {
+        print STDERR "WARN: Wrong parent parameter received _wEnterValue ",ref $parent,"\n";
+        undef $parent;
+    }
+    if (!defined $parent) {
+        if (defined $PACMain::FUNCS{_MAIN}{_GUI}{main}) {
+            $parent = $PACMain::FUNCS{_MAIN}{_GUI}{main};
+        } elsif (defined $WINDOWSPLASH{_GUI}) {
+            $parent = $WINDOWSPLASH{_GUI};
+        }
+    }
+    if (!$stock_icon) {
+        $stock_icon = 'asbru-help';
+    }
     # Create the dialog window,
     $w{window}{data} = Gtk3::Dialog->new_with_buttons(
-        "$APPNAME (v$APPVERSION) : Enter data",
-        undef,
+        "$APPNAME : Enter data",
+        $parent,
         'modal',
         'gtk-cancel' => 'cancel',
         'gtk-ok' => 'ok'
     );
     # and setup some dialog properties.
+    $w{window}{data}->set_decorated(0);
+    $w{window}{data}->get_style_context()->add_class('w-entervalue');
     $w{window}{data}->set_default_response('ok');
-    $w{window}{data}->set_position('center');
-    $w{window}{data}->set_icon_name('pac-app-big');
-    $w{window}{data}->set_size_request(-1, -1);
+    if (!$parent) {
+        $w{window}{data}->set_position('center');
+    }
+    $w{window}{data}->set_icon_name('asbru-app-big');
     $w{window}{data}->set_resizable(0);
     $w{window}{data}->set_border_width(5);
 
+    # Create a VBox to avoid vertical expansions
+    $w{window}{gui}{vbox} = Gtk3::VBox->new(0, 0);
+    $w{window}{data}->get_content_area->pack_start($w{window}{gui}{vbox}, 0, 0, 0);
+
     # Create an HBox to contain a picture and a label
     $w{window}{gui}{hbox} = Gtk3::HBox->new(0, 0);
-    $w{window}{data}->get_content_area->pack_start($w{window}{gui}{hbox}, 1, 1, 5);
-    $w{window}{gui}{hbox}->set_border_width(5);
+    $w{window}{gui}{hbox}->set_border_width(0);
+    $w{window}{gui}{vbox}->pack_start($w{window}{gui}{hbox}, 0, 0, 5);
 
     # Create image
     $w{window}{gui}{img} = Gtk3::Image->new_from_stock($stock_icon, 'dialog');
     $w{window}{gui}{hbox}->pack_start($w{window}{gui}{img}, 0, 1, 5);
 
     # Create 1st label
-    $w{window}{gui}{lblup} = Gtk3::Label->new;
-    $w{window}{gui}{hbox}->pack_start($w{window}{gui}{lblup}, 1, 1, 5);
-    $w{window}{gui}{lblup}->set_markup($lblup);
+    $w{window}{gui}{lblup} = Gtk3::Label->new();
+    $w{window}{gui}{hbox}->pack_start($w{window}{gui}{lblup}, 0, 0, 0);
+    $w{window}{gui}{lblup}->set_markup($lblup // '');
 
     # Create 2nd label
-    $w{window}{gui}{lbldwn} = Gtk3::Label->new;
-    $w{window}{data}->get_content_area->pack_start($w{window}{gui}{lbldwn}, 1, 1, 5);
-    $w{window}{gui}{lbldwn}->set_text($lbldown // '');
+    $w{window}{gui}{lbldwn} = Gtk3::Label->new();
+    $w{window}{gui}{vbox}->pack_start($w{window}{gui}{lbldwn}, 0, 0, 5);
+    $w{window}{gui}{lbldwn}->set_markup($lbldown // '');
 
     if (@list) {
         # Create combobox widget
-        $w{window}{gui}{comboList} = Gtk3::ComboBoxText->new;
-        $w{window}{data}->get_content_area->pack_start($w{window}{gui}{comboList}, 0, 1, 0);
+        $w{window}{gui}{comboList} = Gtk3::ComboBoxText->new();
+        $w{window}{gui}{vbox}->pack_start($w{window}{gui}{comboList}, 0, 1, 5);
         $w{window}{gui}{comboList}->set_property('can_focus', 0);
         foreach my $text (@list) {
             $w{window}{gui}{comboList}->append_text($text)
@@ -1511,33 +1541,38 @@ sub _wEnterValue {
         $w{window}{gui}{comboList}->set_active(0);
     } else {
         # Create the entry widget
-        $w{window}{gui}{entry} = Gtk3::Entry->new;
-        $w{window}{data}->get_content_area->pack_start($w{window}{gui}{entry}, 0, 1, 5);
+        $w{window}{gui}{entry} = Gtk3::Entry->new();
+        $entry = $w{window}{gui}{entry};
+        $w{window}{gui}{vbox}->pack_start($w{window}{gui}{entry}, 0, 1, 5);
         $w{window}{gui}{entry}->set_text($default);
+        $w{window}{gui}{entry}->set_width_chars(30);
         $w{window}{gui}{entry}->set_activates_default(1);
         $w{window}{gui}{entry}->set_visibility($visible);
+        $w{window}{gui}{entry}->grab_focus();
     }
 
     # Show the window (in a modal fashion)
-    $w{window}{data}->set_transient_for($PACMain::FUNCS{_MAIN}{_GUI}{main});
-    $w{window}{data}->show_all;
-    my $ok = $w{window}{data}->run;
-
+    if ($entry) {
+        $entry->grab_focus();
+    }
+    $w{window}{data}->show_all();
+    my $ok = $w{window}{data}->run();
     my $val = undef;
+
     if (@list) {
         if ($ok eq 'ok') {
-            $val = $w{window}{gui}{comboList}->get_active_text;
+            $val = $w{window}{gui}{comboList}->get_active_text();
         }
-        $pos = $w{window}{gui}{comboList}->get_active;
+        $pos = $w{window}{gui}{comboList}->get_active();
     } else {
         if ($ok eq 'ok') {
             $val = $w{window}{gui}{entry}->get_chars(0, -1);
         }
     }
 
-    $w{window}{data}->destroy;
+    $w{window}{data}->destroy();
     while (Gtk3::events_pending) {
-        Gtk3::main_iteration;
+        Gtk3::main_iteration();
     }
 
     return wantarray ? ($val, $pos) : $val;
@@ -1554,12 +1589,12 @@ sub _wAddRenameNode {
         $name = $$cfg{'environments'}{$uuid}{'name'};
         $parent_name = $$cfg{'environments'}{$$cfg{'environments'}{$uuid}{'parent'}}{'name'} // '';
         $title = $$cfg{'environments'}{$uuid}{'title'};
-        $lblup = "<b>Renaming node ' @{[__($name)]}'</b>";
+        $lblup = "Renaming node <b>@{[__($name)]}</b>";
     } elsif ($action eq 'add') {
         $name = '';
         $parent_name = $$cfg{'environments'}{$uuid}{'name'};
         $title = $uuid eq '__PAC__ROOT__' || ! $$cfg{defaults}{'append group name'} ? '' : ($parent_name eq '' ? '' : " - $parent_name");
-        $lblup = "<b>Adding new node into '" . ($uuid eq '__PAC__ROOT__' ? 'ROOT' : __($parent_name)) . "'</b>";
+        $lblup = "Adding new node into <b>" . ($uuid eq '__PAC__ROOT__' ? 'ROOT' : __($parent_name)) . "</b>";
     }
 
     my %w;
@@ -1568,17 +1603,17 @@ sub _wAddRenameNode {
 
     # Create the dialog window,
     $w{window}{data} = Gtk3::Dialog->new_with_buttons(
-        "$APPNAME (v$APPVERSION) : Enter data",
-        undef,
+        "$APPNAME : Enter data",
+        $PACMain::FUNCS{_MAIN}{_GUI}{main},
         'modal',
         'gtk-cancel' => 'cancel',
         'gtk-ok' => 'ok'
     );
     # and setup some dialog properties.
+    $w{window}{data}->set_decorated(0);
+    $w{window}{data}->get_style_context()->add_class('w-renamenode');
     $w{window}{data}->set_default_response('ok');
-    $w{window}{data}->set_position('center');
-    $w{window}{data}->set_icon_name('pac-app-big');
-    $w{window}{data}->set_size_request(-1, -1);
+    $w{window}{data}->set_icon_name('asbru-app-big');
     $w{window}{data}->set_resizable(0);
     $w{window}{data}->set_border_width(5);
 
@@ -1592,7 +1627,7 @@ sub _wAddRenameNode {
     $w{window}{gui}{hbox}->pack_start($w{window}{gui}{img}, 0, 1, 0);
 
     # Create 1st label
-    $w{window}{gui}{lblup} = Gtk3::Label->new;
+    $w{window}{gui}{lblup} = Gtk3::Label->new();
     $w{window}{gui}{hbox}->pack_start($w{window}{gui}{lblup}, 1, 1, 0);
     $w{window}{gui}{lblup}->set_markup($lblup);
 
@@ -1602,14 +1637,15 @@ sub _wAddRenameNode {
     $w{window}{gui}{hbox1}->set_border_width(5);
 
     # Create label
-    $w{window}{gui}{lbl1} = Gtk3::Label->new;
+    $w{window}{gui}{lbl1} = Gtk3::Label->new();
     $w{window}{gui}{hbox1}->pack_start($w{window}{gui}{lbl1}, 0, 1, 0);
-    $w{window}{gui}{lbl1}->set_text('Enter new NAME: ');
+    $w{window}{gui}{lbl1}->set_text('Enter new NAME ');
 
     # Create the entry widget
-    $w{window}{gui}{entry1} = Gtk3::Entry->new;
+    $w{window}{gui}{entry1} = Gtk3::Entry->new();
     $w{window}{gui}{hbox1}->pack_start($w{window}{gui}{entry1}, 1, 1, 0);
     $w{window}{gui}{entry1}->set_text($name);
+    $w{window}{gui}{entry1}->set_width_chars(30);
     $w{window}{gui}{entry1}->set_activates_default(1);
     $w{window}{gui}{entry1}->signal_connect('changed', sub {
         $w{window}{gui}{entry2}->set_text($w{window}{gui}{entry1}->get_chars(0, -1) . ($uuid eq '__PAC__ROOT__' || ! $$cfg{defaults}{'append group name'} ? '' : ($parent_name eq '' ? '' :  " - $parent_name")));
@@ -1621,20 +1657,20 @@ sub _wAddRenameNode {
     $w{window}{gui}{hbox2}->set_border_width(5);
 
     # Create label
-    $w{window}{gui}{lbl2} = Gtk3::Label->new;
+    $w{window}{gui}{lbl2} = Gtk3::Label->new();
     $w{window}{gui}{hbox2}->pack_start($w{window}{gui}{lbl2}, 0, 1, 0);
-    $w{window}{gui}{lbl2}->set_text('Enter new TITLE: ');
+    $w{window}{gui}{lbl2}->set_text('Enter new TITLE ');
 
     # Create the entry widget
-    $w{window}{gui}{entry2} = Gtk3::Entry->new;
+    $w{window}{gui}{entry2} = Gtk3::Entry->new();
     $w{window}{gui}{hbox2}->pack_start($w{window}{gui}{entry2}, 1, 1, 0);
     $w{window}{gui}{entry2}->set_text($title);
+    $w{window}{gui}{entry2}->set_width_chars(30);
     $w{window}{gui}{entry2}->set_activates_default(1);
 
     # Show the window (in a modal fashion)
-    $w{window}{data}->set_transient_for($PACMain::FUNCS{_MAIN}{_GUI}{main});
-    $w{window}{data}->show_all;
-    my $ok = $w{window}{data}->run;
+    $w{window}{data}->show_all();
+    my $ok = $w{window}{data}->run();
 
     if ($ok eq 'ok') {
         $new_name = $w{window}{gui}{entry1}->get_chars(0, -1);
@@ -1643,7 +1679,7 @@ sub _wAddRenameNode {
         $new_title = $w{window}{gui}{entry2}->get_chars(0, -1);
     }
 
-    $w{window}{data}->destroy;
+    $w{window}{data}->destroy();
     while (Gtk3::events_pending) {
         Gtk3::main_iteration;
     }
@@ -1657,7 +1693,7 @@ sub _wPopUpMenu {
     my $below = shift // '0';
     my $ref = shift // '0';
 
-    if (defined $WIDGET_POPUP && $WIDGET_POPUP->get_visible) {
+    if (defined $WIDGET_POPUP && $WIDGET_POPUP->get_visible()) {
         return 1;
     }
 
@@ -1672,7 +1708,7 @@ sub _wPopUpMenu {
     my $actions = Gtk3::ActionGroup->new('Actions');
     $actions->add_actions(\@array, undef);
 
-    my $ui = Gtk3::UIManager->new;
+    my $ui = Gtk3::UIManager->new();
     $ui->set_add_tearoffs(1);
     $ui->insert_action_group($actions, 0);
 
@@ -1685,7 +1721,7 @@ sub _wPopUpMenu {
     }
 
     $WIDGET_POPUP = $ui->get_widget('/Menu');
-    $WIDGET_POPUP->show_all;
+    $WIDGET_POPUP->show_all();
     if ($ref) {
         return $WIDGET_POPUP;
     }
@@ -1709,6 +1745,10 @@ sub _wPopUpMenu {
             my $sensitive = $$m{sensitive} // 1;
             my $tooltip = $$m{tooltip} // '';
 
+            if (!$$m{shortcut}) {
+                $$m{shortcut} = '';
+            }
+
             my $label_orig =  __text($label);
             $label =~ s/\//__backslash__/go;
             my $pre_path = $path;
@@ -1751,9 +1791,9 @@ sub _wPopUpMenu {
 
     sub _pos {
         my $h = $_[0]->size_request->height;
-        my $ymax = $event->get_screen->get_height;
-        my ($x, $y) = $event->window->get_origin;
-        my $dy = $event->window->get_height;
+        my $ymax = $event->get_screen()->get_height();
+        my ($x, $y) = $event->window->get_origin();
+        my $dy = $event->window->get_height();
 
         # Over the event widget
         if ($dy + $y + $h > $ymax) {
@@ -1774,32 +1814,53 @@ sub _wMessage {
     my $window = shift;
     my $msg = shift;
     my $modal = shift // 1;
+    my $selectable = shift // 0;
+    my $class =  shift // 'w-warning';
+    my $msg_type = 'GTK_MESSAGE_WARNING';
 
-    # Why no Gtk3::MessageDialog->new_with_markup() available??
+    if (defined $window && ref $window ne 'Gtk3::Window') {
+        print STDERR "WARN: Wrong parent parameter received _wMessage ",ref $window,"\n";
+        undef $window;
+    }
+    if (!$window) {
+        $window = $PACMain::FUNCS{_MAIN}{_GUI}{main};
+    }
+    if ($msg =~ /error/i) {
+        $msg_type = 'GTK_MESSAGE_ERROR';
+        $class = 'w-error';
+    }
     my $windowConfirm = Gtk3::MessageDialog->new(
         $window,
         'GTK_DIALOG_DESTROY_WITH_PARENT',
-        'GTK_MESSAGE_INFO',
+        $msg_type,
         'none',
         ''
     );
-    if (!$window) {
-        $window = $PACMain::FUNCS{_MAIN}{_GUI}{main};
-    }
+    $windowConfirm->set_decorated(0);
+    $windowConfirm->get_style_context()->add_class($class);
     $windowConfirm->set_markup($msg);
-    $windowConfirm->set_icon_name('pac-app-big');
-    $windowConfirm->set_title("$APPNAME (v$APPVERSION) : Message");
-    $windowConfirm->set_transient_for($window);
+    $windowConfirm->set_icon_name('asbru-app-big');
+    $windowConfirm->set_title("$APPNAME : Message");
+
+    # The message can be selected by user (eg for copy/paste)
+    if ($selectable) {
+        $windowConfirm->get_message_area()->foreach(sub {
+            my $child = shift;
+            if (ref($child) eq 'Gtk3::Label') {
+                $child->set_selectable(1);
+            }
+        });
+    }
 
     if ($modal) {
         $windowConfirm->add_buttons('gtk-ok' => 'ok');
-        $windowConfirm->show_all;
-        my $close = $windowConfirm->run;
-        $windowConfirm->destroy;
+        $windowConfirm->show_all();
+        my $close = $windowConfirm->run();
+        $windowConfirm->destroy();
     } else {
-        $windowConfirm->show_all;
-        while (Gtk3::events_pending) {
-            Gtk3::main_iteration;
+        $windowConfirm->show_all();
+        while (Gtk3::events_pending()) {
+            Gtk3::main_iteration();
         }
     }
 
@@ -1815,10 +1876,10 @@ sub _wProgress {
     $WINDOWPROGRESS{_RET} = 1;
 
     if (! defined $WINDOWPROGRESS{_GUI}) {
-        $WINDOWPROGRESS{_GUI} = Gtk3::Window->new;
+        $WINDOWPROGRESS{_GUI} = Gtk3::Window->new();
 
         $WINDOWPROGRESS{_GUI}->set_position('center');
-        $WINDOWPROGRESS{_GUI}->set_icon_name('pac-app-big');
+        $WINDOWPROGRESS{_GUI}->set_icon_name('asbru-app-big');
         $WINDOWPROGRESS{_GUI}->set_size_request('400', '150');
         $WINDOWPROGRESS{_GUI}->set_resizable(0);
         if (defined $window) {
@@ -1829,13 +1890,13 @@ sub _wProgress {
         $WINDOWPROGRESS{vbox} = Gtk3::VBox->new(0, 0);
         $WINDOWPROGRESS{_GUI}->add($WINDOWPROGRESS{vbox});
 
-        $WINDOWPROGRESS{lbl1} = Gtk3::Label->new;
+        $WINDOWPROGRESS{lbl1} = Gtk3::Label->new();
         $WINDOWPROGRESS{vbox}->pack_start($WINDOWPROGRESS{lbl1}, 0, 1, 5);
 
-        $WINDOWPROGRESS{pb} = Gtk3::ProgressBar->new;
+        $WINDOWPROGRESS{pb} = Gtk3::ProgressBar->new();
         $WINDOWPROGRESS{vbox}->pack_start($WINDOWPROGRESS{pb}, 1, 1, 5);
 
-        $WINDOWPROGRESS{sep} = Gtk3::HSeparator->new;
+        $WINDOWPROGRESS{sep} = Gtk3::HSeparator->new();
         $WINDOWPROGRESS{vbox}->pack_start($WINDOWPROGRESS{sep}, 0, 1, 5);
 
         $WINDOWPROGRESS{btnCancel} = Gtk3::Button->new_from_stock('gtk-cancel');
@@ -1844,12 +1905,12 @@ sub _wProgress {
         $WINDOWPROGRESS{_GUI}->signal_connect('delete_event' => sub {return 1;});
         $WINDOWPROGRESS{btnCancel}->signal_connect('clicked' => sub {
             $WINDOWPROGRESS{_RET} = 0;
-            $WINDOWPROGRESS{_GUI}->hide;
+            $WINDOWPROGRESS{_GUI}->hide();
             return 1;
         });
     }
 
-    $WINDOWPROGRESS{_GUI}->set_icon_name('pac-app-big');
+    $WINDOWPROGRESS{_GUI}->set_icon_name('asbru-app-big');
     $WINDOWPROGRESS{_GUI}->set_title("$APPNAME (v$APPVERSION) : $title");
 
     if ($progress) {
@@ -1859,12 +1920,12 @@ sub _wProgress {
         $WINDOWPROGRESS{pb}->set_text($msg);
         $WINDOWPROGRESS{pb}->set_fraction($partial / $total);
 
-        $WINDOWPROGRESS{_GUI}->show_all;
-        while (Gtk3::events_pending) {
-            Gtk3::main_iteration;
+        $WINDOWPROGRESS{_GUI}->show_all();
+        while (Gtk3::events_pending()) {
+            Gtk3::main_iteration();
         }
     } else {
-        $WINDOWPROGRESS{_GUI}->hide;
+        $WINDOWPROGRESS{_GUI}->hide();
     }
 
     return $WINDOWPROGRESS{_RET};
@@ -1873,8 +1934,19 @@ sub _wProgress {
 sub _wConfirm {
     my $window = shift;
     my $msg = shift;
+    my $default = shift // 'no';
 
+    if (!$window) {
+        $window = $PACMain::FUNCS{_MAIN}{_GUI}{main};
+    }
     # Why no Gtk3::MessageDialog->new_with_markup() available??
+    if (defined $window && ref $window ne 'Gtk3::Window') {
+        print STDERR "WARN: Wrong parent parameter received _wMessage ",ref $window,"\n";
+        undef $window;
+    }
+    if (!$window) {
+        $window = $PACMain::FUNCS{_MAIN}{_GUI}{main};
+    }
     my $windowConfirm = Gtk3::MessageDialog->new(
         $window,
         'GTK_DIALOG_DESTROY_WITH_PARENT',
@@ -1882,18 +1954,17 @@ sub _wConfirm {
         'none',
         ''
     );
-    if (!$window) {
-        $window = $PACMain::FUNCS{_MAIN}{_GUI}{main};
-    }
+    $windowConfirm->set_decorated(0);
+    $windowConfirm->get_style_context()->add_class('w-confirm');
     $windowConfirm->set_markup($msg);
-    $windowConfirm->add_buttons('gtk-cancel'=> 'no','gtk-ok' => 'yes');
-    $windowConfirm->set_icon_name('pac-app-big');
-    $windowConfirm->set_title("Confirm action : $APPNAME (v$APPVERSION)");
-    $windowConfirm->set_transient_for($window);
+    $windowConfirm->add_buttons('gtk-cancel'=> 'no', 'gtk-ok' => 'yes');
+    $windowConfirm->set_icon_name('asbru-app-big');
+    $windowConfirm->set_title("Confirm action : $APPNAME");
+    $windowConfirm->set_default_response($default);
 
-    $windowConfirm->show_all;
-    my $close = $windowConfirm->run;
-    $windowConfirm->destroy;
+    $windowConfirm->show_all();
+    my $close = $windowConfirm->run();
+    $windowConfirm->destroy();
 
     return ($close eq 'yes');
 }
@@ -1903,6 +1974,9 @@ sub _wYesNoCancel {
     my $msg = shift;
 
     # Why no Gtk3::MessageDialog->new_with_markup() available??
+    if (!$window) {
+        $window = $PACMain::FUNCS{_MAIN}{_GUI}{main};
+    }
     my $windowConfirm = Gtk3::MessageDialog->new(
         $window,
         'GTK_DIALOG_DESTROY_WITH_PARENT',
@@ -1910,18 +1984,16 @@ sub _wYesNoCancel {
         'none',
         ''
     );
-    if (!$window) {
-        $window = $PACMain::FUNCS{_MAIN}{_GUI}{main};
-    }
+    $windowConfirm->set_decorated(0);
+    $windowConfirm->get_style_context()->add_class('w-confirm');
     $windowConfirm->set_markup($msg);
     $windowConfirm->add_buttons('gtk-cancel'=> 'cancel','gtk-no'=> 'no','gtk-yes' => 'yes');
-    $windowConfirm->set_icon_name('pac-app-big');
-    $windowConfirm->set_title("Confirm action : $APPNAME (v$APPVERSION)");
-    $windowConfirm->set_transient_for($window);
+    $windowConfirm->set_icon_name('asbru-app-big');
+    $windowConfirm->set_title("Confirm action : $APPNAME");
 
-    $windowConfirm->show_all;
-    my $close = $windowConfirm->run;
-    $windowConfirm->destroy;
+    $windowConfirm->show_all();
+    my $close = $windowConfirm->run();
+    $windowConfirm->destroy();
 
     return (($close eq 'delete-event') || ($close eq 'cancel')) ? 'cancel' : $close;
 }
@@ -1932,7 +2004,7 @@ sub _wSetPACPassword {
 
     # Ask for old password
     if ($ask_old) {
-        my $old_pass = _wEnterValue($self, 'GUI Password Change', "Please, enter *OLD* GUI Password...", undef, 0, 'pac-protected');
+        my $old_pass = _wEnterValue($$self{_WINDOWCONFIG}, 'GUI Password Change', "Please, enter <b>OLD</b> GUI Password...", undef, 0, 'asbru-protected');
         if (!defined $old_pass) {
             return 0;
         }
@@ -1944,19 +2016,19 @@ sub _wSetPACPassword {
     }
 
     # Ask for new password
-    my $new_pass1 = _wEnterValue($self, '<b>GUI Password Change</b>', "Please, enter *NEW* GUI Password...", undef, 0, 'pac-protected');
+    my $new_pass1 = _wEnterValue($$self{_WINDOWCONFIG}, '<b>GUI Password Change</b>', "Please, enter <b>NEW</b> GUI Password...", undef, 0, 'asbru-protected');
     if (!defined $new_pass1) {
         return 0;
     }
 
     # Re-type new password
-    my $new_pass2 = _wEnterValue($self, '<b>GUI Password Change</b>', "Please, repeat *NEW* GUI Password...", undef, 0, 'pac-protected');
+    my $new_pass2 = _wEnterValue($$self{_WINDOWCONFIG}, '<b>GUI Password Change</b>', "Please, <b>confirm NEW</b> GUI Password...", undef, 0, 'asbru-protected');
     if (!defined $new_pass2) {
         return 0;
     }
 
     if ($new_pass1 ne $new_pass2) {
-        _wMessage($$self{_WINDOWCONFIG}, '<b>ERROR</b>: Provided <b>NEW</b> passwords <span foreground="red"><b>DO NOT MATCH</b></span>!!!');
+        _wMessage($$self{_WINDOWCONFIG}, '<b>ERROR</b>: Provided <b>NEW</b> passwords <span color="red"><b>DO NOT MATCH</b></span>!!!');
         return 0;
     }
 
@@ -1972,11 +2044,13 @@ sub _cfgSanityCheck {
     defined $$cfg{'defaults'} or $$cfg{'defaults'} = {};
 
     $$cfg{'defaults'}{'version'} //= $APPVERSION;
+    $$cfg{'defaults'}{'config version'} //= 1;
     #$$cfg{'defaults'}{'config location'} //= $ENV{"ASBRU_CFG"};
     $$cfg{'defaults'}{'auto accept key'} //= 1;
     $$cfg{'defaults'}{'show screenshots'} //= 1;
     $$cfg{'defaults'}{'back color'} //= '#000000000000';
     $$cfg{'defaults'}{'close terminal on disconnect'} //= '';
+    $$cfg{'defaults'}{'max retry on disconnect'} //= 50;
     $$cfg{'defaults'}{'close to tray'} //= 0;
     $$cfg{'defaults'}{'color black'} //= '#000000000000';
     $$cfg{'defaults'}{'color blue'} //=  '#34346565a4a4';
@@ -1994,12 +2068,12 @@ sub _cfgSanityCheck {
     $$cfg{'defaults'}{'color red'} //=  '#cccc00000000';
     $$cfg{'defaults'}{'color white'} //=  '#d3d3d7d7cfcf';
     $$cfg{'defaults'}{'color yellow'} //=  '#c4c4a0a00000';
-    $$cfg{'defaults'}{'command prompt'} //= '[#%\$>]|\:\/\s*$';
-    $$cfg{'defaults'}{'username prompt'} //= '([lL]ogin|[uU]suario|([uU]ser-?)*[nN]ame.*|[uU]ser)\s*:\s*$';
-    $$cfg{'defaults'}{'password prompt'} //= '([pP]ass|[pP]ass[wW]or[dt](\s+for\s+|\w+@\w+)*|[cC]ontrase.a|Enter passphrase for key \'.+\')\s*:\s*$';
-    $$cfg{'defaults'}{'hostkey changed prompt'} //= '^.+ontinue connecting \(([^/]+)\/([^/]+)(?:[^)]+)?\)\?\s*$';
-    $$cfg{'defaults'}{'press any key prompt'} //= '.*(any key to continue|tecla para continuar).*';
-    $$cfg{'defaults'}{'remote host changed prompt'} //= '.*ffending .*key in (.+?)\:(\d+).*';
+    $$cfg{'defaults'}{'command prompt'} //= $DEFAULT_COMMAND_PROMPT;
+    $$cfg{'defaults'}{'username prompt'} //= $DEFAULT_USERNAME_PROMPT;
+    $$cfg{'defaults'}{'password prompt'} //= $DEFAULT_PASSWORD_PROMPT;
+    $$cfg{'defaults'}{'hostkey changed prompt'} //= $DEFAULT_HOSTKEYCHANGED_PROMPT;
+    $$cfg{'defaults'}{'press any key prompt'} //= $DEFAULT_PRESSANYKEY_PROMPT;
+    $$cfg{'defaults'}{'remote host changed prompt'} //= $DEFAULT_REMOTEHOSTCHANGED_PROMPT;
     $$cfg{'defaults'}{'sudo prompt'} //= '[__PAC__SUDO__PROMPT__]';
     $$cfg{'defaults'}{'sudo password'} //= '<<ASK_PASS>>';
     $$cfg{'defaults'}{'sudo show password'} //= 0;
@@ -2010,8 +2084,6 @@ sub _cfgSanityCheck {
     $$cfg{'defaults'}{'auto hide button bar'}     //= 0;
     $$cfg{'defaults'}{'hide on connect'} //= 0;
     $$cfg{'defaults'}{'force split tabs to 50%'} //= 0;
-    $$cfg{'defaults'}{'ping port before connect'} //= 0;
-    $$cfg{'defaults'}{'ping port timeout'} //= 1;
     $$cfg{'defaults'}{'open connections in tabs'} //= 1;
     $$cfg{'defaults'}{'proxy ip'} //= '';
     $$cfg{'defaults'}{'proxy pass'} //= '';
@@ -2032,6 +2104,7 @@ sub _cfgSanityCheck {
     $$cfg{'defaults'}{'show global commands box'} //= 0;
     $$cfg{'defaults'}{'terminal backspace'} //= 'auto';
     $$cfg{'defaults'}{'terminal transparency'} //= 0;
+    $$cfg{'defaults'}{'terminal support transparency'} //= $$cfg{'defaults'}{'terminal transparency'} > 0;
     $$cfg{'defaults'}{'terminal font'} //= 'Monospace 9';
     $$cfg{'defaults'}{'terminal character encoding'} //= 'UTF-8';
     $$cfg{'defaults'}{'terminal scrollback lines'} //= 5000;
@@ -2053,8 +2126,6 @@ sub _cfgSanityCheck {
     $$cfg{'defaults'}{'save session logs'} //= 0;
     $$cfg{'defaults'}{'session log pattern'} //= '<UUID>_<NAME>_<DATE_Y><DATE_M><DATE_D>_<TIME_H><TIME_M><TIME_S>.txt';
     $$cfg{'defaults'}{'session logs folder'} //= "$CFG_DIR/session_logs";
-    # TODO : Remove, this is from a previous migration path
-    #$$cfg{'defaults'}{'session logs folder'} =~ s/\/\.pac\//\/\.config\/pac\//g;
     $$cfg{'defaults'}{'session logs amount'} //= 10;
     $$cfg{'defaults'}{'screenshots external viewer'} //= '/usr/bin/xdg-open';
     $$cfg{'defaults'}{'screenshots use external viewer'}//= 0;
@@ -2065,6 +2136,7 @@ sub _cfgSanityCheck {
     $$cfg{'defaults'}{'confirm chains'} //= 1;
     $$cfg{'defaults'}{'skip first chain expect'} //= 1;
     $$cfg{'defaults'}{'enable tree lines'} //= 0;
+    $$cfg{'defaults'}{'show tree titles'} //= 1;
     #DevNote: option currently disabled
     $$cfg{'defaults'}{'check versions at start'} //= 0;
     $$cfg{'defaults'}{'show statistics'} //= 1;
@@ -2078,10 +2150,6 @@ sub _cfgSanityCheck {
         $$cfg{'defaults'}{'gui password'} //= '';
     }
     $$cfg{'defaults'}{'use gui password tray'} //= 0;
-    $$cfg{'defaults'}{'disable CTRL key bindings'} //= 0;
-    $$cfg{'defaults'}{'disable SHIFT key bindings'} //= 0;
-    $$cfg{'defaults'}{'disable ALT key bindings'} //= 0;
-    $$cfg{'defaults'}{'prevent F11'} //= 0;
     $$cfg{'defaults'}{'autostart shell upon start'} //= 0;
     $$cfg{'defaults'}{'tree on right side'} //= 0;
     $$cfg{'defaults'}{'prevent mouse over show tree'} //= 1;
@@ -2092,11 +2160,9 @@ sub _cfgSanityCheck {
     $$cfg{'defaults'}{'info font'} //= 'monospace';
     $$cfg{'defaults'}{'use login shell to connect'} //= 0;
     $$cfg{'defaults'}{'audible bell'} //= 0;
-    $$cfg{'defaults'}{'ctrl tab'} //= 'last';
     $$cfg{'defaults'}{'append group name'} //= 1;
     $$cfg{'defaults'}{'when no more tabs'} //= 0;
     $$cfg{'defaults'}{'selection to clipboard'} //= 1;
-    $$cfg{'defaults'}{'how to switch tabs'} //= 0;
     $$cfg{'defaults'}{'remove control chars'} //= 0;
     $$cfg{'defaults'}{'allow more instances'} //= 0;
     $$cfg{'defaults'}{'show favourites in unity'} //= 0;
@@ -2108,28 +2174,10 @@ sub _cfgSanityCheck {
     $$cfg{'defaults'}{'remote commands'} //= [];
     $$cfg{'defaults'}{'auto cluster'} //= {};
 
-    if (! defined $$cfg{'defaults'}{'keepass'} && -f "$ENV{'HOME'}/.config/keepassx/config.ini") {
-        open (F,"<:utf8","$ENV{'HOME'}/.config/keepassx/config.ini");
-        my @conf = <F>;
-        close F;
-        my ($lastfile) = grep(/^LastFile\=(.+)/, @conf);
-        if (defined $lastfile) {
-            $lastfile =~ s/^LastFile\=\.+\/+(.+)$/$1/gio; chomp $lastfile;
-            $$cfg{'defaults'}{'keepass'}{'database'} = "$ENV{'HOME'}/$lastfile";
-            $$cfg{'defaults'}{'keepass'}{'password'} = '';
-            $$cfg{'defaults'}{'keepass'}{'use_keepass'} = 0;
-            $$cfg{'defaults'}{'keepass'}{'ask_user'} = 1;
-        }
-    } elsif (! defined $$cfg{'defaults'}{'keepass'}) {
+    if (!defined $$cfg{'defaults'}{'keepass'}) {
         $$cfg{'defaults'}{'keepass'}{'database'} = '';
         $$cfg{'defaults'}{'keepass'}{'password'} = '';
         $$cfg{'defaults'}{'keepass'}{'use_keepass'} = 0;
-        $$cfg{'defaults'}{'keepass'}{'ask_user'} = 1;
-    } else {
-        $$cfg{'defaults'}{'keepass'}{'database'} //= '';
-        $$cfg{'defaults'}{'keepass'}{'password'} //= '';
-        $$cfg{'defaults'}{'keepass'}{'use_keepass'} //= 0;
-        $$cfg{'defaults'}{'keepass'}{'ask_user'} //= 1;
     }
 
     $$cfg{'tmp'}{'changed'} = 0;
@@ -2160,11 +2208,15 @@ sub _cfgSanityCheck {
     $$cfg{'environments'}{'__PAC_SHELL__'}{'session logs amount'} = 10;
     $$cfg{'environments'}{'__PAC_SHELL__'}{'use prepend command'} = 0;
     $$cfg{'environments'}{'__PAC_SHELL__'}{'prepend command'} = '';
+    $$cfg{'environments'}{'__PAC_SHELL__'}{'use postpend command'} = 0;
+    $$cfg{'environments'}{'__PAC_SHELL__'}{'postpend command'} = '';
     $$cfg{'environments'}{'__PAC_SHELL__'}{'quote command'} = 0;
+    $$cfg{'environments'}{'__PAC_SHELL__'}{'quotepost command'} = 0;
     $$cfg{'environments'}{'__PAC_SHELL__'}{'send string active'} = 0;
     $$cfg{'environments'}{'__PAC_SHELL__'}{'send string txt'} = '';
     $$cfg{'environments'}{'__PAC_SHELL__'}{'send string intro'} = 1;
     $$cfg{'environments'}{'__PAC_SHELL__'}{'send string every'} = 60;
+    $$cfg{'environments'}{'__PAC_SHELL__'}{'send string only when idle'} = 0;
     $$cfg{'environments'}{'__PAC_SHELL__'}{'embed'} = 0;
     $$cfg{'environments'}{'__PAC_SHELL__'}{'mac'} = '';
     $$cfg{'environments'}{'__PAC_SHELL__'}{'autoreconnect'} = 0;
@@ -2185,16 +2237,16 @@ sub _cfgSanityCheck {
     $$cfg{'environments'}{'__PAC_SHELL__'}{'terminal options'}{'use tab back color'} //= 0;
     $$cfg{'environments'}{'__PAC_SHELL__'}{'terminal options'}{'tab back color'} //= '#000000000000'; # Black
     $$cfg{'environments'}{'__PAC_SHELL__'}{'terminal options'}{'back color'} //= '#000000000000'; # Black
-    $$cfg{'environments'}{'__PAC_SHELL__'}{'terminal options'}{'command prompt'} //= '(\]\#|\$\s)+';
-    $$cfg{'environments'}{'__PAC_SHELL__'}{'terminal options'}{'username prompt'} //= '([lL]ogin|[uU]suario|[uU]ser-?[nN]ame|[uU]ser):\s*$';
-    $$cfg{'environments'}{'__PAC_SHELL__'}{'terminal options'}{'password prompt'} //= '([pP]ass|[pP]ass[wW]or[dt](\s+for\s+|\w+@\w+)*|[cC]ontrase.a|Enter passphrase for key \'.+\')\s*:\s*$';
+    $$cfg{'environments'}{'__PAC_SHELL__'}{'terminal options'}{'command prompt'} //= $DEFAULT_COMMAND_PROMPT;
+    $$cfg{'environments'}{'__PAC_SHELL__'}{'terminal options'}{'username prompt'} //= $DEFAULT_USERNAME_PROMPT;
+    $$cfg{'environments'}{'__PAC_SHELL__'}{'terminal options'}{'password prompt'} //= $DEFAULT_PASSWORD_PROMPT;
     $$cfg{'environments'}{'__PAC_SHELL__'}{'terminal options'}{'cursor shape'} //= 'block';
     $$cfg{'environments'}{'__PAC_SHELL__'}{'terminal options'}{'open in tab'} //= 1;
     $$cfg{'environments'}{'__PAC_SHELL__'}{'terminal options'}{'terminal font'} //= 'Monospace 9';
     $$cfg{'environments'}{'__PAC_SHELL__'}{'terminal options'}{'terminal backspace'} //= 'auto';
     $$cfg{'environments'}{'__PAC_SHELL__'}{'terminal options'}{'terminal select words'} //= '-.:_/';
     $$cfg{'environments'}{'__PAC_SHELL__'}{'terminal options'}{'terminal character encoding'} //= 'UTF-8';
-    $$cfg{'environments'}{'__PAC_SHELL__'}{'terminal options'}{'terminal scrollback lines'} //= 5000;
+    $$cfg{'environments'}{'__PAC_SHELL__'}{'terminal options'}{'terminal scrollback lines'} //= -2;
     $$cfg{'environments'}{'__PAC_SHELL__'}{'terminal options'}{'terminal transparency'} //= 0;
     $$cfg{'environments'}{'__PAC_SHELL__'}{'terminal options'}{'terminal window hsize'} //= 800;
     $$cfg{'environments'}{'__PAC_SHELL__'}{'terminal options'}{'terminal window vsize'} //= 600;
@@ -2204,9 +2256,6 @@ sub _cfgSanityCheck {
     $$cfg{'environments'}{'__PAC_SHELL__'}{'terminal options'}{'timeout command'} //= 40;
     $$cfg{'environments'}{'__PAC_SHELL__'}{'terminal options'}{'timeout connect'} //= 40;
     $$cfg{'environments'}{'__PAC_SHELL__'}{'terminal options'}{'use personal settings'} //= 0;
-    $$cfg{'environments'}{'__PAC_SHELL__'}{'terminal options'}{'disable CTRL key bindings'} //= 0;
-    $$cfg{'environments'}{'__PAC_SHELL__'}{'terminal options'}{'disable ALT key bindings'} //= 0;
-    $$cfg{'environments'}{'__PAC_SHELL__'}{'terminal options'}{'disable SHIFT key bindings'} //= 0;
     $$cfg{'environments'}{'__PAC_SHELL__'}{'terminal options'}{'audible bell'} //= 0;
 
     foreach my $uuid (keys %{$$cfg{'environments'}}) {
@@ -2243,7 +2292,7 @@ sub _cfgSanityCheck {
 
             # TODO : Remove, this is from a previous migration path
             #foreach (@{$$cfg{'environments'}{$uuid}{'screenshots'}}) {
-            #    $_ =~ s/\/\.pac\//\/\.config\/pac\//g;
+            #    $_ =~ s/\/\.pac\//\/\.config\/asbru\//g;
             #}
 
             next;
@@ -2320,16 +2369,18 @@ sub _cfgSanityCheck {
         $$cfg{'environments'}{$uuid}{'save session logs'} //= 0;
         $$cfg{'environments'}{$uuid}{'session log pattern'} //= '<UUID>_<NAME>_<DATE_Y><DATE_M><DATE_D>_<TIME_H><TIME_M><TIME_S>.txt';
         $$cfg{'environments'}{$uuid}{'session logs folder'} //= "$CFG_DIR/session_logs";
-        # TODO : Remove, this is from a previous migration path
-        #$$cfg{'environments'}{$uuid}{'session logs folder'} =~ s/\/\.pac\//\/\.config\/pac\//g;
         $$cfg{'environments'}{$uuid}{'session logs amount'} //= 10;
         $$cfg{'environments'}{$uuid}{'use prepend command'} //= 0;
         $$cfg{'environments'}{$uuid}{'prepend command'} //= '';
+        $$cfg{'environments'}{$uuid}{'use postpend command'} //= 0;
+        $$cfg{'environments'}{$uuid}{'postpend command'} //= '';
         $$cfg{'environments'}{$uuid}{'quote command'} //= 0;
+        $$cfg{'environments'}{$uuid}{'quotepost command'} //= 0;
         $$cfg{'environments'}{$uuid}{'send string active'} //= 0;
         $$cfg{'environments'}{$uuid}{'send string txt'} //= '';
         $$cfg{'environments'}{$uuid}{'send string intro'} //= 1;
         $$cfg{'environments'}{$uuid}{'send string every'} //= 60;
+        $$cfg{'environments'}{$uuid}{'send string only when idle'} //= 0;
         $$cfg{'environments'}{$uuid}{'embed'} //= 0;
         $$cfg{'environments'}{$uuid}{'mac'} //= '';
         $$cfg{'environments'}{$uuid}{'autoreconnect'} //= 0;
@@ -2370,7 +2421,7 @@ sub _cfgSanityCheck {
         } else {
             # TODO : Remove, this is from a previous migration path
             #foreach (@{$$cfg{'environments'}{$uuid}{'screenshots'}}) {
-            #    $_ =~ s/\/\.pac\//\/\.config\/pac\//g;
+            #    $_ =~ s/\/\.pac\//\/\.config\/asbru\//g;
             #}
             if (defined $$cfg{'environments'}{$uuid}{'screenshot'}) {
                 delete $$cfg{'environments'}{$uuid}{'screenshot'};
@@ -2483,16 +2534,16 @@ sub _cfgSanityCheck {
             $$cfg{'environments'}{$uuid}{'terminal options'}{'use tab back color'} = 0;
             $$cfg{'environments'}{$uuid}{'terminal options'}{'tab back color'} = '#000000000000'; # Black
             $$cfg{'environments'}{$uuid}{'terminal options'}{'back color'} = '#000000000000'; # Black
-            $$cfg{'environments'}{$uuid}{'terminal options'}{'command prompt'} = '[#%\$>]|\:\/\s*$';
-            $$cfg{'environments'}{$uuid}{'terminal options'}{'username prompt'} = '([lL]ogin|[uU]suario|[uU]ser-?[nN]ame|[uU]ser):\s*$';
-            $$cfg{'environments'}{$uuid}{'terminal options'}{'password prompt'} = '([pP]ass|[pP]ass[wW]or[dt](\s+for\s+|\w+@\w+)*|[cC]ontrase.a|Enter passphrase for key \'.+\')\s*:\s*$';
+            $$cfg{'environments'}{$uuid}{'terminal options'}{'command prompt'} = $DEFAULT_COMMAND_PROMPT;
+            $$cfg{'environments'}{$uuid}{'terminal options'}{'username prompt'} = $DEFAULT_USERNAME_PROMPT;
+            $$cfg{'environments'}{$uuid}{'terminal options'}{'password prompt'} = $DEFAULT_PASSWORD_PROMPT;
             $$cfg{'environments'}{$uuid}{'terminal options'}{'cursor shape'}  = 'block';
             $$cfg{'environments'}{$uuid}{'terminal options'}{'open in tab'} = 1;
             $$cfg{'environments'}{$uuid}{'terminal options'}{'terminal font'} = 'Monospace 9';
             $$cfg{'environments'}{$uuid}{'terminal options'}{'terminal select words'} = '-.:_/';
             $$cfg{'environments'}{$uuid}{'terminal options'}{'terminal backspace'} = 'auto';
             $$cfg{'environments'}{$uuid}{'terminal options'}{'terminal character encoding'} = 'UTF-8';
-            $$cfg{'environments'}{$uuid}{'terminal options'}{'terminal scrollback lines'} = 5000;
+            $$cfg{'environments'}{$uuid}{'terminal options'}{'terminal scrollback lines'} = -2;
             $$cfg{'environments'}{$uuid}{'terminal options'}{'terminal transparency'} = 0;
             $$cfg{'environments'}{$uuid}{'terminal options'}{'terminal window hsize'} = 800;
             $$cfg{'environments'}{$uuid}{'terminal options'}{'terminal window vsize'} = 600;
@@ -2502,23 +2553,20 @@ sub _cfgSanityCheck {
             $$cfg{'environments'}{$uuid}{'terminal options'}{'timeout command'} = 40;
             $$cfg{'environments'}{$uuid}{'terminal options'}{'timeout connect'} = 40;
             $$cfg{'environments'}{$uuid}{'terminal options'}{'use personal settings'} = 0;
-            $$cfg{'environments'}{$uuid}{'terminal options'}{'disable CTRL key bindings'} = 0;
-            $$cfg{'environments'}{$uuid}{'terminal options'}{'disable ALT key bindings'} = 0;
-            $$cfg{'environments'}{$uuid}{'terminal options'}{'disable SHIFT key bindings'} = 0;
         } else {
             $$cfg{'environments'}{$uuid}{'terminal options'}{'use tab back color'} //= 0;
             $$cfg{'environments'}{$uuid}{'terminal options'}{'tab back color'} //= '#000000000000'; # Black
             $$cfg{'environments'}{$uuid}{'terminal options'}{'back color'} //= '#000000000000'; # Black
-            $$cfg{'environments'}{$uuid}{'terminal options'}{'command prompt'} //= '(\]\#|\$\s)+';
-            $$cfg{'environments'}{$uuid}{'terminal options'}{'username prompt'} //= '([lL]ogin|[uU]suario|[uU]ser-?[nN]ame|[uU]ser):\s*$';
-            $$cfg{'environments'}{$uuid}{'terminal options'}{'password prompt'} //= '([pP]ass|[pP]ass[wW]or[dt](\s+for\s+|\w+@\w+)*|[cC]ontrase.a|Enter passphrase for key \'.+\')\s*:\s*$';
+            $$cfg{'environments'}{$uuid}{'terminal options'}{'command prompt'} //= $DEFAULT_COMMAND_PROMPT;
+            $$cfg{'environments'}{$uuid}{'terminal options'}{'username prompt'} //= $DEFAULT_USERNAME_PROMPT;
+            $$cfg{'environments'}{$uuid}{'terminal options'}{'password prompt'} //= $DEFAULT_PASSWORD_PROMPT;
             $$cfg{'environments'}{$uuid}{'terminal options'}{'cursor shape'} //= 'block';
             $$cfg{'environments'}{$uuid}{'terminal options'}{'open in tab'} //= 1;
             $$cfg{'environments'}{$uuid}{'terminal options'}{'terminal font'} //= 'Monospace 9';
             $$cfg{'environments'}{$uuid}{'terminal options'}{'terminal select words'} //= '-.:_/';
             $$cfg{'environments'}{$uuid}{'terminal options'}{'terminal backspace'} //= 'auto';
             $$cfg{'environments'}{$uuid}{'terminal options'}{'terminal character encoding'} //= 'UTF-8';
-            $$cfg{'environments'}{$uuid}{'terminal options'}{'terminal scrollback lines'} //= 5000;
+            $$cfg{'environments'}{$uuid}{'terminal options'}{'terminal scrollback lines'} //= -2;
             $$cfg{'environments'}{$uuid}{'terminal options'}{'terminal transparency'} //= 0;
             $$cfg{'environments'}{$uuid}{'terminal options'}{'terminal window hsize'} //= 800;
             $$cfg{'environments'}{$uuid}{'terminal options'}{'terminal window vsize'} //= 600;
@@ -2528,9 +2576,6 @@ sub _cfgSanityCheck {
             $$cfg{'environments'}{$uuid}{'terminal options'}{'timeout command'} //= 40;
             $$cfg{'environments'}{$uuid}{'terminal options'}{'timeout connect'} //= 40;
             $$cfg{'environments'}{$uuid}{'terminal options'}{'use personal settings'} //= 0;
-            $$cfg{'environments'}{$uuid}{'terminal options'}{'disable CTRL key bindings'} //= 0;
-            $$cfg{'environments'}{$uuid}{'terminal options'}{'disable ALT key bindings'} //= 0;
-            $$cfg{'environments'}{$uuid}{'terminal options'}{'disable SHIFT key bindings'} //= 0;
             $$cfg{'environments'}{$uuid}{'terminal options'}{'audible bell'} //= 0;
         }
     }
@@ -2538,6 +2583,28 @@ sub _cfgSanityCheck {
     return 1;
 }
 
+sub _cfgGetTmpSessions {
+    my $cfg = shift;
+    my %tmp;
+
+    foreach my $uuid (keys %{$$cfg{'environments'}}) {
+        if ($uuid =~ /^(HASH|_tmp_|pacshell_PID)/go) {
+            $tmp{$uuid} = $$cfg{'environments'}{$uuid};
+        }
+    }
+
+    return %tmp;
+}
+
+sub _cfgAddSessions {
+    my $cfg = shift;
+    my $tmp = shift;
+
+    foreach my $uuid (keys %{$tmp}) {
+        $$cfg{'environments'}{$uuid} = $tmp->{$uuid};
+    }
+}
+
 sub _updateSSHToIPv6 {
     my $cmd_line = shift // '';
 
@@ -2645,12 +2712,14 @@ sub _updateSSHToIPv6 {
 sub _cipherCFG {
     my $cfg = shift;
 
+    if (!$CIPHER->salt()) {
+        $CIPHER->salt(pack('Q',$SALT));
+    }
     foreach my $var (keys %{$$cfg{'defaults'}{'global variables'}}) {
         if ($$cfg{'defaults'}{'global variables'}{$var}{'hidden'} eq '1') {
             $$cfg{'defaults'}{'global variables'}{$var}{'value'} = $CIPHER->encrypt_hex(encode('UTF-8',$$cfg{'defaults'}{'global variables'}{$var}{'value'}));
         }
     }
-
     if (defined $$cfg{'defaults'}{'keepass'}) {
         $$cfg{'defaults'}{'keepass'}{'password'} = $CIPHER->encrypt_hex(encode('UTF-8',$$cfg{'defaults'}{'keepass'}{'password'}));
     }
@@ -2688,6 +2757,9 @@ sub _decipherCFG {
     my $cfg = shift;
     my $single_uuid = shift // 0;
 
+    if (!$CIPHER->salt()) {
+        $CIPHER->salt(pack('Q',$SALT));
+    }
     if (! $single_uuid) {
         foreach my $var (keys %{$$cfg{'defaults'}{'global variables'}}) {
             if ($$cfg{'defaults'}{'global variables'}{$var}{'hidden'} eq '1') {
@@ -2792,133 +2864,57 @@ sub _substCFG {
     return 1;
 }
 
-# TODO : Looks like duplicate from pac_conn, can be reused?
 sub _subst {
     my $string = shift;
     my $CFG = shift;
     my $uuid = shift;
-
+    my $uuid_tmp = shift;
+    my $asbru_conn = shift;
+    my $kpxc = shift;
     my $ret = $string;
+    my %V = ();
     my %out;
     my $pos = -1;
+    my @LOCAL_VARS = ('UUID','SOCKS5_PORT','TIMESTAMP','DATE_Y','DATE_M','DATE_D','TIME_H','TIME_M','TIME_S','NAME','TITLE','IP','PORT','USER','PASS');
+    my $parent;
 
-    my $tstamp = time;
-    my ($dy, $dm, $dd, $th, $tm, $ts) = split('_', strftime("%Y_%m_%d_%H_%M_%S", localtime));
-    my ($name, $title, $ip, $user, $pass);
-    if (defined $uuid) {
-        if (!defined $$CFG{'environments'}{$uuid}) {
-            return;
+    if ($uuid) {
+        if (defined $PACMain::RUNNING{$uuid}{_PARENTWINDOW}) {
+            $parent = $PACMain::RUNNING{$uuid}{_PARENTWINDOW};
         }
-
-        $name = $$CFG{'environments'}{$uuid}{name};
-        $title = $$CFG{'environments'}{$uuid}{title};
-        $ip = $$CFG{'environments'}{$uuid}{ip};
-        $user = $$CFG{'environments'}{$uuid}{user};
-        $pass = $$CFG{'environments'}{$uuid}{pass};
-    }
-
-    if (defined $uuid) {
-        while ($string =~ /<UUID>/go) {
-            $string =~ s/<UUID>/$uuid/g; $ret = $string;
-        }
-    }
-    while ($string =~ /<TIMESTAMP>/go) {
-        $string =~ s/<TIMESTAMP>/$tstamp/g; $ret = $string;
-    }
-    while ($string =~ /<DATE_Y>/go) {
-        $string =~ s/<DATE_Y>/$dy/g; $ret = $string;
-    }
-    while ($string =~ /<DATE_M>/go) {
-        $string =~ s/<DATE_M>/$dm/g; $ret = $string;
-    }
-    while ($string =~ /<DATE_D>/go) {
-        $string =~ s/<DATE_D>/$dd/g; $ret = $string;
-    }
-    while ($string =~ /<TIME_H>/go) {
-        $string =~ s/<TIME_H>/$th/g; $ret = $string;
-    }
-    while ($string =~ /<TIME_M>/go) {
-        $string =~ s/<TIME_M>/$tm/g; $ret = $string;
-    }
-    while ($string =~ /<TIME_S>/go) {
-        $string =~ s/<TIME_S>/$ts/g; $ret = $string;
+    } else {
+        $parent = $PACMain::FUNCS{_MAIN}{_GUI}{main};
     }
     if (defined $uuid) {
-        while ($string =~ /<NAME>/go) {
-            $string =~ s/<NAME>/$name/g; $ret = $string;
-        }
-        while ($string =~ /<TITLE>/go) {
-            $string =~ s/<TITLE>/$title/g; $ret = $string;
-        }
-        while ($string =~ /<IP>/go) {
-            $string =~ s/<IP>/$ip/g; $ret = $string;
-        }
-        while ($string =~ /<USER>/go) {
-            $string =~ s/<USER>/$user/g; $ret = $string;
-        }
-        while ($string =~ /<PASS>/go) {
-            $string =~ s/<PASS>/$pass/g; $ret = $string;
+        if (!defined $$CFG{'environments'}{$uuid}) {
+            return $string;
         }
-    }
-
-    # Replace <KPXRE_GET_(title|username|password|url)_WHERE_(title|username|password|url)==(.+?)==> with KeePassX value
-    while ($string =~ /<KPXRE_GET_(title|username|password|url)_WHERE_(title|username|password|url)==(.+?)==>/go) {
-        my $what = $1;
-        my $where = $2;
-        my $var = $3;
-        my $regexp = qr/$var/;
-
-        if (! $$CFG{'defaults'}{'keepass'}{'use_keepass'}) {
-            msg("ERROR: KeePassX variable '@{[__($var)]}' can not be used because 'KeePassX' is not enabled under 'Preferences->KeePass Options'");
-            exit 1;
+        $V{'UUID'}  = $uuid;
+        $V{'NAME'}  = $$CFG{'environments'}{$uuid}{name};
+        $V{'TITLE'} = $$CFG{'environments'}{$uuid}{title};
+        $V{'IP'}    = $$CFG{'environments'}{$uuid}{ip};
+        $V{'PORT'}  = $$CFG{'environments'}{$uuid}{port};
+        if ($$CFG{'environments'}{$uuid}{'auth type'} eq 'publickey') {
+            $V{'USER'}  = $$CFG{'environments'}{$uuid}{'passphrase user'};
+            $V{'PASS'}  = $$CFG{'environments'}{$uuid}{passphrase};
+        } else {
+            $V{'USER'}  = $$CFG{'environments'}{$uuid}{user};
+            $V{'PASS'}  = $$CFG{'environments'}{$uuid}{pass};
         }
-
-        my @found = $PACMain::FUNCS{_KEEPASS}->find($where, $regexp);
-        if (! scalar @found) {
-            msg("ERROR: No entry '$where' found on KeePassX matching '@{[__($var)]}'");
-            exit 1;
-        } elsif (((scalar @found) > 1) && $$CFG{'defaults'}{'keepass'}{'ask_user'}) {
-            msg("INFO: Found more than one entry for '$where' with value '$var'. Asking user...");
-            my $tmp = "<ASK:KeePass Passwords matching '$where' like '$var':";
-            foreach my $hash (@found) {
-                $tmp .= "|$$hash{$what}";
-            }
-            $tmp .= '>';
-            $string =~ s/<KPXRE_GET_${what}_WHERE_${where}==\Q$var\E==>/$tmp/g;
+        if ($$CFG{'environments'}{$uuid}{'method'} =~ /ssh/i && $$CFG{'environments'}{$uuid}{'connection options'}{'randomSocksTunnel'} && defined($uuid_tmp) && defined($PACMain::SOCKS5PORTS{$uuid_tmp})) {
+          $V{'SOCKS5_PORT'} = $PACMain::SOCKS5PORTS{$uuid_tmp};
         } else {
-            if ((scalar(@found) > 1) && ! $$CFG{'defaults'}{'keepass'}{'ask_user'}) {
-                msg("INFO: Found " . (scalar(@found)) ." entries for '$where' with value '$var'. Selected first entry...");
-            }
-            $string =~ s/<KPXRE_GET_${what}_WHERE_${where}==\Q$var\E==>/$found[0]{$what}/g;
+          $V{'SOCKS5_PORT'} = "";
         }
-        $ret = $string;
     }
+    $V{'TIMESTAMP'} = time;
+    ($V{'DATE_Y'},$V{'DATE_M'},$V{'DATE_D'},$V{'TIME_H'},$V{'TIME_M'},$V{'TIME_S'}) = split('_', strftime("%Y_%m_%d_%H_%M_%S", localtime));
 
-    # Replace <KPX_*:*> with KeePassX 'password' value
-    while ($string =~ /<KPX_(title|username|url):(.+?)>/go) {
-        my $type = $1;
-        my $var = $2;
-
-        if (! $$CFG{'defaults'}{'keepass'}{'use_keepass'}) {
-            _wMessage(undef, "ERROR: KeePassX variable '<b>@{[__($var)]}</b>' can not be used.\n'KeePassX' is not enabled under '<b>Preferences->KeePass Options</b>'");
-            return undef;
-        }
-
-        my @found = $PACMain::FUNCS{_KEEPASS}->find($type, $var);
-        if (! scalar @found) {
-            _wMessage(undef, "ERROR: No entry '<b>$type</b>' found on KeePassX matching '<b>@{[__($var)]}</b>'");
-            return undef;
-        } elsif (((scalar @found) > 1) && $$CFG{defaults}{keepass}{ask_user}) {
-            my $tmp = "<ASK:KeePass Passwords matching '$type' like '$var':";
-            foreach my $hash (@found) {
-                $tmp .= "|$$hash{password}";
-            }
-            $tmp .= '>';
-            $string =~ s/<KPX_$type:\Q$var\E>/$tmp/g;
-        } else {
-            $string =~ s/<KPX_$type:\Q$var\E>/$found[0]{password}/g;
+    foreach my $var (@LOCAL_VARS) {
+        if (defined $V{$var}) {
+            while ($string =~ s/<$var>/$V{$var}/g) {}
+            $ret = $string;
         }
-        $ret = $string;
     }
 
     # Replace '<GV:.+>' with user saved global variables for '$connection_cmd' execution
@@ -2953,79 +2949,95 @@ sub _subst {
         }
     }
 
-    # Replace '<ASK:#>' with user provided data for 'cmd' execution
-    while ($string =~ /<ASK:(\d+?)>/go) {
-        my $var = $1;
-        my $val = _wEnterValue(undef, "<b>Variable substitution '$var'</b>" , $string) // return undef;
-        $string =~ s/<ASK:$var>/$val/g;
-        $ret = $string;
-    }
+    if (!$asbru_conn) {
+        # Execute when not from asbru_conn
+        # Replace '<ASK:#>' with user provided data for 'cmd' execution
+        while ($string =~ /<ASK:(\d+?)>/go) {
+            my $var = $1;
+            my $val = _wEnterValue(undef, "<b>Variable substitution '$var'</b>" , $string) // return undef;
+            $string =~ s/<ASK:$var>/$val/g;
+            $ret = $string;
+        }
 
-    # Replace '<ASK:description|opt1|opt2|...|optN>' with user provided data for 'cmd' execution
-    #while ($string =~ /<ASK:(.+\|.+?)>/go) {
-    while ($string =~ /<ASK:(.+?)\|(.+?)>/go) {
-        my $desc = $1;
-        my $var = $2;
-        my @list = split('\|', $var);
-        ($ret, $pos) = _wEnterValue(undef, "<b>Choose variable value:</b>" , $desc, \@list);
-        $string =~ s/<ASK:(.+?)\|(.+?)>/$ret/;
-        $ret = $string;
-    }
+        # Replace '<ASK:description|opt1|opt2|...|optN>' with user provided data for 'cmd' execution
+        while ($string =~ /<ASK:(.+?)\|(.+?)>/go) {
+            my $desc = $1;
+            my $var = $2;
+            my @list = split('\|', $var);
+            ($ret, $pos) = _wEnterValue(undef, "<b>Choose variable value:</b>" , $desc, \@list);
+            $string =~ s/<ASK:(.+?)\|(.+?)>/$ret/;
+            $ret = $string;
+        }
 
-    # Replace '<ASK:*>' with user provided data for 'cmd' execution
-    while ($string =~ /<ASK:(.+?)>/go) {
-        my $var = $1;
-        my $val = _wEnterValue(undef, "<b>Variable substitution</b>" , "Please, enter a value for:'$var'") // return undef;
-        $string =~ s/<ASK:$var>/$val/g;
-        $ret = $string;
-    }
+        # Replace '<ASK:*>' with user provided data for 'cmd' execution
+        while ($string =~ /<ASK:(.+?)>/go) {
+            my $var = $1;
+            my $val = _wEnterValue(undef, "<b>Variable substitution</b>" , "Please, enter a value for:'$var'") // return undef;
+            $string =~ s/<ASK:$var>/$val/g;
+            $ret = $string;
+        }
 
-    # Replace '<CMD:.+>' with the result of executing 'cmd'
-    while ($string =~ /<CMD:(.+?)>/go) {
-        my $var = $1;
-        my $output = `$var`;
-        chomp $output;
-        if ($output =~ /\R/go) {
-            $string =~ s/<CMD:\Q$var\E>/echo "$output"/g;
-        } else {
-            $string =~ s/<CMD:\Q$var\E>/$output/g;
+        # Replace '<CMD:.+>' with the result of executing 'cmd'
+        while ($string =~ /<CMD:(.+?)>/go) {
+            my $var = $1;
+            my $output = `$ENV{'ASBRU_ENV_FOR_EXTERNAL'} $var`;
+            chomp $output;
+            if ($output =~ /\R/go) {
+                $string =~ s/<CMD:\Q$var\E>/echo "$output"/g;
+            } else {
+                $string =~ s/<CMD:\Q$var\E>/$output/g;
+            }
+            $ret = $string;
         }
-        $ret = $string;
-    }
 
-    # Delete '<CTRL_.+:.+>' and save it's value (output)
-    while ($string =~ /<CTRL_(.+?):(.+?)>/go) {
-        my $ctrl = $1;
-        my $cmd = $2;
-        $out{'ctrl'}{'ctrl'} = $ctrl;
-        $out{'ctrl'}{'cmd'} = $cmd;
-        $string =~ s/<CTRL_$ctrl:$cmd>//g;
-        $ret = $string;
-    }
+        # Delete '<CTRL_.+:.+>' and save it's value (output)
+        while ($string =~ /<CTRL_(.+?):(.+?)>/go) {
+            my $ctrl = $1;
+            my $cmd = $2;
+            $out{'ctrl'}{'ctrl'} = $ctrl;
+            $out{'ctrl'}{'cmd'} = $cmd;
+            $string =~ s/<CTRL_$ctrl:$cmd>//g;
+            $ret = $string;
+        }
 
-    # Delete '<TEE:.+>' and save it's value (output)
-    while ($string =~ /<TEE:(.+)>/go) {
-        my $var = $1;
-        $out{'tee'} = $var;
-        $string =~ s/<TEE:$var>//g;
-        $ret = $string;
+        # Delete '<TEE:.+>' and save it's value (output)
+        while ($string =~ /<TEE:(.+)>/go) {
+            my $var = $1;
+            $out{'tee'} = $var;
+            $string =~ s/<TEE:$var>//g;
+            $ret = $string;
+        }
+
+        # Delete '<PIPE:.+:.+>' and save it's value (command to pipe the result through)
+        while ($string =~ /<PIPE:(.+?):(.+?)>/go) {
+            my $pipe = $1;
+            my $prompt = $2;
+            push(@{$out{'pipe'}}, $pipe);
+            $out{'prompt'} = $prompt;
+            $string =~ s/<PIPE:\Q$pipe\E:\Q$prompt>\E//g;
+            $ret = $string;
+        }
+        # Delete '<PIPE:.+>' and save it's value (command to pipe the result through)
+        while ($string =~ /<PIPE:(.+?)>/go) {
+            my $var = $1;
+            push(@{$out{'pipe'}}, $var);
+            $string =~ s/<PIPE:$var>//g;
+            $ret = $string;
+        }
     }
 
-    # Delete '<PIPE:.+:.+>' and save it's value (command to pipe the result through)
-    while ($string =~ /<PIPE:(.+?):(.+?)>/go) {
-        my $pipe = $1;
-        my $prompt = $2;
-        push(@{$out{'pipe'}}, $pipe);
-        $out{'prompt'} = $prompt;
-        $string =~ s/<PIPE:\Q$pipe\E:\Q$prompt>\E//g;
-        $ret = $string;
+    # KeePassXC
+    if ($$CFG{'defaults'}{'keepass'}{'use_keepass'}) {
+        if (!$asbru_conn) {
+            $kpxc = $PACMain::FUNCS{_KEEPASS};
+        }
+        if (defined $kpxc) {
+            $ret = $kpxc->applyMask($ret);
+        }
     }
-    # Delete '<PIPE:.+>' and save it's value (command to pipe the result through)
-    while ($string =~ /<PIPE:(.+?)>/go) {
-        my $var = $1;
-        push(@{$out{'pipe'}}, $var);
-        $string =~ s/<PIPE:$var>//g;
-        $ret = $string;
+
+    if ($asbru_conn) {
+        return $ret;
     }
 
     $out{'pos'} = $pos;
@@ -3063,7 +3075,7 @@ sub _wakeOnLan {
     # and setup some dialog properties.
     $w{window}{data}->set_default_response('ok');
     $w{window}{data}->set_position('center');
-    $w{window}{data}->set_icon_name('pac-app-big');
+    $w{window}{data}->set_icon_name('asbru-app-big');
     $w{window}{data}->set_size_request(480, 0);
     $w{window}{data}->set_resizable(0);
     $w{window}{data}->set_transient_for($PACMain::FUNCS{_MAIN}{_GUI}{main});
@@ -3079,7 +3091,7 @@ sub _wakeOnLan {
     $w{window}{data}->get_content_area->pack_start($w{window}{gui}{hbox}, 1, 1, 0);
 
     # Create 1st label
-    $w{window}{gui}{lblup} = Gtk3::Label->new;
+    $w{window}{gui}{lblup} = Gtk3::Label->new();
     $w{window}{gui}{hbox}->pack_start($w{window}{gui}{lblup}, 1, 1, 0);
     $w{window}{gui}{lblup}->set_markup("<b>Enter the following data and press 'OK' to send Magic Packet:</b>");
 
@@ -3089,28 +3101,28 @@ sub _wakeOnLan {
     $w{window}{data}->get_content_area->pack_start($w{window}{gui}{table}, 1, 1, 0);
 
     # Create MAC label
-    $w{window}{gui}{lblmac} = Gtk3::Label->new;
+    $w{window}{gui}{lblmac} = Gtk3::Label->new();
     $w{window}{gui}{table}->attach_defaults($w{window}{gui}{lblmac}, 0, 1, 0, 1);
     $w{window}{gui}{lblmac}->set_text('MAC Address: ');
 
     # Create MAC entry widget
-    $w{window}{gui}{entrymac} = Gtk3::Entry->new;
+    $w{window}{gui}{entrymac} = Gtk3::Entry->new();
     $w{window}{gui}{table}->attach_defaults($w{window}{gui}{entrymac}, 1, 2, 0, 1);
     $w{window}{gui}{entrymac}->set_text($mac);
     $w{window}{gui}{entrymac}->set_activates_default(1);
-    $w{window}{gui}{entrymac}->grab_focus;
+    $w{window}{gui}{entrymac}->grab_focus();
 
     # Create MAC icon widget
     $w{window}{gui}{iconmac} = Gtk3::Image->new_from_stock('gtk-no', 'menu');
     $w{window}{gui}{table}->attach_defaults($w{window}{gui}{iconmac}, 2, 3, 0, 1);
 
     # Create HOST label
-    $w{window}{gui}{lblip} = Gtk3::Label->new;
+    $w{window}{gui}{lblip} = Gtk3::Label->new();
     $w{window}{gui}{table}->attach_defaults($w{window}{gui}{lblip}, 0, 1, 1, 2);
     $w{window}{gui}{lblip}->set_text('Host: ');
 
     # Create HOST entry widget
-    $w{window}{gui}{entryip} = Gtk3::Entry->new;
+    $w{window}{gui}{entryip} = Gtk3::Entry->new();
     $w{window}{gui}{table}->attach_defaults($w{window}{gui}{entryip}, 1, 2, 1, 2);
     $w{window}{gui}{entryip}->set_text($ip);
     $w{window}{gui}{entryip}->set_sensitive(0);
@@ -3121,7 +3133,7 @@ sub _wakeOnLan {
     $w{window}{gui}{table}->attach_defaults($w{window}{gui}{iconip}, 2, 3, 1, 2);
 
     # Create PORT label
-    $w{window}{gui}{lblport} = Gtk3::Label->new;
+    $w{window}{gui}{lblport} = Gtk3::Label->new();
     $w{window}{gui}{table}->attach_defaults($w{window}{gui}{lblport}, 0, 1, 2, 3);
     $w{window}{gui}{lblport}->set_text('Port Number: ');
 
@@ -3142,16 +3154,16 @@ sub _wakeOnLan {
     $w{window}{gui}{hbox2}->pack_start($w{window}{gui}{cbbroadcast}, 1, 1, 0);
     $w{window}{data}->get_content_area->pack_start($w{window}{gui}{hbox2}, 0, 1, 0);
 
-    $w{window}{gui}{lblstatus} = Gtk3::Label->new;
+    $w{window}{gui}{lblstatus} = Gtk3::Label->new();
     $w{window}{gui}{lblstatus}->set_margin_bottom(20);
     $w{window}{data}->get_content_area->pack_start($w{window}{gui}{lblstatus}, 0, 1, 0);
     $w{window}{gui}{lblstatus}->set_text("Checking MAC for '$ip' ...");
 
     # Show the window
-    $w{window}{data}->show_all;
+    $w{window}{data}->show_all();
 
     # Setup some callbacks...
-    $w{window}{gui}{cbbroadcast}->signal_connect('toggled' => sub {$w{window}{gui}{entryport}->set_sensitive(! $w{window}{gui}{cbbroadcast}->get_active); return 0;});
+    $w{window}{gui}{cbbroadcast}->signal_connect('toggled' => sub {$w{window}{gui}{entryport}->set_sensitive(! $w{window}{gui}{cbbroadcast}->get_active()); return 0;});
 
     $w{window}{gui}{entrymac}->signal_connect('event' => sub {
         $w{window}{data}->get_action_area->foreach(sub {
@@ -3186,7 +3198,7 @@ sub _wakeOnLan {
         $w{window}{gui}{entrymac}->select_region(0, length($mac));
         $w{window}{gui}{lblstatus}->set_text("'$ip' TCP port $ping_port seems to be " . ($up ? 'REACHABLE' : 'UNREACHABLE'));
         $w{window}{gui}{table}->set_sensitive(1);
-        $w{window}{gui}{entrymac}->grab_focus;
+        $w{window}{gui}{entrymac}->grab_focus();
         $w{window}{data}->get_action_area->foreach(sub {
             if ($_[0]->get_label ne 'gtk-ok') {
                 return 1;
@@ -3208,12 +3220,12 @@ sub _wakeOnLan {
 
     ##########################################################
 
-    $w{window}{gui}{entryport}->set_sensitive(! $w{window}{gui}{cbbroadcast}->get_active);
+    $w{window}{gui}{entryport}->set_sensitive(! $w{window}{gui}{cbbroadcast}->get_active());
 
-    my $ok = $w{window}{data}->run;
+    my $ok = $w{window}{data}->run();
     $mac = $w{window}{gui}{entrymac}->get_chars(0, -1);
 
-    $w{window}{data}->destroy;
+    $w{window}{data}->destroy();
 
     if ($ok ne 'ok') {
         return 0;
@@ -3221,7 +3233,7 @@ sub _wakeOnLan {
 
     $$cfg{mac} = $mac;
 
-    my $broadcast = $w{window}{gui}{cbbroadcast}->get_active;
+    my $broadcast = $w{window}{gui}{cbbroadcast}->get_active();
 
     # Prepare UDP socket
     socket(S, PF_INET, SOCK_DGRAM, getprotobyname('udp')) || die "ERROR: Can't create socket ($!)";
@@ -3249,7 +3261,7 @@ sub _wakeOnLan {
     }
 
     if (! send(S, $MAGIC, $SIZE, $paddr)) {
-        _wMessage(undef, "ERROR: Sending magic packet to $ip (MAC: $mac) failed:\n$!");
+        _wMessage($PACMain::FUNCS{_MAIN}{_GUI}{main}, "ERROR: Sending magic packet to $ip (MAC: $mac) failed:\n$!");
         return $mac;
     } else {
         send(S, $MAGIC, $SIZE, $paddr);
@@ -3266,7 +3278,7 @@ sub _wakeOnLan {
             send(S, $MAGIC, $SIZE, sockaddr_in(9, $ipaddr));
         }
 
-        _wMessage(undef, "Wake On Lan 'Magic Packet'\nCORRECTLY sent to " . ($broadcast ? 'BROADCAST' : "IP: $ip") . "\n(MAC: $mac)");
+        _wMessage($PACMain::FUNCS{_MAIN}{_GUI}{main}, "Wake On Lan 'Magic Packet'\nCORRECTLY sent to " . ($broadcast ? 'BROADCAST' : "IP: $ip") . "\n(MAC: $mac)");
     }
 
     return $mac;
@@ -3353,14 +3365,13 @@ sub _replaceBadChars {
 sub _removeEscapeSeqs {
     my $string = shift // '';
 
-    $string =~ s/\e\[[0-9;]*m//g;
-    $string =~ s/\e\[[0-9;]*[mG]//g;
-    $string =~ s/\e\[[0-9;]*[mGKH]//g;
-    $string =~ s/\e\[[0-9;]*[a-zA-Z]//g;
+    $string =~ s/\x07/\x07\n/g;
+    $string =~ s/\x1B[=>]//g;
+    $string =~ s/\e\[[0-9;]*[a-zA-Z]%?//g;
     $string =~ s/\e\[[0-9;]*m(?:\e\[K)?//g;
-    $string =~ s/\x1B.+~\x07//g;
-    $string =~ s/(\x1B|\x08|\x07)(\[w)?//g;
-    $string =~ s/\[\?\d+h//g;
+    $string =~ s/\x1B\]1.+?\x07\n?//g;
+    $string =~ s/(\x1B|\x08|\x07)(\[w|=|\(B)?//g;
+    $string =~ s/\[\?\d+\w{1,2}//g;
     $string =~ s/\]\d;//g;
 
     return $string;
@@ -3399,11 +3410,11 @@ sub _getXWindowsList {
     my %list;
 
     my $s = Wnck::Screen::get_default() or die print $!;
-    $s->force_update;
+    $s->force_update();
 
     foreach my $w (@{$s->get_windows}) {
-        my $xid = $w->get_xid or next;
-        my $data_name = $w->get_name;
+        my $xid = $w->get_xid() or next;
+        my $data_name = $w->get_name();
 
         $list{'by_xid'}{$xid}{'title'} = $data_name;
         $list{'by_xid'}{$xid}{'window'} = $w;
@@ -3417,15 +3428,6 @@ sub _getXWindowsList {
     return \%list;
 }
 
-# TODO: Should be changed to github or removed
-sub _getREADME {
-    my $pid = shift // 0;
-
-    my $readme_file = "$CFG_DIR/tmp/latest_README";
-    system("(/usr/bin/wget http://sourceforge.net/projects/pacmanager/files/README -O $readme_file 1>&2 2>/dev/null; kill -10 $pid) &");
-    return 1;
-}
-
 sub _checkREADME {
     my $readme_file = "$CFG_DIR/tmp/latest_README";
     if (!open(F,"<:utf8",$readme_file)) {
@@ -3449,60 +3451,6 @@ sub _checkREADME {
     return $version, \@changes;
 }
 
-sub _showUpdate {
-    my $NEW_VERSION = shift;
-    my $NEW_CHANGES = shift;
-    my $notify_no_updates = shift // 0;
-
-    if (((! $NEW_VERSION) || ($APPVERSION ge $NEW_VERSION)) && (! $notify_no_updates)) {
-        return 0;
-    }
-    my $windowConfirm = Gtk3::Dialog->new_with_buttons(
-        "$APPNAME (v$APPVERSION) : Check new version availability",
-        undef,
-        'modal',
-        'gtk-ok' => 'ok',
-    );
-
-    my $lbl = Gtk3::Label->new;
-    $windowConfirm->get_content_area->pack_start($lbl, 0, 0, 5);
-
-    my $lbl2 = Gtk3::LinkButton->new_with_label('http://sourceforge.net/projects/pacmanager');
-    $windowConfirm->get_content_area->pack_start($lbl2, 0, 0, 5);
-    $lbl2->set('relief', 'none');
-
-    if ((! $NEW_VERSION) || ($APPVERSION ge $NEW_VERSION)) {
-        $lbl->set_markup("There is <b>NO</b> new version available");
-        $windowConfirm->signal_connect('response', sub {$windowConfirm->destroy;});
-    } else {
-        $lbl->set_markup("There is a <b><big>NEW</big></b> version available: <b><big>$NEW_VERSION</big></b>");
-
-        # Create a scrolled window to contain the textview
-        my $scrollDescription = Gtk3::ScrolledWindow->new;
-        $windowConfirm->get_content_area->pack_start($scrollDescription, 1, 1, 0);
-        $scrollDescription->set_policy('automatic', 'automatic');
-        my $tb = Gtk3::TextBuffer->new;
-        $tb->set_text(join("\n", @{$NEW_CHANGES}));
-        my $tv = Gtk3::TextView->new_with_buffer($tb);
-        $tv->set_editable(0);
-        $scrollDescription->add($tv);
-        my $cb = Gtk3::CheckButton->new('Do not check for updates anymore (also configurable under "Preferences")');
-        $cb->set_active(! $PACMain::FUNCS{_MAIN}{_CFG}{'defaults'}{'check versions at start'});
-        $windowConfirm->get_content_area->pack_start($cb, 0, 0, 5);
-
-        $windowConfirm->signal_connect('response', sub {$PACMain::FUNCS{_MAIN}{_CFG}{defaults}{'check versions at start'} = ! $cb->get_active; $PACMain::FUNCS{_MAIN}->_saveConfiguration; $windowConfirm->destroy;});
-        $windowConfirm->set_size_request(640, 480);
-        $windowConfirm->set_resizable(1);
-    }
-
-    $windowConfirm->set_position('center_always');
-    $windowConfirm->set_icon_name('pac-app-big');
-    $windowConfirm->set_border_width(5);
-    $windowConfirm->show_all;
-
-    return 1;
-}
-
 sub _getEncodings {
     return {
         "Adobe-Standard-Encoding" => "PostScript Language Reference Manual",
@@ -3764,38 +3712,37 @@ sub _getEncodings {
     };
 }
 
-# TODO : Should be renamed to asbru.desktop
 sub _makeDesktopFile {
     my $cfg = shift;
 
     if (! $$cfg{'defaults'}{'show favourites in unity'}) {
         unlink "$ENV{HOME}/.local/share/applications/asbru.desktop";
-        system('/usr/bin/xdg-desktop-menu forceupdate &');
+        system("$ENV{'ASBRU_ENV_FOR_EXTERNAL'} /usr/bin/xdg-desktop-menu forceupdate &");
         return 1;
     }
 
     my $d = "[Desktop Entry]\n";
-    $d .= "Name=Asbru Connection Manager\n";
-    $d .= "Comment=Asbru Connection Manage\n";
+    $d .= "Name=Ásbrú Connection Manager\n";
+    $d .= "Comment=A user interface that helps organizing remote terminal sessions and automating repetitive tasks\n";
     $d .= "Terminal=false\n";
     $d .= "Icon=pac\n";
     $d .= "Type=Application\n";
-    $d .= "Exec=/usr/bin/asbru-cm\n";
+    $d .= "Exec=env GDK_BACKEND=x11 /usr/bin/asbru-cm\n";
     $d .= "StartupNotify=true\n";
-    $d .= "Name[en_US]=Asbru\n";
-    $d .= "Comment[en_US]=Asbru Connetion Manager\n";
+    $d .= "Name[en_US]=Ásbrú Connection Manager\n";
+    $d .= "Comment[en_US]=A user interface that helps organizing remote terminal sessions and automating repetitive tasks\n";
     $d .= "Categories=Applications;Network;\n";
     $d .= "X-GNOME-Autostart-enabled=false\n";
     my $dal = 'Actions=Shell;Quick;Preferences;';
     my $da = "\n[Desktop Action Shell]\n";
     $da .= "Name=<Start local shell>\n";
-    $da .= "Exec=asbru-cm --start-shell\n";
+    $da .= "Exec=env GDK_BACKEND=x11 /usr/bin/asbru-cm --start-shell\n";
     $da .= "\n[Desktop Action Quick]\n";
     $da .= "Name=<Quick connect...>\n";
-    $da .= "Exec=asbru-cm --quick-conn\n";
+    $da .= "Exec=env GDK_BACKEND=x11 /usr/bin/asbru-cm --quick-conn\n";
     $da .= "\n[Desktop Action Preferences]\n";
     $da .= "Name=<Open Preferences...>\n";
-    $da .= "Exec=asbru-cm --preferences\n";
+    $da .= "Exec=env GDK_BACKEND=x11 /usr/bin/asbru-cm --preferences\n";
 #    my $action = 0;
 #    foreach my $uuid (keys %{$$cfg{environments}}) {
 #        if (($uuid eq '__PAC__ROOT__') || (! $$cfg{'environments'}{$uuid}{'favourite'})) {
@@ -3808,14 +3755,14 @@ sub _makeDesktopFile {
 #        $da .= "Exec=asbru-cm --start-uuid=$uuid\n";
 #    }
 
-    if (!open(F,">:utf8","$ENV{HOME}/.local/share/applications/pac.desktop")) {
+    if (!open(F,">:utf8","$ENV{HOME}/.local/share/applications/asbru.desktop")) {
         return 0;
     }
 
-    open F, ">$ENV{HOME}/.local/share/applications/pac.desktop" or return 0;
+    open F, ">$ENV{HOME}/.local/share/applications/asbru.desktop" or return 0;
     print F "$d\n$dal\n$da\n";
     close F;
-    system('/usr/bin/xdg-desktop-menu forceupdate &');
+    system("$ENV{'ASBRU_ENV_FOR_EXTERNAL'} /usr/bin/xdg-desktop-menu forceupdate &");
 
     return 1;
 }
@@ -3839,7 +3786,7 @@ sub _getSelectedRows {
     # https://metacpan.org/pod/Gtk3
     # "Gtk3::TreeSelection: get_selected_rows() now returns two values: an array ref containing the selected paths, and the model."
     # Go back to the Gtk2 behavior: drop the model, return the selected paths as array.
-    my ($aref, $model) = $treeSelection->get_selected_rows;
+    my ($aref, $model) = $treeSelection->get_selected_rows();
     if (!$aref) {
         return ();
     }
@@ -3856,25 +3803,15 @@ sub _vteFeed {
 sub _vteFeedChild {
     my $vte = shift;
     my $str = shift;
+    my $feedVersion = $PACMain::FUNCS{_MAIN}{_Vte}{vte_feed_child};
 
     use bytes;
     my $b = length($str);
     my @arr = unpack ('C*', $str);
 
-    if (Vte::get_major_version() >= 1 or Vte::get_minor_version() >= 54) {
+    if ($feedVersion == 1) {
         # Newer version only requires 1 parameter
         $vte->feed_child(\@arr);
-    } elsif (Vte::get_major_version() >= 1 or Vte::get_minor_version() == 52) {
-        # Some distros have a special patched version of v0.52 that still requires 2 parameters; some others only one
-        # Not nice but let's ignore the warning for that special case
-        # See https://bugs.launchpad.net/ubuntu/+source/ubuntu-release-upgrader/+bug/1780501
-        eval {
-            local $SIG{__WARN__} = sub {};
-            $vte->feed_child($str, $b);
-            1;
-        } or do {
-            $vte->feed_child(\@arr);
-        };
     } else {
         # Elder versions requires 2 parameters
         $vte->feed_child($str, $b);
@@ -3885,7 +3822,9 @@ sub _vteFeedChildBinary {
     my $vte = shift;
     my $str = shift;
     my @arr = unpack ('C*', $str);
-    if (Vte::get_major_version() >= 1 or Vte::get_minor_version() >= 46) {
+    my $feedVersion = $PACMain::FUNCS{_MAIN}{_Vte}{vte_feed_binary};
+
+    if ($feedVersion == 1) {
         # Newer version only requires 1 parameter
         $vte->feed_child_binary(\@arr);
     } else {
@@ -3901,7 +3840,7 @@ sub _createBanner {
     my $icon;
     my $text;
 
-    $icon = Gtk3::Image->new_from_file("${RES_DIR}/${icon_filename}");
+    $icon = Gtk3::Image->new_from_file("${THEME_DIR}/${icon_filename}");
     $icon->set_margin_left(10);
     $icon->set_margin_right(10);
     $text = Gtk3::Label->new();
@@ -3923,12 +3862,16 @@ sub _copyPass {
     my $cfg = $PACMain::FUNCS{_MAIN}{_CFG};
     my $clip;
 
-    my $clipboard = Gtk3::Clipboard::get(Gtk3::Gdk::Atom::intern('CLIPBOARD', 0));
+    my $clipboard = Gtk3::Clipboard::get(Gtk3::Gdk::Atom::intern('PRIMARY', 0));
     if ($$cfg{environments}{$uuid}{'passphrase'} ne '') {
         $clip = $$cfg{environments}{$uuid}{'passphrase'};
     } else {
         $clip = $$cfg{environments}{$uuid}{'pass'};
     }
+    if ($$cfg{'defaults'}{'keepass'}{'use_keepass'} && PACKeePass->isKeePassMask($clip)) {
+        my $kpxc = $PACMain::FUNCS{_KEEPASS};
+        $clip = $kpxc->applyMask($clip);
+    }
     use bytes;
     $clipboard->set_text($clip,length($clip));
 }
@@ -3937,6 +3880,10 @@ sub _appName {
     return "$APPNAME $APPVERSION";
 }
 
+sub _setDefaultRGBA {
+    ($R,$G,$B,$A) = ($_[0]/255,$_[1]/255,$_[2]/255,$_[3]);
+}
+
 sub _setWindowPaintable {
     my $win = shift;
 
@@ -3952,13 +3899,21 @@ sub _setWindowPaintable {
 sub mydraw {
     my ($w,$c) = @_;
 
-    $c->set_source_rgba(240,240,240,1);
+    $c->set_source_rgba($R,$G,$B,$A);
     $c->set_operator('source');
     $c->paint();
     $c->set_operator('over');
     return 0;
 }
 
+sub _doShellEscape {
+    my $str = shift;
+
+    $str =~ s/([\$\\`"])/\\$1/g;
+
+    return $str;
+}
+
 1;
 
 __END__
@@ -3998,14 +3953,6 @@ Prepare string to be included in a HTML TAG
 
 Inverse of __(string)
 
-=head2 sub _findKP (list,where,what)
-
-    Search inside Keepass the list of elements that match
-    where : a field of Keypass database (title, username, ...)
-    what  : How to compare
-        'Regexp': using a regular expression
-        empty   : string equal
-
 =head2 sub _splash
 
 Build and Show Splash screen
@@ -4068,9 +4015,15 @@ Support function to build and xml file to build the popup menu
 
 Support function to calculate the location of the popup menu
 
-=head2 sub _wMessage
+=head2 sub _wMessage(window,msg,modal,selectable,class)
 
-Create a modela message to the user
+    window      parent window to be transient for
+    msg         message to display
+    modal       0 no, 1 yes (defaul yes)
+    selectable  should message be selectable (default no)
+    class       css class : w-warning, w-info, w-error (default w-warning)
+
+Create a modal message to the user
 
 =head2 sub _wProgress
 
@@ -4090,7 +4043,15 @@ Sets the Application password
 
 =head2 sub _cfgSanityCheck
 
-Configuration Checks
+Sanitize the configuration and delete temporary sessions that should not be persisted
+
+=head2 sub _cfgGetTmpSessions
+
+Extract the temporary sessions from the configuration.  Those sessions will be deleted by _cfgSanityCheck
+
+=head2 sub _cfgAddSessions
+
+Restore a list of sessions to the configuration.
 
 =head2 sub _updateSSHToIPv6
 
@@ -4154,7 +4115,7 @@ Get hash (table, dictionary list) or encoders
 
 =head2 sub _makeDesktopFile
 
-Creates a pac.desktop file to launch application
+Creates a asbru.desktop file to launch application
 
 =head2 sub _updateWidgetColor
 
@@ -4190,6 +4151,10 @@ Hack to make transparent terminals
 
 Generic routine to draw a gray background for widgets that do not painted their own.
 
+=head2 _doShellEscape
+
+Escape characters so that the text can be used in a shell string command, like echo "$VAR"
+
 =head1 Perl particulars
 
     @{[function(parameters)]} ==> Inside an interpolation, executes the function and uses the result as the string in that position
diff --git a/lib/pac_conn b/lib/asbru_conn
similarity index 65%
rename from lib/pac_conn
rename to lib/asbru_conn
index 0c3c3713..6d11c358 100755
--- a/lib/pac_conn
+++ b/lib/asbru_conn
@@ -3,7 +3,7 @@
 ###############################################################################
 # This file is part of Ásbrú Connection Manager
 #
-# Copyright (C) 2017-2020 Ásbrú Connection Manager team (https://asbru-cm.net)
+# Copyright (C) 2017-2022 Ásbrú Connection Manager team (https://asbru-cm.net)
 # Copyright (C) 2010-2016 David Torrejón Vaquerizas
 #
 # Ásbrú Connection Manager is free software: you can redistribute it and/or
@@ -40,8 +40,9 @@ use POSIX qw (strftime);
 use Encode qw (encode decode);
 use IO::Socket::INET;
 use Encode;
-use KeePass;
+use PACKeePass;
 use PACUtils;
+use POSIX qw(strftime);
 
 use Gtk3 '-init';
 
@@ -66,9 +67,9 @@ my $UUID;
 my $GETCMD = 0;
 my $CONNECTED = 0;
 my $PASSWORD_COUNT = 0;
-my $WAS_ASK_PASS = 0;
 my $SUDO_PASSWORD_COUNT = 0;
 my $USER_COUNT = 0;
+my $HIDE_TERMINAL = 0;
 my $SOCKET;
 my $SOCKET_EXEC;
 my $proxy_type = 'socks5';
@@ -78,21 +79,26 @@ my $proxy_user = '';
 my $proxy_pass = '';
 my $proxy_cmd = '';
 my $proxy_jump = 0;
+my $proxy_get = '';
+my $JUMP_PASS = 0;
+my $TERM_PASS = 0;
+my $PSEUDO_JUMP = 0;
 
 my @KPXWHERE = ('comment', 'created', 'password', 'title', 'url', 'username');
 
 # Define some ANSI colors
 my %COLOR = (
-    'norm' => "\033[m",    # black
+    'norm' => "\033[m",    # reset
     'log' => "\033[33m",   # yellow
     'recv' => "\033[35m",  # magenta
+    'cyan' => "\033[36m",  # cyan
     'sent' => "\033[0m\033[32m", # green
     'err' => "\033[31m" # red
 );
 
 # Create the Expect object
 $Expect::Multiline_Matching = 1;
-my $EXP = new Expect;
+my $EXP = new Expect();
 eval {
     $EXP->slave->clone_winsize_from(\*STDIN);
 };
@@ -105,7 +111,7 @@ eval {
 sub __disconnect {
     my $signal = shift;
     ctrl("DISCONNECTING");
-    $EXP->hard_close;
+    _hardClose($EXP, $UUID);
     ctrl("DISCONNECTED");
     exit 0;
 }
@@ -130,17 +136,16 @@ $CFG = retrieve($CFG_FILE) or die "ERROR: Could not load config file '$CFG_FILE'
 # Check some command line options
 defined $$CFG{'environments'}{$UUID} or die("ERROR: Profile '$UUID' does not exist!!");
 
-`which autossh 1>/dev/null 2>&1`;
-my $autossh_bin = ! $?;
+my $autossh_bin = (system("$ENV{'ASBRU_ENV_FOR_EXTERNAL'} which autossh 1>/dev/null 2>&1") eq 0);
 
 # Shorten some variables
 my $DEBUG = $$CFG{'defaults'}{'debug'};
-my $COMMAND_PROMPT = $$CFG{'defaults'}{'command prompt'};
-my $USERNAME_PROMPT = $$CFG{'defaults'}{'username prompt'};
-my $PASSWORD_PROMPT = $$CFG{'defaults'}{'password prompt'};
-my $HOSTCHANGE_PROMPT = $$CFG{'defaults'}{'hostkey changed prompt'};
-my $ANYKEY_PROMPT = $$CFG{'defaults'}{'press any key prompt'};
-my $REMOTEHOST_PROMPT = $$CFG{'defaults'}{'remote host changed prompt'};
+my $COMMAND_PROMPT = encode('utf8',$$CFG{'defaults'}{'command prompt'});
+my $USERNAME_PROMPT = encode('utf8',$$CFG{'defaults'}{'username prompt'});
+my $PASSWORD_PROMPT = encode('utf8',$$CFG{'defaults'}{'password prompt'});
+my $HOSTCHANGE_PROMPT = encode('utf8',$$CFG{'defaults'}{'hostkey changed prompt'});
+my $ANYKEY_PROMPT = encode('utf8',$$CFG{'defaults'}{'press any key prompt'});
+my $REMOTEHOST_PROMPT = encode('utf8',$$CFG{'defaults'}{'remote host changed prompt'});
 my $ACCEPT_KEY = $$CFG{'defaults'}{'auto accept key'};
 my $TIMEOUT_CONNECT = $$CFG{'defaults'}{'timeout connect'} || undef;
 my $TIMEOUT_CMD = $$CFG{'defaults'}{'timeout command'} || undef;
@@ -148,14 +153,14 @@ my $AUTOSSH = $$CFG{'environments'}{$UUID}{'autossh'} && $autossh_bin;
 my $METHOD = $AUTOSSH ? 'autossh' : $$CFG{'environments'}{$UUID}{'method'};
 my $SUDO = $$CFG{'environments'}{$UUID}{'use sudo'};
 my $SUDO_PROMPT = $$CFG{'defaults'}{'sudo prompt'};
-my $SUDO_PASSWORD = $$CFG{'defaults'}{'sudo password'};
+my $SUDO_PASSWORD = encode('UTF-8', $$CFG{'defaults'}{'sudo password'});
 my $IP = $$CFG{'environments'}{$UUID}{'ip'};
 my $PORT = $$CFG{'environments'}{$UUID}{'port'};
 my $USER = $$CFG{'environments'}{$UUID}{'user'};
-my $PASS = $$CFG{'environments'}{$UUID}{'pass'};
+my $PASS = encode('UTF-8', $$CFG{'environments'}{$UUID}{'pass'});
 my $AUTH = $$CFG{'environments'}{$UUID}{'auth type'};
 my $PUBKEY = $$CFG{'environments'}{$UUID}{'public key'};
-my $PASSPHRASE = $$CFG{'environments'}{$UUID}{'passphrase'};
+my $PASSPHRASE = encode('UTF-8', $$CFG{'environments'}{$UUID}{'passphrase'});
 my $PASSPHRASE_USER = $$CFG{'environments'}{$UUID}{'passphrase user'};
 my $AUTHFALLBACK = $$CFG{'environments'}{$UUID}{'auth fallback'};
 my $NAME = $$CFG{'environments'}{$UUID}{'name'};
@@ -165,64 +170,118 @@ my $TITLE = $$CFG{'environments'}{$UUID}{'title'};
 my $EXPECT = defined $$CFG{'environments'}{$UUID}{'expect'};
 my $USE_PREPEND_COMMAND = $$CFG{'environments'}{$UUID}{'use prepend command'};
 my $PREPEND_COMMAND = $$CFG{'environments'}{$UUID}{'prepend command'};
+my $USE_POSTPEND_COMMAND = $$CFG{'environments'}{$UUID}{'use postpend command'};
+my $POSTPEND_COMMAND = $$CFG{'environments'}{$UUID}{'postpend command'};
 my $QUOTE_COMMAND = $$CFG{'environments'}{$UUID}{'quote command'} && $USE_PREPEND_COMMAND;
-my $MANUAL = $$CFG{'environments'}{$UUID}{'auth type'} eq 'manual';
+my $QUOTEPOST_COMMAND = $$CFG{'environments'}{$UUID}{'quotepost command'} && $USE_POSTPEND_COMMAND;
+my $MANUAL = ($$CFG{'environments'}{$UUID}{'auth type'} // '') eq 'manual';
 my $TMP_UUID = $$CFG{'tmp'}{'uuid'};
 my $LOG_FILE = $$CFG{'tmp'}{'log file'};
 my $SOCK_FILE = $$CFG{'tmp'}{'socket'};
 my $SOCK_EXEC_FILE = $$CFG{'tmp'}{'socket exec'};
 my $REMOVE_CTRL_CHARS = $$CFG{'environments'}{$UUID}{'save session logs'} ? $$CFG{'environments'}{$UUID}{'remove control chars'} : $$CFG{'defaults'}{'remove control chars'};
-my @KEEPASS = @{$$CFG{'keepass'} // []};
+my $LOG_TIMESTAMP = $$CFG{'environments'}{$UUID}{'log timestamp'} ? $$CFG{'environments'}{$UUID}{'log timestamp'} : $$CFG{'defaults'}{'log timestamp'};
 my $LPORT;
 
 if (!$RESTART && $IS_CLUSTER) {
     $RESTART = 2;
 }
 
-$IP = subst($IP);
-$PORT = subst($PORT);
-# Use keepass
-if ($$CFG{'environments'}{$UUID}{'infer user pass from KPX'} && $$CFG{'defaults'}{'keepass'}{'use_keepass'}) {
-    # TODO : I think this will never happen previous if already stated that use_keepass is true
-    if (!$$CFG{'defaults'}{'keepass'}{'use_keepass'}) {
-        msg("ERROR: KeePassX can not be used because 'KeePassX' is not enabled under 'Preferences->KeePass Options'");
-        exit 1;
+# Checks that session ID is still known in 'environements' ; otherwise abort immediately
+if (!defined($NAME)) {
+    print("$COLOR{'err'}ERROR: Session '$UUID' is invalid.$COLOR{'norm'}\n");
+    exit;
+}
+
+open_socket();
+
+# Use keepass ?
+my $kpxc;
+if ($$CFG{'defaults'}{'keepass'}{'use_keepass'}) {
+    sub _dieMissingKeePassEntry {
+        my $entry = shift;
+
+        die("$COLOR{'err'}ERROR$COLOR{'norm'} Unable to find entry $COLOR{'log'}$entry$COLOR{'norm'} in the configured KeePass database $COLOR{'log'}$$CFG{'defaults'}{'keepass'}{database}]$COLOR{'norm'}.\n");
     }
 
-    my $re = $$CFG{'environments'}{$UUID}{'KPX title regexp'};
-    my $where = $KPXWHERE[$$CFG{'environments'}{$UUID}{'infer from KPX where'}];
-    my @found = findKP(\@KEEPASS, $where, qr/$re/);
-    if (! scalar @found) {
-        msg("ERROR: No entry '$where' found on KeePassX matching '$re'");
-        exit 1;
-    } elsif (((scalar @found) > 1) && $$CFG{'defaults'}{'keepass'}{'ask_user'}) {
-        msg("INFO: Found " . (scalar @found) . " entries with '$where' matching '$re' while inferring. Asking user...");
-        my $tmp = "<ASK:KeePass '$where' matching '$TITLE':";
-        foreach my $hash (@found) {
-            $tmp .= "|$$hash{$where}";
+    my $ok;
+    $kpxc = PACKeePass->new(0, $$CFG{'defaults'}{'keepass'});
+    if ($AUTH eq 'publickey') {
+        my $ORIG_PASSPHRASE = $PASSPHRASE;
+        ($PASSPHRASE, $ok) = $kpxc->getFieldValueFromString($PASSPHRASE);
+        if (!$ok) {
+            _dieMissingKeePassEntry($ORIG_PASSPHRASE);
         }
-        $tmp .= '>';
-        my ($str, $pos) = subst($tmp);
-        if (! defined $str) {
-            msg("INFO: Connection canceled by user");
-            exit 1;
+        my $ORIG_PASSPHRASE_USER = $PASSPHRASE_USER;
+        ($PASSPHRASE_USER, $ok) = $kpxc->getFieldValueFromString($PASSPHRASE_USER);
+        if (!$ok) {
+            _dieMissingKeePassEntry($ORIG_PASSPHRASE_USER);
         }
-        ($USER, $PASS) = ($found[$pos]{username}, $found[$pos]{password});
     } else {
-        msg("INFO: Using with $where '$found[0]{$where}' matching '$re' (username: $USER, password: hidden!!) while inferring...");
-        ($USER, $PASS) = ($found[0]{username}, $found[0]{password});
+        my $ORIG_USER = $USER;
+        ($USER, $ok) = $kpxc->getFieldValueFromString($USER);
+        if (!$ok) {
+            _dieMissingKeePassEntry($ORIG_USER);
+        }
+        my $ORIG_PASS = $PASS;
+        ($PASS, $ok) = $kpxc->getFieldValueFromString($PASS);
+        if (!$ok) {
+            _dieMissingKeePassEntry($ORIG_PASS);
+        }
     }
+    # Makes sure the KeePass password is not exposed in the spawned process
+    delete $ENV{'KPXC_MP'};
 } else {
-    $USER = subst($USER);
-    $PASS = subst($PASS);
+    if ($AUTH eq 'publickey') {
+        $PASSPHRASE = subst($PASSPHRASE);
+        $PASSPHRASE_USER = subst($PASSPHRASE_USER);
+    } else {
+        $USER = subst($USER);
+        $PASS = subst($PASS);
+    }
 }
-$PASSPHRASE = subst($PASSPHRASE);
-$PASSPHRASE_USER = subst($PASSPHRASE_USER);
+
+# Translate variables, KeePassXC
+$TITLE = subst($TITLE,'GET_TITLE');
+$IP = subst($IP);
+$PORT = subst($PORT);
+$$CFG{'environments'}{$UUID}{'proxy ip'}   = subst($$CFG{'environments'}{$UUID}{'proxy ip'});
+$$CFG{'environments'}{$UUID}{'proxy user'} = subst($$CFG{'environments'}{$UUID}{'proxy user'});
+$$CFG{'environments'}{$UUID}{'proxy pass'} = subst($$CFG{'environments'}{$UUID}{'proxy pass'});
+$$CFG{'environments'}{$UUID}{'jump ip'}    = subst($$CFG{'environments'}{$UUID}{'jump ip'});
+$$CFG{'environments'}{$UUID}{'jump user'}  = subst($$CFG{'environments'}{$UUID}{'jump user'});
+$$CFG{'environments'}{$UUID}{'jump pass'}  = subst($$CFG{'environments'}{$UUID}{'jump pass'});
+$$CFG{'defaults'}{'jump ip'}    = subst($$CFG{'defaults'}{'jump ip'});
+$$CFG{'defaults'}{'jump user'}  = subst($$CFG{'defaults'}{'jump user'});
+$$CFG{'defaults'}{'jump pass'}  = subst($$CFG{'defaults'}{'jump pass'});
+$$CFG{'defaults'}{'proxy ip'}   = subst($$CFG{'defaults'}{'proxy ip'});
+$$CFG{'defaults'}{'proxy user'} = subst($$CFG{'defaults'}{'proxy user'});
+$$CFG{'defaults'}{'proxy pass'} = subst($$CFG{'defaults'}{'proxy pass'});
 
 # Build initial SSH connection command
 my $CONNECT_OPTS = $$CFG{'environments'}{$UUID}{'options'} || '';
 
-if (! $GETCMD) {
+# Test if we can avoid openning consecutive port forwarders
+if ($CONNECT_OPTS =~ /(-[LR] .+?)( |$)/) {
+    my $x = `$ENV{'ASBRU_ENV_FOR_EXTERNAL'} ps a | grep ssh `;
+    my $y = $1;
+    if ($x =~ /$y/) {
+        $y =~ s/-[LR] //g;
+        print "$COLOR{'log'}Skip tunnel opening $y, already open in different terminal. $COLOR{'norm'}\n\n";
+        $CONNECT_OPTS =~ s/(-[LR] .+?)( |$)//g;
+    }
+}
+
+my %_W;
+my $INT = 0;
+
+########################################################
+# START : Procedures definition
+
+sub open_socket {
+    if ($GETCMD) {
+        return 0;
+    }
     $SOCKET = IO::Socket::UNIX->new(
         Type => SOCK_STREAM,
         Peer => $SOCK_FILE
@@ -230,7 +289,7 @@ if (! $GETCMD) {
     $SOCKET->autoflush;
 
     if (!auth($SOCKET)) {
-        die "ERROR: Service listening at file '$SOCK_FILE' is not PAC";
+        die "ERROR: Service listening at file '$SOCK_FILE' is not Ásbrú";
     }
 
     $SOCKET_EXEC = IO::Socket::UNIX->new(
@@ -240,12 +299,6 @@ if (! $GETCMD) {
     $SOCKET_EXEC->autoflush;
 }
 
-my %_W;
-my $INT = 0;
-
-########################################################
-# START : Procedures definition
-
 sub msg {
     my $msg = shift or die "$COLOR{'err'}ERROR: You must provide a message to 'msg'!!$COLOR{'norm'}";
 
@@ -266,10 +319,61 @@ sub ctrl {
     my $wout = '';
     vec($wout, fileno($SOCKET), 1) = 1;
     select(undef, $wout, undef, 5) or die "ERROR: Could not write to PACMain SOCKET at $SOCK_FILE: $!";
-
     $SOCKET->send('PAC_MSG_START[' . encode('UTF-16', $msg) . ']PAC_MSG_END');
     return 1;
 }
+
+sub readData {
+    my $key = shift;
+    my @vals;
+
+    while (1) {
+        my @data = receiveData($SOCKET);
+        foreach my $data (@data) {
+            $data = decode('UTF-16', $data);
+            if ($data =~ /^$key/) {
+                my ($cmd,@vals) = split /\|:\|/, $data;
+                return wantarray ? @vals : $vals[0];
+            }
+        }
+    }
+}
+
+sub receiveData {
+    my $socket = shift;
+    my @data = ();
+    my $buffer = '';
+    my $data = '';
+    my $bytes;
+
+    if (!$socket) {
+        die "Error, bad call to receiveData no socket!!!!";
+    }
+    # At least one read should be done
+    do {
+        $bytes = sysread($socket, $data, 1024) // 0;
+        if (!defined $bytes) {
+            last;
+        }
+        $buffer .= $data;
+        chomp $buffer;
+        $buffer =~ s/\R/ /go;
+        my $empty_buffer = 0;
+        while ($buffer =~ s/PAC_MSG_START\[(.+?)\]PAC_MSG_END/$1/o) {
+            my $buffer = $1;
+            if (!$buffer) {
+                next;
+            }
+            push(@data,$buffer);
+            $empty_buffer = 1;
+        }
+        $empty_buffer and $buffer = '';
+
+    } until $bytes < 1024;
+
+    return @data;
+}
+
 sub auth {
     my $socket = shift;
 
@@ -281,9 +385,14 @@ sub auth {
 
 sub subst {
     my $string = shift // '';
+    my $get = shift;
+    my ($pos);
 
-    my $pos = -1;
-
+    if (!$GETCMD && $get) {
+        ctrl("$get:");
+        $get = readData($get);
+        return $get;
+    }
     if (!defined $$CFG{'environments'}{$UUID}) {
         return $string;
     }
@@ -292,147 +401,20 @@ sub subst {
     $string =~ s/\<\<(proxy|jump)_port\>\>/$proxy_port/g;
     $string =~ s/\<\<(proxy|jump)_user\>\>/$proxy_user/g;
     $string =~ s/\<\<(proxy|jump)_pass\>\>/$proxy_pass/g;
-    #$string =~ s/\<\<jump_key\>\>/$proxy_key/g;
-
-    my $tstamp = time;
-    my ($dy, $dm, $dd, $th, $tm, $ts) = split('_', strftime("%Y_%m_%d_%H_%M_%S", localtime));
-    my $name = $$CFG{'environments'}{$UUID}{name};
-    my $title = $$CFG{'environments'}{$UUID}{title};
-    my $ip = $$CFG{'environments'}{$UUID}{ip};
-    my $user = $$CFG{'environments'}{$UUID}{user};
-    my $pass = $$CFG{'environments'}{$UUID}{pass};
-
-    while ($string =~ /<UUID>/go) {
-        $string =~ s/<UUID>/$UUID/g;
-    }
-    while ($string =~ /<TIMESTAMP>/go) {
-        $string =~ s/<TIMESTAMP>/$tstamp/g;
-    }
-    while ($string =~ /<DATE_Y>/go) {
-        $string =~ s/<DATE_Y>/$dy/g;
-    }
-    while ($string =~ /<DATE_M>/go) {
-        $string =~ s/<DATE_M>/$dm/g;
-    }
-    while ($string =~ /<DATE_D>/go) {
-        $string =~ s/<DATE_D>/$dd/g;
-    }
-    while ($string =~ /<TIME_H>/go) {
-        $string =~ s/<TIME_H>/$th/g;
-    }
-    while ($string =~ /<TIME_M>/go) {
-        $string =~ s/<TIME_M>/$tm/g;
-    }
-    while ($string =~ /<TIME_S>/go) {
-        $string =~ s/<TIME_S>/$ts/g;
-    }
-    while ($string =~ /<NAME>/go) {
-        $string =~ s/<NAME>/$name/g;
-    }
-    while ($string =~ /<TITLE>/go) {
-        $string =~ s/<TITLE>/$title/g;
-    }
-    while ($string =~ /<IP>/go) {
-        $string =~ s/<IP>/$ip/g;
-    }
-    while ($string =~ /<USER>/go) {
-        $string =~ s/<USER>/$user/g;
-    }
-    while ($string =~ /<PASS>/go) {
-        $string =~ s/<PASS>/$pass/g;
-    }
 
     # Replace '<command prompt>' with user defined value for command prompt
     while ($string =~ /<command prompt>/go) {
         $string = $COMMAND_PROMPT;
     }
 
-    # Replace <KPXRE_GET_(title|username|password|url)_WHERE_(title|username|password|url)==(.+?)==> with KeePassX value
-    while ($string =~ /<KPXRE_GET_(title|username|password|url)_WHERE_(title|username|password|url)==(.+?)==>/go) {
-        my $what = $1;
-        my $where = $2;
-        my $var = $3;
-        my $regexp = qr/$var/;
-
-        if (! $$CFG{'defaults'}{'keepass'}{'use_keepass'}) {
-            msg("WARNING: KeePassX variable '$var' can not be used because 'KeePassX' is not enabled under 'Preferences->KeePass Options'");
-            next;
-        }
-
-        my @found = findKP(\@KEEPASS, $where, $regexp);
-        if (! scalar @found) {
-            msg("ERROR: No entry '$where' found on KeePassX matching '$var'");
-            exit 1;
-        } elsif (((scalar @found) > 1) && $$CFG{'defaults'}{'keepass'}{'ask_user'}) {
-            msg("INFO: Found more than one entry for '$where' with value '$var'. Asking user...");
-            my $tmp = "<ASK:KeePass Passwords matching '$where' like '$var':";
-            foreach my $hash (@found) {
-                $tmp .= "|$$hash{$what}";
-            }
-            $tmp .= '>';
-            $string =~ s/<KPXRE_GET_${what}_WHERE_${where}==\Q$var\E==>/$tmp/g;
-        } else {
-            msg("INFO: Found " . (scalar(@found)) ." entries for '$where' with value '$var'. Selected first entry...") if (scalar(@found) > 1) && ! $$CFG{'defaults'}{'keepass'}{'ask_user'};
-            $string =~ s/<KPXRE_GET_${what}_WHERE_${where}==\Q$var\E==>/$found[0]{$what}/g;
-        }
-    }
-
-    # Replace <KPX_(title|username|url):*> with KeePassX password value
-    while ($string =~ /<KPX_(title|username|url):(.+?)>/go) {
-        my $type = $1;
-        my $var = $2;
-
-        if (! $$CFG{'defaults'}{'keepass'}{'use_keepass'}) {
-            msg("WARNING: KeePassX variable '$var' can not be used because 'KeePassX' is not enabled under 'Preferences->KeePass Options'");
-            next;
-        }
-
-        my @found = findKP(\@KEEPASS, $type, $var);
-        if (! scalar @found) {
-            msg("ERROR: No entry '$type' found on KeePassX matching '$var'"); exit 1;
-        } elsif (((scalar @found) > 1) && $$CFG{'defaults'}{'keepass'}{'ask_user'}) {
-            msg("WARNING: Found more than one entry for '$type' with value '$var'. Asking user...");
-            my $tmp = "<ASK:KeePass Passwords matching '$type' like '$var':";
-            foreach my $hash (@found) {
-                $tmp .= "|$$hash{password}";
-            }
-            $tmp .= '>';
-            $string =~ s/<KPX_$type:\Q$var\E>/$tmp/g;
-        } else {
-            $string =~ s/<KPX_$type:\Q$var\E>/$found[0]{password}/g;
-        }
-    }
-
-    # Replace '<GV:.+>' with user saved global variables for '$connection_cmd' execution
-    while ($string =~ /<GV:(.+?)>/go) {
-        my $var = $1;
-        if (defined $$CFG{'defaults'}{'global variables'}{$var}) {
-            my $val = $$CFG{'defaults'}{'global variables'}{$var}{'value'} // '';
-            $string =~ s/<GV:$var>/$val/g;
-        }
-    }
-
-    # Replace '<V:#>' with user saved variables for '$connection_cmd'
-    while ($string =~ /<V:(\d+?)>/go) {
-        my $var = $1;
-        if (defined $$CFG{'environments'}{$UUID}{'variables'}[$var]) {
-            my $val = $$CFG{'environments'}{$UUID}{'variables'}[$var]{txt} // '';
-            $string =~ s/<V:$var>/$val/g;
-        }
-    }
-
-    # Replace '<ENV:#>' with environment variables for '$connection_cmd'
-    while ($string =~ /<ENV:(.+?)>/go) {
-        my $var = $1;
-        if (defined $ENV{$var}) {
-            $string =~ s/<ENV:\Q$var\E>/$ENV{$var}/g;
-        }
-    }
+    # Reuse most of the implementation in PACUtils.pm
+    $string = _subst($string,$CFG,$UUID,$TMP_UUID,1,$kpxc);
 
+    # Use local wEnterValue routine
     # Replace '<ASK:#>' with user provided data for 'cmd' execution
     while ($string =~ /<ASK:(\d+?)>/go) {
         my $var = $1;
-        my $val = wEnterValue(undef, "<b>Variable substitution '$var'</b>" , $string) // return undef;
+        my $val = wEnterValue("<b>Variable substitution '$var'</b>" , $string) // return undef;
         if (!defined $val) {
             last;
         }
@@ -443,10 +425,11 @@ sub subst {
     while ($string =~ /<ASK:(.+\|.+?)>/go) {
         my $var = $1;
         my @list;
+        my $ret;
         @list = split('\|', $var);
         my $desc = shift @list;
-        my $ret;
-        ($ret, $pos) = wEnterValue(undef, "<b>Choose variable value:</b>" , $desc, \@list);
+        $var =~ s/$desc\|//;
+        ($ret, $pos) = wEnterValue("<b>Choose variable value:</b>" , $desc, $var);
         defined $ret or return undef;
         $string =~ s/<ASK:(.+\|.+?)>/$ret/g;
     }
@@ -454,17 +437,19 @@ sub subst {
     # Replace '<ASK:*>' with user provided data for 'cmd' execution
     while ($string =~ /<ASK:(.+?)>/go) {
         my $var = $1;
-        my $val = wEnterValue(undef, "<b>Variable substitution</b>" , $var) // return undef;
+        my $val = wEnterValue("<b>Variable substitution</b>" , $var) // return undef;
         if (!defined $val) {
             last;
         }
         $string =~ s/<ASK:\Q$var\E>/$val/g;
     }
 
+    # Different from PACUtils implementation
+
     # Replace '<CMD:#>' with the result of executing 'cmd'
     while ($string =~ /<CMD:(.+?)>/go) {
         my $var = $1;
-        my $output = `$var 2>&1`;
+        my $output = `$ENV{'ASBRU_ENV_FOR_EXTERNAL'} $var 2>&1`;
         chomp $output;
         $string =~ s/<CMD:\Q$var\E>/$output/g;
     }
@@ -473,95 +458,30 @@ sub subst {
 }
 
 sub wEnterValue {
-    my $self = shift;
-    my $lblup = shift;
-    my $lbldown = shift;
-    my $default = shift;
+    my $lblup = shift // '';
+    my $lbldown = shift // '';
+    my $default = shift // '';
     my $visible = shift // 1;
+    my $val = '';
+    my $pos = 0;
 
-    my @list;
-    my $pos = -1;
-
-    if (! defined $default) {
-        $default = '';
-    } elsif (ref($default)) {
-        @list = @{$default};
-    }
-
-    # Create the dialog window,
-    $_W{window}{data} = Gtk3::Dialog->new_with_buttons(
-        "$APPNAME : Enter data",
-        undef,
-        'modal',
-        'gtk-cancel' => 'cancel',
-        'gtk-ok' => 'ok'
-    );
-    # and setup some dialog properties.
-    $_W{window}{data}->set_default_response('ok');
-    $_W{window}{data}->set_position('center');
-    $_W{window}{data}->set_icon_from_file($APPICON);
-    $_W{window}{data}->set_size_request(-1, -1);
-    $_W{window}{data}->set_resizable(0);
-    $_W{window}{data}->set_border_width(5);
-
-    # Create an HBox to contain a picture and a label
-    $_W{window}{gui}{hbox} = Gtk3::HBox->new(0, 0);
-    $_W{window}{data}->get_content_area->pack_start($_W{window}{gui}{hbox}, 1, 1, 5);
-    $_W{window}{gui}{hbox}->set_border_width(5);
-
-    # Create image
-    $_W{window}{gui}{img} = Gtk3::Image->new_from_stock('gtk-edit', 'dialog');
-    $_W{window}{gui}{hbox}->pack_start($_W{window}{gui}{img}, 0, 1, 5);
-
-    # Create 1st label
-    $_W{window}{gui}{lblup} = Gtk3::Label->new;
-    $_W{window}{gui}{hbox}->pack_start($_W{window}{gui}{lblup}, 1, 1, 5);
-    $_W{window}{gui}{lblup}->set_markup($lblup);
-
-    if (defined $lbldown) {
-        # Create 2nd label
-        $_W{window}{gui}{lbldwn} = Gtk3::Label->new;
-        $_W{window}{data}->get_content_area->pack_start($_W{window}{gui}{lbldwn}, 1, 1, 5);
-        $_W{window}{gui}{lbldwn}->set_text($lbldown);
-    }
-
-    if (@list) {
-        # Create combobox widget
-        $_W{window}{gui}{comboList} = Gtk3::ComboBoxText->new;
-        $_W{window}{data}->get_content_area->pack_start($_W{window}{gui}{comboList}, 0, 1, 0);
-        $_W{window}{gui}{comboList}->set_property('can_focus', 0);
-        foreach my $text (@list) {
-            $_W{window}{gui}{comboList}->append_text($text)
-        };
-        $_W{window}{gui}{comboList}->set_active(0);
-    } else {
-        # Create the entry widget
-        $_W{window}{gui}{entry} = Gtk3::Entry->new;
-        $_W{window}{data}->get_content_area->pack_start($_W{window}{gui}{entry}, 0, 1, 5);
-        $_W{window}{gui}{entry}->set_text($default);
-        $_W{window}{gui}{entry}->set_activates_default(1);
-        $_W{window}{gui}{entry}->set_visibility($visible);
-    }
-
-    # Show the window (in a modal fashion)
-    $_W{window}{data}->show_all;
-    my $ok = $_W{window}{data}->run;
-
-    my $val;
-    if (@list) {
-        $val = ($ok eq 'ok') ? $_W{window}{gui}{comboList}->get_active_text : undef;
-        $pos = $_W{window}{gui}{comboList}->get_active;
-    } else {
-        $val = ($ok eq 'ok') ? $_W{window}{gui}{entry}->get_chars(0, -1) : undef;
+    if ($GETCMD) {
+        return '&lt;ASK&gt;';
     }
+    # Request a value to the PACTerminal object
+    ctrl("WENTER|:|$lblup|:|$lbldown|:|$default|:|$visible");
+    # Wait for data to arrive
+    ($val,$pos) = readData('WENTER');
+    return wantarray ? ($val, $pos) : $val;
+}
 
-    $_W{window}{data}->destroy;
-    while (Gtk3::events_pending) {
-        Gtk3::main_iteration;
-    }
-    undef %_W;
+sub _hideSTDERR {
+    open OLDERR, ">&STDERR";
+    open STDERR, ">/dev/null";
+}
 
-    return wantarray ? ($val, $pos) : $val;
+sub _showSTDERR {
+    open STDERR, ">&OLDERR";
 }
 
 sub send_slow {
@@ -574,7 +494,7 @@ sub send_slow {
 
 sub _getPrompt {
     # Delete any data accumulated before launching the command
-    $EXP->clear_accum;
+    $EXP->clear_accum();
     $EXP->restart_timeout_upon_receive(1);
 
     send_slow($EXP, "\n");
@@ -600,7 +520,7 @@ sub _execAndCapture {
     $cmd ||= $$ctrl{cmd};
 
     # Delete any data accumulated before launching the command
-    $EXP->clear_accum;
+    $EXP->clear_accum();
     $EXP->restart_timeout_upon_receive(1);
 
     if ($intro) {
@@ -632,7 +552,7 @@ sub _execAndCapture {
         [eof => sub {
             ctrl("ERROR:Connection ended by remote peer!! " . $EXP->set_accum());
             $CONNECTED = 0;
-            $EXP->hard_close;
+            _hardClose($EXP, $UUID);
         }],
 
         [((! defined $pattern && ($pipe || $tee || $capture || defined $ctrl)) ? '##__PAC__PIPE__##' : (defined $pattern ? $pattern : '')) => sub {$ok = 1;}]
@@ -716,7 +636,7 @@ sub _execScript {
 
         ctrl("SCRIPT_SUB_ASK[NAME:$name][PID:$$][PARAMS:$txt, $visible]");
 
-        return wEnterValue(undef, "<b>PAC SCRIPT USER INPUT</b>" , $txt, undef, $visible);
+        return wEnterValue("<b>Ásbrú SCRIPT USER INPUT</b>" , $txt, undef, $visible);
     };
     $TERMINAL{msg} = sub {msg(subst(shift));};
     $TERMINAL{log} = sub {
@@ -735,7 +655,7 @@ sub _execScript {
 
         ctrl("SCRIPT_SUB_SEND[NAME:$name][PID:$$][PARAMS:$txt]");
 
-        $EXP->clear_accum;
+        $EXP->clear_accum();
         send_slow($EXP, $txt);
     };
     $TERMINAL{send_get} = sub {
@@ -774,27 +694,28 @@ sub _execScript {
         $TERMINAL{error} = '';
 
         my $wait = $tmout;
-        while ($wait > 0) {
+        my $found = 0;
+        while (!$found && $wait>0) {
             $EXP->expect(
                 1,
                 [eof => sub {$TERMINAL{error} = "Connection closed while waiting for pattern '$pattern'", exit 1;}],
                 [$pattern => sub {
-                    $TERMINAL{out1} = $EXP->before;
-                    $TERMINAL{out2} = $EXP->after;
+                    $TERMINAL{out1} = $EXP->before();
+                    $TERMINAL{out2} = $EXP->after();
                     $TERMINAL{error} = '';
-                    last;
+                    $found = 1;
                 }]
             );
             $wait--;
         }
-        if (! $wait) {
+        if (!$found) {
             $TERMINAL{error} = "Timeout ($tmout seconds) waiting for pattern '$pattern'";
             return 0;
         }
         return $TERMINAL{error} eq '';
     };
 
-    # Start PAC Script
+    # Start script
     ctrl("SCRIPT_START[NAME:$name]");
 
     no warnings ('redefine');
@@ -818,7 +739,7 @@ sub _execScript {
     eval {
         local $SIG{'TERM'} = sub {
             ctrl("SCRIPT_STOPPED_MANUALLY[NAME:$name]");
-            msg("PAC Script '$name' terminated by user request (TERM(15) signal)");
+            msg("Ásbrú Script '$name' terminated by user request (TERM(15) signal)");
             if (defined $_W{window}{data}){
                 $_W{window}{data}->destroy;
             }
@@ -837,39 +758,16 @@ sub _execScript {
     return 1;
 }
 
-sub findKP {
-    my $kp = shift;
-    my $where = shift // 'title';
-    my $what = shift // qr/.*/;
-
-    my @found;
-    foreach my $hash (@{$kp}) {
-        if (ref($what) eq 'Regexp') {
-            if ($$hash{$where} !~ /^$what$/) {
-                next;
-            }
-        } elsif ($$hash{$where} ne $what) {
-            next;
-        }
-        push(@found, {
-            title => $$hash{title},
-            url => $$hash{url},
-            username => $$hash{username},
-            password => $$hash{password},
-            created => $$hash{created},
-            comment => $$hash{comment}
-        });
-    }
-
-    return wantarray ? @found : scalar(@found);
-}
-
 sub _setProxy {
     my $method = shift;
+    my $user = $USER;
 
     # Set variables in case they are used in function : sub subst()
     my $ssh_config = '';
     if (($$CFG{'environments'}{$UUID}{'use proxy'} == 3) || ($$CFG{'environments'}{$UUID}{'use proxy'} == 0)) {
+        if ($AUTH eq 'publickey') {
+            $user = $PASSPHRASE_USER;
+        }
         if (-e "/etc/ssh/ssh_config") {
             open (SSHC,"<:utf8","/etc/ssh/ssh_config");
             while (my $l = <SSHC>) {
@@ -908,14 +806,14 @@ sub _setProxy {
         $proxy_user = $$CFG{'environments'}{$UUID}{'jump user'};
         $proxy_pass = $$CFG{'environments'}{$UUID}{'jump pass'};
         open(CFG,">:utf8","$CFG_DIR/tmp/$UUID.conf");
-        print CFG qq“Host *\n$ssh_config\nProtocol 2\nCompression yes\nTCPKeepAlive yes\nServerAliveInterval 60\nPreferredAuthentications publickey,hostbased,keyboard-interactive,password\n“;
-        print CFG qq“\nHost jumpserver\nHostName $proxy_ip\nPort $proxy_port\nUser $proxy_user\n“;
+        print CFG qq"Host *\n$ssh_config\nProtocol 2\nCompression yes\nTCPKeepAlive yes\nServerAliveInterval 60\nPreferredAuthentications publickey,hostbased,keyboard-interactive,password\n";
+        print CFG qq"\nHost jumpserver\nHostName $proxy_ip\nPort $proxy_port\nUser $proxy_user\n";
         if ($$CFG{'environments'}{$UUID}{'jump key'}) {
             print CFG "IdentityFile $$CFG{'environments'}{$UUID}{'jump key'}\n";
         }
         if ($method =~ /ssh/i) {
             # Second server is only important for SSH JumpHost
-            print CFG qq“\nHost server\nHostName $IP\nUser $PASSPHRASE_USER\nPort $PORT\n“;
+            print CFG qq"\nHost server\nHostName $IP\nUser $user\nPort $PORT\n";
             if (($PUBKEY)&&($$CFG{'environments'}{$UUID}{'auth type'} eq 'publickey')) {
                 print CFG "IdentityFile $PUBKEY\n";
             }
@@ -934,14 +832,14 @@ sub _setProxy {
             $proxy_user = $$CFG{'defaults'}{'jump user'};
             $proxy_pass = $$CFG{'defaults'}{'jump pass'};
             open(CFG,">:utf8","$CFG_DIR/tmp/$UUID.conf");
-            print CFG qq“Host *\n$ssh_config\nProtocol 2\nCompression yes\nTCPKeepAlive yes\nServerAliveInterval 60\nPreferredAuthentications publickey,hostbased,keyboard-interactive,password\n“;
-            print CFG qq“\nHost jumpserver\nHostName $proxy_ip\nPort $proxy_port\nUser $proxy_user\n“;
+            print CFG qq"Host *\n$ssh_config\nProtocol 2\nCompression yes\nTCPKeepAlive yes\nServerAliveInterval 60\nPreferredAuthentications publickey,hostbased,keyboard-interactive,password\n";
+            print CFG qq"\nHost jumpserver\nHostName $proxy_ip\nPort $proxy_port\nUser $proxy_user\n";
             if ($$CFG{'defaults'}{'jump key'}) {
                 print CFG "IdentityFile $$CFG{'defaults'}{'jump key'}\n";
             }
             if ($method =~ /ssh/i) {
                 # Second server is only important for SSH JumpHost
-                print CFG qq“\nHost server\nHostName $IP\nUser $PASSPHRASE_USER\nPort $PORT\n“;
+                print CFG qq"\nHost server\nHostName $IP\nUser $user\nPort $PORT\n";
                 if (($PUBKEY)&&($$CFG{'environments'}{$UUID}{'auth type'} eq 'publickey')) {
                     print CFG "IdentityFile $PUBKEY\n";
                 }
@@ -972,11 +870,9 @@ sub _getProxyCmd {
     my ($proxy_type, $proxy_ip, $proxy_port, $proxy_user, $proxy_pass) = @_;
 
     if ($proxy_user ne '') {
-        `which ncat 1>/dev/null 2>&1`;
-        if (! $?) {
-            return "ncat --proxy $proxy_ip:$proxy_port --proxy-type $proxy_type --proxy-auth $proxy_user:$proxy_pass";
+        if (system("$ENV{'ASBRU_ENV_FOR_EXTERNAL'} which ncat 1>/dev/null 2>&1") eq 0) {
+            return "ncat --proxy $proxy_ip:$proxy_port --proxy-type $proxy_type --proxy-auth $proxy_user:\"$proxy_pass\"";
         }
-        ctrl("UNHIDE_TERMINAL");
         print("$COLOR{'err'}ERROR$COLOR{'norm'}: ncat is required if using proxy user/password.\nncat is part of the nmap project (https://nmap.org/ncat/).\n");
         die();
     } else {
@@ -986,33 +882,43 @@ sub _getProxyCmd {
 
 sub _openSshTunnel {
     my ($uuid) = @_;
+    my $TMP_DIR = $ENV{"ASBRU_TMP"};
 
+    # Get a local port that is not alreay in use
+    $LPORT = _getLocalPort($PORT);
+
+    if ($GETCMD) {
+        $proxy_get .= "\nssh -F \"$CFG_DIR/tmp/$uuid.conf\" -S \"$TMP_DIR/$uuid.ctl\" -f -N -T -M -L $LPORT:$IP:$PORT jumpserver";
+        return 0;
+    }
     $proxy_jump = 2;
 
-    if (-e "$CFG_DIR/tmp/$uuid.ctl") {
+    if (-e "$TMP_DIR/$uuid.ctl") {
         # Avoid open a second terminal with the same UUID
-        my $check = `ssh -F $CFG_DIR/tmp/$uuid.conf -S $CFG_DIR/tmp/$uuid.ctl -T -O check jumpserver 2>&1`;
+        my $check = `$ENV{'ASBRU_ENV_FOR_EXTERNAL'} ssh -F \"$CFG_DIR/tmp/$uuid.conf\" -S \"$TMP_DIR/$uuid.ctl\" -T -O check jumpserver 2>&1`;
         if ($check =~ /=\d+/) {
-            ctrl("UNHIDE_TERMINAL");
             die "$COLOR{'err'}Can not duplicate VNC/RDP connections$COLOR{'norm'}\nConfigure a different second connection.\n\n";
         }
     }
-    # Check if port we want to bind is not alreay in use
-    $LPORT = _getLocalPort($PORT);
-    system "ssh -F $CFG_DIR/tmp/$uuid.conf -S $CFG_DIR/tmp/$uuid.ctl -f -N -T -M -L $LPORT:$IP:$PORT jumpserver";
+    # Start SSH tunnel
+    system "$ENV{'ASBRU_ENV_FOR_EXTERNAL'} ssh -F \"$CFG_DIR/tmp/$uuid.conf\" -S \"$TMP_DIR/$uuid.ctl\" -f -N -T -M -L $LPORT:$IP:$PORT jumpserver";
     $IP = '127.0.0.1';
     $PORT = $LPORT;
 }
 
 sub _openSocksTunnel {
-    my $pipe = "$CFG_DIR/tmp/pipe_$UUID";
+    my $pipe = $ENV{"ASBRU_TMP"}."/pipe_$UUID";
 
     $LPORT = _getLocalPort($PORT);
     $proxy_cmd = _getProxyCmd($proxy_type, $proxy_ip, $proxy_port, $proxy_user, $proxy_pass);
+    if ($GETCMD) {
+        $proxy_get .= "\nnc -l -p $LPORT <$pipe | $proxy_cmd $IP $PORT >$pipe &";
+        return 0;
+    }
 
     unlink($pipe);
-    system("mkfifo $pipe");
-    system("nc -l -p $LPORT <$pipe | $proxy_cmd $IP $PORT >$pipe &");
+    system("$ENV{'ASBRU_ENV_FOR_EXTERNAL'} mkfifo $pipe");
+    system("$ENV{'ASBRU_ENV_FOR_EXTERNAL'} nc -l -p $LPORT <$pipe | $proxy_cmd $IP $PORT >$pipe &");
     $IP = '127.0.0.1';
     $PORT = $LPORT;
 }
@@ -1020,26 +926,139 @@ sub _openSocksTunnel {
 # Find out a free local TCP port
 sub _getLocalPort {
     my $LPORT = shift;
-    my $break = 100;
 
-    while ($break && (my $msg = `netstat -lnt | grep $LPORT 2>&1`)) {
-        if ($msg !~ /:$LPORT/) {
-            # netstat not installed?
-            last;
+    my $PING = Net::Ping->new('tcp');
+    $PING->service_check(0);
+
+    for (my $break = 0; $break < 100; ++$break) {
+        $PING->port_number($LPORT);
+        if (!$PING->ping('localhost')) {
+            return $LPORT;
         }
         $LPORT++;
-        $break--;
     }
+
+
     return $LPORT;
 }
 
-# Place any thing that has to be done before a hard_close
+# We have a jump proxy, we have to figure out which password is being asked: Jump server? Destination?
+
+sub getJumpPassword {
+    my $match = $EXP->match();
+    my $debug = $DEBUG ? $DEBUG : $ENV{'VERBOSE'};
+
+    if ($debug) {
+        print "\n$COLOR{log}",
+        "MATCH   : >$match<\n",
+        "IP      : $IP\n",
+        "JUMP IP : $proxy_ip\n",
+        "DEFAULT  KEY : $$CFG{'defaults'}{'jump key'}\n",
+        "TERMINAL KEY : $$CFG{'environments'}{$UUID}{'jump key'}\n",
+        "$COLOR{'norm'}";
+    }
+
+    if ($$CFG{'environments'}{$UUID}{'use proxy'} == 3 && !$JUMP_PASS) {
+        # Use terminal configuration settings
+        if ($$CFG{'environments'}{$UUID}{'jump key'} && $match =~ /$$CFG{'environments'}{$UUID}{'jump key'}/) {
+            $JUMP_PASS++;
+            if ($proxy_pass) {
+                if ($debug) {
+                    print "$COLOR{cyan}TRY JUMP UUID PASSPRHASE$COLOR{'norm'}\n";
+                }
+                return $proxy_pass;
+            }
+            if ($debug) {
+                print "$COLOR{recv}* ASK JUMP UUID PASSPRHASE$COLOR{'norm'}\n";
+            }
+            return askPassword();
+        }
+    } elsif ($$CFG{'environments'}{$UUID}{'use proxy'} == 0 && $$CFG{'defaults'}{'proxy'} eq 'Jump' && !$JUMP_PASS) {
+        # Use global configuration settings
+        if ($$CFG{'defaults'}{'jump key'} && $match =~ /$$CFG{'defaults'}{'jump key'}/) {
+            $JUMP_PASS++;
+            if ($proxy_pass) {
+                if ($debug) {
+                    print "$COLOR{cyan}TRY JUMP DEFAULT PASSPHRASE OK!$COLOR{'norm'}\n";
+                }
+                return $proxy_pass;
+            }
+            if ($debug) {
+                print "$COLOR{recv}* ASK JUMP DEFAULT PASSPRHASE$COLOR{'norm'}\n";
+            }
+            return askPassword();
+        }
+    } elsif ($AUTH eq 'publickey' && $PUBKEY && $match =~ /$PUBKEY/ && $TERM_PASS<2) {
+        $TERM_PASS++;
+        if ($PASSPHRASE) {
+            if ($debug) {
+                print "$COLOR{cyan}TRY TERMINAL PASSPHRASE ($TERM_PASS)$COLOR{'norm'}\n";
+            }
+            return $PASSPHRASE;
+        }
+        if ($debug) {
+            print "$COLOR{recv}* ASK TERMINAL PASSPHRASE ($TERM_PASS)$COLOR{'norm'}\n";
+        }
+        return askPassword();
+    }
+    if ($debug) {
+        print "$COLOR{log}",
+        "JUMP PASS? $JUMP_PASS\n",
+        "TERM PASS? $TERM_PASS",
+        "$COLOR{'norm'}\n";
+    }
+    if (!$JUMP_PASS && $proxy_pass) {
+        if ($debug) {
+            print "$COLOR{cyan}TRY DEFAULT JUMP$COLOR{'norm'}\n";
+        }
+        $JUMP_PASS++;
+        return $proxy_pass;
+    }
+    $JUMP_PASS++;
+    if (!$TERM_PASS) {
+        # Try a terminal password, maybe the jump server is alrealy logged in
+        $TERM_PASS++;
+        if ($AUTH eq 'publickey' && $PASSPHRASE) {
+            if ($debug) {
+                print "$COLOR{cyan}TRY DESTINATION PASSPHRASE$COLOR{'norm'}\n";
+            }
+            return $PASSPHRASE;
+        } elsif ($AUTH eq 'userpass' && $PASS && $PASS ne '<<ASK_PASS>>') {
+            if ($debug) {
+                print "$COLOR{cyan}TRY DESTINATION PASSWORD$COLOR{'norm'}\n";
+            }
+            return $PASS;
+        }
+    }
+    if ($debug) {
+        print "$COLOR{recv}* ASK PASSWORD$COLOR{'norm'}\n";
+    }
+    # Extract the last line and use it is as prompt for the request password dialog
+    return askPassword();
+}
+
+sub askPassword {
+    my @before;
+
+    my $real_prompt = (scalar @before > 0 ? $before[-1] : '') . $EXP->match();
+    ctrl("PASSWORD:Asking user for password...");
+    my $p = wEnterValue('<b>Manual Password requested</b>', $real_prompt, '', 0);
+    return $p;
+}
+
+# Place any thing that has to be done before a hard_close; and finally do the hard_close
 sub _hardClose {
-    my ($uuid)  = @_;
-    my $pipe = "$CFG_DIR/tmp/pipe_$uuid";
+    my ($EXP, $uuid)  = @_;
+    my $pipe = $ENV{"ASBRU_TMP"}."/pipe_$uuid";
+    my $sock = $ENV{"ASBRU_TMP"}."/$uuid.ctl";
+    my $cmd_file = "$CFG_DIR/tmp/cmd_$uuid.run";
 
-    if ($proxy_jump == 2) {
-        system "ssh -F $CFG_DIR/tmp/$uuid.conf -S $CFG_DIR/tmp/$uuid.ctl -T -O exit jumpserver";
+    if (-e $cmd_file) {
+        unlink($cmd_file);
+    }
+
+    if ($proxy_jump == 2 && -e $sock) {
+        system "$ENV{'ASBRU_ENV_FOR_EXTERNAL'} ssh -F \"$CFG_DIR/tmp/$uuid.conf\" -S \"$sock\" -T -O exit jumpserver";
     }
     if (-e $pipe) {
         unlink($pipe);
@@ -1047,20 +1066,26 @@ sub _hardClose {
     if ($IS_CLUSTER && ($RESTART == 2)) {
         ctrl('RESTART');
     }
+    if ($EXP) {
+        $EXP->hard_close();
+    }
     return 0;
 }
 
+sub logTime {
+    my $t = encode('utf8',strftime "%Y-%m-%d %H:%M:%S", localtime());
+    print LOG "$t : $_[0]";
+    if ($_[0] !~ /\n|\r$/) {
+        print LOG "\n";
+    }
+}
+
 # If we want a perfect fit of an embedded RDP tab, we can use X11::GUITest if available
 # We should eval in BEGIN or perl warns "Too late to run INIT block"
 my $module_guitest;
 BEGIN{
-    eval("use X11::GUITest qw (GetWindowPos GetRootWindow)");
-
-    if ($@) {
-        $module_guitest="N";
-    } else {
-        $module_guitest="Y";
-    }
+    eval("use X11::GUITest qw (GetWindowPos GetWindowName)");
+    $module_guitest = $@ ? "N" : "Y";
 }
 # END OF : Procedures definition
 ########################################################
@@ -1069,6 +1094,7 @@ BEGIN{
 
 # Choose and prepare the connection method
 my $connection_cmd = '';
+my $connection_cmd2 = '';
 my $connection_txt = '';
 
 if (defined $METHOD) {
@@ -1077,6 +1103,11 @@ if (defined $METHOD) {
     ##############################################
     if (($METHOD =~ /^.*ssh.*$/) || ($METHOD eq 'SSH')) {
         _setProxy('ssh');
+
+        if (defined $$CFG{'tmp'}{'randomSocksTunnel'}) {
+          $CONNECT_OPTS .= ' -D localhost:' . $$CFG{'tmp'}{'randomSocksTunnel'};
+        }
+
         if ($METHOD ne 'autossh') {
             $METHOD = 'ssh';
         }
@@ -1088,25 +1119,33 @@ if (defined $METHOD) {
         } elsif (! $AUTHFALLBACK) {
             $key = '-o "PreferredAuthentications=password,keyboard-interactive"';
         }
+        # Build the command line
+        $connection_cmd = $METHOD
+                          . ($PORT > 0 ? " -p $PORT" : '')
+                          . ($key ne '' ? " $key" : "")
+                          . $CONNECT_OPTS
+                          . ($USER ? " -l $USER " : '')
+                          . " $IP";
         if ($proxy_jump) {
-            $connection_cmd = "$METHOD -F $CFG_DIR/tmp/$UUID.conf $CONNECT_OPTS -J jumpserver server";
-        } else {
-            $connection_cmd = "$METHOD -p $PORT $key $CONNECT_OPTS " . ($USER ? "-l $USER " : '') . "$IP";
+            if ($$CFG{'environments'}{$UUID}{'pseudo jump'}) {
+                # Pseudo jump, connect to the first server and then we will send the second connection command over the second server
+                $connection_cmd2 = $connection_cmd;
+                $connection_cmd = "$METHOD -F \"$CFG_DIR/tmp/$UUID.conf\" $CONNECT_OPTS jumpserver";
+            } else {
+                $connection_cmd = "$METHOD -F \"$CFG_DIR/tmp/$UUID.conf\" $CONNECT_OPTS -J jumpserver server";
+            }
         }
         $connection_txt = $connection_cmd;
     } elsif (($METHOD =~ /^.*mosh.*$/) || ($METHOD eq 'MOSH')) {
-        $METHOD = 'mosh';
-        if ($PORT != 22) {
-            $CONNECT_OPTS .= " --ssh=\"ssh -p $PORT\"";
-        }
         my $key = '';
+        $METHOD = 'mosh';
         if ($AUTH eq 'publickey') {
-            $key = ($PUBKEY ? "-i \"$PUBKEY\"" : "") . ($AUTHFALLBACK ? '' : ' -o "PreferredAuthentications=publickey"');
+            $key = $PUBKEY ? "-i '$PUBKEY'" : '';
             $USER = $PASSPHRASE_USER;
             $PASS = $PASSPHRASE;
-            $CONNECT_OPTS = " --ssh=\"ssh -p $PORT $key\"";
-        } elsif (! $AUTHFALLBACK) {
-            $key = '-o "PreferredAuthentications=password,keyboard-interactive"';
+            $CONNECT_OPTS .= " --ssh=\"ssh -p $PORT $key\"";
+        } elsif ($PORT != 22) {
+            $CONNECT_OPTS .= " --ssh=\"ssh -p $PORT\"";
         }
         $connection_cmd = "$METHOD $CONNECT_OPTS ${USER}\@$IP";
         $connection_txt = $connection_cmd;
@@ -1121,7 +1160,11 @@ if (defined $METHOD) {
         } elsif (! $AUTHFALLBACK) {
             $key = '-o "PreferredAuthentications=password,keyboard-interactive"';
         }
-        $connection_cmd = "$METHOD $key -P $PORT $CONNECT_OPTS " . ($USER ? "$USER@" : '') . "$IP";
+        if ($proxy_jump) {
+            $connection_cmd = "$METHOD -F \"$CFG_DIR/tmp/$UUID.conf\" $CONNECT_OPTS -o Proxyjump=jumpserver server";
+        } else {
+            $connection_cmd = "$METHOD $key -P $PORT $CONNECT_OPTS " . ($USER ? "$USER@" : '') . "$IP";
+        }
         $connection_txt = $connection_cmd;
     } elsif (($METHOD =~ /^.*telnet.*$/) || ($METHOD eq 'Telnet')) {
         $METHOD = 'telnet';
@@ -1156,6 +1199,7 @@ if (defined $METHOD) {
     # TERMINAL DESKTOP METHODS (rdp, vnc, etc)
     ##############################################
     elsif ($METHOD =~ /^.*RDP \((.+)\).*$/) {
+        $HIDE_TERMINAL = 1;
         $METHOD = $1;
         _setProxy('RDP');
         if ((defined $$CFG{'tmp'}{'xid'}) && ($METHOD eq 'rdesktop')) {
@@ -1171,11 +1215,19 @@ if (defined $METHOD) {
         } elsif ((defined $$CFG{'tmp'}{'xid'}) && ($METHOD =~ /^.*freerdp$/)) {
             if ($module_guitest eq 'Y') {
                 my ($xpos, $ypos, $Xwidth, $Xheight, $borderWidth, $_screen) = GetWindowPos($$CFG{'tmp'}{'xid'});
+                my $name = GetWindowName($$CFG{'tmp'}{'xid'});
                 if ($Xwidth > 1 && $Xheight > 1) {
                     $$CFG{'tmp'}{'width'} = $Xwidth;
                     $$CFG{'tmp'}{'height'} = $Xheight;
                 }
             }
+            # Just in case we end up with impossible values
+            if ($$CFG{'tmp'}{'width'} <= 1) {
+                $$CFG{'tmp'}{'width'} = 1024;
+            }
+            if ($$CFG{'tmp'}{'height'} <= 1) {
+                $$CFG{'tmp'}{'height'} = 768;
+            }
             $connection_cmd = "$METHOD /parent-window:$$CFG{'tmp'}{'xid'} /size:$$CFG{'tmp'}{'width'}x$$CFG{'tmp'}{'height'} $CONNECT_OPTS" . ($MANUAL ? '' : " /u:'$USER' /p:'$PASS'") . " /v:$IP:$PORT";
             $connection_txt = "$METHOD /parent-window:$$CFG{'tmp'}{'xid'} /size:$$CFG{'tmp'}{'width'}x$$CFG{'tmp'}{'height'} $CONNECT_OPTS" . ($MANUAL ? '' : " /u:'$USER' /p:'<<hidden_password>>'") . " /v:$IP:$PORT";
         } elsif (defined $$CFG{'tmp'}{'xid'}) {
@@ -1199,37 +1251,38 @@ if (defined $METHOD) {
         $METHOD = 'vncviewer';
         if (($PASS eq '<<ASK_PASS>>') || ($MANUAL)) {
             ctrl("PASSWORD:Asking user for password...");
-            $PASS = wEnterValue(undef, '<b>Manual Password requested</b>', "Enter Password for '$NAME'", '', 0) // '';
+            $PASS = wEnterValue('<b>Manual Password requested</b>', "Enter Password for '$NAME'", '', 0) // '';
         }
         my $method = 'VNC';
+        my $vncviewer_cmd = "LC_ALL=C $METHOD";
         $CONNECT_OPTS =~ s/\s*-embed//go;
-        if (`vncviewer --help 2>&1 | /bin/grep RealVNC`) {
+        if (`$ENV{'ASBRU_ENV_FOR_EXTERNAL'} vncviewer --help 2>&1 | $ENV{'ASBRU_ENV_FOR_EXTERNAL'} /bin/grep RealVNC`) {
             $method = 'RealVNC';
-        } elsif (`vncviewer --help 2>&1 | /bin/grep TigerVNC`) {
+        } elsif (`$ENV{'ASBRU_ENV_FOR_EXTERNAL'} vncviewer --help 2>&1 | $ENV{'ASBRU_ENV_FOR_EXTERNAL'} /bin/grep TigerVNC`) {
             $method = 'TigerVNC';
         }
         _setProxy($method);
         if ($method eq 'TigerVNC') {
-            my $pfile = "$CFG_DIR/tmp/pac_conn_{$$}_$UUID";
-            system("echo \"$PASS\" | vncpasswd -f > $pfile");
+            my $pfile = "$CFG_DIR/tmp/asbru_conn_{$$}_$UUID";
+            system("$ENV{'ASBRU_ENV_FOR_EXTERNAL'} echo \"" . _doShellEscape($PASS) . "\" | vncpasswd -f > \"$pfile\"");
             if (defined $$CFG{'tmp'}{'xid'}) {
-                $connection_cmd = "$METHOD $CONNECT_OPTS -PasswordFile=$pfile -Parent=$$CFG{'tmp'}{'xid'} $IP:$PORT";
-                $connection_txt = "$METHOD $CONNECT_OPTS -PasswordFile=$pfile -Parent=$$CFG{'tmp'}{'xid'} $IP:$PORT";
+                $connection_cmd = "$vncviewer_cmd $CONNECT_OPTS -PasswordFile=\"$pfile\" -Parent=$$CFG{'tmp'}{'xid'} $IP:$PORT";
+                $connection_txt = "$vncviewer_cmd $CONNECT_OPTS -PasswordFile=\"$pfile\" -Parent=$$CFG{'tmp'}{'xid'} $IP:$PORT";
             } else {
-                $connection_cmd = "$METHOD $CONNECT_OPTS -PasswordFile=$pfile $IP:$PORT";
-                $connection_txt = "$METHOD $CONNECT_OPTS -PasswordFile=$pfile $IP:$PORT";
+                $connection_cmd = "$vncviewer_cmd $CONNECT_OPTS -PasswordFile=\"$pfile\" $IP:$PORT";
+                $connection_txt = "$vncviewer_cmd $CONNECT_OPTS -PasswordFile=\"$pfile\" $IP:$PORT";
             }
         } elsif ($method eq 'RealVNC') {
             my $user = $USER ? "UserName=$USER" : '';
 
-            $connection_cmd = "$METHOD $CONNECT_OPTS $user $IP:$PORT";
-            $connection_txt = "$METHOD $CONNECT_OPTS $user $IP:$PORT";
+            $connection_cmd = "$vncviewer_cmd $CONNECT_OPTS $user $IP:$PORT";
+            $connection_txt = "$vncviewer_cmd $CONNECT_OPTS $user $IP:$PORT";
             $METHOD = "Real$METHOD";
         } else {
             my $user = '';
 
-            $connection_cmd = "echo \"$PASS\" | $METHOD $CONNECT_OPTS $user $IP:$PORT";
-            $connection_txt = "echo \"<<hidden_password>>\" | $METHOD $CONNECT_OPTS $user $IP:$PORT";
+            $connection_cmd = "echo \"" . _doShellEscape($PASS) . "\" | $vncviewer_cmd $CONNECT_OPTS $user $IP:$PORT";
+            $connection_txt = "echo \"<<hidden_password>>\" | $vncviewer_cmd $CONNECT_OPTS $user $IP:$PORT";
         }
     }
     ##############################################
@@ -1262,12 +1315,24 @@ if ($QUOTE_COMMAND) {
 if ($QUOTE_COMMAND) {
     $connection_txt = qq|"$connection_cmd"|;
 }
+if ($QUOTEPOST_COMMAND) {
+    $connection_cmd = qq|"$connection_cmd"|;
+}
+if ($QUOTEPOST_COMMAND) {
+    $connection_txt = qq|"$connection_cmd"|;
+}
 if ($USE_PREPEND_COMMAND) {
     $connection_cmd = "$PREPEND_COMMAND $connection_cmd";
 }
 if ($USE_PREPEND_COMMAND) {
     $connection_txt = "$PREPEND_COMMAND $connection_txt";
 }
+if ($USE_POSTPEND_COMMAND) {
+    $connection_cmd = "$connection_cmd $POSTPEND_COMMAND ";
+}
+if ($USE_POSTPEND_COMMAND) {
+    $connection_txt = "$connection_txt $POSTPEND_COMMAND ";
+}
 
 # Check for 'sudo' use
 if ($SUDO) {
@@ -1286,16 +1351,47 @@ if ($$CFG{'environments'}{$UUID}{'terminal options'}{'use personal settings'}) {
 
 $connection_cmd = subst($connection_cmd);
 if ($GETCMD) {
-    print $connection_cmd;
+    print "<b>Command line:</b>\n";
+    print Glib::Markup::escape_text($connection_cmd);
+    if ($proxy_get ne '') {
+        print "\n\n<b>Proxy setup:</b>";
+        print Glib::Markup::escape_text($proxy_get);
+    }
     exit 0;
 }
 
 # Set log file
-$EXP->log_file($LOG_FILE);
+# Only if the target directory is writable; if not writable, we can silently ignore the erroneous log file since the warning has already been raised in the main application
+
+if (open(LOG,">:raw",$LOG_FILE)) {
+    if ($LOG_TIMESTAMP) {
+        $EXP->log_file(\&logTime);
+    } else {
+        close LOG;
+        $EXP->log_file($LOG_FILE);
+    }
+} else {
+    print "\n$COLOR{'err'}ERROR: could not open log file :$LOG_FILE$COLOR{'norm'}\n(check path and permissions)\n\n";
+}
+
+# Prepare command file that is only accessible to the user
+my $do_connection_cmd = $connection_cmd;
+my $cmd_file = "$CFG_DIR/tmp/cmd_${UUID}_" . int(rand(123456789)) . ".run";
+if ($METHOD ne 'PACShell') {
+    if (open(my $CMD, ">:utf8", $cmd_file)) {
+        chmod(0400, $CMD);
+        print { $CMD } "rm -f \"$cmd_file\"\n"; # deleting the temporary file immediately after it has been started
+        print { $CMD } $connection_cmd;
+        close($CMD);
+        $do_connection_cmd = "sh \"$cmd_file\"";
+    }
+}
 
 # Spawn the session
 ctrl("SPAWNING:$connection_txt");
-$EXP->spawn("$connection_cmd 2>&1") or die "Cannot spawn '$connection_cmd: $!\n";
+my $external_dir = $ENV{'ASBRU_SUB_CWD'} // '.';
+$do_connection_cmd = "$ENV{'ASBRU_ENV_FOR_EXTERNAL'} cd '$external_dir' && $ENV{'ASBRU_ENV_FOR_EXTERNAL'} $do_connection_cmd";
+$EXP->spawn("$do_connection_cmd 2>&1") or die "Cannot spawn '$connection_cmd: $!\n";
 ctrl("SPAWNED:'$connection_txt' (PID:$$)");
 
 $EXP->exp_internal($DEBUG); # EXPECT DEBUG!!
@@ -1304,18 +1400,15 @@ if (($METHOD =~ /^.*rdesktop$/) || ($METHOD =~ /^.*freerdp.*/) || ($METHOD eq 'R
     $CONNECTED = 1;
     ctrl("CONNECTED");
 
-    # No way to expect anything from 'rdesktop' command line...
     $EXP->expect($TIMEOUT_CONNECT,
 
         [eof => sub {
             $CONNECTED = 0;
             ctrl("CLOSE:Connection ended by remote peer!! " . $EXP->set_accum());
-            _hardClose($UUID);
-            $EXP->hard_close;
+            _hardClose($EXP, $UUID);
         }],
 
         ['\[ERROR\]', sub {
-            ctrl("UNHIDE_TERMINAL");
         }],
 
         # Found certificate verification string
@@ -1323,38 +1416,41 @@ if (($METHOD =~ /^.*rdesktop$/) || ($METHOD =~ /^.*freerdp.*/) || ($METHOD eq 'R
             if ($ACCEPT_KEY) {
                 send_slow($EXP, "Y\n");
                 ctrl("HOSTKEY:accepted by configuration (sent 'Y')");
-                exp_continue;
+                exp_continue();
             } else {
                 $CONNECTED = 0;
                 send_slow($EXP, "N\n");
-                ctrl("UNHIDE_TERMINAL");
                 ctrl("CLOSE:HOSTKEY:rejected by configuration (sent 'N')");
             }
         }],
 
+        # Found question about untrusted certificate ; keep the terminal open and
+        # let the user review this manually
+        ['Do you trust this certificate', sub {
+            $HIDE_TERMINAL = 0;
+        }],
+
         # Found login string
         [$USERNAME_PROMPT, sub {
-
             if (($USER eq '') && ($USER_COUNT)) {
                 ctrl("CLOSE:LOGIN:Empty username is not valid to login here");
-                _hardClose($UUID);
-                $EXP->hard_close();
+                _hardClose($EXP, $UUID);
             }
             $USER_COUNT++;
             $USER = subst($USER);
             ctrl("LOGIN:$USER");
             send_slow($EXP, "$USER\n");
-            exp_continue;
-            }],
+            exp_continue();
+        }],
+
         # Found password/passphrase string
         [$PASSWORD_PROMPT, sub {
-
-        # First password attempt...
+            # First password attempt...
             if (! $PASSWORD_COUNT) {
                 $PASSWORD_COUNT++;
                 if (($PASS eq '<<ASK_PASS>>') || ($MANUAL)) {
                     ctrl("PASSWORD:Asking user for password...");
-                    $PASS = wEnterValue(undef, '<b>Manual Password requested</b>', "Please, enter Password", '', 0);
+                    $PASS = wEnterValue('<b>Manual Password requested</b>', "Please, enter Password", '', 0);
                 }
                 if (defined $PASS) {
                     $EXP->log_stdout(0);
@@ -1362,22 +1458,24 @@ if (($METHOD =~ /^.*rdesktop$/) || ($METHOD =~ /^.*freerdp.*/) || ($METHOD eq 'R
                     send_slow($EXP, "$PASS\n", 'hide');
                     $EXP->log_stdout(1);
                     ctrl("PASSWORD:Sent (not shown)");
-                    exp_continue;
+                    exp_continue();
                 } else {
-                    ctrl("UNHIDE_TERMINAL");
                     ctrl("CLOSE:PASSWORD:Password input cancelled by user");
                     $CONNECTED = 0;
-                    _hardClose($UUID);
-                    $EXP->hard_close;
+                    _hardClose($EXP, $UUID);
                 }
             }
             # ... second password attempt: provided password is no longer valid!!
             else {
                 ctrl("CLOSE:PASSWORD:Provided username/password '$USER/<<hidden_password>>' was rejected");
-                _hardClose($UUID);
-                $EXP->hard_close;
+                _hardClose($EXP, $UUID);
             }
         }],
+
+        # Found success string for xfreerdp
+        ['\[INFO\]', sub {
+            return 1;
+        }],
     )
 }
 elsif (($METHOD =~ /^.*vncviewer$/) || ($METHOD eq 'VNC')) {
@@ -1391,8 +1489,7 @@ elsif (($METHOD =~ /^.*vncviewer$/) || ($METHOD eq 'VNC')) {
             } else {
                 $CONNECTED = 0;
                 ctrl("CLOSE:TIMEOUT:$TIMEOUT_CONNECT seconds trying to connect or get prompt!!");
-                _hardClose($UUID);
-                $EXP->hard_close;
+                _hardClose($EXP, $UUID);
             }
         }],
 
@@ -1400,8 +1497,7 @@ elsif (($METHOD =~ /^.*vncviewer$/) || ($METHOD eq 'VNC')) {
 
             $CONNECTED = 0;
             ctrl("CLOSE:Connection ended by remote peer!! " . $EXP->set_accum());
-            _hardClose($UUID);
-            $EXP->hard_close;
+            _hardClose($EXP, $UUID);
         }],
 
         # Found login string
@@ -1427,14 +1523,13 @@ elsif (($METHOD =~ /^.*vncviewer$/) || ($METHOD eq 'VNC')) {
 
             if (($USER eq '') && ($USER_COUNT)) {
                 ctrl("CLOSE:LOGIN:Empty username is not valid to login here");
-                _hardClose($UUID);
-                $EXP->hard_close();
+                _hardClose($EXP, $UUID);
             }
             $USER_COUNT++;
             $USER = subst($USER);
             ctrl("LOGIN:$USER");
             send_slow($EXP, "$USER\n");
-            exp_continue;
+            exp_continue();
         }],
 
         # Found password/passphrase string
@@ -1444,7 +1539,7 @@ elsif (($METHOD =~ /^.*vncviewer$/) || ($METHOD eq 'VNC')) {
             $user =~ s/^(.+?)@.+/$1/go;
 
             ctrl("PASSWORD:Asking user for gateway's password...");
-            $PASS = wEnterValue(undef, "<b>Gateway Password requested</b>", "Enter Password for gateway's user '$user'", '', 0);
+            $PASS = wEnterValue("<b>Gateway Password requested</b>", "Enter Password for gateway's user '$user'", '', 0);
 
             if (defined $PASS) {
                 $EXP->log_stdout(0);
@@ -1452,11 +1547,10 @@ elsif (($METHOD =~ /^.*vncviewer$/) || ($METHOD eq 'VNC')) {
                 send_slow($EXP, "$PASS\n", 'hide');
                 $EXP->log_stdout(1);
                 ctrl("PASSWORD:Sent (not shown)");
-                exp_continue;
+                exp_continue();
             } else {
                 ctrl("CLOSE:PASSWORD:Password input cancelled by user");
-                _hardClose($UUID);
-                $EXP->hard_close;
+                _hardClose($EXP, $UUID);
             }
         }],
 
@@ -1493,7 +1587,7 @@ elsif (($METHOD =~ /^.*generic$/) || ($METHOD eq 'Generic Command') || ($METHOD
         if (!$active) {
             next;
         }
-        my $jump = 0;
+        my $skip_command = 0;
 
         if ($time_out >= 0) {
             $TIMEOUT_CMD = $time_out;
@@ -1510,7 +1604,7 @@ elsif (($METHOD =~ /^.*generic$/) || ($METHOD eq 'Generic Command') || ($METHOD
                 if ($on_fail == -1) {
                     ctrl("CLOSE:TIMEOUT:$TIMEOUT_CMD seconds expecting pattern '$pattern'!!");
                     $CONNECTED = 0;
-                    $EXP->hard_close;
+                    _hardClose($EXP, $UUID);
                 } elsif ($on_fail == -2) {
                     ctrl("EXPECT:ON_FAIL:timeout expecting '$pattern'. Finishing Expect");
                     $CONNECTED = 1;
@@ -1518,7 +1612,7 @@ elsif (($METHOD =~ /^.*generic$/) || ($METHOD eq 'Generic Command') || ($METHOD
                 } else {
                     ctrl("EXPECT:ON_FAIL:timeout expecting '$pattern'. Jumping to '$on_fail'");
                     $i = --$on_fail;
-                    $jump = 1;
+                    $skip_command = 1;
                 }
             }],
 
@@ -1526,12 +1620,12 @@ elsif (($METHOD =~ /^.*generic$/) || ($METHOD eq 'Generic Command') || ($METHOD
 
                 $CONNECTED = 0;
                 ctrl("CLOSE:Connection ended by remote peer!! " . $EXP->set_accum());
-                $EXP->hard_close();
+                _hardClose($EXP, $UUID);
             }],
 
             [($avoid_first_expectation) ? '' : $pattern, sub {
                 if ($on_match == -1) {
-                    $jump = 0;
+                    $skip_command = 0;
                 } elsif ($on_match == -2) {
                     $end = 1;
                     $CONNECTED = 1;
@@ -1544,7 +1638,7 @@ elsif (($METHOD =~ /^.*generic$/) || ($METHOD eq 'Generic Command') || ($METHOD
             }]
         );
         last if $end;
-        next if $jump;
+        next if $skip_command;
         $avoid_first_expectation = 0;
         if (!$CONNECTED) {
             last;
@@ -1592,28 +1686,26 @@ elsif (!$MANUAL) {
         [timeout => sub {
             $CONNECTED = 0;
             ctrl("CLOSE:TIMEOUT:$TIMEOUT_CONNECT seconds trying to connect or get prompt!!");
-            _hardClose($UUID);
-            $EXP->hard_close();
+            _hardClose($EXP, $UUID);
         }],
 
         [eof => sub {
             $CONNECTED = 0;
             ctrl("CLOSE:Connection ended by remote peer!! " . $EXP->set_accum());
-            _hardClose($UUID);
-            $EXP->hard_close();
+            _hardClose($EXP, $UUID);
         }],
 
         # Found sudo prompt
         ["\Q$SUDO_PROMPT\E", sub {
             if ($CONNECTED) {
-                $EXP->exp_continue;
+                $EXP->exp_continue();
             }
             # First 'sudo' password attempt...
             if (! $SUDO_PASSWORD_COUNT) {
                 $SUDO_PASSWORD_COUNT++;
                 if ((defined $SUDO_PASSWORD) && ($SUDO_PASSWORD eq '<<ASK_PASS>>')) {
                     ctrl("PASSWORD:Asking user '$ENV{'USER'}' for 'sudo' password...");
-                    $SUDO_PASSWORD = wEnterValue(undef, '<b>Password requested</b>', "Enter 'sudo' password for '$ENV{'USER'}'", '', 0);
+                    $SUDO_PASSWORD = wEnterValue('<b>Password requested</b>', "Enter 'sudo' password for '$ENV{'USER'}'", '', 0);
                 }
                 if (defined $SUDO_PASSWORD) {
                     $EXP->log_stdout(0);
@@ -1621,34 +1713,33 @@ elsif (!$MANUAL) {
                     send_slow($EXP, "$SUDO_PASSWORD\n", 'hide');
                     $EXP->log_stdout(1);
                     ctrl("PASSWORD:'sudo' password sent (not shown)");
-                    exp_continue;
+                    exp_continue();
                 } else {
                     ctrl("CLOSE:PASSWORD:Password for 'sudo' input cancelled by user");
-                    $EXP->hard_close;
+                    _hardClose($EXP, $UUID);
                 }
             }
             # ... second 'sudo' password attempt: provided password is no longer valid!!
             else {
                 ctrl("CLOSE:PASSWORD:Provided 'sudo' password was rejected");
-                _hardClose($UUID);
-                $EXP->hard_close;
+                _hardClose($EXP, $UUID);
             }
         }],
 
         # Found Host-Key verification string
         [$HOSTCHANGE_PROMPT, sub {
-            my $match = $EXP->match;
+            my $match = $EXP->match();
             $match =~ /$HOSTCHANGE_PROMPT/g;
             my ($yes, $no) = ($1, $2);
             if ($ACCEPT_KEY) {
                 send_slow($EXP, "$yes\n");
                 ctrl("HOSTKEY:accepted by configuration (sent '$yes')");
-                exp_continue;
+                exp_continue();
             } else {
-                my $val = wEnterValue(undef, $match, "Answer yes/no") // return undef;
+                my $val = wEnterValue($match, "Answer yes/no") // return undef;
                 send_slow($EXP, "$val\n");
                 ctrl("HOSTKEY:user value sent '$val')");
-                exp_continue;
+                exp_continue();
             }
         }],
 
@@ -1656,23 +1747,23 @@ elsif (!$MANUAL) {
         [$ANYKEY_PROMPT, sub {
             send_slow($EXP, "\n");
             ctrl("PRESSKEY:sending 'return' to continue connecting");
-            exp_continue;
+            exp_continue();
         }],
 
         # Found WARNING: REMOTE HOST IDENTIFICATION HAS CHANGED
         [$REMOTEHOST_PROMPT, sub {
-            my $match = $EXP->match;
+            my $match = $EXP->match();
             chomp $match;
             $match =~ /$REMOTEHOST_PROMPT/go;
             my ($known_hosts, $line) = ($1, $2);
             $CONNECTED = 0;
             if ($ACCEPT_KEY) {
                 ctrl("HOSTKEY:deleting offending hostkey by configuration and Restarting connection");
-                open(F, `echo $known_hosts 2>&1`) or die "ERROR: could not open for reading '$known_hosts' ($!)";
+                open(F, `$ENV{'ASBRU_ENV_FOR_EXTERNAL'} echo $known_hosts 2>&1`) or die "ERROR: could not open for reading '$known_hosts' ($!)";
                 my @data = <F>;
                 close F;
                 splice(@data, $line - 1, 1);
-                open(F, '>' . `echo $known_hosts 2>&1`) or die "ERROR: could not open for writing '$known_hosts' ($!)";
+                open(F, '>' . `$ENV{'ASBRU_ENV_FOR_EXTERNAL'} echo $known_hosts 2>&1`) or die "ERROR: could not open for writing '$known_hosts' ($!)";
                 print F @data;
                 close F;
                 ctrl('RESTART');
@@ -1686,187 +1777,201 @@ elsif (!$MANUAL) {
 
             if (($USER eq '') && ($USER_COUNT)) {
                 ctrl("CLOSE:LOGIN:Empty username is not valid to login here");
-                $EXP->hard_close();
+                _hardClose($EXP, $UUID);
             }
             $USER_COUNT++;
             $USER = subst($USER);
             ctrl("LOGIN:$USER");
             send_slow($EXP, "$USER\n");
-            exp_continue;
+            exp_continue();
         }],
 
         # Found password/passphrase string
         [$PASSWORD_PROMPT, sub {
-
-        # A few attempts...
+            # A few attempts...
             if ($PASSWORD_COUNT < 6) {
-                $PASSWORD_COUNT++;
-                $WAS_ASK_PASS = 0;
-                if ((defined $PASS && $PASS eq '<<ASK_PASS>>') || ((!defined $PASS || $PASS eq '') && $AUTH eq 'publickey')) {
-                    my @before = split /\n/, $EXP->before;
-                    # Extract the last line and use it is as prompt for the request password dialog
-                    my $real_prompt = (scalar @before > 0 ? $before[-1] : '') . $EXP->match;
+                my $password = '';
+                my @before = split /\n/, $EXP->before;
 
-                    $WAS_ASK_PASS = 1;
-                    ctrl("PASSWORD:Asking user for password...");
-                    $PASS = wEnterValue(undef, '<b>Manual Password requested</b>', $real_prompt, '', 0);
+                $PASSWORD_COUNT++;
+                if ($proxy_jump) {
+                    # get the next password
+                    $password = getJumpPassword();
+                } else {
+                    if ((!$PASS) || ($PASS eq '<<ASK_PASS>>')) {
+                        $password = askPassword();
+                    } else {
+                        $password = $PASS;
+                    }
                 }
-                if (defined $PASS) {
+                if ($password) {
                     $EXP->log_stdout(0);
-                    $PASS = subst($PASS);
-                    send_slow($EXP, "$PASS\n", 'hide');
+                    $password = subst($password);
+                    send_slow($EXP, "$password\n", 'hide');
                     $EXP->log_stdout(1);
                     ctrl("PASSWORD:Sent (not shown)");
-                    # Next time we will ask the password since the automatic one did not work
-                    $PASS = '<<ASK_PASS>>';
-                    exp_continue;
+                    if (!$proxy_jump) {
+                        # Next time we will ask the password since the automatic one did not work
+                        $PASS = '<<ASK_PASS>>';
+                    }
+                    exp_continue();
                 } else {
                     ctrl("CLOSE:PASSWORD:Password input cancelled by user");
-                    $EXP->hard_close;
+                    _hardClose($EXP, $UUID);
                 }
-            }
-            # ... too many password attempts: provided password is no longer valid!!
-            else {
+            } else {
+                # ... too many password attempts: provided password is no longer valid!!
                 ctrl("CLOSE:PASSWORD:Provided username/password '$USER/<<hidden_password>>' was rejected");
-                _hardClose($UUID);
-                $EXP->hard_close;
+                _hardClose($EXP, $UUID);
             }
         }],
 
         # Found user prompt
         [$COMMAND_PROMPT, sub {
             $CONNECTED = 1;
-            my $avoid_first_expectation = 1;
 
-            # Do we have to do complex expects?
-            if (!$EXPECT || !$CONNECTED) {
-                return 1;
-            }
-
-            $EXP->restart_timeout_upon_receive(1);
-            for(my $i = 0; $i < scalar(@{$$CFG{'environments'}{$UUID}{'expect'}}); $i++) {
-                my $hash = $$CFG{'environments'}{$UUID}{'expect'}[$i];
-                my $pattern = $$hash{'expect'} // '';
-                my $command = $$hash{'send'} // '';
-                my $hide = $$hash{'hidden'} // 0;
-                my $active = $$hash{'active'} // 0;
-                my $return = $$hash{'return'} // 1;
-                my $on_match = $$hash{'on_match'} // -1;
-                my $on_fail = $$hash{'on_fail'} // -1;
-                my $time_out = $$hash{'time_out'} // -1;
-
-                if (!$active) {
-                    next;
-                }
-
-                my $jump = 0;
+            if ($connection_cmd2) {
+                # Pseudo Jump Server
+                send_slow($EXP, "$connection_cmd2\n");
+                $connection_cmd2 = '';
+                $PSEUDO_JUMP = 1;
+                $EXP->clear_accum();
+                exp_continue();
+            } elsif ($PSEUDO_JUMP && $EXP->before() =~ /\x1B$/) {
+                # On pseudo jumps, the strings come with terminal escape sequences that match the user prompt regex
+                $EXP->clear_accum();
+                exp_continue();
+            } else {
+                my $avoid_first_expectation = 0;
 
-                if ($time_out >= 0) {
-                    $TIMEOUT_CMD = $time_out;
+                # Do we have to do complex expects?
+                if (!$EXPECT || !$CONNECTED) {
+                    return 1;
                 }
-                $pattern = subst($pattern);
-
-                ctrl("EXPECT:WAITING:$pattern");
-
-                # Wait for pattern prompt before continue...
-                $EXP->expect($TIMEOUT_CMD,
 
-                    [timeout => sub {
-                        if ($on_fail == -1) {
-                            ctrl("CLOSE:TIMEOUT:$TIMEOUT_CMD seconds expecting pattern '$pattern'!!");
+                $EXP->restart_timeout_upon_receive(1);
+                for(my $i = 0; $i < scalar(@{$$CFG{'environments'}{$UUID}{'expect'}}); $i++) {
+                    my $hash = $$CFG{'environments'}{$UUID}{'expect'}[$i];
+                    my $pattern = $$hash{'expect'} // '';
+                    my $command = $$hash{'send'} // '';
+                    my $hide = $$hash{'hidden'} // 0;
+                    my $active = $$hash{'active'} // 0;
+                    my $return = $$hash{'return'} // 1;
+                    my $on_match = $$hash{'on_match'} // -1;
+                    my $on_fail = $$hash{'on_fail'} // -1;
+                    my $time_out = $$hash{'time_out'} // -1;
+
+                    if (!$active) {
+                        next;
+                    }
+
+                    my $skip_command = 0;
+
+                    if ($time_out >= 0) {
+                        $TIMEOUT_CMD = $time_out;
+                    }
+                    $pattern = subst($pattern);
+
+                    ctrl("EXPECT:WAITING:$pattern");
+
+                    # Wait for pattern prompt before continue...
+                    $EXP->expect($TIMEOUT_CMD,
+
+                        [timeout => sub {
+                            if ($on_fail == -1) {
+                                ctrl("CLOSE:TIMEOUT:$TIMEOUT_CMD seconds expecting pattern '$pattern'!!");
+                                $CONNECTED = 0;
+                                _hardClose($EXP, $UUID);
+                            } elsif ($on_fail == -2) {
+                                ctrl("EXPECT:ON_FAIL:timeout expecting '$pattern'. Finishing Expect");
+                                $CONNECTED = 1;
+                                $end = 1;
+                            } else {
+                                ctrl("EXPECT:ON_FAIL:timeout expecting '$pattern'. Jumping to '$on_fail'");
+                                $i = --$on_fail;
+                                $skip_command = 1;
+                            }
+                        }],
+
+                        [eof => sub {
                             $CONNECTED = 0;
-                            $EXP->hard_close;
-                        } elsif ($on_fail == -2) {
-                            ctrl("EXPECT:ON_FAIL:timeout expecting '$pattern'. Finishing Expect");
-                            $CONNECTED = 1;
-                            $end = 1;
-                        } else {
-                            ctrl("EXPECT:ON_FAIL:timeout expecting '$pattern'. Jumping to '$on_fail'");
-                            $i = --$on_fail;
-                            $jump = 1;
-                        }
-                    }],
-
-                    [eof => sub {
+                            ctrl("CLOSE:Connection ended by remote peer!! " . $EXP->set_accum());
+                            _hardClose($EXP, $UUID);
+                        }],
+
+                        # Found Host-Key verification string
+                        [$HOSTCHANGE_PROMPT, sub {
+
+                            my $match = $EXP->match();
+                            $match =~ /$HOSTCHANGE_PROMPT/g;
+                            my ($yes, $no) = ($1, $2);
+                            if ($ACCEPT_KEY) {
+                                send_slow($EXP, "$yes\n");
+                                ctrl("EXPECT:HOSTKEY:accepted by configuration (sent '$yes')");
+                                exp_continue();
+                            } else {
+                                send_slow($EXP, "$no\n");
+                                $CONNECTED = 0;
+                                _hardClose($EXP, $UUID);
+                                ctrl("CLOSE:EXPECT:HOSTKEY:rejected by configuration (sent '$no')");
+                            }
+                        }],
+
+                        [($avoid_first_expectation) ? '' : $pattern, sub {
+                            if ($on_match == -1) {
+                                $skip_command = 0;
+                            } elsif ($on_match == -2) {
+                                $end = 1;
+                                $CONNECTED = 1;
+                                ctrl("EXPECT:ON_MATCH:found pattern '$pattern'. Stopping by config");
+                            } else {
+                                ctrl("EXPECT:ON_MATCH:found pattern '$pattern'. Jumping to '$on_match'");
+                                $avoid_first_expectation = 1;
+                                $i = --$on_match;
+                            }
+                        }]
+                    );
+                    if ($end) {
+                        last;
+                    }
+                    if ($skip_command) {
+                        next;
+                    }
+                    $avoid_first_expectation = 0;
+                    if (!$CONNECTED) {
+                        last;
+                    }
+
+                    $command = subst($command);
+
+                    # Disconnect if an error occured during command substitution (eg: when user cancelled data entry)
+                    if (not defined($command)) {
                         $CONNECTED = 0;
-                        ctrl("CLOSE:Connection ended by remote peer!! " . $EXP->set_accum());
-                        _hardClose($UUID);
-                        $EXP->hard_close();
-                    }],
-
-                    # Found Host-Key verification string
-                    [$HOSTCHANGE_PROMPT, sub {
-
-                        my $match = $EXP->match;
-                        $match =~ /$HOSTCHANGE_PROMPT/g;
-                        my ($yes, $no) = ($1, $2);
-                        if ($ACCEPT_KEY) {
-                            send_slow($EXP, "$yes\n");
-                            ctrl("EXPECT:HOSTKEY:accepted by configuration (sent '$yes')");
-                            exp_continue;
-                        } else {
-                            send_slow($EXP, "$no\n");
-                            $CONNECTED = 0;
-                            $EXP->hard_close();
-                            ctrl("CLOSE:EXPECT:HOSTKEY:rejected by configuration (sent '$no')");
-                        }
-                    }],
-
-                    [($avoid_first_expectation) ? '' : $pattern, sub {
-                        if ($on_match == -1) {
-                            $jump = 0;
-                        } elsif ($on_match == -2) {
-                            $end = 1;
-                            $CONNECTED = 1;
-                            ctrl("EXPECT:ON_MATCH:found pattern '$pattern'. Stopping by config");
-                        } else {
-                            ctrl("EXPECT:ON_MATCH:found pattern '$pattern'. Jumping to '$on_match'");
-                            $avoid_first_expectation = 1;
-                            $i = --$on_match;
-                        }
-                    }]
-                );
-                if ($end) {
-                    last;
-                }
-                if ($jump) {
-                    next;
-                }
-                $avoid_first_expectation = 0;
-                if (!$CONNECTED) {
-                    last;
-                }
-
-                $command = subst($command);
-
-                # Disconnect if an error occured during command substitution (eg: when user cancelled data entry)
-                if (not defined($command)) {
-                    $CONNECTED = 0;
-                    last;
+                        last;
+                    }
+
+                    # otherwise launch command
+                    if ($hide) {
+                        ctrl("EXPECT:SENDING:<<HIDDEN STRING>>" . ($return ? '\n' : ''));
+                        $EXP->log_stdout(0);
+                    } else {
+                        my $cmd_str = $command;
+                        $cmd_str =~ s/\n$//go;
+                        ctrl("EXPECT:SENDING:$cmd_str" . ($return ? '\n' : ''));
+                    }
+
+                    send_slow($EXP, $command);
+                    if ($return) {
+                        send_slow($EXP, "\n");
+                    }
+
+                    if ($hide) {
+                        $EXP->log_stdout(1);
+                    }
                 }
 
-                # otherwise launch command
-                if ($hide) {
-                    ctrl("EXPECT:SENDING:<<HIDDEN STRING>>" . ($return ? '\n' : ''));
-                    $EXP->log_stdout(0);
-                } else {
-                    my $cmd_str = $command;
-                    $cmd_str =~ s/\n$//go;
-                    ctrl("EXPECT:SENDING:$cmd_str" . ($return ? '\n' : ''));
-                }
-
-                send_slow($EXP, $command);
-                if ($return) {
-                    send_slow($EXP, "\n");
-                }
-
-                if ($hide) {
-                    $EXP->log_stdout(1);
-                }
+                $EXP->restart_timeout_upon_receive(0);
             }
-
-            $EXP->restart_timeout_upon_receive(0);
-
         }],
 
     ); # EXPECT CLOSE
@@ -1911,7 +2016,7 @@ $SIG{'HUP'} = sub {
     my $chain_uuid = '';
     my $CHAIN_CFG;
 
-    _hardClose($UUID);
+    _hardClose(undef, $UUID);
 
     if ($INT) {
         return 1;
@@ -1976,7 +2081,7 @@ $SIG{'HUP'} = sub {
         if (!$active) {
             next;
         }
-        my $jump = 0;
+        my $skip_command = 0;
 
         if ($time_out >= 0) {
             $TIMEOUT_CMD = $time_out;
@@ -1993,7 +2098,7 @@ $SIG{'HUP'} = sub {
                 if ($on_fail == -1) {
                     ctrl("CLOSE:TIMEOUT:$TIMEOUT_CMD seconds expecting pattern '$pattern'!!");
                     $CONNECTED = 0;
-                    $EXP->hard_close;
+                    _hardClose($EXP, $UUID);
                 } elsif ($on_fail == -2) {
                     ctrl("CHAIN:EXPECT:ON_FAIL:timeout expecting '$pattern'. Finishing Expect");
                     $CONNECTED = 1;
@@ -2001,7 +2106,7 @@ $SIG{'HUP'} = sub {
                 } else {
                     ctrl("CHAIN:EXPECT:ON_FAIL:timeout expecting '$pattern'. Jumping to '$on_fail'");
                     $i = --$on_fail;
-                    $jump = 1;
+                    $skip_command = 1;
                 }
             }],
 
@@ -2009,30 +2114,30 @@ $SIG{'HUP'} = sub {
 
                 $CONNECTED = 0;
                 ctrl("CLOSE:Connection ended by remote peer!! " . $EXP->set_accum());
-                $EXP->hard_close();
+                _hardClose($EXP, $UUID);
             }],
 
             # Found Host-Key verification string
             [$HOSTCHANGE_PROMPT, sub {
 
-                my $match = $EXP->match;
+                my $match = $EXP->match();
                 $match =~ /$HOSTCHANGE_PROMPT/go;
                 my ($yes, $no) = ($1, $2);
                 if ($ACCEPT_KEY) {
                     send_slow($EXP, $yes . (($METHOD =~ /^.*3270.*$/) || ($METHOD eq 'IBM 3270/5250')) ? "\r\f" : "\n");
                     ctrl("EXPECT:HOSTKEY:accepted by configuration (sent '$yes')");
-                    exp_continue;
+                    exp_continue();
                 } else {
                     send_slow($EXP, $no . (($METHOD =~ /^.*3270.*$/) || ($METHOD eq 'IBM 3270/5250')) ? "\r\f" : "\n");
                     $CONNECTED = 0;
-                    $EXP->hard_close();
+                    _hardClose($EXP, $UUID);
                     ctrl("CLOSE:EXPECT:HOSTKEY:rejected by configuration (sent '$no')");
                 }
             }],
 
             [($avoid_first_expectation) ? '' : $pattern, sub {
                 if ($on_match == -1) {
-                    $jump = 0;
+                    $skip_command = 0;
                 } elsif ($on_match == -2) {
                     $end = 1;
                     $CONNECTED = 1;
@@ -2047,7 +2152,7 @@ $SIG{'HUP'} = sub {
         if ($end) {
             last;
         }
-        if ($jump) {
+        if ($skip_command) {
             next;
         }
         $avoid_first_expectation = 0;
@@ -2137,13 +2242,16 @@ $SIG{'USR2'} = sub {
 
 if ($CONNECTED) {
     # Restart only when connecting at startup connection
+    if ($HIDE_TERMINAL) {
+        ctrl("HIDE_TERMINAL");
+    }
     if ($IS_CLUSTER && ($RESTART == 2)) {
         $RESTART = 0;
     }
     $EXP->interact(\*STDIN, "__PAC__STOP__${UUID}__${$}__");
 }
 
-_hardClose($UUID);
+_hardClose(undef, $UUID);
 
 my $why = $?;
 
@@ -2155,7 +2263,7 @@ if (($why ne 0) && $RESTART) {
 if (defined $EXP->pid) {
     kill(15, $EXP->pid);
 }
-$EXP->hard_close;
+$EXP->hard_close();
 
 close_log_file();
 
@@ -2164,45 +2272,35 @@ ctrl("DISCONNECTED");
 exit 0;
 
 sub close_log_file {
-    if (!$LOG_FILE || !$REMOVE_CTRL_CHARS) {
-        return 1;
-    }
-    if (!open(F,"<:utf8",$LOG_FILE)) {
-        ctrl("ERROR: Could not open file '$LOG_FILE' for reading!! ($!)");
-        return 1;
-    }
-    my @lines = <F>;
-    close F;
-    if (! open(F,">:utf8","$LOG_FILE.$$")) {
-        ctrl("ERROR: Could not open file '$LOG_FILE.$$' for writting!! ($!)");
-        return 1;
-    }
-    print F _removeEscapeSeqs(join('', @lines));
-    close F;
-    rename("$LOG_FILE.$$", $LOG_FILE) or ctrl("ERROR: $!");
-}
+    my $line;
 
-END {
+    if ($LOG_TIMESTAMP) {
+        close LOG;
+    }
     if (!$LOG_FILE || !$REMOVE_CTRL_CHARS) {
         return 1;
     }
-
-    ctrl("LOGFILE:Removing CONTROL characters");
-
-    if (!open(F,"<:utf8",$LOG_FILE)) {
+    if (!open(FIN,"<:raw",$LOG_FILE)) {
         ctrl("ERROR: Could not open file '$LOG_FILE' for reading!! ($!)");
         return 1;
     }
-    my @lines = <F>;
-    close F;
-
-    if (! open(F,">:utf8","$LOG_FILE.$$")) {
+    if (!open(FOUT,">:raw","$LOG_FILE.$$")) {
         ctrl("ERROR: Could not open file '$LOG_FILE.$$' for writting!! ($!)");
+        close FIN;
         return 1;
     }
-    print F _removeEscapeSeqs(join('', @lines));
-    close F;
-
+    while ($line = <FIN>) {
+        my $l = _removeEscapeSeqs($line);
+        if ($LOG_TIMESTAMP) {
+            while ($l =~ s/^(\D.+?)\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2} : /$1/) {}
+            if ($l !~ /^\d{3,4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2} : /) {
+                print FOUT ' 'x22;
+            }
+        }
+        print FOUT $l;
+    }
+    close FIN;
+    close FOUT;
     rename("$LOG_FILE.$$", $LOG_FILE) or ctrl("ERROR: $!");
 }
 
@@ -2215,7 +2313,7 @@ __END__
 
 =head1 NAME
 
-pac_conn
+asbru_conn
 
 =head1 SYNOPSIS
 
@@ -2253,6 +2351,10 @@ prints a message to the terminal screen using I<log color>
 
 Sends a internal message to the terminal associated with this connection. Using a UNIX socket
 
+=head2 sub receiveData
+
+Read data comming from the socket, used to prompt data to the user
+
 =head2 sub auth (socket)
 
 Check that socket is a PAC socket and not other
@@ -2266,6 +2368,8 @@ B<line> string
         password
         username
         uuid
+        global and local variables
+        kepass masks
         etc
 
 =head2 sub wEnterValue(undef,title,label,default,visible)
@@ -2307,9 +2411,11 @@ Pipe the command to other terminals if $pipe is active (possibly used in cluster
 
 Parse a user script, run the script.
 
-=head2 sub findKP
+=head2 sub _setProxy
 
-Find Keepass user, password
+Preparse proxy connections depending on the type of proxy used, currently : SOCKS and JumpHost (-J)
+
+Is uses a local config file to preconfigure the parameters.
 
 =head2 main
 
@@ -2334,4 +2440,3 @@ Steps
 =head1 Perl particulars
 
     select(undef, undef, undef, 0.5)        ===>  sleep(500ms);
-
diff --git a/lib/edit/PACExecEntry.pm b/lib/edit/PACExecEntry.pm
index 3571ca8c..6f7bfedc 100644
--- a/lib/edit/PACExecEntry.pm
+++ b/lib/edit/PACExecEntry.pm
@@ -3,7 +3,7 @@ package PACExecEntry;
 ###############################################################################
 # This file is part of Ásbrú Connection Manager
 #
-# Copyright (C) 2017-2020 Ásbrú Connection Manager team (https://asbru-cm.net)
+# Copyright (C) 2017-2022 Ásbrú Connection Manager team (https://asbru-cm.net)
 # Copyright (C) 2010-2016 David Torrejon Vaquerizas
 #
 # Ásbrú Connection Manager is free software: you can redistribute it and/or
@@ -61,7 +61,6 @@ sub new {
     $self->{cfg} = shift;
     $self->{variables} = shift;
     $self->{where} = shift;
-
     $self->{container} = undef;
     $self->{frame} = {};
     $self->{list} = [];
@@ -80,6 +79,7 @@ sub update {
     my $cfg = shift;
     my $variables = shift;
     my $where = shift;
+    my $uuid = shift;
 
     if (defined $cfg) {
         $$self{cfg} = $cfg;
@@ -90,6 +90,9 @@ sub update {
     if (defined $where) {
         $$self{where} = $where;
     }
+    if ($uuid) {
+        $$self{uuid} = $uuid;
+    }
 
     # Destroy previous widgets
     $$self{frame}{vbexec}->foreach(sub {
@@ -116,9 +119,22 @@ sub get_cfg {
         my %hash;
         $hash{txt} = $$w{txt}->get_chars(0, -1);
         $hash{description} = $$w{desc}->get_chars(0, -1);
+        $hash{keybind} = $$w{keybind}->get_chars(0, -1);
         $hash{confirm} = $$w{confirm}->get_active() || '0';
         $hash{intro} = $$w{intro}->get_active() || '0';
+        # Force no descriptions equal to command
+        if (!$hash{description}) {
+            $hash{description} = $hash{txt};
+        }
+        # Normalize capitalization of groups
+        $hash{description} =~ s/^(.+?):/\u\L$1\E:/;
         push(@cfg, \%hash) unless $hash{txt} eq '';
+        if ($hash{keybind}) {
+            # Register final values after all editing changes
+            my $lf  = $hash{intro} ? "\n" : '';
+            my $ask = $hash{confirm} ? "?" : '';
+            $PACMain::FUNCS{_KEYBINDS}->RegisterHotKey('terminal',$hash{keybind},"HOTKEY_CMD:$self->{where}","$ask$hash{txt}$lf",$self->{uuid});
+        }
     }
 
     @cfg = sort {lc($$a{description}) cmp lc($$b{description})} @cfg;
@@ -141,15 +157,35 @@ sub _buildExecGUI {
 
     # Build a vbox for:buttons, separator and expect widgets
     $w{vbox} = Gtk3::VBox->new(0, 0);
+    $w{hbox} = Gtk3::HBox->new(1, 0);
 
     # Build a hbuttonbox for widgets actions (add, etc.)
     $w{bbox} = Gtk3::HButtonBox->new();
-    $w{vbox}->pack_start($w{bbox}, 0, 1, 0);
+    $w{vbox}->pack_start($w{hbox}, 0, 1, 0);
+    $w{hbox}->pack_start($w{bbox}, 0, 1, 0);
     $w{bbox}->set_layout('GTK_BUTTONBOX_START');
 
     # Build 'add' button
     $w{btnadd} = Gtk3::Button->new_from_stock('gtk-add');
     $w{bbox}->add($w{btnadd});
+    if ($$self{where}) {
+        if ($$self{where} eq 'local') {
+            $w{help} = Gtk3::LinkButton->new('https://docs.asbru-cm.net/Manual/Preferences/LocalCommands/');
+        } elsif ($$self{where} eq 'remote') {
+            $w{help} = Gtk3::LinkButton->new('https://docs.asbru-cm.net/Manual/Preferences/RemoteCommands/');
+        } elsif ($$self{where} eq 'cremote') {
+            $w{help} = Gtk3::LinkButton->new('https://docs.asbru-cm.net/Manual/Connections/SSH/#remote-macros');
+        } elsif ($$self{where} eq 'clocal') {
+            $w{help} = Gtk3::LinkButton->new('https://docs.asbru-cm.net/Manual/Connections/SSH/#local-macros');
+        }
+        $w{hbox}->pack_start($w{help},0,1,0);
+
+        $w{help}->set_halign('GTK_ALIGN_END');
+        $w{help}->set_label('');
+        $w{help}->set_tooltip_text('Open Online Help');
+        $w{help}->set_always_show_image(1);
+        $w{help}->set_image(Gtk3::Image->new_from_stock('asbru-help', 'button'));
+    }
 
     # Build a separator
     $w{sep} = Gtk3::HSeparator->new();
@@ -193,17 +229,25 @@ sub _buildExecGUI {
 sub _buildExec {
     my $self = shift;
     my $hash = shift;
-
     my $txt = $hash;
     my $desc = '';
+    my $keybind = '';
     my $confirm = 0;
     my $intro = 1;
+    my $width = 80;
 
     if (ref($hash) ) {
-        $txt = $$hash{txt} // '';
-        $desc = $$hash{description} // '';
+        $txt     = $$hash{txt} // '';
+        $desc    = $$hash{description} // '';
         $confirm = $$hash{confirm} // 0;
-        $intro = $$hash{intro} // 1;
+        $intro   = $$hash{intro} // 1;
+        $keybind = $$hash{keybind} // '';
+        if ($keybind && defined $PACMain::FUNCS{_KEYBINDS}) {
+            # Register so we can validate
+            my $lf  = $intro   ? "\n" : '';
+            my $ask = $confirm ? "?"  : '';
+            $PACMain::FUNCS{_KEYBINDS}->RegisterHotKey('terminal',$keybind,"HOTKEY_CMD:$self->{where}","$ask$txt$lf", $self->{uuid});
+        }
     }
 
     my @undo;
@@ -219,19 +263,22 @@ sub _buildExec {
 
     $w{frame} = Gtk3::Frame->new();
     $w{frame}->set_label_widget($w{confirm});
+    $w{frame}->set_shadow_type('GTK_SHADOW_NONE');
 
     # Make an HBox to contain checkbox, entry and delete
     $w{hbox} = Gtk3::HBox->new(0, 0);
     $w{frame}->add($w{hbox});
 
-    $w{vbox} = Gtk3::VBox->new(0, 0);
+    $w{vbox} = Gtk3::VBox->new(0, 5);
     $w{hbox}->pack_start($w{vbox}, 1, 1, 0);
 
     $w{hbox3} = Gtk3::HBox->new(0, 0);
     $w{vbox}->pack_start($w{hbox3}, 0, 1, 0);
 
     # Build label
-    $w{lbl} = Gtk3::Label->new('Command: ');
+    $w{lbl} = Gtk3::Label->new('Command');
+    $w{lbl}->set_size_request($width,-1);
+    $w{lbl}->set_xalign(0);
     $w{hbox3}->pack_start($w{lbl}, 0, 1, 0);
 
     # Build entry
@@ -241,7 +288,7 @@ sub _buildExec {
     $w{txt}->set_text($txt);
 
     # Build checkbutton
-    $w{intro} = Gtk3::CheckButton->new(' send <INTRO> at the end');
+    $w{intro} = Gtk3::CheckButton->new('send <INTRO>');
     $w{hbox3}->pack_start($w{intro}, 0, 1, 0);
     $w{intro}->set_active($intro);
 
@@ -249,27 +296,38 @@ sub _buildExec {
     $w{vbox}->pack_start($w{hbox4}, 0, 1, 0);
 
     # Build label
-    $w{lbl2} = Gtk3::Label->new('Description: ');
+    $w{lbl2} = Gtk3::Label->new('Description');
+    $w{lbl2}->set_size_request($width,-1);
+    $w{lbl2}->set_xalign(0);
     $w{hbox4}->pack_start($w{lbl2}, 0, 1, 0);
+    $w{hbox4}->set_tooltip_markup("<i>Group</i><b>:</b><i>Description</i>\n<b>Group:</b> This value will group all commands with the same name in the menu.\n\nExample <b>Mysql</b>:<i>Show tables</i>");
 
     # Build entry
     $w{desc} = Gtk3::Entry->new();
     $w{hbox4}->pack_start($w{desc}, 1, 1, 0);
     $w{desc}->set_text($desc);
 
-    $w{vbox2} = Gtk3::VBox->new(0, 0);
-    $w{hbox}->pack_start($w{vbox2}, 0, 1, 0);
+    # Build Keybind
+    $w{keybind} = Gtk3::Entry->new();
+    $w{keybind}->set_max_width_chars(18);
+    $w{keybind}->set_width_chars(18);
+    $w{keybind}->set_editable(0);
+    $w{hbox4}->pack_start($w{keybind}, 0, 0, 0);
+    $w{keybind}->set_text($keybind);
+    $w{keybind}->set_placeholder_text("Set Keybinding");
 
     # Build delete button
     $w{btn} = Gtk3::Button->new_from_stock('gtk-delete');
-    $w{vbox2}->pack_start($w{btn}, 1, 1, 0);
+    $w{hbox3}->pack_start($w{btn}, 0, 0, 0);
 
     if ($$self{'where'} eq 'local') {
         # Build exec button
         $w{btnExec} = Gtk3::Button->new_from_stock('gtk-execute');
-        $w{vbox2}->pack_start($w{btnExec}, 0, 1, 0);
+        $w{hbox4}->pack_start($w{btnExec}, 0, 0, 0);
     }
 
+    $w{vbox}->pack_start(Gtk3::HSeparator->new(), 1, 1, 0);
+
     # Add built control to main container
     $$self{frame}{vbexec}->pack_start($w{frame}, 0, 1, 0);
     $$self{frame}{vbexec}->show_all();
@@ -280,8 +338,13 @@ sub _buildExec {
 
     # Assign a callback for deleting entry
     $w{btn}->signal_connect('clicked' => sub {
+        my $keymask = $w{keybind}->get_chars(0, -1);
         splice(@{$$self{list}}, $w{position}, 1);
         splice(@{$$self{cfg}}, $w{position}, 1);
+        if ($keymask) {
+            # Remove registered keybind
+            $PACMain::FUNCS{_KEYBINDS}->UnRegisterHotKey('terminal',$keymask, $self->{uuid});
+        }
         $self->update();
         return 1;
     });
@@ -292,13 +355,13 @@ sub _buildExec {
 
         # Ask for confirmation
         if ($w{confirm}->get_active()) {
-            if (!_wConfirm(undef, "Execute <b>'" . __($cmd) . "'</b> " . 'LOCALLY')) {
+            if (!_wConfirm($PACMain::FUNCS{_EDIT}{_WINDOWEDIT},"Execute <b>'" . __($cmd) . "'</b> " . 'LOCALLY')) {
                 # Not confirmed, do not execute
                 return 1;
             }
         };
 
-        system(_subst($cmd, $PACMain::FUNCS{_MAIN}{_CFG}) . ' &');
+        system("$ENV{'ASBRU_ENV_FOR_EXTERNAL'} " . _subst($cmd, $PACMain::FUNCS{_MAIN}{_CFG}) . ' &');
 
         return 1;
     }) if ($$self{'where'} eq 'local');
@@ -307,7 +370,9 @@ sub _buildExec {
     $w{txt}->signal_connect('button_press_event' => sub {
         my ($widget, $event) = @_;
 
-        return 0 unless $event->button eq 3;
+        if ($event->button != 3) {
+            return 0;
+        }
 
         my @menu_items;
 
@@ -400,6 +465,7 @@ sub _buildExec {
         # Populate with Ásbrú Connection Manager internal variables
         my @int_variables_menu;
         push(@int_variables_menu, {label => "UUID",      code => sub {$w{txt}->insert_text("<UUID>",      -1, $w{txt}->get_position());} });
+        push(@int_variables_menu, {label => "SOCKS5_PORT",code => sub {$w{txt}->insert_text("<SOCKS5_PORT>",-1, $w{txt}->get_position());} });
         push(@int_variables_menu, {label => "TIMESTAMP", code => sub {$w{txt}->insert_text("<TIMESTAMP>", -1, $w{txt}->get_position());} });
         push(@int_variables_menu, {label => "DATE_Y",    code => sub {$w{txt}->insert_text("<DATE_Y>",    -1, $w{txt}->get_position());} });
         push(@int_variables_menu, {label => "DATE_M",    code => sub {$w{txt}->insert_text("<DATE_M>",    -1, $w{txt}->get_position());} });
@@ -411,59 +477,11 @@ sub _buildExec {
         push(@int_variables_menu, {label => "TITLE",     code => sub {$w{txt}->insert_text("<TITLE>",     -1, $w{txt}->get_position());} });
         push(@int_variables_menu, {label => "IP",        code => sub {$w{txt}->insert_text("<IP>",        -1, $w{txt}->get_position());} });
         push(@int_variables_menu, {label => "USER",      code => sub {$w{txt}->insert_text("<USER>",      -1, $w{txt}->get_position());} });
+        push(@int_variables_menu, {label => "PORT",      code => sub {$w{txt}->insert_text("<PORT>",      -1, $w{txt}->get_position());} });
         push(@int_variables_menu, {label => "PASS",      code => sub {$w{txt}->insert_text("<PASS>",      -1, $w{txt}->get_position());} });
         push(@menu_items, {label => 'Internal variables...', submenu => \@int_variables_menu});
 
-        # Populate with <KPX_(title|username|url):*> special string
-        if ($PACMain::FUNCS{_MAIN}{_CFG}{'defaults'}{'keepass'}{'use_keepass'}) {
-            my (@titles, @usernames, @urls);
-            foreach my $hash ($PACMain::FUNCS{_KEEPASS}->find()) {
-                push(@titles, {
-                    label => "<KPX_title:$$hash{title}>",
-                    tooltip => "$$hash{password}",
-                    code => sub {
-                        $w{txt}->insert_text("<KPX_title:$$hash{title}>", -1, $w{txt}->get_position());
-                    }
-                });
-                push(@usernames, {
-                    label => "<KPX_username:$$hash{username}>",
-                    tooltip => "$$hash{password}",
-                    code => sub {
-                        $w{txt}->insert_text("<KPX_username:$$hash{username}>", -1, $w{txt}->get_position());
-                    }
-                });
-                push(@usernames, {
-                    label => "<KPX_url:$$hash{url}>",
-                    tooltip => "$$hash{password}",
-                    code => sub {
-                        $w{txt}->insert_text("<KPX_url:$$hash{url}>", -1, $w{txt}->get_position());
-                    }
-                });
-            }
-
-            push(@menu_items, {
-                label => 'KeePassX',
-                stockicon => 'pac-keepass',
-                submenu => [
-                    {
-                        label => 'KeePassX title values',
-                        submenu => \@titles
-                    }, {
-                        label => 'KeePassX username values',
-                        submenu => \@usernames
-                    }, {
-                        label => 'KeePassX URL values',
-                        submenu => \@urls
-                    }, {
-                        label => "KeePass Extended Query",
-                        tooltip => "This allows you to select the value to be returned, based on another value's match againt a Perl Regular Expression",
-                        code => sub {
-                            $w{txt}->insert_text("<KPXRE_GET_(title|username|password|url)_WHERE_(title|username|password|url)==Your_RegExp_here==>", -1, $w{txt}->get_position());
-                        }
-                    }
-                ]
-            });
-        }
+        $PACMain::FUNCS{_KEEPASS}->setRigthClickMenuEntry($PACMain::FUNCS{_EDIT}{_WINDOWEDIT},'username,password',$w{txt},\@menu_items);
 
         _wPopUpMenu(\@menu_items, $event);
 
@@ -495,6 +513,37 @@ sub _buildExec {
         return 0;
     });
 
+    $w{keybind}->signal_connect('key_press_event' => sub {
+        my ($widget, $event) = @_;
+        my ($keyval, $unicode, $keymask) = $PACMain::FUNCS{_KEYBINDS}->GetKeyMask($widget, $event);
+        my $text    = $widget->get_chars(0, -1);
+        my $command = $w{txt}->get_chars(0, -1);
+        my $lf      = $w{intro}->get_active() ? "\n" : '';
+        my $ask     = $w{confirm}->get_active() ? "?"  : '';
+
+        if (!$keymask && ($unicode == 8 || $unicode == 127)) {
+            if ($text) {
+                $PACMain::FUNCS{_KEYBINDS}->UnRegisterHotKey('terminal',$text, $self->{uuid});
+            }
+            $widget->set_text('');
+            return 1;
+        } elsif (!$keymask) {
+            return 0;
+        } elsif ($text && $text ne $keymask) {
+            $PACMain::FUNCS{_KEYBINDS}->UnRegisterHotKey('terminal',$text, $self->{uuid});
+        } elsif ($text && $text eq $keymask) {
+            return 0;
+        }
+        my ($free,$msg) = $PACMain::FUNCS{_KEYBINDS}->HotKeyIsFree('terminal',$keymask, $self->{uuid});
+        if ($free) {
+            # Register to validate, and apply changes online
+            $PACMain::FUNCS{_KEYBINDS}->RegisterHotKey('terminal',$keymask,"HOTKEY_CMD:$self->{where}","$ask$command$lf", $self->{uuid});
+            $widget->set_text($keymask);
+        } else {
+            _wMessage($PACMain::FUNCS{_EDIT}{_WINDOWEDIT},$msg);
+        }
+    });
+
     return %w;
 }
 
diff --git a/lib/edit/PACExpectEntry.pm b/lib/edit/PACExpectEntry.pm
index a1c116d1..aff19d5c 100644
--- a/lib/edit/PACExpectEntry.pm
+++ b/lib/edit/PACExpectEntry.pm
@@ -3,7 +3,7 @@ package PACExpectEntry;
 ###############################################################################
 # This file is part of Ásbrú Connection Manager
 #
-# Copyright (C) 2017-2020 Ásbrú Connection Manager team (https://asbru-cm.net)
+# Copyright (C) 2017-2022 Ásbrú Connection Manager team (https://asbru-cm.net)
 # Copyright (C) 2010-2016 David Torrejon Vaquerizas
 #
 # Ásbrú Connection Manager is free software: you can redistribute it and/or
@@ -146,16 +146,26 @@ sub _buildExpectGUI {
 
     # Build a vbox for:buttons, separator and expect widgets
     $w{vbox} = Gtk3::VBox->new(0, 0);
+    $w{hbox} = Gtk3::HBox->new(1, 0);
 
     # Build a hbuttonbox for widgets actions (add, etc.)
     $w{bbox} = Gtk3::HButtonBox->new();
-    $w{vbox}->pack_start($w{bbox}, 0, 1, 0);
+    $w{vbox}->pack_start($w{hbox}, 0, 1, 0);
+    $w{hbox}->pack_start($w{bbox}, 0, 1, 0);
     $w{bbox}->set_layout('GTK_BUTTONBOX_START');
 
     # Build 'add' button
     $w{btnadd} = Gtk3::Button->new_from_stock('gtk-add');
     $w{bbox}->add($w{btnadd});
 
+    $w{help} = Gtk3::LinkButton->new('https://docs.asbru-cm.net/Manual/Connections/SSH/#expect');
+    $w{help}->set_halign('GTK_ALIGN_END');
+    $w{help}->set_label('');
+    $w{help}->set_tooltip_text('Open Online Help');
+    $w{help}->set_always_show_image(1);
+    $w{help}->set_image(Gtk3::Image->new_from_stock('asbru-help', 'button'));
+    $w{hbox}->pack_start($w{help}, 0, 1, 0);
+
     # Build a separator
     $w{sep} = Gtk3::HSeparator->new();
     $w{vbox}->pack_start($w{sep}, 0, 1, 5);
@@ -168,7 +178,7 @@ sub _buildExpectGUI {
 
     $w{vp} = Gtk3::Viewport->new();
     $w{sw}->add($w{vp});
-    $w{vp}->set_property('border-width', 5);
+    #$w{vp}->set_property('border-width', 0);
     $w{vp}->set_shadow_type('none');
 
     # Build and add the vbox that will contain the expect widgets
@@ -224,10 +234,13 @@ sub _buildExpect {
     # Make an container frame
     $w{frame} = Gtk3::Frame->new;
     $w{frame}->set_label_widget($w{active});
+    $w{frame}->set_shadow_type('GTK_SHADOW_NONE');
 
     # Build an HBox
+    $w{vbox} = Gtk3::VBox->new(0, 5);
     $w{hbox1} = Gtk3::HBox->new(0, 0);
-    $w{frame}->add($w{hbox1});
+    $w{frame}->add($w{vbox});
+    $w{vbox}->pack_start($w{hbox1}, 0, 1, 0);
 
     # Build a vbox for event_boxes 1 & 2
     $w{vbox1} = Gtk3::VBox->new(0, 0);
@@ -244,7 +257,7 @@ sub _buildExpect {
     $w{ebdown}->add(Gtk3::Image->new_from_stock('gtk-go-down', 'small-toolbar') );
 
     # Build a vbox for expect and send entries
-    $w{vbox2} = Gtk3::VBox->new(0, 0);
+    $w{vbox2} = Gtk3::VBox->new(0, 3);
     $w{hbox1}->pack_start($w{vbox2}, 1, 1, 0);
     $w{vbox2}->set_sensitive($active);
 
@@ -259,7 +272,7 @@ sub _buildExpect {
     $w{expect} = Gtk3::Entry->new;
     $w{hboxExpect}->pack_start($w{expect}, 1, 1, 0);
     $w{expect}->set_text($exp);
-    $w{expect}->set_icon_from_stock('primary', 'pac-prompt');
+    $w{expect}->set_icon_from_stock('primary', 'asbru-prompt');
 
     $w{cbTimeOut} = Gtk3::CheckButton->new('Time out (seconds): ');
     $w{cbTimeOut}->set_active($time_out != -1);
@@ -356,7 +369,10 @@ sub _buildExpect {
 
     # Build delete button
     $w{btn} = Gtk3::Button->new_from_stock('gtk-delete');
-    $w{hbox1}->pack_start($w{btn}, 0, 1, 0);
+    $w{btn}->set_valign('GTK_ALIGN_START');
+    $w{hbox1}->pack_start($w{btn}, 0, 0, 0);
+
+    $w{vbox}->pack_start(Gtk3::HSeparator->new(), 1, 1, 0);
 
     # Add built control to main container
     $$self{frame}{vbexpect}->pack_start($w{frame}, 0, 1, 0);
@@ -366,6 +382,13 @@ sub _buildExpect {
 
     # Setup some callbacks
 
+    # Disable scroll on spin buttons to avoid changes by mistake
+    foreach my $spin ('time_out','on_match','on_fail') {
+        $w{$spin}->signal_connect('scroll-event' => sub {
+            return 1;
+        });
+    }
+
     $w{on_match}->signal_connect('value_changed' => sub {
         my $v = $w{on_match}->get_chars(0, -1);
         return 1 if $v <= scalar(@{$$self{cfg}} -1);
@@ -626,7 +649,7 @@ sub _buildExpect {
         push(@menu_items, {
             label => '<command prompt>',
             tooltip => 'Expect for a sting matching a COMMAND PROMPT (as defined under "Preferences")',
-            stockicon => 'pac-prompt',
+            stockicon => 'asbru-prompt',
             code => sub {$w{expect}->insert_text('<command prompt>', -1, $w{expect}->get_position);}
         });
 
@@ -677,6 +700,7 @@ sub _buildExpect {
         # Populate with Ásbrú Connection Manager internal variables
         my @int_variables_menu;
         push(@int_variables_menu, {label => "UUID",code => sub {$w{send}->insert_text("<UUID>", -1, $w{send}->get_position);} });
+        push(@int_variables_menu, {label => "SOCKS5_PORT",code => sub {$w{send}->insert_text("<SOCKS5_PORT>",-1, $w{send}->get_position());} });
         push(@int_variables_menu, {label => "TIMESTAMP",code => sub {$w{send}->insert_text("<TIMESTAMP>", -1, $w{send}->get_position);} });
         push(@int_variables_menu, {label => "DATE_Y",code => sub {$w{send}->insert_text("<DATE_Y>", -1, $w{send}->get_position);} });
         push(@int_variables_menu, {label => "DATE_M",code => sub {$w{send}->insert_text("<DATE_M>", -1, $w{send}->get_position);} });
@@ -688,51 +712,11 @@ sub _buildExpect {
         push(@int_variables_menu, {label => "TITLE",code => sub {$w{send}->insert_text("<TITLE>", -1, $w{send}->get_position);} });
         push(@int_variables_menu, {label => "IP",code => sub {$w{send}->insert_text("<IP>", -1, $w{send}->get_position);} });
         push(@int_variables_menu, {label => "USER",code => sub {$w{send}->insert_text("<USER>", -1, $w{send}->get_position);} });
+        push(@int_variables_menu, {label => "PORT",code => sub {$w{send}->insert_text("<PORT>", -1, $w{send}->get_position);} });
         push(@int_variables_menu, {label => "PASS",code => sub {$w{send}->insert_text("<PASS>", -1, $w{send}->get_position);} });
         push(@menu_items, {label => 'Internal variables...', submenu => \@int_variables_menu});
 
-        # Populate with <KPX_(title|username|url):*> special string
-        if ($PACMain::FUNCS{_MAIN}{_CFG}{'defaults'}{'keepass'}{'use_keepass'}) {
-            my (@titles, @usernames, @urls);
-            foreach my $hash ($PACMain::FUNCS{_KEEPASS}->find) {
-                push(@titles, {
-                    label => "<KPX_title:$$hash{title}>",
-                    tooltip => "$$hash{password}",
-                    code => sub {$w{expect}->insert_text("<KPX_title:$$hash{title}>", -1, $w{expect}->get_position);}
-                });
-                push(@usernames, {
-                    label => "<KPX_username:$$hash{username}>",
-                    tooltip => "$$hash{password}",
-                    code => sub {$w{expect}->insert_text("<KPX_username:$$hash{username}>", -1, $w{expect}->get_position);}
-                });
-                push(@usernames, {
-                    label => "<KPX_url:$$hash{url}>",
-                    tooltip => "$$hash{password}",
-                    code => sub {$w{expect}->insert_text("<KPX_url:$$hash{url}>", -1, $w{expect}->get_position);}
-                });
-            }
-
-            push(@menu_items, {
-                label => 'KeePassX',
-                stockicon => 'pac-keepass',
-                submenu => [
-                    {
-                        label => 'KeePassX title values',
-                        submenu => \@titles
-                    }, {
-                        label => 'KeePassX username values',
-                        submenu => \@usernames
-                    }, {
-                        label => 'KeePassX URL values',
-                        submenu => \@urls
-                    }, {
-                        label => "KeePass Extended Query",
-                        tooltip => "This allows you to select the value to be returned, based on another value's match againt a Perl Regular Expression",
-                        code => sub {$w{expect}->insert_text("<KPXRE_GET_(title|username|password|url)_WHERE_(title|username|password|url)==Your_RegExp_here==>", -1, $w{expect}->get_position);}
-                    }
-                ]
-            });
-        }
+        $PACMain::FUNCS{_KEEPASS}->setRigthClickMenuEntry($PACMain::FUNCS{_EDIT}{_WINDOWEDIT},'username,password',$w{expect},\@menu_items);
 
         _wPopUpMenu(\@menu_items, $event);
 
@@ -833,6 +817,7 @@ sub _buildExpect {
         # Populate with Ásbrú Connection Manager internal variables
         my @int_variables_menu;
         push(@int_variables_menu, {label => "UUID",code => sub {$w{send}->insert_text("<UUID>", -1, $w{send}->get_position);} });
+        push(@int_variables_menu, {label => "SOCKS5_PORT",code => sub {$w{send}->insert_text("<SOCKS5_PORT>",-1, $w{send}->get_position());} });
         push(@int_variables_menu, {label => "TIMESTAMP",code => sub {$w{send}->insert_text("<TIMESTAMP>", -1, $w{send}->get_position);} });
         push(@int_variables_menu, {label => "DATE_Y",code => sub {$w{send}->insert_text("<DATE_Y>", -1, $w{send}->get_position);} });
         push(@int_variables_menu, {label => "DATE_M",code => sub {$w{send}->insert_text("<DATE_M>", -1, $w{send}->get_position);} });
@@ -847,46 +832,29 @@ sub _buildExpect {
         push(@int_variables_menu, {label => "PASS",code => sub {$w{send}->insert_text("<PASS>", -1, $w{send}->get_position);} });
         push(@menu_items, {label => 'Internal variables...', submenu => \@int_variables_menu});
 
-        # Populate with <KPX_(title|username|url):*> special string
-        if ($PACMain::FUNCS{_MAIN}{_CFG}{'defaults'}{'keepass'}{'use_keepass'}) {
-            my (@titles, @usernames, @urls);
-            foreach my $hash ($PACMain::FUNCS{_KEEPASS}->find) {
-                push(@titles, {
-                    label => "<KPX_title:$$hash{title}>",
-                    tooltip => "$$hash{password}",
-                    code => sub {$w{send}->insert_text("<KPX_title:$$hash{title}>", -1, $w{send}->get_position);}
-                });
-                push(@usernames, {
-                    label => "<KPX_username:$$hash{username}>",
-                    tooltip => "$$hash{password}",
-                    code => sub {$w{send}->insert_text("<KPX_username:$$hash{username}>", -1, $w{send}->get_position);}
-                });
-                push(@usernames, {
-                    label => "<KPX_url:$$hash{url}>",
-                    tooltip => "$$hash{password}",
-                    code => sub {$w{send}->insert_text("<KPX_url:$$hash{url}>", -1, $w{send}->get_position);}
-                });
-            }
-
+        if ($PACMain::FUNCS{_KEEPASS}->getUseKeePass()) {
+            # Copy User,Password from KeePassXC
+            push(@menu_items, {
+                label => 'Add Username KeePassXC',
+                tooltip => 'KeePassXC Username',
+                code => sub {
+                    my $pos = $w{send}->get_property('cursor_position');
+                    my $selection = $PACMain::FUNCS{_KEEPASS}->listEntries($$self{_WINDOWEDIT});
+                    if ($selection) {
+                        $w{send}->insert_text("<username|$selection>", -1, $w{expect}->get_position);
+                    }
+                }
+            });
             push(@menu_items, {
-                label => 'KeePassX',
-                stockicon => 'pac-keepass',
-                submenu => [
-                    {
-                        label => 'KeePassX title values',
-                        submenu => \@titles
-                    }, {
-                        label => 'KeePassX username values',
-                        submenu => \@usernames
-                    }, {
-                        label => 'KeePassX URL values',
-                        submenu => \@urls
-                    }, {
-                        label => "KeePass Extended Query",
-                        tooltip => "This allows you to select the value to be returned, based on another value's match againt a Perl Regular Expression",
-                        code => sub {$w{send}->insert_text("<KPXRE_GET_(title|username|password|url)_WHERE_(title|username|password|url)==Your_RegExp_here==>", -1, $w{send}->get_position);}
+                label => 'Add Password KeePassXC',
+                tooltip => 'KeePassXC Password',
+                code => sub {
+                    my $pos = $w{send}->get_property('cursor_position');
+                    my $selection = $PACMain::FUNCS{_KEEPASS}->listEntries($$self{_WINDOWEDIT});
+                    if ($selection) {
+                        $w{send}->insert_text("<password|$selection>", -1, $w{expect}->get_position);
                     }
-                ]
+                }
             });
         }
 
diff --git a/lib/edit/PACMethod.pm b/lib/edit/PACMethod.pm
index c95b2944..dfc4924f 100644
--- a/lib/edit/PACMethod.pm
+++ b/lib/edit/PACMethod.pm
@@ -3,7 +3,7 @@ package PACMethod;
 ###############################################################################
 # This file is part of Ásbrú Connection Manager
 #
-# Copyright (C) 2017-2020 Ásbrú Connection Manager team (https://asbru-cm.net)
+# Copyright (C) 2017-2022 Ásbrú Connection Manager team (https://asbru-cm.net)
 # Copyright (C) 2010-2016 David Torrejon Vaquerizas
 #
 # Ásbrú Connection Manager is free software: you can redistribute it and/or
@@ -87,8 +87,8 @@ $METHODS{'RDP (rdesktop)'} = "PACMethod_rdesktop"->new($CONTAINER);
 eval {require "$RealBin/lib/method/PACMethod_xfreerdp.pm";}; die $@ if $@;
 $METHODS{'RDP (xfreerdp)'} = "PACMethod_xfreerdp"->new($CONTAINER);
 
-my $tigervnc = `vncviewer --help 2>&1 | /bin/grep TigerVNC`;
-my $realvnc = `vncviewer --help 2>&1 | /bin/grep RealVNC`;
+my $tigervnc = `$ENV{'ASBRU_ENV_FOR_EXTERNAL'} vncviewer --help 2>&1 | /bin/grep TigerVNC`;
+my $realvnc = `$ENV{'ASBRU_ENV_FOR_EXTERNAL'} vncviewer --help 2>&1 | /bin/grep RealVNC`;
 
 if ($tigervnc) {
     # Use TigerVNC
@@ -139,7 +139,7 @@ sub change {
 
     $$self{container}->foreach(sub {$_[0]->destroy;});
     $METHODS{$$self{_METHOD}}->_buildGUI();
-    $METHODS{$$self{_METHOD}}->update($$self{_CFG}{'options'});
+    $METHODS{$$self{_METHOD}}->update($$self{_CFG}{'options'}, $$self{_CFG}{"$$self{_METHOD} options"});
 
     return 1;
 }
@@ -157,11 +157,15 @@ sub update {
         return 0;
     }
 
-    $METHODS{$$self{_METHOD}}->update($$self{_CFG}{'options'});
+    $METHODS{$$self{_METHOD}}->update($$self{_CFG}{'options'}, $$self{_CFG}{'connection options'});
 
     return 1;
 }
 
+sub get_cfg_array {
+    return $METHODS{$_[0]{_METHOD}}->get_cfg_array();
+}
+
 sub get_cfg {
     return $METHODS{$_[0]{_METHOD}}->get_cfg();
 }
diff --git a/lib/edit/PACPrePostEntry.pm b/lib/edit/PACPrePostEntry.pm
index 7846c235..7bfc35a3 100644
--- a/lib/edit/PACPrePostEntry.pm
+++ b/lib/edit/PACPrePostEntry.pm
@@ -3,7 +3,7 @@ package PACPrePostEntry;
 ###############################################################################
 # This file is part of Ásbrú Connection Manager
 #
-# Copyright (C) 2017-2020 Ásbrú Connection Manager team (https://asbru-cm.net)
+# Copyright (C) 2017-2022 Ásbrú Connection Manager team (https://asbru-cm.net)
 # Copyright (C) 2010-2016 David Torrejon Vaquerizas
 #
 # Ásbrú Connection Manager is free software: you can redistribute it and/or
@@ -125,16 +125,26 @@ sub _buildPrePostGUI {
 
     # Build a vbox for:buttons, separator and expect widgets
     $w{vbox} = Gtk3::VBox->new(0, 0);
+    $w{hbox} = Gtk3::HBox->new(1, 0);
 
     # Build a hbuttonbox for widgets actions (add, etc.)
     $w{bbox} = Gtk3::HButtonBox->new();
-    $w{vbox}->pack_start($w{bbox}, 0, 1, 0);
+    $w{vbox}->pack_start($w{hbox}, 0, 1, 0);
+    $w{hbox}->pack_start($w{bbox}, 0, 1, 0);
     $w{bbox}->set_layout('GTK_BUTTONBOX_START');
 
     # Build 'add' button
     $w{btnadd} = Gtk3::Button->new_from_stock('gtk-add');
     $w{bbox}->add($w{btnadd});
 
+    $w{help} = Gtk3::LinkButton->new('https://docs.asbru-cm.net/Manual/Connections/SSH/#pre-post-exec');
+    $w{help}->set_halign('GTK_ALIGN_END');
+    $w{help}->set_label('');
+    $w{help}->set_tooltip_text('Open Online Help');
+    $w{help}->set_always_show_image(1);
+    $w{help}->set_image(Gtk3::Image->new_from_stock('asbru-help', 'button'));
+    $w{hbox}->pack_start($w{help}, 0, 1, 0);
+
     # Build a separator
     $w{sep} = Gtk3::HSeparator->new();
     $w{vbox}->pack_start($w{sep}, 0, 1, 5);
@@ -316,6 +326,7 @@ sub _buildPrePost {
         # Populate with Ásbrú Connection Manager internal variables
         my @int_variables_menu;
         push(@int_variables_menu, {label => "UUID",code => sub {$w{command}->insert_text("<UUID>", -1, $w{command}->get_position);} });
+        push(@int_variables_menu, {label => "SOCKS5_PORT",code => sub {$w{command}->insert_text("<SOCKS5_PORT>",-1, $w{command}->get_position());} });
         push(@int_variables_menu, {label => "TIMESTAMP",code => sub {$w{command}->insert_text("<TIMESTAMP>", -1, $w{command}->get_position);} });
         push(@int_variables_menu, {label => "DATE_Y",code => sub {$w{command}->insert_text("<DATE_Y>", -1, $w{command}->get_position);} });
         push(@int_variables_menu, {label => "DATE_M",code => sub {$w{command}->insert_text("<DATE_M>", -1, $w{command}->get_position);} });
@@ -326,53 +337,12 @@ sub _buildPrePost {
         push(@int_variables_menu, {label => "NAME",code => sub {$w{command}->insert_text("<NAME>", -1, $w{command}->get_position);} });
         push(@int_variables_menu, {label => "TITLE",code => sub {$w{command}->insert_text("<TITLE>", -1, $w{command}->get_position);} });
         push(@int_variables_menu, {label => "IP",code => sub {$w{command}->insert_text("<IP>", -1, $w{command}->get_position);} });
+        push(@int_variables_menu, {label => "PORT",code => sub {$w{command}->insert_text("<PORT>", -1, $w{command}->get_position);} });
         push(@int_variables_menu, {label => "USER",code => sub {$w{command}->insert_text("<USER>", -1, $w{command}->get_position);} });
         push(@int_variables_menu, {label => "PASS",code => sub {$w{command}->insert_text("<PASS>", -1, $w{command}->get_position);} });
         push(@menu_items, {label => 'Internal variables...', submenu => \@int_variables_menu});
 
-        # Populate with <KPX_(title|username|url):*> special string
-        if ($PACMain::FUNCS{_MAIN}{_CFG}{'defaults'}{'keepass'}{'use_keepass'}) {
-            my (@titles, @usernames, @urls);
-            foreach my $hash ($PACMain::FUNCS{_KEEPASS}->find) {
-                next if(exists $$hash{'binary'}{'bin-stream'} && $$hash{'comment'} eq 'KPX_CUSTOM_ICONS_4');
-                push(@titles, {
-                    label => "<KPX_title:$$hash{title}>",
-                    tooltip => "$$hash{password}",
-                    code => sub {$w{command}->insert_text("<KPX_title:$$hash{title}>", -1, $w{command}->get_position);}
-                });
-                push(@usernames, {
-                    label => "<KPX_username:$$hash{username}>",
-                    tooltip => "$$hash{password}",
-                    code => sub {$w{command}->insert_text("<KPX_username:$$hash{username}>", -1, $w{command}->get_position);}
-                });
-                push(@urls, {
-                    label => "<KPX_url:$$hash{url}>",
-                    tooltip => "$$hash{password}",
-                    code => sub {$w{command}->insert_text("<KPX_url:$$hash{url}>", -1, $w{command}->get_position);}
-                });
-            }
-
-            push(@menu_items, {
-                label => 'KeePassX',
-                stockicon => 'pac-keepass',
-                submenu => [
-                    {
-                        label => 'KeePassX title values',
-                        submenu => \@titles
-                    }, {
-                        label => 'KeePassX username values',
-                        submenu => \@usernames
-                    }, {
-                        label => 'KeePassX URL values',
-                        submenu => \@urls
-                    }, {
-                        label => "KeePass Extended Query",
-                        tooltip => "This allows you to select the value to be returned, based on another value's match againt a Perl Regular Expression",
-                        code => sub {$w{command}->insert_text("<KPXRE_GET_(title|username|password|url)_WHERE_(title|username|password|url)==Your_RegExp_here==>", -1, $w{command}->get_position);}
-                    }
-                ]
-            });
-        }
+        $PACMain::FUNCS{_KEEPASS}->setRigthClickMenuEntry($PACMain::FUNCS{_EDIT}{_WINDOWEDIT},'username,password',$w{command},\@menu_items);
 
         _wPopUpMenu(\@menu_items, $event);
 
diff --git a/lib/edit/PACTermOpts.pm b/lib/edit/PACTermOpts.pm
index 8649b2db..1d060b89 100644
--- a/lib/edit/PACTermOpts.pm
+++ b/lib/edit/PACTermOpts.pm
@@ -3,7 +3,7 @@ package PACTermOpts;
 ###############################################################################
 # This file is part of Ásbrú Connection Manager
 #
-# Copyright (C) 2017-2020 Ásbrú Connection Manager team (https://asbru-cm.net)
+# Copyright (C) 2017-2022 Ásbrú Connection Manager team (https://asbru-cm.net)
 # Copyright (C) 2010-2016 David Torrejon Vaquerizas
 #
 # Ásbrú Connection Manager is free software: you can redistribute it and/or
@@ -48,17 +48,27 @@ use PACUtils;
 # Define GLOBAL CLASS variables
 
 my %CURSOR_SHAPE = (
-    'block' => 0,
-    'ibeam' => 1,
+    'block'     => 0,
+    'ibeam'     => 1,
     'underline' => 2
 );
 
 my %BACKSPACE_BINDING = (
-    'auto' => 0,
+    'auto'            => 0,
     'ascii-backspace' => 1,
-    'ascii-delete' => 2,
+    'ascii-delete'    => 2,
     'delete-sequence' => 3,
-    'tty' => 4
+    'tty'             => 4
+);
+
+my %TERMINAL_EMULATION = (
+    'xterm'  => 0,
+    'X11R6'  => 1,
+    'VT100'  => 2,
+    'VT200'  => 3,
+    'rxvt'   => 4,
+    'MGT'    => 5,
+    'screen' => 6
 );
 
 # END: Define GLOBAL CLASS variables
@@ -79,7 +89,9 @@ sub new {
     $self->{gui} = undef;
 
     _buildTermOptsGUI($self);
-    defined $$self{cfg} and PACTermOpts::update($$self{cfg});
+    if (defined $$self{cfg}) {
+        PACTermOpts::update($$self{cfg});
+    }
 
     bless($self, $class);
     return $self;
@@ -89,21 +101,16 @@ sub update {
     my $self = shift;
     my $cfg = shift;
 
-    defined $cfg and $$self{cfg} = $cfg;
-
-    $$self{gui}{cbCTRLDisable}->set_active($$cfg{'disable CTRL key bindings'} // 0);
-    $$self{gui}{cbALTDisable}->set_active($$cfg{'disable ALT key bindings'} // 0);
-    $$self{gui}{cbSHIFTDisable}->set_active($$cfg{'disable SHIFT key bindings'} // 0);
-
-    $$self{gui}{cbAudibleBell}->set_active($$cfg{'audible bell'} // 0);
-    $$self{gui}{cbVisibleBell}->set_active($$cfg{'visible bell'} // 0);
+    if (defined $cfg) {
+        $$self{cfg} = $cfg;
+    }
 
     $$self{gui}{cbUsePersonal}->set_active(1); # Just to force 'toggled' signal to trigger that callback and update GUI
     $$self{gui}{cbUsePersonal}->set_active($$cfg{'use personal settings'} // 0);
 
-    $$self{gui}{entryCfgPrompt}->set_text($$cfg{'command prompt'} // '[#%\$>]|\:\/\s*$');
-    $$self{gui}{entryCfgUserPrompt}->set_text($$cfg{'username prompt'} // '([lL]ogin|[uU]suario|[uU]ser-?[nN]ame|[uU]ser):\s*$');
-    $$self{gui}{entryCfgPasswordPrompt}->set_text($$cfg{'password prompt'} // '([pP]ass|[pP]ass[wW]or[dt](\s+for\s+|\w+@\w+)*|[cC]ontrase.a|Enter passphrase for key \'.+\')\s*:\s*$');
+    $$self{gui}{entryCfgPrompt}->set_text($$cfg{'command prompt'} // $PACUtils::DEFAULT_COMMAND_PROMPT);
+    $$self{gui}{entryCfgUserPrompt}->set_text($$cfg{'username prompt'} // $PACUtils::DEFAULT_USERNAME_PROMPT);
+    $$self{gui}{entryCfgPasswordPrompt}->set_text($$cfg{'password prompt'} // $PACUtils::DEFAULT_PASSWORD_PROMPT);
 
     $$self{gui}{cbTabBackColor}->set_active($$cfg{'use tab back color'} // 0);
     _updateWidgetColor($self, $cfg, $$self{gui}{colorTabBack}, 'tab back color', '#000000000000');
@@ -115,8 +122,16 @@ sub update {
     $$self{gui}{colorBold}->set_sensitive(! $$self{gui}{cbBoldAsText}->get_active);
     $$self{gui}{fontTerminal}->set_font_name($$cfg{'terminal font'} // 'Monospace 9');
     $$self{gui}{comboCursorShape}->set_active($CURSOR_SHAPE{$$cfg{'cursor shape'} // 'block'});
-    $$self{gui}{spCfgTerminalScrollback}->set_value($$cfg{'terminal scrollback lines'} // 5000);
+    $$self{gui}{spCfgTerminalScrollback}->set_value($$cfg{'terminal scrollback lines'} // -2);
     $$self{gui}{spCfgTerminalTransparency}->set_value($$cfg{'terminal transparency'} // 0);
+    if ($PACMain::FUNCS{_MAIN}{_CFG}{'defaults'}{'terminal support transparency'}) {
+        $$self{gui}{spCfgTerminalTransparency}->set_sensitive(1);
+        $$self{gui}{spCfgTerminalTransparency}->set_tooltip_text("");
+    } else {
+        $$self{gui}{spCfgTerminalTransparency}->set_sensitive(0);
+        $$self{gui}{spCfgTerminalTransparency}->set_tooltip_text("Transparency has been disabled globally.  See your global preferences to activate transparency.");
+    }
+
     $$self{gui}{entrySelectWords}->set_text($$cfg{'terminal select words'} // '-.:_/');
 
     $$self{gui}{spCfgTmoutConnect}->set_value($$cfg{'timeout connect'} // 40);
@@ -130,7 +145,8 @@ sub update {
     $$self{gui}{comboBackspace}->set_active($BACKSPACE_BINDING{$$cfg{'terminal backspace'} // 'auto'} // '0');
 
     $$self{gui}{comboEncoding}->set_active(($PACMain::FUNCS{_CONFIG}{_ENCODINGS_MAP}{$$cfg{'terminal character encoding'} // 'UTF-8'}) // -1);
-    $$self{gui}{lblEncoding}->set_text(($PACMain::FUNCS{_CONFIG}{_ENCODINGS_HASH}{$$cfg{'terminal character encoding'} // 'RFC 3629'}) // '');
+
+    $$self{gui}{comboEmulation}->set_active($TERMINAL_EMULATION{$$cfg{'terminal emulation'} // 'xterm'} // '0');
 
     return 1;
 }
@@ -140,13 +156,6 @@ sub get_cfg {
 
     my %options;
 
-    $options{'disable CTRL key bindings'} = $$self{gui}{cbCTRLDisable}->get_active;
-    $options{'disable ALT key bindings'} = $$self{gui}{cbALTDisable}->get_active;
-    $options{'disable SHIFT key bindings'} = $$self{gui}{cbSHIFTDisable}->get_active;
-
-    $options{'audible bell'} = $$self{gui}{cbAudibleBell}->get_active;
-    $options{'visible bell'} = $$self{gui}{cbVisibleBell}->get_active;
-
     $options{'use personal settings'} = $$self{gui}{cbUsePersonal}->get_active // 0;
 
     $options{'command prompt'} = $$self{gui}{entryCfgPrompt}->get_chars(0, -1);
@@ -162,7 +171,7 @@ sub get_cfg {
     $options{'terminal font'} = $$self{gui}{fontTerminal}->get_font_name;
     $options{'cursor shape'} = $$self{gui}{comboCursorShape}->get_active_text;
     $options{'terminal scrollback lines'} = $$self{gui}{spCfgTerminalScrollback}->get_chars(0, -1);
-    $options{'terminal transparency'} = $$self{gui}{spCfgTerminalTransparency}->get_value;
+    $options{'terminal transparency'} = $$self{gui}{spCfgTerminalTransparency}->get_value();
     $options{'terminal transparency'} =~ s/,/\./go;
     $options{'terminal select words'} = $$self{gui}{entrySelectWords}->get_chars(0, -1);
 
@@ -173,6 +182,7 @@ sub get_cfg {
     $options{'terminal window hsize'} = $$self{gui}{spCfgNewWindowWidth}->get_value;
     $options{'terminal window vsize'} = $$self{gui}{spCfgNewWindowHeight}->get_value;
     $options{'terminal character encoding'} = $$self{gui}{comboEncoding}->get_active_text;
+    $options{'terminal emulation'} = $$self{gui}{comboEmulation}->get_active_text;
     $options{'terminal backspace'} = $$self{gui}{comboBackspace}->get_active_text;
 
     return \%options;
@@ -198,42 +208,12 @@ sub _buildTermOptsGUI {
     $w{hboxopts} = Gtk3::HBox->new(0, 0);
     $w{vbox}->pack_start($w{hboxopts}, 0, 1, 0);
 
-    $w{frameBindings} = Gtk3::Frame->new(" Disable next key bindings for this connection: ");
-    $w{hboxopts}->pack_start($w{frameBindings}, 0, 1, 0);
-    $w{frameBindings}->set_tooltip_text("Here you can select which key bindings will not be available in this connection. ");
-
-    $w{hboxKBD} = Gtk3::HBox->new(0, 0);
-    $w{frameBindings}->add($w{hboxKBD});
-    $w{hboxKBD}->set_border_width(5);
-
-    $w{cbCTRLDisable} = Gtk3::CheckButton->new_with_label('CTRL');
-    $w{hboxKBD}->pack_start($w{cbCTRLDisable}, 0, 1, 0);
-
-    $w{cbALTDisable} = Gtk3::CheckButton->new_with_label('ALT');
-    $w{hboxKBD}->pack_start($w{cbALTDisable}, 0, 1, 0);
-
-    $w{cbSHIFTDisable} = Gtk3::CheckButton->new_with_label('SHIFT');
-    $w{hboxKBD}->pack_start($w{cbSHIFTDisable}, 0, 1, 0);
-
-    $w{frameBell} = Gtk3::Frame->new(" Other options: ");
-    $w{hboxopts}->pack_start($w{frameBell}, 0, 1, 0);
-
-    $w{hboxbell} = Gtk3::HBox->new(0, 0);
-    $w{frameBell}->add($w{hboxbell});
-    $w{hboxbell}->set_border_width(5);
-
-    $w{cbAudibleBell} = Gtk3::CheckButton->new_with_label('Audible bell');
-    $w{hboxbell}->pack_start($w{cbAudibleBell}, 0, 1, 0);
-
-    $w{cbVisibleBell} = Gtk3::CheckButton->new_with_label('Visible bell');
-    $w{hboxbell}->pack_start($w{cbVisibleBell}, 0, 1, 0);
-
-
     $w{frameSuper} = Gtk3::Frame->new;
     $w{vbox}->pack_start($w{frameSuper}, 1, 1, 0);
 
-    $w{cbUsePersonal} = Gtk3::CheckButton->new_with_label(' Use these personal options: ');
+    $w{cbUsePersonal} = Gtk3::CheckButton->new_with_label(' Use these personal options  ');
     $w{frameSuper}->set_label_widget($w{cbUsePersonal});
+    $w{frameSuper}->set_shadow_type('GTK_SHADOW_NONE');
 
     $w{vbox1} = Gtk3::VBox->new(0, 0);
     $w{frameSuper}->add($w{vbox1});
@@ -242,30 +222,34 @@ sub _buildTermOptsGUI {
     my $hbox1 = Gtk3::HBox->new(0, 0);
     $w{vbox1}->pack_start($hbox1, 0, 1, 0);
 
-    my $frameCommandPrompt = Gtk3::Frame->new(' Prompt RegExp: ');
+    my $frameCommandPrompt = Gtk3::Frame->new(' Prompt RegExp  ');
     $hbox1->pack_start($frameCommandPrompt, 1, 1, 0);
 
     $w{entryCfgPrompt} = Gtk3::Entry->new;
-    $w{entryCfgPrompt}->set_icon_from_stock('primary', 'pac-prompt');
+    $w{entryCfgPrompt}->set_icon_from_stock('primary', 'asbru-prompt');
     $frameCommandPrompt->add($w{entryCfgPrompt});
+    $frameCommandPrompt->set_shadow_type('GTK_SHADOW_NONE');
 
-    my $frameUserPrompt = Gtk3::Frame->new(' Username RegExp: ');
+    my $frameUserPrompt = Gtk3::Frame->new(' Username RegExp  ');
     $hbox1->pack_start($frameUserPrompt, 1, 1, 0);
 
     $w{entryCfgUserPrompt} = Gtk3::Entry->new;
     $frameUserPrompt->add($w{entryCfgUserPrompt});
+    $frameUserPrompt->set_shadow_type('GTK_SHADOW_NONE');
 
-    my $framePasswordPrompt = Gtk3::Frame->new(' Password RegExp: ');
+    my $framePasswordPrompt = Gtk3::Frame->new(' Password RegExp  ');
     $hbox1->pack_start($framePasswordPrompt, 1, 1, 0);
 
     $w{entryCfgPasswordPrompt} = Gtk3::Entry->new;
     $framePasswordPrompt->add($w{entryCfgPasswordPrompt});
+    $framePasswordPrompt->set_shadow_type('GTK_SHADOW_NONE');
 
-    my $frameTermUI = Gtk3::Frame->new(' Terminal UI: ');
+    my $frameTermUI = Gtk3::Frame->new(' Terminal UI  ');
     $w{vbox1}->pack_start($frameTermUI, 0, 1, 0);
 
     my $vboxTermUI = Gtk3::VBox->new(0, 0);
     $frameTermUI->add ($vboxTermUI);
+    $frameTermUI->set_shadow_type('GTK_SHADOW_NONE');
 
     my $hboxTermUI1 = Gtk3::HBox->new(0, 0);
     $vboxTermUI->add ($hboxTermUI1);
@@ -273,23 +257,23 @@ sub _buildTermOptsGUI {
 
     my $frameTxtFore = Gtk3::Frame->new('Text color:');
     $hboxTermUI1->pack_start($frameTxtFore, 0, 1, 0);
-    $frameTxtFore->set_shadow_type('none');
+    $frameTxtFore->set_shadow_type('GTK_SHADOW_NONE');
 
     $w{colorText} = Gtk3::ColorButton->new;
     $frameTxtFore->add($w{colorText});
 
     my $frameTxtBack = Gtk3::Frame->new('Back color:');
     $hboxTermUI1->pack_start($frameTxtBack, 0, 1, 0);
-    $frameTxtBack->set_shadow_type('none');
+    $frameTxtBack->set_shadow_type('GTK_SHADOW_NONE');
 
     $w{colorBack} = Gtk3::ColorButton->new;
     $frameTxtBack->add($w{colorBack});
 
     my $frameTxtBold = Gtk3::Frame->new;
     $hboxTermUI1->pack_start($frameTxtBold, 0, 1, 0);
-    $frameTxtBold->set_shadow_type('none');
+    $frameTxtBold->set_shadow_type('GTK_SHADOW_NONE');
 
-    $w{cbBoldAsText} = Gtk3::CheckButton->new_with_label(' Bold color like Text color: ');
+    $w{cbBoldAsText} = Gtk3::CheckButton->new_with_label(' Bold color like Text color  ');
     $frameTxtBold->set_label_widget($w{cbBoldAsText});
 
     $w{colorBold} = Gtk3::ColorButton->new;
@@ -297,16 +281,16 @@ sub _buildTermOptsGUI {
 
     my $frameFont = Gtk3::Frame->new('Font:');
     $hboxTermUI1->pack_start($frameFont, 0, 1, 0);
-    $frameFont->set_shadow_type('none');
+    $frameFont->set_shadow_type('GTK_SHADOW_NONE');
 
     $w{fontTerminal} = Gtk3::FontButton->new;
     $frameFont->add($w{fontTerminal});
 
     my $frameTabBackColor = Gtk3::Frame->new;
     $hboxTermUI1->pack_start($frameTabBackColor, 0, 1, 0);
-    $frameTabBackColor->set_shadow_type('none');
+    $frameTabBackColor->set_shadow_type('GTK_SHADOW_NONE');
 
-    $w{cbTabBackColor} = Gtk3::CheckButton->new_with_label(' Use this Tab background color: ');
+    $w{cbTabBackColor} = Gtk3::CheckButton->new_with_label(' Use this Tab background color  ');
     $frameTabBackColor->set_label_widget($w{cbTabBackColor});
 
     $w{colorTabBack} = Gtk3::ColorButton->new;
@@ -318,7 +302,7 @@ sub _buildTermOptsGUI {
 
     my $frameCursor = Gtk3::Frame->new('Cursor Shape:');
     $hboxTermUI2->pack_start($frameCursor, 0, 1, 0);
-    $frameCursor->set_shadow_type('none');
+    $frameCursor->set_shadow_type('GTK_SHADOW_NONE');
 
     $w{comboCursorShape} = Gtk3::ComboBoxText->new;
     $frameCursor->add($w{comboCursorShape});
@@ -326,55 +310,60 @@ sub _buildTermOptsGUI {
 
     my $frameScroll = Gtk3::Frame->new('Scrollback lines:');
     $hboxTermUI2->pack_start($frameScroll, 0, 1, 0);
-    $frameScroll->set_shadow_type('none');
+    $frameScroll->set_shadow_type('GTK_SHADOW_NONE');
 
-    $w{spCfgTerminalScrollback} = Gtk3::SpinButton->new_with_range(1, 99999, 100);
+    $w{spCfgTerminalScrollback} = Gtk3::SpinButton->new_with_range(-2, 99999, 100);
+    $w{spCfgTerminalScrollback}->set_tooltip_text("If positive, sets the length of the scrollback buffer used by the terminal.\nIf 0, disables the scrollback buffer.\nIf -1, means an \"infinitive scrollback\".\nIf -2, uses the value set in global preferences.");
     $frameScroll->add($w{spCfgTerminalScrollback});
 
     my $frameTransparency = Gtk3::Frame->new('Transparency:');
     $hboxTermUI2->pack_start($frameTransparency, 1, 1, 0);
-    $frameTransparency->set_shadow_type('none');
+    $frameTransparency->set_shadow_type('GTK_SHADOW_NONE');
 
-    $w{spCfgTerminalTransparency} = Gtk3::HScale->new(Gtk3::Adjustment->new(0, 0, 1, 0.1, 0.1, 0.1) );
+    $w{spCfgTerminalTransparency} = Gtk3::HScale->new(Gtk3::Adjustment->new(0, 0, 1, 0.01, 0.2, 0.01));
+    $w{spCfgTerminalTransparency}->set_digits(2);
     $frameTransparency->add($w{spCfgTerminalTransparency});
 
-    my $frameSelectWords = Gtk3::Frame->new(' Select Word CHARS: ');
+    my $frameSelectWords = Gtk3::Frame->new(' Select Word CHARS  ');
     $hboxTermUI2->pack_start($frameSelectWords, 0, 1, 0);
 
     $w{entrySelectWords} = Gtk3::Entry->new;
     $frameSelectWords->add($w{entrySelectWords});
+    $frameSelectWords->set_shadow_type('GTK_SHADOW_NONE');
 
     $w{hboxTimeSize} = Gtk3::HBox->new(0, 0);
     $w{vbox1}->pack_start($w{hboxTimeSize}, 0, 1, 0);
 
-    my $frameTimeOuts = Gtk3::Frame->new(' Time outs (seconds): ');
+    my $frameTimeOuts = Gtk3::Frame->new(' Time outs (seconds)  ');
     $w{hboxTimeSize}->pack_start($frameTimeOuts, 0, 1, 0);
 
     my $hbox2 = Gtk3::HBox->new(0, 0);
     $frameTimeOuts->add($hbox2);
+    $frameTimeOuts->set_shadow_type('GTK_SHADOW_NONE');
     $hbox2->set_border_width(5);
 
     my $frameTOConn = Gtk3::Frame->new(' Connection ');
     $hbox2->pack_start($frameTOConn, 0, 1, 0),
-    $frameTOConn->set_shadow_type('none');
+    $frameTOConn->set_shadow_type('GTK_SHADOW_NONE');
     $frameTOConn->set_tooltip_text('Set to 0 (zero) to wait forever until connection is established');
 
     $w{spCfgTmoutConnect} = Gtk3::SpinButton->new_with_range(0, 86400, 1);
     $frameTOConn->add($w{spCfgTmoutConnect});
 
-    my $frameTOCmd = Gtk3::Frame->new(' Expect Cmd exec: ');
+    my $frameTOCmd = Gtk3::Frame->new(' Expect Cmd exec  ');
     $hbox2->pack_start($frameTOCmd, 0, 1, 0),
-    $frameTOCmd->set_shadow_type('none');
+    $frameTOCmd->set_shadow_type('GTK_SHADOW_NONE');
     $frameTOCmd->set_tooltip_text('Set to 0 (zero) to wait forever for Expect and equivalentes commands to complete');
 
     $w{spCfgTmoutCommand} = Gtk3::SpinButton->new_with_range(0, 86400, 1);
     $frameTOCmd->add($w{spCfgTmoutCommand});
 
-    my $frameWindowSize = Gtk3::Frame->new(' Open NEW connection on: ');
+    my $frameWindowSize = Gtk3::Frame->new(' Open NEW connection on  ');
     $w{hboxTimeSize}->pack_start($frameWindowSize, 0, 1, 0);
 
     my $vboxWindowSize = Gtk3::VBox->new(0, 0);
     $frameWindowSize->add($vboxWindowSize);
+    $frameWindowSize->set_shadow_type('GTK_SHADOW_NONE');
 
     $w{cbCfgNewInTab} = Gtk3::RadioButton->new_with_label(undef, 'Tab');
     $vboxWindowSize->pack_start($w{cbCfgNewInTab}, 0, 1, 0);
@@ -388,31 +377,50 @@ sub _buildTermOptsGUI {
     $w{hboxWidthHeight} = Gtk3::HBox->new(0, 0);
     $hboxWindowSize->pack_start($w{hboxWidthHeight}, 0, 1, 0);
 
-    $w{hboxWidthHeight}->pack_start(Gtk3::Label->new(' Width: '), 0, 1, 0);
+    $w{hboxWidthHeight}->pack_start(Gtk3::Label->new(' Width  '), 0, 1, 0);
     $w{spCfgNewWindowWidth} = Gtk3::SpinButton->new_with_range(1, 4096, 10);
     $w{hboxWidthHeight}->pack_start($w{spCfgNewWindowWidth}, 0, 1, 0);
 
-    $w{hboxWidthHeight}->pack_start(Gtk3::Label->new(' Height: '), 0, 1, 0);
+    $w{hboxWidthHeight}->pack_start(Gtk3::Label->new(' Height  '), 0, 1, 0);
     $w{spCfgNewWindowHeight} = Gtk3::SpinButton->new_with_range(1, 4096, 10);
     $w{hboxWidthHeight}->pack_start($w{spCfgNewWindowHeight}, 0, 1, 0);
 
-    my $frameBackspace = Gtk3::Frame->new(' Backspace binding: ');
+    my $frameBackspace = Gtk3::Frame->new(' Backspace binding  ');
     $w{hboxTimeSize}->pack_start($frameBackspace, 0, 1, 0);
 
     $w{comboBackspace} = Gtk3::ComboBoxText->new;
     $frameBackspace->add($w{comboBackspace});
+    $frameBackspace->set_shadow_type('GTK_SHADOW_NONE');
+
+    $w{hboxchar} = Gtk3::HBox->new(0,0);
+    $w{vbox1}->pack_start($w{hboxchar},0,1,5);
 
-    my $frameEncoding = Gtk3::Frame->new(' Character Encoding: ');
-    $w{vbox1}->pack_start($frameEncoding, 1, 1, 0);
+    my $frameEncoding = Gtk3::Frame->new(' Character Encoding  ');
+    $w{hboxchar}->pack_start($frameEncoding, 1, 1, 0);
 
     my $vboxEnc = Gtk3::VBox->new(0, 0);
     $frameEncoding->add($vboxEnc);
+    $frameEncoding->set_shadow_type('GTK_SHADOW_NONE');
 
     $w{comboEncoding} = Gtk3::ComboBoxText->new;
     $vboxEnc->pack_start($w{comboEncoding}, 0, 1, 0);
 
-    $w{lblEncoding} = Gtk3::Label->new('');
-    $vboxEnc->pack_start($w{lblEncoding}, 1, 1, 0);
+    my $frameEmulations = Gtk3::Frame->new(' Terminal Emulation ');
+    $w{hboxchar}->pack_start($frameEmulations, 1, 1, 0);
+
+    my $vboxEmulation = Gtk3::VBox->new(0, 0);
+    $frameEmulations->add($vboxEmulation);
+    $frameEmulations->set_shadow_type('GTK_SHADOW_NONE');
+
+    $w{comboEmulation} = Gtk3::ComboBoxText->new;
+    $vboxEmulation->pack_start($w{comboEmulation}, 0, 1, 0);
+    $w{comboEmulation}->append_text('xterm');
+    $w{comboEmulation}->append_text('X11R6');
+    $w{comboEmulation}->append_text('VT100');
+    $w{comboEmulation}->append_text('VT220');
+    $w{comboEmulation}->append_text('rxvt');
+    $w{comboEmulation}->append_text('MGT');
+    $w{comboEmulation}->append_text('screen');
 
     my $sep = Gtk3::HSeparator->new;
     $w{vbox1}->pack_start($sep, 0, 1, 5);
@@ -425,21 +433,31 @@ sub _buildTermOptsGUI {
     $$self{gui} = \%w;
 
     # Populate the Encodings combobox
-    foreach my $enc (sort {uc($a) cmp uc($b)} keys %{$PACMain::FUNCS{_CONFIG}{_ENCODINGS_ARRAY}}) {$w{comboEncoding}->append_text($enc);}
+    foreach my $enc (sort {uc($a) cmp uc($b)} keys %{$PACMain::FUNCS{_CONFIG}{_ENCODINGS_ARRAY}}) {
+        $w{comboEncoding}->append_text($enc);
+    }
 
     # Populate the Backspace binding combobox
-    foreach my $key ('auto', 'ascii-backspace', 'ascii-delete', 'delete-sequence', 'tty') {$w{comboBackspace}->append_text($key);}
+    foreach my $key ('auto', 'ascii-backspace', 'ascii-delete', 'delete-sequence', 'tty') {
+        $w{comboBackspace}->append_text($key);
+    }
 
     # Setup some callbacks
-    $w{cbUsePersonal}->signal_connect('toggled' => sub {$w{vbox1}->set_sensitive($w{cbUsePersonal}->get_active);});
-    $w{cbTabBackColor}->signal_connect('toggled' => sub {$w{colorTabBack}->set_sensitive($w{cbTabBackColor}->get_active);});
-    $w{cbBoldAsText}->signal_connect('toggled' => sub {$w{colorBold}->set_sensitive(! $w{cbBoldAsText}->get_active);});
-    $w{comboEncoding}->signal_connect('changed' => sub {$w{lblEncoding}->set_text($PACMain::FUNCS{_CONFIG}{_ENCODINGS_HASH}{$w{comboEncoding}->get_active_text} // '');});
-    $w{cbCfgNewInWindow}->signal_connect('toggled' => sub {$w{hboxWidthHeight}->set_sensitive($w{cbCfgNewInWindow}->get_active); return 1;});
+    $w{cbUsePersonal}->signal_connect('toggled' => sub {
+        $w{vbox1}->set_sensitive($w{cbUsePersonal}->get_active);
+    });
+    $w{cbTabBackColor}->signal_connect('toggled' => sub {
+        $w{colorTabBack}->set_sensitive($w{cbTabBackColor}->get_active);
+    });
+    $w{cbBoldAsText}->signal_connect('toggled' => sub {
+        $w{colorBold}->set_sensitive(! $w{cbBoldAsText}->get_active);
+    });
+    $w{cbCfgNewInWindow}->signal_connect('toggled' => sub {
+        $w{hboxWidthHeight}->set_sensitive($w{cbCfgNewInWindow}->get_active); return 1;
+    });
     $w{btnResetDefaults}->signal_connect('clicked' => sub {
         my %default_cfg;
         defined $default_cfg{'defaults'}{1} or 1;
-
         PACUtils::_cfgSanityCheck(\%default_cfg);
         $self->update(\%default_cfg);
     });
diff --git a/lib/edit/PACVarEntry.pm b/lib/edit/PACVarEntry.pm
index e9bd8eec..3f522dbd 100644
--- a/lib/edit/PACVarEntry.pm
+++ b/lib/edit/PACVarEntry.pm
@@ -3,7 +3,7 @@ package PACVarEntry;
 ###############################################################################
 # This file is part of Ásbrú Connection Manager
 #
-# Copyright (C) 2017-2020 Ásbrú Connection Manager team (https://asbru-cm.net)
+# Copyright (C) 2017-2022 Ásbrú Connection Manager team (https://asbru-cm.net)
 # Copyright (C) 2010-2016 David Torrejon Vaquerizas
 #
 # Ásbrú Connection Manager is free software: you can redistribute it and/or
@@ -116,16 +116,26 @@ sub _buildVarGUI {
 
     # Build a vbox for:buttons, separator and expect widgets
     $w{vbox} = Gtk3::VBox->new(0, 0);
+    $w{hbox} = Gtk3::HBox->new(1, 0);
 
     # Build a hbuttonbox for widgets actions (add, etc.)
     $w{bbox} = Gtk3::HButtonBox->new();
-    $w{vbox}->pack_start($w{bbox}, 0, 1, 0);
+    $w{vbox}->pack_start($w{hbox}, 0, 1, 0);
+    $w{hbox}->pack_start($w{bbox}, 0, 1, 0);
     $w{bbox}->set_layout('GTK_BUTTONBOX_START');
 
     # Build 'add' button
     $w{btnadd} = Gtk3::Button->new_from_stock('gtk-add');
     $w{bbox}->add($w{btnadd});
 
+    $w{help} = Gtk3::LinkButton->new('https://docs.asbru-cm.net/Manual/Connections/SSH/#user-variables');
+    $w{help}->set_halign('GTK_ALIGN_END');
+    $w{help}->set_label('');
+    $w{help}->set_tooltip_text('Open Online Help');
+    $w{help}->set_always_show_image(1);
+    $w{help}->set_image(Gtk3::Image->new_from_stock('asbru-help', 'button'));
+    $w{hbox}->pack_start($w{help}, 0, 1, 0);
+
     # Build a separator
     $w{sep} = Gtk3::HSeparator->new();
     $w{vbox}->pack_start($w{sep}, 0, 1, 5);
diff --git a/lib/ex/PACTree.pm b/lib/ex/PACTree.pm
index 792fca14..0b140f3b 100644
--- a/lib/ex/PACTree.pm
+++ b/lib/ex/PACTree.pm
@@ -1,5 +1,25 @@
 package PACTree;
 
+###############################################################################
+# This file is part of Ásbrú Connection Manager
+#
+# Copyright (C) 2017-2022 Ásbrú Connection Manager team (https://asbru-cm.net)
+#
+# Ásbrú Connection Manager is free software: you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Ásbrú Connection Manager 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License version 3
+# along with Ásbrú Connection Manager.
+# If not, see <http://www.gnu.org/licenses/gpl-3.0.html>.
+###############################################################################
+
 use strict;
 use Carp;
 use Gtk3;
@@ -8,38 +28,40 @@ use PACUtils;
 
 use TiedTree;
 
-our @ISA = 'Gtk3::TreeView';
-
-our $VERSION = '0.50';
+use base 'Gtk3::TreeView';
 
 our %column_types;
 *column_types = \%Gtk3::SimpleList::column_types;
 *add_column_type = \&Gtk3::SimpleList::add_column_type;
 
-# Start PAC specific methods
+# Start Ásbrú specific methods
 sub _getSelectedUUIDs {
     my $self = shift;
-    my $selection = $self->get_selection;
-    my $model = $self->get_model;
+    my $selection = $self->get_selection();
+    my $model = $self->get_model();
     my @paths = _getSelectedRows($selection);
 
     my @selected;
 
     scalar(@paths) or push(@selected, '__PAC__ROOT__');
-    foreach my $path (@paths) {push(@selected, $model->get_value($model->get_iter($path), 2) ) ;}
+    foreach my $path (@paths) {
+        push(@selected, $model->get_value($model->get_iter($path), 2));
+    }
 
     return wantarray ? @selected : scalar(@selected);
 }
 
 sub _getSelectedNames {
     my $self = shift;
-    my $selection = $self->get_selection;
-    my $model = $self->get_model;
+    my $selection = $self->get_selection();
+    my $model = $self->get_model();
     my @paths = _getSelectedRows($selection);
 
     my @selected;
 
-    foreach my $path (@paths) {push(@selected, $model->get_value($model->get_iter($path), 1) ) ;}
+    foreach my $path (@paths) {
+        push(@selected, $model->get_value($model->get_iter($path), 1));
+    }
 
     return wantarray ? @selected : scalar(@selected);
 }
@@ -48,27 +70,31 @@ sub _getChildren {
     my $self = shift;
     my $uuid = shift;
     my $which = shift // 'all'; # 0:nodes, 1:groups, all:nodes+groups
-    my $deep = shift // 0; # 0:1st_level, 1:all_levels
+    my $deep = shift // 0;      # 0:1st_level, 1:all_levels
 
-    my $selection = $self->get_selection;
-    my $modelsort = $self->get_model;
-    my $model = $modelsort->get_model;
+    my $modelsort = $self->get_model();
+    my $model = $modelsort->get_model();
 
     my @list;
     my $root;
 
     # Locate every node under $uuid
-    $modelsort->foreach(sub
-    {
+    $modelsort->foreach(sub {
         my ($store, $path, $iter, $tmp) = @_;
         my $node_uuid = $store->get_value($iter, 2);
         my $node_name = $store->get_value($iter, 1);
 
-        ($node_uuid eq $uuid) and $root = $path->to_string;
-        return 0 unless (defined $root && ($deep || $path->to_string =~ /^$root:\d+$/g) );
+        if ($node_uuid eq $uuid) {
+            $root = $path->to_string();
+        }
+        if (!(defined $root && ($deep || $path->to_string() =~ /^$root:\d+$/g))) {
+            return 0;
+        }
 
-        (($path->to_string =~ /^$root:/g) && (((defined($$self{children}) || '0') eq $which) || ($which eq 'all') ) && ($node_uuid ne '__PAC__ROOT__') ) and push(@list, $node_uuid);
-        return $path->to_string !~ /^$root/g;
+        if ((($path->to_string() =~ /^$root:/g) && (((defined($$self{children}) || '0') eq $which) || ($which eq 'all') ) && ($node_uuid ne '__PAC__ROOT__'))) {
+            push(@list, $node_uuid);
+        }
+        return $path->to_string() !~ /^$root/g;
     });
 
     return wantarray ? @list : scalar(@list);
@@ -78,20 +104,20 @@ sub _getPath {
     my $self = shift;
     my $uuid = shift;
 
-    my $selection = $self->get_selection;
-    my $modelsort = $self->get_model;
-    my $model = $modelsort->get_model;
+    my $modelsort = $self->get_model();
+    my $model = $modelsort->get_model();
 
     my $ret_path;
 
     # Locate every connection under $uuid
-    $modelsort->foreach(sub
-    {
+    $modelsort->foreach(sub {
         my ($store, $path, $iter, $tmp) = @_;
         my $node_uuid = $store->get_value($iter, 2);
 
-        return 0 unless $node_uuid eq $uuid;
-        $ret_path = $path->to_string;
+        if ($node_uuid ne $uuid) {
+            return 0;
+        }
+        $ret_path = $path->to_string();
         return 1;
     });
 
@@ -132,17 +158,17 @@ sub _delNode {
     my $self = shift;
     my $uuid = shift;
 
-    my $selection = $self->get_selection;
-    my $modelsort = $self->get_model;
-    my $model = $modelsort->get_model;
+    my $modelsort = $self->get_model();
+    my $model = $modelsort->get_model();
 
     # Delete the given UUID from the PACTree
-    $modelsort->foreach(sub
-    {
+    $modelsort->foreach(sub {
         my ($store, $path, $iter, $tmp) = @_;
         my $node_uuid = $store->get_value($iter, 2);
-        return 0 unless $node_uuid eq $uuid;
-        $model->remove($modelsort->convert_iter_to_child_iter($modelsort->get_iter($path) ));
+        if ($node_uuid ne $uuid) {
+            return 0;
+        }
+        $model->remove($modelsort->convert_iter_to_child_iter($modelsort->get_iter($path)));
         return 1;
     });
 
@@ -153,15 +179,16 @@ sub _setTreeFocus {
     my $self = shift;
     my $uuid = shift;
 
-    my $model = $self->get_model;
+    my $model = $self->get_model();
 
-    $model->foreach(sub
-    {
+    $model->foreach(sub {
         my ($store, $path, $iter) = @_;
 
         my $elem_uuid = $model->get_value($model->get_iter($path), 2);
 
-        return 0 unless $elem_uuid eq $uuid;
+        if ($elem_uuid ne $uuid) {
+            return 0;
+        }
 
         $self->expand_to_path($path);
         $self->set_cursor($path, undef, 0);
@@ -171,33 +198,29 @@ sub _setTreeFocus {
 
     return 1;
 }
-# End of PAC specific methods
-
-sub text_cell_edited {
-    my ($cell_renderer, $text_path, $new_text, $model) = @_;
-    my $path = Gtk3::TreePath->new_from_string ($text_path);
-    my $iter = $model->get_iter ($path);
-    $model->set ($iter, $cell_renderer->{column}, $new_text);
-}
+# End of Ásbrú specific methods
 
 sub new {
-    croak "Usage: $_[0]\->new (title => type, ...)\n"
-        . " expecting a list of column title and type name pairs.\n"
-        . " can't create a SimpleTree with no columns"
-        unless @_ >= 3; # class, key1, val1
-    return shift->new_from_treeview (Gtk3::TreeView->new (), @_);
+    if (!(@_ >= 3)) {
+        croak "Usage: $_[0]\->new(title => type, ...)\n"
+            . " expecting a list of column title and type name pairs.\n"
+            . " can't create a SimpleTree with no columns";
+    }
+    return shift->new_from_treeview (Gtk3::TreeView->new(), @_);
 }
 
 sub new_from_treeview {
     my $class = shift;
     my $view = shift;
-    croak "treeview is not a Gtk3::TreeView"
-        unless defined ($view)
-           and UNIVERSAL::isa ($view, 'Gtk3::TreeView');
-    croak "Usage: $class\->new_from_treeview (treeview, title => type, ...)\n"
-        . " expecting a treeview reference and list of column title and type name pairs.\n"
-        . " can't create a SimpleTree with no columns"
-        unless @_ >= 2; # key1, val1
+
+    if (!(defined ($view) and UNIVERSAL::isa ($view, 'Gtk3::TreeView'))) {
+        croak "treeview is not a Gtk3::TreeView";
+    }
+    if (!(@_ >= 2)) {
+        croak "Usage: $class\->new_from_treeview (treeview, title => type, ...)\n"
+            . " expecting a treeview reference and list of column title and type name pairs.\n"
+            . " can't create a SimpleTree with no columns";
+    }
 
     # Defines a special column type that does not use a standard renderer
     # The renderer is built by function 'column_builder'
@@ -223,11 +246,13 @@ sub new_from_treeview {
     my @column_info = ();
     for (my $i = 0; $i < @_ ; $i+=2) {
         my $typekey = $_[$i+1];
-        croak "expecting pairs of title=>type"
-            unless $typekey;
-        croak "unknown column type $typekey, use one of "
-            . join(", ", keys %column_types)
-            unless exists $column_types{$typekey};
+
+        if (!$typekey) {
+            croak "expecting pairs of title=>type";
+        }
+        if (!(exists $column_types{$typekey})) {
+            croak "unknown column type $typekey, use one of " . join(", ", keys %column_types);
+        }
         my $type = $column_types{$typekey}{type};
         if (not defined $type) {
             $type = 'Glib::String';
@@ -245,47 +270,40 @@ sub new_from_treeview {
     }
 
     ## Create the store
-    my $model = Gtk3::TreeStore->new (map {$_->{type}} @column_info);
+    my $model = Gtk3::TreeStore->new(map {$_->{type}} @column_info);
+    $view->set_model($model);
 
-    ## Create the view
-    # just in case, 'cause i'm paranoid like that.
-    map {$view->remove_column ($_)} $view->get_columns;
-    $view->set_model ($model);
+    ## Create view columns
     for (my $i = 0; $i < @column_info ; $i++) {
         if (!defined($column_info[$i]{rtype}) && defined($column_info[$i]{column_builder}) && ('CODE' eq ref $column_info[$i]{column_builder})) {
             # A column builder has been defined
             $view->append_column($column_info[$i]{column_builder}());
         }
-        elsif ('CODE' eq ref $column_info[$i]{attr})
-        {
+        elsif ('CODE' eq ref $column_info[$i]{attr}) {
             $view->insert_column_with_data_func (-1,
                 $column_info[$i]{title},
                 $column_info[$i]{rtype}->new,
                 $column_info[$i]{attr}, $i);
-        }
-        elsif ('hidden' eq $column_info[$i]{attr})
-        {
+        } elsif ('hidden' eq $column_info[$i]{attr}) {
             # skip hidden column
-        }
-        else
-        {
+        } else {
             my $column = Gtk3::TreeViewColumn->new_with_attributes (
                 $column_info[$i]{title},
                 $column_info[$i]{rtype}->new,
                 $column_info[$i]{attr} => $i,
             );
-            $view->append_column ($column);
+            $view->append_column($column);
 
             if ($column_info[$i]{attr} eq 'active') {
                 # make boolean columns respond to editing.
                 my $r = $column->get_cells;
                 $r->set (activatable => 1);
-                $r->signal_connect (toggled => sub {
+                $r->signal_connect(toggled => sub {
                     my ($renderer, $row, $col) = @_;
                     my $path = Gtk3::TreePath->new_from_string ($row);
                     my $iter = $model->get_iter ($path);
                     my $val = $model->get ($iter, $col);
-                    $model->set ($iter, $col, !$val);
+                    $model->set($iter, $col, !$val);
                     }, $i);
 
             } elsif ($column_info[$i]{attr} eq 'text') {
@@ -294,8 +312,7 @@ sub new_from_treeview {
                 # turn on editing by default.
                 my $r = $column->get_cells;
                 $r->{column} = $i;
-                $r->signal_connect (edited => \&text_cell_edited,
-                            $model);
+                $r->signal_connect(edited => \&text_cell_edited, $model);
             }
         }
     }
@@ -307,329 +324,23 @@ sub new_from_treeview {
     return bless $view, $class;
 }
 
-sub set_column_editable {
-    my ($self, $index, $editable) = @_;
-    my $column = $self->get_column ($index);
-    croak "invalid column index $index"
-        unless defined $column;
-    my $cell_renderer = $column->get_cells;
-    $cell_renderer->set (editable => $editable);
-}
-
-sub get_column_editable {
-    my ($self, $index, $editable) = @_;
-    my $column = $self->get_column ($index);
-    croak "invalid column index $index"
-        unless defined $column;
-    my $cell_renderer = $column->get_cells;
-    return $cell_renderer->get ('editable');
-}
-
-sub set_data_array {
-    @{$_[0]->{data}} = @{$_[1]};
+sub text_cell_edited {
+    my ($cell_renderer, $text_path, $new_text, $model) = @_;
+    my $path = Gtk3::TreePath->new_from_string($text_path);
+    my $iter = $model->get_iter($path);
+    $model->set($iter, $cell_renderer->{column}, $new_text);
 }
 
 1;
 
-# FIXME-DOC The documentation below is outdated, incorrect and probably misleading,
-# especially due to the blind Gtk2->Gtk3 search'n'replace.
-
 __END__
 
 =head1 NAME
 
-Tree - A simple interface to Gtk3's complex MVC tree widget
-
-=head1 SYNOPSIS
-
-  use Glib qw(TRUE FALSE);
-  use Gtk3 '-init';
-  use Tree;
-
-  my $stree = Tree->new (
-          'Text Field' => 'text',
-          'Int Field' => 'int',
-          'Double Field' => 'double',
-          'Bool Field' => 'bool',
-          'Scalar Field' => 'scalar',
-      );
-
-  @{$stree->{data}} = (
-    {
-        value => ['one', 1, 1.1],
-        children =>
-        [
-            {
-                value => ['one-b', -1, 1.11,],
-            },
-        ]
-    },
-  );
+PACTree - Ásbrú interface to Gtk3's complex MVC tree widget
 
 =head1 ABSTRACT
 
-Simple::Tree is a simple interface to the powerful but complex Gtk3::TreeView
+PACTree is a simple interface to the powerful but complex Gtk3::TreeView
 and Gtk3::TreeStore combination, implementing using tied arrays to make
 thing simple and easy.
-
-=head1 DESCRIPTION
-
-Gtk3 has a powerful, but complex MVC (Model, View, Controller) system used to
-implement list and tree widgets.  Tree automates the complex
-setup work and allows you to treat the tree model as a more natural list of
-hash refs.
-
-After creating a new Tree object with the desired columns you
-may set the tree data with a simple Perl array assignment. Rows may be added or
-deleted with all of the normal array operations. You can treat the C<data>
-member of the Simple::Tree object as an array reference, and manipulate the
-tree data with perl's normal operators. Each element is a hash reference
-containing (optionally) C<value> and C<children> members. C<value> holds the
-value of the node while C<children> is a array reference of futher nodes.
-(recursive)
-
-A mechanism has also been put into place allowing columns to be Perl scalars.
-The scalar is converted to text through Perl's normal mechanisms and then
-displayed in the tree. This same mechanism can be expanded by defining
-arbitrary new column types before calling the new function.
-
-=head1 OBJECT HIERARCHY
-
- Glib::Object
- +--- Gtk3::Object
-      +--- Gtk3::Widget
-           +--- Gtk3::TreeView
-            +--- Tree
-
-=head1 METHODS
-
-=over
-
-=item $stree = Tree->new ($cname, $ctype, ...)
-
-=over
-
-=over
-
-=item * $cname (string)
-
-=item * $ctype (string)
-
-=back
-
-=back
-
-Creates a new Tree object with the specified columns. The
-parameter C<cname> is the name of the column, what will be displayed in the
-tree headers if they are turned on. The parameter ctype is the type of the
-column, one of:
-
- text    normal text strings
- markup  pango markup strings
- int     integer values
- double  double-precision floating point values
- bool    boolean values, displayed as toggle-able checkboxes
- scalar  a perl scalar, displayed as a text string by default
- pixbuf  a Gtk3::Gdk::Pixbuf
-
-or the name of a custom type you add with C<add_column_type>.  These should be
-provided in pairs according to the desired columns for your tree.
-
-=item $stree = Tree->new_from_treeview ($treeview, $cname, $ctype, ...)
-
-=over
-
-=over
-
-=item * $treeview (Gtk3::TreeView)
-
-=item * $cname (string)
-
-=item * $ctype (string)
-
-=back
-
-=back
-
-Like C<< Tree->new() >>, but turns an existing Gtk3::TreeView
-into a Tree.  This is intended mostly for use with stuff like
-Glade, where the widget is created for you.  This will create and attach a new
-model and remove any existing columns from I<treeview>.  Returns I<treeview>,
-re-blessed as a Tree.
-
-=item $stree->set_data_array ($arrayref)
-
-=over
-
-=over
-
-=item * $arrayref (array reference)
-
-=back
-
-=back
-
-Set the data in the tree to the array reference $arrayref. This is completely
-equivalent to @{$tree->{data}} = @{$arrayref} and is only here for convenience
-and for those programmers who don't like to type-cast and have static, set once
-data.
-
-=item $stree->set_column_editable ($index, $editable)
-
-=over
-
-=over
-
-=item * $index (integer)
-
-=item * $editable (boolean)
-
-=back
-
-=back
-
-=item boolean = $stree->get_column_editable ($index)
-
-=over
-
-=over
-
-=item * $index (integer)
-
-=back
-
-=back
-
-This is a very simple interface to Gtk3::TreeView's editable text column cells.
-All columns which use the attr "text" (basically, any text or number column,
-see C<add_column_type>) automatically have callbacks installed to update data
-when cells are edited.  With C<set_column_editable>, you can enable the
-in-place editing.
-
-C<get_column_editable> tells you if column I<index> is currently editable.
-
-=item Tree->add_column_type ($type_name, ...)
-
-
-=over
-
-=over
-
-=item $type_name (string)
-
-=back
-
-=back
-
-Add a new column type to the list of possible types. Initially six column types
-are defined, text, int, double, bool, scalar, and pixbuf. The bool column type
-uses a toggle cell renderer, the pixbuf uses a pixbuf cell renderer, and the
-rest use text cell renderers. In the process of adding a new column type you
-may use any cell renderer you wish.
-
-The first parameter is the column type name, the list of six are examples.
-There are no restrictions on the names and you may even overwrite the existing
-ones should you choose to do so. The remaining parameters are the type
-definition consisting of key value pairs. There are three required: type,
-renderer, and attr. The type key determines what actual datatype will be
-stored in the underlying model representation; this is a package name, e.g.
-Glib::String, Glib::Int, Glib::Boolean, but in general if you want an
-arbitrary Perl data structure you will want to use 'Glib::Scalar'. The
-renderer key should hold the class name of the cell renderer to create for this
-column type; this may be any of Gtk3::CellRendererText,
-Gtk3::CellRendererToggle, Gtk3::CellRendererPixbuf, or some other, possibly
-custom, cell renderer class.  The attr key is magical; it may be either a
-string, in which case it specifies the attribute which will be set from the
-specified column (e.g. 'text' for a text renderer, 'active' for a toggle
-renderer, etc), or it may be a reference to a subroutine which will be called
-each time the renderer needs to draw the data.
-
-This function, described as a GtkTreeCellDataFunc in the API reference,
-will receive 5 parameters: $treecol, $cell, $model, $iter,
-$col_num (when SimpleList hooks up the function, it sets the column number to
-be passed as the user data).  The data value for the particular cell in question
-is available via $model->get ($iter, $col_num); you can then do whatever it is
-you have to do to render the cell the way you want.  Here are some examples:
-
-  # just displays the value in a scalar as
-  # Perl would convert it to a string
-  Tree->add_column_type('a_scalar',
-          type => 'Glib::Scalar',
-      renderer => 'Gtk3::CellRendererText',
-          attr => sub {
-               my ($treecol, $cell, $model, $iter, $col_num) = @_;
-               my $info = $model->get ($iter, $col_num);
-               $cell->set (text => $info);
-      }
-     );
-
-  # sums up the values in an array ref and displays
-  # that in a text renderer
-  Tree->add_column_type('sum_of_array',
-          type => 'Glib::Scalar',
-      renderer => 'Gtk3::CellRendererText',
-          attr => sub {
-               my ($treecol, $cell, $model, $iter, $col_num) = @_;
-               my $sum = 0;
-               my $info = $model->get ($iter, $col_num);
-               foreach (@$info)
-               {
-                   $sum += $_;
-               }
-               $cell->set (text => $sum);
-          }
-     );
-
-=back
-
-=head1 MODIFYING TREE DATA
-
-Examples only, possibilities are too numerous to list here (see examples.)
-
-  # first level assignment
-  $stree->{data}[3]{value}[1] = 6;
-
-  # second level assignment
-  $stree->{data}[3]{children}[1]{value}[1] = 12;
-
-  # first level store
-  @{$stree->{data}[1]{value}} = ('store', -1, -1.1, 1, 'store',);
-
-  # second level store
-  @{$stree->{data}[1]{children}[0]{value}} = ('store', -2, -2.1, 0, 'store',);
-
-  # first level push
-  push @{$tdata}, {value => ['push', 1, 1.1, 1, 'push',],};
-
-  # second level push
-  push @{$stree->{data}[4]{children}}, {value => ['push-b', 2, 2.2, 0, 'push-b',],};
-
-=head1 SEE ALSO
-
-Perl(1), Glib(3pm), Gtk3(3pm), Gtk3::TreeView(3pm), Gtk3::TreeModel(3pm),
-Gtk3::TreeStore(3pm).
-
-=head1 AUTHORS
-
- muppet <scott at asofyet dot org>
- Ross McFarland <rwmcfa1 at neces dot com>
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright 2004 by the Gtk3-Perl team.
-
-This library is free software; you can redistribute it and/or modify it under
-the terms of the GNU Library General Public License as published by the Free
-Software Foundation; either version 2.1 of the License, or (at your option) any
-later version.
-
-This library 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 Library General Public License for more
-details.
-
-You should have received a copy of the GNU Library General Public License along
-with this library; if not, write to the Free Software Foundation, Inc., 59
-Temple Place - Suite 330, Boston, MA  02111-1307  USA.
-
-=cut
diff --git a/lib/ex/SortedTreeStore.pm b/lib/ex/SortedTreeStore.pm
new file mode 100644
index 00000000..ef03b458
--- /dev/null
+++ b/lib/ex/SortedTreeStore.pm
@@ -0,0 +1,211 @@
+package SortedTreeStore;
+
+###############################################################################
+# This file is part of Ásbrú Connection Manager
+#
+# Copyright (C) 2017-2022 Ásbrú Connection Manager team (https://asbru-cm.net)
+#
+# Ásbrú Connection Manager is free software: you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Ásbrú Connection Manager 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License version 3
+# along with Ásbrú Connection Manager.
+# If not, see <http://www.gnu.org/licenses/gpl-3.0.html>.
+###############################################################################
+
+use utf8;
+binmode STDOUT,':utf8';
+binmode STDERR,':utf8';
+
+$|++;
+
+###################################################################
+# Import Modules
+
+# Standard
+use strict;
+use warnings;
+
+# GTK
+use Gtk3 '-init';
+
+# END: Import Modules
+###################################################################
+
+use Glib::Object::Subclass
+    'Gtk3::TreeModelSort',
+    interfaces => [ 'Gtk3::TreeDragSource', 'Gtk3::TreeDragDest' ];
+
+###################################################################
+# START: Public class methods
+sub create {
+    my ($class, $model, $cfg, $verbose) = @_;
+
+    my $self = $class->new(model => $model);
+
+    $$self{_CFG} = $cfg;
+    $$self{_VERBOSE} = $verbose;
+
+    $self->set_default_sort_func(\&__treeSort, $self);
+
+    bless($self, $class);
+    return $self;
+}
+# END: Public class methods
+###################################################################
+
+###################################################################
+# START: Interface overrides
+
+# Asks if the row specified by path can be used as the source of a DND operation.
+# (Returns true if the row can be dragged)
+sub ROW_DRAGGABLE {
+    my ($self, $dest_path) = @_;
+    my ($uuid, $dest, $iter);
+
+    $iter = $self->get_iter($dest_path);
+
+    if ($iter) {
+        $uuid = $self->get_value($iter, 2);
+
+        # The root node cannot be dragged
+        if ($uuid eq '__PAC__ROOT__') {
+            return 0;
+        }
+    }
+
+    # All other nodes are draggable
+    return 1;
+}
+
+# Asks to fill in the selection data object specified by selection_data with a representation of the row specified by path.
+# The selection_data target attribute gives the required type of the data.
+# (Returns true if data of the required type was provided)
+sub DRAG_DATA_GET {
+    my ($self, $dest_path, $selection_data) = @_;
+
+    return 0;
+}
+
+# Asks to delete the row specified by path, because it was moved somewhere else via drag-and-drop.
+# This method returns false if the deletion fails because path no longer exists, or for some other model-specific reason.
+sub DRAG_DATA_DELETE {
+    my ($self, $dest_path) = @_;
+
+    # Move and deletion are managed elsewhere in Ásbrú (in PACMain)
+    return 0;
+}
+
+
+# Asks to insert a row before the path dest, deriving the contents of the row from selection_data. If dest is outside the tree
+# so that inserting before it is impossible, false will be returned.
+# Also, false may be returned if the new row is not created for some model-specific reason.
+# (Returns true if a new row was created before position dest)
+sub DRAG_DATA_RECEIVED {
+    my ($self, $dest_path, $selection_data) = @_;
+
+    # Move and deletion are managed elsewhere in Ásbrú (in PACMain)
+    return 0;
+}
+
+# Determines if a drop is possible before the tree path specified by dest_path and at the same depth as dest_path.
+# That is, can we drop the data specified by selection_data at that location.
+# (Returns true if a drop is possible before dest_path)
+sub ROW_DROP_POSSIBLE {
+    my ($self, $dest_path, $selection_data) = @_;
+    my ($uuid, $dest, $iter);
+
+    $iter = $self->get_iter($dest_path);
+
+    if ($iter) {
+        $uuid = $self->get_value($iter, 2);
+
+        if ($uuid eq '__PAC__ROOT__') {
+            return 1;
+        }
+
+        $dest = $$self{_CFG}{'environments'}{$uuid};
+    }
+
+    if ($iter && $dest) {
+        if (!$$self{_CFG}{'environments'}{$uuid}{'_is_group'}) {
+            return 0;
+        }
+    }
+
+    if ($iter && $dest) {
+        if ($$self{_VERBOSE}) {
+            print("Drop possible for UUID=[$uuid], Name=[$$dest{'name'}], Is Group?=[$$dest{'_is_group'}]\n");
+        }
+
+        return $$dest{'_is_group'} && !$$dest{'_protected'};
+    }
+
+    return 0;
+}
+# END: Interface overrides
+###################################################################
+
+###################################################################
+# START: Private functions definitions
+sub __treeSort {
+    my ($treestore, $a_iter, $b_iter, $self) = @_;
+    my $cfg = $$self{_CFG};
+
+    my $groups_1st = $$cfg{'defaults'}{'sort groups first'} // 1;
+    my $b_uuid = $treestore->get_value($b_iter, 2);
+    if (!defined $b_uuid) {
+        return 0;
+    }
+    # __PAC__ROOT__ must always be the first node!!
+    if ($b_uuid eq '__PAC__ROOT__') {
+        return 1;
+    }
+
+    my $a_uuid = $treestore->get_value($a_iter, 2);
+    if (!defined $a_uuid) {
+        return 1;
+    }
+    # __PAC__ROOT__ must always be the first node!!
+    if ($a_uuid eq '__PAC__ROOT__') {
+        return -1;
+    }
+
+    # Groups first...
+    if ($groups_1st) {
+        my $a_is_group = $$cfg{'environments'}{ $a_uuid }{'_is_group'};
+        my $b_is_group = $$cfg{'environments'}{ $b_uuid }{'_is_group'};
+        if ($a_is_group && ! $b_is_group){
+            return -1;
+        }
+        if (! $a_is_group && $b_is_group){
+            return 1;
+        }
+    }
+    # ... then alphabetically
+    return lc($$cfg{'environments'}{$a_uuid}{name}) cmp lc($$cfg{'environments'}{$b_uuid}{name});
+}
+# END: Private functions definitions
+###################################################################
+
+1;
+
+__END__
+
+=encoding utf8
+
+=head1 NAME
+
+SortedTreeStore.pm
+
+=head1 SYNOPSIS
+
+Overrides the standard Gtk3::TreeModelSort to properly implement the drag and drop interfaces
+Gtk3::TreeDragSource and Gtk3::TreeDragDest.
diff --git a/lib/method/PACMethod_3270.pm b/lib/method/PACMethod_3270.pm
index 3cd96fa7..69695260 100644
--- a/lib/method/PACMethod_3270.pm
+++ b/lib/method/PACMethod_3270.pm
@@ -3,7 +3,7 @@ package PACMethod_3270;
 ###############################################################################
 # This file is part of Ásbrú Connection Manager
 #
-# Copyright (C) 2017-2020 Ásbrú Connection Manager team (https://asbru-cm.net)
+# Copyright (C) 2017-2022 Ásbrú Connection Manager team (https://asbru-cm.net)
 # Copyright (C) 2010-2016 David Torrejon Vaquerizas
 #
 # Ásbrú Connection Manager is free software: you can redistribute it and/or
@@ -55,6 +55,7 @@ sub new {
     $self->{container} = shift;
 
     $self->{cfg} = undef;
+    $self->{cfg_array} = undef;
     $self->{gui} = undef;
     $self->{frame} = {};
 
@@ -67,8 +68,10 @@ sub new {
 sub update {
     my $self = shift;
     my $cfg = shift;
+    my $cfg_array = shift;
 
     defined $cfg and $$self{cfg} = $cfg;
+    defined $cfg_array and $$self{cfg_array} = $cfg_array;
 
     my $options = _parseCfgToOptions($$self{cfg});
 
@@ -87,6 +90,15 @@ sub update {
     return 1;
 }
 
+sub get_cfg_array
+{
+    my $self = shift;
+
+    my %options_array;
+
+    return \%options_array;
+}
+
 sub get_cfg {
     my $self = shift;
 
diff --git a/lib/method/PACMethod_cadaver.pm b/lib/method/PACMethod_cadaver.pm
index 9076535d..2d48277e 100644
--- a/lib/method/PACMethod_cadaver.pm
+++ b/lib/method/PACMethod_cadaver.pm
@@ -3,7 +3,7 @@ package PACMethod_cadaver;
 ###############################################################################
 # This file is part of Ásbrú Connection Manager
 #
-# Copyright (C) 2017-2020 Ásbrú Connection Manager team (https://asbru-cm.net)
+# Copyright (C) 2017-2022 Ásbrú Connection Manager team (https://asbru-cm.net)
 # Copyright (C) 2010-2016 David Torrejon Vaquerizas
 #
 # Ásbrú Connection Manager is free software: you can redistribute it and/or
@@ -56,6 +56,7 @@ sub new
     $self->{container} = shift;
 
     $self->{cfg} = undef;
+    $self->{cfg_array} = undef;
     $self->{gui} = undef;
     $self->{frame} = {};
 
@@ -69,8 +70,10 @@ sub update
 {
     my $self = shift;
     my $cfg = shift;
+    my $cfg_array = shift;
 
     defined $cfg and $$self{cfg} = $cfg;
+    defined $cfg_array and $$self{cfg_array} = $cfg_array;
 
     my $options = _parseCfgToOptions($$self{cfg});
 
@@ -79,6 +82,15 @@ sub update
     return 1;
 }
 
+sub get_cfg_array
+{
+    my $self = shift;
+
+    my %options_array;
+
+    return \%options_array;
+}
+
 sub get_cfg
 {
     my $self = shift;
diff --git a/lib/method/PACMethod_cu.pm b/lib/method/PACMethod_cu.pm
index 5bca2406..0282b8d3 100644
--- a/lib/method/PACMethod_cu.pm
+++ b/lib/method/PACMethod_cu.pm
@@ -3,7 +3,7 @@ package PACMethod_cu;
 ###############################################################################
 # This file is part of Ásbrú Connection Manager
 #
-# Copyright (C) 2017-2020 Ásbrú Connection Manager team (https://asbru-cm.net)
+# Copyright (C) 2017-2022 Ásbrú Connection Manager team (https://asbru-cm.net)
 # Copyright (C) 2010-2016 David Torrejon Vaquerizas
 #
 # Ásbrú Connection Manager is free software: you can redistribute it and/or
@@ -57,6 +57,7 @@ sub new
     $self->{container} = shift;
 
     $self->{cfg} = undef;
+    $self->{cfg_array} = undef;
     $self->{gui} = undef;
     $self->{frame} = {};
 
@@ -70,9 +71,10 @@ sub update
 {
     my $self = shift;
     my $cfg = shift;
-    my $method = shift;
+    my $cfg_array = shift;
 
     defined $cfg and $$self{cfg} = $cfg;
+    defined $cfg_array and $$self{cfg_array} = $cfg_array;
 
     my $options = _parseCfgToOptions($$self{cfg});
 
@@ -86,6 +88,15 @@ sub update
     return 1;
 }
 
+sub get_cfg_array
+{
+    my $self = shift;
+
+    my %options_array;
+
+    return \%options_array;
+}
+
 sub get_cfg
 {
     my $self = shift;
@@ -178,7 +189,7 @@ sub _buildGUI
             $w{entryLine}->set_tooltip_text("[-l|--line] : Line to use to connect. Ex: /dev/ttyUSB0");
 
             $w{hbox1}->pack_start(Gtk3::Label->new(' Speed: '), 0, 1, 0);
-            $w{spSpeed} = Gtk3::SpinButton->new_with_range(1, 999999, 1);
+            $w{spSpeed} = Gtk3::SpinButton->new_with_range(1, 1999999, 1);
             $w{hbox1}->pack_start($w{spSpeed}, 0, 1, 0);
             $w{spSpeed}->set_tooltip_text("[-s|--speed] : Speed to use to connect. Ex: 9660");
             $w{spSpeed}->set_value(9660);
diff --git a/lib/method/PACMethod_ftp.pm b/lib/method/PACMethod_ftp.pm
index 0d8d9f27..4f954265 100644
--- a/lib/method/PACMethod_ftp.pm
+++ b/lib/method/PACMethod_ftp.pm
@@ -3,7 +3,7 @@ package PACMethod_ftp;
 ###############################################################################
 # This file is part of Ásbrú Connection Manager
 #
-# Copyright (C) 2017-2020 Ásbrú Connection Manager team (https://asbru-cm.net)
+# Copyright (C) 2017-2022 Ásbrú Connection Manager team (https://asbru-cm.net)
 # Copyright (C) 2010-2016 David Torrejon Vaquerizas
 #
 # Ásbrú Connection Manager is free software: you can redistribute it and/or
@@ -56,6 +56,7 @@ sub new
     $self->{container} = shift;
 
     $self->{cfg} = undef;
+    $self->{cfg_array} = undef;
     $self->{gui} = undef;
     $self->{frame} = {};
 
@@ -69,8 +70,10 @@ sub update
 {
     my $self = shift;
     my $cfg = shift;
+    my $cfg_array = shift;
 
     defined $cfg and $$self{cfg} = $cfg;
+    defined $cfg_array and $$self{cfg_array} = $cfg_array;
 
     my $options = _parseCfgToOptions($$self{cfg});
 
@@ -81,6 +84,15 @@ sub update
     return 1;
 }
 
+sub get_cfg_array
+{
+    my $self = shift;
+
+    my %options_array;
+
+    return \%options_array;
+}
+
 sub get_cfg
 {
     my $self = shift;
diff --git a/lib/method/PACMethod_generic.pm b/lib/method/PACMethod_generic.pm
index 9e2936c6..7d8fcb64 100644
--- a/lib/method/PACMethod_generic.pm
+++ b/lib/method/PACMethod_generic.pm
@@ -3,7 +3,7 @@ package PACMethod_generic;
 ###############################################################################
 # This file is part of Ásbrú Connection Manager
 #
-# Copyright (C) 2017-2020 Ásbrú Connection Manager team (https://asbru-cm.net)
+# Copyright (C) 2017-2022 Ásbrú Connection Manager team (https://asbru-cm.net)
 # Copyright (C) 2010-2016 David Torrejon Vaquerizas
 #
 # Ásbrú Connection Manager is free software: you can redistribute it and/or
@@ -56,6 +56,7 @@ sub new
     $self->{container} = shift;
 
     $self->{cfg} = undef;
+    $self->{cfg_array} = undef;
     $self->{gui} = undef;
     $self->{frame} = {};
 
@@ -69,15 +70,25 @@ sub update
 {
     my $self = shift;
     my $cfg = shift;
-    my $method = shift;
+    my $cfg_array = shift;
 
     defined $cfg and $$self{cfg} = $cfg;
+    defined $cfg_array and $$self{cfg_array} = $cfg_array;
 
     my $options = _parseCfgToOptions($$self{cfg});
 
     return 1;
 }
 
+sub get_cfg_array
+{
+    my $self = shift;
+
+    my %options_array;
+
+    return \%options_array;
+}
+
 sub get_cfg
 {
     my $self = shift;
diff --git a/lib/method/PACMethod_mosh.pm b/lib/method/PACMethod_mosh.pm
index 1562b3b6..7d1fdc95 100644
--- a/lib/method/PACMethod_mosh.pm
+++ b/lib/method/PACMethod_mosh.pm
@@ -3,7 +3,7 @@ package PACMethod_mosh;
 ###############################################################################
 # This file is part of Ásbrú Connection Manager
 #
-# Copyright (C) 2017-2020 Ásbrú Connection Manager team (https://asbru-cm.net)
+# Copyright (C) 2017-2022 Ásbrú Connection Manager team (https://asbru-cm.net)
 # Copyright (C) 2010-2016 David Torrejon Vaquerizas
 #
 # Ásbrú Connection Manager is free software: you can redistribute it and/or
@@ -55,6 +55,7 @@ sub new {
     $self->{container} = shift;
 
     $self->{cfg} = undef;
+    $self->{cfg_array} = undef;
     $self->{gui} = undef;
     $self->{frame} = {};
 
@@ -67,8 +68,10 @@ sub new {
 sub update {
     my $self = shift;
     my $cfg = shift;
+    my $cfg_array = shift;
 
     defined $cfg and $$self{cfg} = $cfg;
+    defined $cfg_array and $$self{cfg_array} = $cfg_array;
 
     my $options = _parseCfgToOptions($$self{cfg});
 
@@ -76,10 +79,20 @@ sub update {
     $$self{gui}{rbPredictAlways}->set_active($$options{predictAlways});
     $$self{gui}{rbPredictNever}->set_active($$options{predictNever});
     $$self{gui}{sbUDPPort}->set_value($$options{udpPort});
+    $$self{gui}{sbUDPPort2}->set_value($$options{udpPort2});
 
     return 1;
 }
 
+sub get_cfg_array
+{
+    my $self = shift;
+
+    my %options_array;
+
+    return \%options_array;
+}
+
 sub get_cfg {
     my $self = shift;
 
@@ -89,6 +102,7 @@ sub get_cfg {
     $options{predictAlways} = $$self{gui}{rbPredictAlways}->get_active;
     $options{predictNever} = $$self{gui}{rbPredictNever}->get_active;
     $options{udpPort} = $$self{gui}{sbUDPPort}->get_chars(0, -1);
+    $options{udpPort2} = $$self{gui}{sbUDPPort2}->get_chars(0, -1);
 
     return _parseOptionsToCfg(\%options);
 }
@@ -106,16 +120,29 @@ sub _parseCfgToOptions {
     $hash{predictAdaptive} = 1;
     $hash{predictAlways} = 0;
     $hash{predictNever} = 0;
-    $hash{udpPort} = 60000;
+    $hash{udpPort}  = 60000;
+    $hash{udpPort2} = 60005;
 
     my @opts = split(/\s+-/, $cmd_line);
     foreach my $opt (@opts) {
-        next unless $opt ne '';
+        if ($opt eq '') {
+            next;
+        }
         $opt =~ s/\s+$//go;
 
-        $opt eq 'a'                and    $hash{predictAlways} = 1;
-        $opt eq 'n'                and    $hash{predictNever} = 1;
-        $opt =~ /p\s+(\d+)/go    and    $hash{udpPort} = $1;
+        if ($opt eq 'a') {
+            $hash{predictAlways} = 1;
+        }
+        if ($opt eq 'n') {
+            $hash{predictNever} = 1;
+        }
+        if ($opt =~ /p\s+(\d+):(\d+)/go) {
+            $hash{udpPort}  = $1;
+            $hash{udpPort2} = $2;
+        } elsif ($opt =~ /p\s+(\d+)/go) {
+            $hash{udpPort} = $1;
+            $hash{udpPort2} = $hash{udpPort}+5;
+        }
     }
 
     return \%hash;
@@ -125,10 +152,18 @@ sub _parseOptionsToCfg {
     my $hash = shift;
 
     my $txt = '';
-
-    $txt .= ' -a'    if $$hash{predictAlways};
-    $txt .= ' -n'    if $$hash{predictNever};
-    (defined $$hash{udpPort}) and $txt .= " -p $$hash{udpPort}";
+    if ($$hash{predictAlways}) {
+        $txt .= ' -a';
+    }
+    if ($$hash{predictNever}) {
+        $txt .= ' -n'
+    }
+    if (defined $$hash{udpPort}) {
+        if (!$$hash{udpPort2} || $$hash{udpPort2} <= $$hash{udpPort}) {
+            $$hash{udpPort2} = $$hash{udpPort}+5;
+        }
+        $txt .= " -p $$hash{udpPort}:$$hash{udpPort2}";
+    }
 
     return $txt;
 }
@@ -148,38 +183,61 @@ sub _buildGUI {
 
     $w{vbox} = $container;
 
-        $w{frPredict} = Gtk3::Frame->new(' Select speculative local echo (predictions) model: ');
-        $w{frPredict}->set_tooltip_text('[-(a|n)] : Controls use of speculative local echo (defaults to "adaptive")');
-        $w{vbox}->pack_start($w{frPredict}, 0, 1, 0);
+    $w{frPredict} = Gtk3::Frame->new(' Select speculative local echo (predictions) model: ');
+    $w{frPredict}->set_tooltip_text('[-(a|n)] : Controls use of speculative local echo (defaults to "adaptive")');
+    $w{frPredict}->set_shadow_type('GTK_SHADOW_NONE');
+    $w{vbox}->pack_start($w{frPredict}, 0, 1, 0);
 
-            $w{hboxPredict} = Gtk3::HBox->new(0, 0);
-            $w{frPredict}->add($w{hboxPredict});
+    $w{hboxPredict} = Gtk3::HBox->new(0, 0);
+    $w{frPredict}->add($w{hboxPredict});
 
-                $w{rbPredictAdaptive} = Gtk3::RadioButton->new_with_label(undef, 'Adaptive');
-                $w{hboxPredict}->pack_start($w{'rbPredictAdaptive'}, 0, 1, 0);
+    $w{rbPredictAdaptive} = Gtk3::RadioButton->new_with_label(undef, 'Adaptive');
+    $w{hboxPredict}->pack_start($w{'rbPredictAdaptive'}, 0, 1, 0);
 
-                $w{rbPredictAlways} = Gtk3::RadioButton->new_with_label($w{rbPredictAdaptive}, 'Always');
-                $w{hboxPredict}->pack_start($w{rbPredictAlways}, 0, 1, 0);
+    $w{rbPredictAlways} = Gtk3::RadioButton->new_with_label($w{rbPredictAdaptive}, 'Always');
+    $w{hboxPredict}->pack_start($w{rbPredictAlways}, 0, 1, 0);
 
-                $w{rbPredictNever} = Gtk3::RadioButton->new_with_label($w{rbPredictAdaptive}, 'Never');
-                $w{hboxPredict}->pack_start($w{rbPredictNever}, 0, 1, 0);
+    $w{rbPredictNever} = Gtk3::RadioButton->new_with_label($w{rbPredictAdaptive}, 'Never');
+    $w{hboxPredict}->pack_start($w{rbPredictNever}, 0, 1, 0);
 
-                $w{rbPredictAdaptive}->set_active(1);
+    $w{rbPredictAdaptive}->set_active(1);
 
-        $w{vbox}->pack_start(Gtk3::HSeparator->new, 0, 1, 5);
+    $w{vbox}->pack_start(Gtk3::HSeparator->new, 0, 1, 5);
 
-        $w{hbUDPPort} = Gtk3::HBox->new(0, 0);
-        $w{vbox}->pack_start($w{hbUDPPort}, 0, 1, 0);
+    $w{hbUDPPort} = Gtk3::HBox->new(0, 0);
+    $w{vbox}->pack_start($w{hbUDPPort}, 0, 1, 0);
 
-            $w{hbUDPPort}->pack_start(Gtk3::Label->new('Server-side UDP Port: '), 0, 1, 0);
-            $w{sbUDPPort} = Gtk3::SpinButton->new(Gtk3::Adjustment->new(60000, 1, 65535, 1, 10, 0), 1, 0);
+    $w{hbUDPPort}->pack_start(Gtk3::Label->new('Server-side UDP Port Start: '), 0, 1, 0);
+    $w{sbUDPPort} = Gtk3::SpinButton->new(Gtk3::Adjustment->new(60000, 1, 65535, 1, 10, 0), 1, 0);
+    $w{hbUDPPort}->pack_start($w{sbUDPPort}, 0, 1, 0);
 
-            $w{hbUDPPort}->pack_start($w{sbUDPPort}, 0, 1, 0);
+    $w{hbUDPPort}->pack_start(Gtk3::Label->new('Server-side UDP Port End: '), 0, 1, 0);
+    $w{sbUDPPort2} = Gtk3::SpinButton->new(Gtk3::Adjustment->new(60005, 1, 65535, 1, 10, 0), 1, 0);
+    $w{hbUDPPort}->pack_start($w{sbUDPPort2}, 0, 1, 0);
 
     $$self{gui} = \%w;
 
     # Avoid the enter of non numeric values in this entry
-    $w{sbUDPPort}->signal_connect('insert_text' => sub {$_[1] =~ s/[^\d]//go; return $_[1], $_[3];});
+    $w{sbUDPPort}->signal_connect('insert_text' => sub {
+        $_[1] =~ s/[^\d]//go;
+        return $_[1], $_[3];
+    });
+    $w{sbUDPPort2}->signal_connect('insert_text' => sub {
+        $_[1] =~ s/[^\d]//go;
+        return $_[1], $_[3];
+    });
+
+    # Do not allow inverse port range or overlap, at least 1 unit difference
+    $w{sbUDPPort}->signal_connect('value-changed' => sub {
+        if ($w{sbUDPPort}->get_chars(0, -1) ge $w{sbUDPPort2}->get_chars(0, -1)) {
+            $w{sbUDPPort2}->set_value(int($w{sbUDPPort}->get_chars(0, -1)) + 1);
+        }
+    });
+    $w{sbUDPPort2}->signal_connect('value-changed' => sub {
+        if ($w{sbUDPPort}->get_chars(0, -1) ge $w{sbUDPPort2}->get_chars(0, -1)) {
+            $w{sbUDPPort}->set_value(int($w{sbUDPPort2}->get_chars(0, -1)) - 1);
+        }
+    });
 
     return 1;
 }
diff --git a/lib/method/PACMethod_rdesktop.pm b/lib/method/PACMethod_rdesktop.pm
index 8a674274..bbafa5bd 100644
--- a/lib/method/PACMethod_rdesktop.pm
+++ b/lib/method/PACMethod_rdesktop.pm
@@ -3,7 +3,7 @@ package PACMethod_rdesktop;
 ###############################################################################
 # This file is part of Ásbrú Connection Manager
 #
-# Copyright (C) 2017-2020 Ásbrú Connection Manager team (https://asbru-cm.net)
+# Copyright (C) 2017-2022 Ásbrú Connection Manager team (https://asbru-cm.net)
 # Copyright (C) 2010-2016 David Torrejon Vaquerizas
 #
 # Ásbrú Connection Manager is free software: you can redistribute it and/or
@@ -58,6 +58,7 @@ sub new {
     $self->{container} = shift;
 
     $self->{cfg} = undef;
+    $self->{cfg_array} = undef;
     $self->{gui} = undef;
     $self->{frame} = {};
 
@@ -70,9 +71,10 @@ sub new {
 sub update {
     my $self = shift;
     my $cfg = shift;
-    my $method = shift;
+    my $cfg_array = shift;
 
     defined $cfg and $$self{cfg} = $cfg;
+    defined $cfg_array and $$self{cfg_array} = $cfg_array;
 
     my $options = _parseCfgToOptions($$self{cfg});
 
@@ -109,6 +111,15 @@ sub update {
     return 1;
 }
 
+sub get_cfg_array
+{
+    my $self = shift;
+
+    my %options_array;
+
+    return \%options_array;
+}
+
 sub get_cfg {
     my $self = shift;
 
@@ -428,7 +439,8 @@ sub _buildGUI {
         my $opt_hash = _parseCfgToOptions($$self{cfg});
         push(@{$$opt_hash{redirDisk}}, {'redirDiskShare' => $ENV{'USER'}, 'redirDiskPath' => $ENV{'HOME'}});
         $$self{cfg} = _parseOptionsToCfg($opt_hash);
-        $self->update($$self{cfg});
+        $$self{cfg_array} = $self->get_cfg_array();
+        $self->update($$self{cfg}, $$self{cfg_array});
         return 1;
     });
 
@@ -480,7 +492,8 @@ sub _buildRedir {
         $$self{cfg} = $self->get_cfg();
         splice(@{$$self{listRedir}}, $w{position}, 1);
         $$self{cfg} = $self->get_cfg();
-        $self->update($$self{cfg});
+        $$self{cfg_array} = $self->get_cfg_array();
+        $self->update($$self{cfg}, $$self{cfg_array});
         return 1;
     });
 
diff --git a/lib/method/PACMethod_realvnc.pm b/lib/method/PACMethod_realvnc.pm
index d57ce773..9429b464 100644
--- a/lib/method/PACMethod_realvnc.pm
+++ b/lib/method/PACMethod_realvnc.pm
@@ -3,7 +3,7 @@ package PACMethod_realvnc;
 ###############################################################################
 # This file is part of Ásbrú Connection Manager
 #
-# Copyright (C) 2017-2020 Ásbrú Connection Manager team (https://asbru-cm.net)
+# Copyright (C) 2017-2022 Ásbrú Connection Manager team (https://asbru-cm.net)
 # Copyright (C) 2010-2016 David Torrejon Vaquerizas
 #
 # Ásbrú Connection Manager is free software: you can redistribute it and/or
@@ -63,6 +63,7 @@ sub new {
     $self->{container} = shift;
 
     $self->{cfg} = undef;
+    $self->{cfg_array} = undef;
     $self->{gui} = undef;
     $self->{frame} = {};
 
@@ -75,9 +76,10 @@ sub new {
 sub update {
     my $self = shift;
     my $cfg = shift;
-    my $method = shift;
+    my $cfg_array = shift;
 
     defined $cfg and $$self{cfg} = $cfg;
+    defined $cfg_array and $$self{cfg_array} = $cfg_array;
 
     my $options = _parseCfgToOptions($$self{cfg});
 
@@ -91,6 +93,15 @@ sub update {
     return 1;
 }
 
+sub get_cfg_array
+{
+    my $self = shift;
+
+    my %options_array;
+
+    return \%options_array;
+}
+
 sub get_cfg {
     my $self = shift;
 
diff --git a/lib/method/PACMethod_remote_tty.pm b/lib/method/PACMethod_remote_tty.pm
index 57373330..3da4b064 100644
--- a/lib/method/PACMethod_remote_tty.pm
+++ b/lib/method/PACMethod_remote_tty.pm
@@ -3,7 +3,7 @@ package PACMethod_remote_tty;
 ###############################################################################
 # This file is part of Ásbrú Connection Manager
 #
-# Copyright (C) 2017-2020 Ásbrú Connection Manager team (https://asbru-cm.net)
+# Copyright (C) 2017-2022 Ásbrú Connection Manager team (https://asbru-cm.net)
 # Copyright (C) 2010-2016 David Torrejon Vaquerizas
 #
 # Ásbrú Connection Manager is free software: you can redistribute it and/or
@@ -56,6 +56,7 @@ sub new
     $self->{container} = shift;
 
     $self->{cfg} = undef;
+    $self->{cfg_array} = undef;
     $self->{gui} = undef;
     $self->{frame} = {};
 
@@ -69,8 +70,10 @@ sub update
 {
     my $self = shift;
     my $cfg = shift;
+    my $cfg_array = shift;
 
     defined $cfg and $$self{cfg} = $cfg;
+    defined $cfg_array and $$self{cfg_array} = $cfg_array;
 
     my $options = _parseCfgToOptions($$self{cfg});
 
@@ -80,6 +83,15 @@ sub update
     return 1;
 }
 
+sub get_cfg_array
+{
+    my $self = shift;
+
+    my %options_array;
+
+    return \%options_array;
+}
+
 sub get_cfg
 {
     my $self = shift;
diff --git a/lib/method/PACMethod_sftp.pm b/lib/method/PACMethod_sftp.pm
index be318466..4c2c638e 100644
--- a/lib/method/PACMethod_sftp.pm
+++ b/lib/method/PACMethod_sftp.pm
@@ -3,7 +3,7 @@ package PACMethod_sftp;
 ###############################################################################
 # This file is part of Ásbrú Connection Manager
 #
-# Copyright (C) 2017-2020 Ásbrú Connection Manager team (https://asbru-cm.net)
+# Copyright (C) 2017-2022 Ásbrú Connection Manager team (https://asbru-cm.net)
 # Copyright (C) 2010-2016 David Torrejon Vaquerizas
 #
 # Ásbrú Connection Manager is free software: you can redistribute it and/or
@@ -81,6 +81,7 @@ sub new
     $self->{container} = shift;
 
     $self->{cfg} = undef;
+    $self->{cfg_array} = undef;
     $self->{gui} = undef;
     $self->{frame} = {};
     $self->{listAdvOpt} = [];
@@ -95,8 +96,10 @@ sub update
 {
     my $self = shift;
     my $cfg = shift;
+    my $cfg_array = shift;
 
     defined $cfg and $$self{cfg} = $cfg;
+    defined $cfg_array and $$self{cfg_array} = $cfg_array;
 
     my $options = _parseCfgToOptions($$self{cfg});
 
@@ -111,6 +114,15 @@ sub update
     return 1;
 }
 
+sub get_cfg_array
+{
+    my $self = shift;
+
+    my %options_array;
+
+    return \%options_array;
+}
+
 sub get_cfg
 {
     my $self = shift;
@@ -148,15 +160,20 @@ sub _parseCfgToOptions
     $hash{useCompression} = 0;
     @{$hash{advancedOption}} = ();
 
-    my @opts = split(/\s+-/, $cmd_line);
+    my @opts = split(/\s+-o /, $cmd_line);
     foreach my $opt (@opts)
     {
+        $opt =~ s/^ -//;
         next unless $opt ne '';
         $opt =~ s/\s+$//go;
 
-        $opt =~ /^([1|2]$)/go    and    $hash{sshVersion} = $1;
-        $opt eq 'C'                and    $hash{useCompression} = 1;
-        while ($opt =~ /^o\s+\"(.+?)\"$/go) {
+        if ($opt =~ /^([1|2]$)/go) {
+            $hash{sshVersion} = $1;
+        }
+        if ($opt eq 'C') {
+            $hash{useCompression} = 1;
+        }
+        while ($opt =~ /\"(.+?)\"$/go) {
             my %opts;
             my $tmpopt = $1;
             $tmpopt =~ /\s*(.+?)\s*=\s*(.+)\s*/go;
@@ -200,51 +217,51 @@ sub _buildGUI
 
     $w{vbox} = $container;
 
-        $w{hbox1} = Gtk3::HBox->new(0, 5);
-        $w{vbox}->pack_start($w{hbox1}, 0, 1, 5);
+    $w{hbox1} = Gtk3::HBox->new(0, 5);
+    $w{vbox}->pack_start($w{hbox1}, 0, 1, 5);
 
-            $w{frSSHVersion} = Gtk3::Frame->new('SSH Version:');
-            $w{hbox1}->pack_start($w{frSSHVersion}, 0, 1, 0);
-            $w{frSSHVersion}->set_shadow_type('GTK_SHADOW_NONE');
-            $w{frSSHVersion}->set_tooltip_text('-(1|any) : Use SSH v1 or let negotiate any of them');
+    $w{frSSHVersion} = Gtk3::Frame->new('SSH Version:');
+    $w{hbox1}->pack_start($w{frSSHVersion}, 0, 1, 0);
+    $w{frSSHVersion}->set_shadow_type('GTK_SHADOW_NONE');
+    $w{frSSHVersion}->set_tooltip_text('-(1|any) : Use SSH v1 or let negotiate any of them');
 
-                $w{cbSSHVersion} = Gtk3::ComboBoxText->new;
-                $w{frSSHVersion}->add($w{cbSSHVersion});
-                foreach my $ssh_version (sort {$a cmp $b} keys %SSH_VERSION) {$w{cbSSHVersion}->append_text($ssh_version);};
+    $w{cbSSHVersion} = Gtk3::ComboBoxText->new;
+    $w{frSSHVersion}->add($w{cbSSHVersion});
+    foreach my $ssh_version (sort {$a cmp $b} keys %SSH_VERSION) {$w{cbSSHVersion}->append_text($ssh_version);};
 
-            $w{chUseCompression} = Gtk3::CheckButton->new_with_label('Use Compression');
-            $w{hbox1}->pack_start($w{chUseCompression}, 1, 1, 0);
-            $w{chUseCompression}->set_tooltip_text('[-C] : Use or not compression');
+    $w{chUseCompression} = Gtk3::CheckButton->new_with_label('Use Compression');
+    $w{hbox1}->pack_start($w{chUseCompression}, 1, 1, 0);
+    $w{chUseCompression}->set_tooltip_text('[-C] : Use or not compression');
 
-        $w{vbox}->pack_start(Gtk3::HSeparator->new, 0, 1, 5);
+    $w{vbox}->pack_start(Gtk3::HSeparator->new, 0, 1, 5);
 
-            $w{vbox}->pack_start(Gtk3::Label->new('Advanced Options:'), 0, 1, 0);
+    $w{vbox}->pack_start(Gtk3::Label->new('Advanced Options:'), 0, 1, 0);
 
-            $w{vboxAdvOpt} = Gtk3::VBox->new(0, 0);
-            $w{vbox}->pack_start($w{vboxAdvOpt}, 1, 1, 5);
-            $w{lblAdvOpt} = Gtk3::Label->new('Advanced Options');
-            $w{vboxAdvOpt}->set_tooltip_text('[-o "ssh_option=value"]');
-            $w{vboxAdvOpt}->set_border_width(5);
+    $w{vboxAdvOpt} = Gtk3::VBox->new(0, 0);
+    $w{vbox}->pack_start($w{vboxAdvOpt}, 1, 1, 5);
+    $w{lblAdvOpt} = Gtk3::Label->new('Advanced Options');
+    $w{vboxAdvOpt}->set_tooltip_text('[-o "ssh_option=value"]');
+    $w{vboxAdvOpt}->set_border_width(5);
 
-                # Build 'add' button
-                $w{btnaddAdvOpt} = Gtk3::Button->new_from_stock('gtk-add');
-                $w{vboxAdvOpt}->pack_start($w{btnaddAdvOpt}, 0, 1, 0);
+    # Build 'add' button
+    $w{btnaddAdvOpt} = Gtk3::Button->new_from_stock('gtk-add');
+    $w{vboxAdvOpt}->pack_start($w{btnaddAdvOpt}, 0, 1, 0);
 
-                # Build a scrolled window
-                $w{swAdvOpt} = Gtk3::ScrolledWindow->new;
-                $w{vboxAdvOpt}->pack_start($w{swAdvOpt}, 1, 1, 0);
-                $w{swAdvOpt}->set_policy('automatic', 'automatic');
-                $w{swAdvOpt}->set_shadow_type('none');
+    # Build a scrolled window
+    $w{swAdvOpt} = Gtk3::ScrolledWindow->new;
+    $w{vboxAdvOpt}->pack_start($w{swAdvOpt}, 1, 1, 0);
+    $w{swAdvOpt}->set_policy('automatic', 'automatic');
+    $w{swAdvOpt}->set_shadow_type('none');
 
-                    $w{vpAdvOpt} = Gtk3::Viewport->new;
-                    $w{swAdvOpt}->add($w{vpAdvOpt});
-                    $w{vpAdvOpt}->set_shadow_type('GTK_SHADOW_NONE');
+    $w{vpAdvOpt} = Gtk3::Viewport->new;
+    $w{swAdvOpt}->add($w{vpAdvOpt});
+    $w{vpAdvOpt}->set_shadow_type('GTK_SHADOW_NONE');
 
-                        # Build and add the vbox that will contain the advanced options widgets
-                        $w{vbAdvOpt} = Gtk3::VBox->new(0, 0);
-                        $w{vpAdvOpt}->add($w{vbAdvOpt});
+    # Build and add the vbox that will contain the advanced options widgets
+    $w{vbAdvOpt} = Gtk3::VBox->new(0, 0);
+    $w{vpAdvOpt}->add($w{vbAdvOpt});
 
-        $w{vbox}->pack_start(Gtk3::HSeparator->new, 0, 1, 5);
+    $w{vbox}->pack_start(Gtk3::HSeparator->new, 0, 1, 5);
 
     $$self{gui} = \%w;
 
@@ -253,7 +270,8 @@ sub _buildGUI
         my $opt_hash = _parseCfgToOptions($$self{cfg});
         push(@{$$opt_hash{advancedOption}}, {'option' => 'SFTP option (right-click here to show list)', 'value' => 'value'});
         $$self{cfg} = _parseOptionsToCfg($opt_hash);
-        $self->update($$self{cfg});
+        $$self{cfg_array} = $self->get_cfg_array();
+        $self->update($$self{cfg}, $$self{cfg_array});
         return 1;
     });
 
@@ -278,27 +296,27 @@ sub _buildAdvOpt
     # Make an HBox to contain option, value and delete
     $w{hbox} = Gtk3::HBox->new(0, 0);
 
-        $w{frAdvOptOption} = Gtk3::Frame->new('Option:');
-        $w{hbox}->pack_start($w{frAdvOptOption}, 1, 1, 0);
-        $w{frAdvOptOption}->set_shadow_type('GTK_SHADOW_NONE');
+    $w{frAdvOptOption} = Gtk3::Frame->new('Option:');
+    $w{hbox}->pack_start($w{frAdvOptOption}, 1, 1, 0);
+    $w{frAdvOptOption}->set_shadow_type('GTK_SHADOW_NONE');
 
-            $w{entryAdvOptOption} = Gtk3::Entry->new;
-            $w{frAdvOptOption}->add($w{entryAdvOptOption});
-            $w{entryAdvOptOption}->set_size_request(30, 20);
-            $w{entryAdvOptOption}->set_text($option);
+    $w{entryAdvOptOption} = Gtk3::Entry->new;
+    $w{frAdvOptOption}->add($w{entryAdvOptOption});
+    $w{entryAdvOptOption}->set_size_request(30, 20);
+    $w{entryAdvOptOption}->set_text($option);
 
-        $w{frAdvOptValue} = Gtk3::Frame->new('Value:');
-        $w{hbox}->pack_start($w{frAdvOptValue}, 1, 1, 0);
-        $w{frAdvOptValue}->set_shadow_type('GTK_SHADOW_NONE');
+    $w{frAdvOptValue} = Gtk3::Frame->new('Value:');
+    $w{hbox}->pack_start($w{frAdvOptValue}, 1, 1, 0);
+    $w{frAdvOptValue}->set_shadow_type('GTK_SHADOW_NONE');
 
-            $w{entryAdvOptValue} = Gtk3::Entry->new;
-            $w{frAdvOptValue}->add($w{entryAdvOptValue});
-            $w{entryAdvOptValue}->set_size_request(30, 20);
-            $w{entryAdvOptValue}->set_text($value);
+    $w{entryAdvOptValue} = Gtk3::Entry->new;
+    $w{frAdvOptValue}->add($w{entryAdvOptValue});
+    $w{entryAdvOptValue}->set_size_request(30, 20);
+    $w{entryAdvOptValue}->set_text($value);
 
-        # Build delete button
-        $w{btn} = Gtk3::Button->new_from_stock('gtk-delete');
-        $w{hbox}->pack_start($w{btn}, 0, 1, 0);
+    # Build delete button
+    $w{btn} = Gtk3::Button->new_from_stock('gtk-delete');
+    $w{hbox}->pack_start($w{btn}, 0, 1, 0);
 
     # Add built control to main container
     $$self{gui}{vbAdvOpt}->pack_start($w{hbox}, 0, 1, 0);
@@ -313,7 +331,8 @@ sub _buildAdvOpt
         $$self{cfg} = $self->get_cfg();
         splice(@{$$self{listAdvOpt}}, $w{position}, 1);
         $$self{cfg} = $self->get_cfg();
-        $self->update($$self{cfg});
+        $$self{cfg_array} = $self->get_cfg_array();
+        $self->update($$self{cfg}, $$self{cfg_array});
         return 1;
     });
 
diff --git a/lib/method/PACMethod_ssh.pm b/lib/method/PACMethod_ssh.pm
index f0f9be2e..3799f401 100644
--- a/lib/method/PACMethod_ssh.pm
+++ b/lib/method/PACMethod_ssh.pm
@@ -3,7 +3,7 @@ package PACMethod_ssh;
 ###############################################################################
 # This file is part of Ásbrú Connection Manager
 #
-# Copyright (C) 2017-2020 Ásbrú Connection Manager team (https://asbru-cm.net)
+# Copyright (C) 2017-2022 Ásbrú Connection Manager team (https://asbru-cm.net)
 # Copyright (C) 2010-2016 David Torrejon Vaquerizas
 #
 # Ásbrú Connection Manager is free software: you can redistribute it and/or
@@ -51,24 +51,24 @@ use Gtk3 '-init';
 my %SSH_VERSION = (1 => 0, 2 => 1, 'any' => 2);
 my %IP_PROTOCOL = (4 => 0, 6 => 1, 'any' => 2);
 my %SSH_ADV_OPTS = (
-    'A' => ['AddressFamily'],
+    'A' => ['AddKeysToAgent','AddressFamily'],
     'B' => ['BatchMode', 'BindAddress'],
-    'C' => ['CanonicalDomains', 'CanonicalizeFallbackLocal', 'CanonicalizeHostname', 'CanonicalizeMaxDots', 'CanonicalizePermittedCNAMEs', 'ChallengeResponseAuthentication', 'CheckHostIP', 'Cipher', 'Ciphers', 'ClearAllForwardings', 'Compression', 'CompressionLevel', 'ConnectionAttempts', 'ConnectTimeout', 'ControlMaster', 'ControlPath', 'ControlPersist'],
+    'C' => ['CanonicalDomains', 'CanonicalizeFallbackLocal', 'CanonicalizeHostname', 'CanonicalizeMaxDots', 'CanonicalizePermittedCNAMEs', 'CASignatureAlgorithms', 'CertificateFile', 'ChallengeResponseAuthentication', 'CheckHostIP', 'Cipher', 'Ciphers', 'ClearAllForwardings', 'Compression', 'CompressionLevel', 'ConnectionAttempts', 'ConnectTimeout', 'ControlMaster', 'ControlPath', 'ControlPersist'],
     'D' => ['DynamicForward'],
     'E' => ['EscapeChar', 'ExitOnForwardFailure'],
-    'F' => ['ForwardAgent', 'ForwardX11', 'ForwardX11Timeout', 'ForwardX11Trusted'],
-    'G' => ['GatewayPorts', 'GlobalKnownHostsFile', 'GSSAPIAuthentication', 'GSSAPIDelegateCredentials'],
+    'F' => ['FingerprintHash', 'ForwardAgent', 'ForwardX11', 'ForwardX11Timeout', 'ForwardX11Trusted'],
+    'G' => ['GatewayPorts', 'GlobalKnownHostsFile', 'GSSAPIAuthentication', 'GSSAPIKeyExchange', 'GSSAPIClientIdentity', 'GSSAPIDelegateCredentials', 'GSSAPIKexAlgorithms', 'GSSAPIRenewalForcesRekey', 'GSSAPIServerIdentity', 'GSSAPITrustDns'],
     'H' => ['HashKnownHosts', 'Host', 'HostbasedAuthentication', 'HostKeyAlgorithms', 'HostKeyAlias', 'HostName'],
-    'I' => ['IdentityAgent', 'IdentityFile', 'IdentitiesOnly', 'IPQoS'],
+    'I' => ['IdentitiesOnly', 'IdentityAgent', 'IdentityFile', 'IPQoS'],
     'K' => ['KbdInteractiveAuthentication', 'KbdInteractiveDevices', 'KexAlgorithms'],
     'L' => ['LocalCommand', 'LocalForward', 'LogLevel'],
     'M' => ['MACs', 'Match'],
     'N' => ['NoHostAuthenticationForLocalhost', 'NumberOfPasswordPrompts'],
-    'P' => ['PasswordAuthentication', 'PermitLocalCommand', 'PKCS11Provider', 'Port', 'PreferredAuthentications', 'Protocol', 'ProxyCommand', 'ProxyUseFdpass', 'PubkeyAuthentication'],
-    'R' => ['RekeyLimit', 'RemoteForward', 'RequestTTY', 'RhostsRSAAuthentication', 'RSAAuthentication'],
-    'S' => ['SendEnv', 'ServerAliveInterval', 'ServerAliveCountMax', 'StrictHostKeyChecking'],
+    'P' => ['PasswordAuthentication', 'PermitLocalCommand', 'PKCS11Provider', 'Port', 'PreferredAuthentications', 'Protocol', 'ProxyCommand', 'ProxyJump', 'ProxyUseFdpass', 'PubkeyAcceptedKeyTypes', 'PubkeyAuthentication'],
+    'R' => ['RekeyLimit', 'RemoteCommand', 'RemoteForward', 'RequestTTY', 'RhostsRSAAuthentication', 'RSAAuthentication'],
+    'S' => ['SendEnv', 'ServerAliveInterval', 'ServerAliveCountMax', 'SetEnv', 'StreamLocalBindMask', 'StreamLocalBindUnlink', 'StrictHostKeyChecking'],
     'T' => ['TCPKeepAlive', 'Tunnel', 'TunnelDevice'],
-    'U' => ['UsePrivilegedPort', 'User', 'UserKnownHostsFile'],
+    'U' => ['UpdateHostKeys', 'UsePrivilegedPort', 'User', 'UserKnownHostsFile'],
     'V' => ['VerifyHostKeyDNS', 'VisualHostKey'],
     'X' => ['XAuthLocation']
 );
@@ -87,6 +87,7 @@ sub new
 
     $self->{container} = shift;
     $self->{cfg} = undef;
+    $self->{cfg_array} = undef;
     $self->{gui} = undef;
     $self->{frame} = {};
     $self->{list} = [];
@@ -103,8 +104,12 @@ sub update
 {
     my $self = shift;
     my $cfg = shift;
+    my $cfg_array = shift;
 
     defined $cfg and $$self{cfg} = $cfg;
+    defined $cfg_array and $$self{cfg_array} = $cfg_array;
+
+    $$self{gui}{chRandomSocksTunnel}->set_active($$cfg_array{randomSocksTunnel});
 
     my $options = _parseCfgToOptions($$self{cfg});
 
@@ -117,10 +122,10 @@ sub update
     $$self{gui}{chForwardAgent}->set_active($$options{forwardAgent});
 
     # Destroy previuos widgets
-    $$self{gui}{vbForward}->foreach(sub {$_[0]->destroy;});
-    $$self{gui}{vbRemote}->foreach(sub {$_[0]->destroy;});
-    $$self{gui}{vbDynamic}->foreach(sub {$_[0]->destroy;});
-    $$self{gui}{vbAdvOpt}->foreach(sub {$_[0]->destroy;});
+    $$self{gui}{vbForward}->foreach(sub {$_[0]->destroy();});
+    $$self{gui}{vbRemote}->foreach(sub {$_[0]->destroy();});
+    $$self{gui}{vbDynamic}->foreach(sub {$_[0]->destroy();});
+    $$self{gui}{vbAdvOpt}->foreach(sub {$_[0]->destroy();});
 
     # Empty parent's forward ports widgets' list
     $$self{list} = [];
@@ -129,15 +134,15 @@ sub update
     $$self{listAdvOpt} = [];
 
     # Now, add the -new?- local forward widgets
-    if ($$self{gui}{rbOrderLI}->get_active) {
+    if ($$self{gui}{rbOrderLI}->get_active()) {
         foreach my $hash (sort {$$a{localIP} cmp $$b{localIP}} @{$$options{forwardPort}}) {
             $self->_buildForward($hash);
         }
-    } elsif ($$self{gui}{rbOrderLP}->get_active) {
+    } elsif ($$self{gui}{rbOrderLP}->get_active()) {
         foreach my $hash (sort {$$a{localPort} <=> $$b{localPort}} @{$$options{forwardPort}}) {
             $self->_buildForward($hash);
         }
-    } elsif ($$self{gui}{rbOrderRI}->get_active) {
+    } elsif ($$self{gui}{rbOrderRI}->get_active()) {
         foreach my $hash (sort {$$a{remoteIP} cmp $$b{remoteIP}} @{$$options{forwardPort}}) {
             $self->_buildForward($hash);
         }
@@ -145,15 +150,15 @@ sub update
     $$self{gui}{lblLocal}->set_markup('Local Port Forwarding (<b>' . (scalar(@{$$self{list}})) . '</b>)');
 
     # Now, add the -new?- remote forward widgets
-    if ($$self{gui}{rbOrderLI2}->get_active) {
+    if ($$self{gui}{rbOrderLI2}->get_active()) {
         foreach my $hash (sort {$$a{localIP} cmp $$b{localIP}} @{$$options{remotePort}}) {
             $self->_buildRemote($hash);
         }
-    } elsif ($$self{gui}{rbOrderLP2}->get_active) {
+    } elsif ($$self{gui}{rbOrderLP2}->get_active()) {
         foreach my $hash (sort {$$a{localPort} <=> $$b{localPort}} @{$$options{remotePort}}) {
             $self->_buildRemote($hash);
         }
-    } elsif ($$self{gui}{rbOrderRI2}->get_active) {
+    } elsif ($$self{gui}{rbOrderRI2}->get_active()) {
         foreach my $hash (sort {$$a{remoteIP} cmp $$b{remoteIP}} @{$$options{remotePort}}) {
             $self->_buildRemote($hash);
         }
@@ -161,11 +166,11 @@ sub update
     $$self{gui}{lblRemote}->set_markup('Remote Port Forwarding (<b>' . (scalar(@{$$self{listRemote}})) . '</b>)');
 
     # Now, add the -new?- dynamic socks widgets
-    if ($$self{gui}{rbOrderLI3}->get_active) {
+    if ($$self{gui}{rbOrderLI3}->get_active()) {
         foreach my $hash (sort {$$a{dynamicIP} cmp $$b{dynamicIP}} @{$$options{dynamicForward}}) {
             $self->_buildDynamic($hash);
         }
-    } elsif ($$self{gui}{rbOrderLP3}->get_active) {
+    } elsif ($$self{gui}{rbOrderLP3}->get_active()) {
         foreach my $hash (sort {$$a{dynamicPort} <=> $$b{dynamicPort}} @{$$options{dynamicForward}}) {
             $self->_buildDynamic($hash);
         }
@@ -181,19 +186,30 @@ sub update
     return 1;
 }
 
+sub get_cfg_array
+{
+    my $self = shift;
+
+    my %options_array;
+
+    $options_array{randomSocksTunnel} = $$self{gui}{chRandomSocksTunnel}->get_active();
+
+    return \%options_array;
+}
+
 sub get_cfg
 {
     my $self = shift;
 
     my %options;
 
-    $options{sshVersion} = $$self{gui}{cbSSHVersion}->get_active_text;
-    $options{ipVersion} = $$self{gui}{cbSSHProtocol}->get_active_text;
-    $options{noRemoteCmd} = $$self{gui}{chNoRemoteCmd}->get_active;
-    $options{forwardX} = $$self{gui}{chForwardX}->get_active;
-    $options{useCompression} = $$self{gui}{chUseCompression}->get_active;
-    $options{allowRemoteConnection} = $$self{gui}{chAllowPortConnect}->get_active;
-    $options{forwardAgent} = $$self{gui}{chForwardAgent}->get_active;
+    $options{sshVersion} = $$self{gui}{cbSSHVersion}->get_active_text();
+    $options{ipVersion} = $$self{gui}{cbSSHProtocol}->get_active_text();
+    $options{noRemoteCmd} = $$self{gui}{chNoRemoteCmd}->get_active();
+    $options{forwardX} = $$self{gui}{chForwardX}->get_active();
+    $options{useCompression} = $$self{gui}{chUseCompression}->get_active();
+    $options{allowRemoteConnection} = $$self{gui}{chAllowPortConnect}->get_active();
+    $options{forwardAgent} = $$self{gui}{chForwardAgent}->get_active();
     $options{forwardPort} = ();
     $options{localPort} = ();
     $options{dynamicForward} = ();
@@ -271,7 +287,6 @@ sub _parseCfgToOptions
 
     my %options;
     $options{noRemoteCmd} = 0;
-    #$options{useCompression} = 1;
     $options{allowRemoteConnection} = 0;
     $options{forwardAgent} = 0;
     @{$options{forwardPort}} = ();
@@ -282,8 +297,8 @@ sub _parseCfgToOptions
     $options{_optionL} =
     $options{_optionR} = sub {
         my ($optionName,$forwardSpec) = @_;
-        #                                                              [-L [bind_address:]port:host:hostport]
-        my (undef,$bind_address,$port,$host,$hostport) = $forwardSpec=~m/((.+)(?:\/|:))*(\d+):([^:]*):(\d+)/;
+        #                                                                [-L [bind_address:]port:host:hostport]
+        my (undef,$bind_address,$port,$host,$hostport) = $forwardSpec =~ m/((.+)(?:\/|:))*(\d+):([^:]*):(\d+)/;
 
         push @{$options{($optionName eq "_optionL" ? "forwardPort" : "remotePort")}},
             {
@@ -296,7 +311,7 @@ sub _parseCfgToOptions
     $options{_optionD} = sub {
         my (undef,$forwardSpec) = @_;
         #                                                [-D [bind_address:]port]
-        my (undef,$bind_address,$port) = $forwardSpec=~m/((.+)(?:\/|:))*(\d+)/;
+        my (undef,$bind_address,$port) = $forwardSpec =~ m/((.+)(?:\/|:))*(\d+)/;
         push @{$options{dynamicForward}},
             {
                 'dynamicIP'   => $bind_address // '',
@@ -376,7 +391,6 @@ sub _buildGUI
     my $self = shift;
 
     my $container = $self->{container};
-    my $cfg = $self->{cfg};
 
     my %w;
 
@@ -395,12 +409,19 @@ sub _buildGUI
     my $hb123 = Gtk3::HBox->new(0, 5);
     $w{vboxipv}->pack_start($hb123, 1, 1, 0);
 
-    my $lblsshv = Gtk3::Label->new('SSH Version: ');
+    $w{help} = Gtk3::LinkButton->new('https://docs.asbru-cm.net/Manual/Connections/SSH/');
+    $w{help}->set_halign('GTK_ALIGN_END');
+    $w{help}->set_label('');
+    $w{help}->set_tooltip_text('Open Online Help');
+    $w{help}->set_always_show_image(1);
+    $w{help}->set_image(Gtk3::Image->new_from_stock('asbru-help', 'button'));
+
+    my $lblsshv = Gtk3::Label->new('SSH Version ');
     $lblsshv->set_alignment(1, 0.5);
     $hb123->pack_start($lblsshv, 1, 1, 0);
     $hb123->set_tooltip_text('-(1|2|any) : Use SSH v1, v2 or any  of them');
 
-    $w{cbSSHVersion} = Gtk3::ComboBoxText->new;
+    $w{cbSSHVersion} = Gtk3::ComboBoxText->new();
     $hb123->pack_start($w{cbSSHVersion}, 0, 1, 0);
     foreach my $ssh_version (sort {$a cmp $b} keys %SSH_VERSION) {
         $w{cbSSHVersion}->append_text($ssh_version);
@@ -409,22 +430,23 @@ sub _buildGUI
     my $hb456 = Gtk3::HBox->new(0, 5);
     $w{vboxipv}->pack_start($hb456, 1, 1, 0);
 
-    my $lblipv = Gtk3::Label->new('IP Protocol: ');
+    my $lblipv = Gtk3::Label->new('IP Protocol  ');
     $lblipv->set_alignment(1, 0.5);
     $hb456->pack_start($lblipv, 1, 1, 0);
     $hb456->set_tooltip_text('-(4|6) : Uses IPv4, IPv6 or no specification (ip based)');
 
-    $w{cbSSHProtocol} = Gtk3::ComboBoxText->new;
+    $w{cbSSHProtocol} = Gtk3::ComboBoxText->new();
     $hb456->pack_start($w{cbSSHProtocol}, 0, 1, 0);
     foreach my $ip_protocol (sort {$a cmp $b} keys %IP_PROTOCOL) {
         $w{cbSSHProtocol}->append_text($ip_protocol);
     }
 
-    $w{frSSHOther} = Gtk3::Frame->new(' Other Options: ');
+    $w{frSSHOther} = Gtk3::Frame->new(' Other Options  ');
     $w{hbox1}->pack_start($w{frSSHOther}, 1, 1, 0);
 
     my $vboxother = Gtk3::VBox->new(0, 0);
     $w{frSSHOther}->add($vboxother);
+    $w{frSSHOther}->set_shadow_type('GTK_SHADOW_NONE');
 
     my $hbox1 = Gtk3::HBox->new(0, 0);
     #$w{frSSHOther}->add($hbox1);
@@ -446,6 +468,7 @@ sub _buildGUI
     $w{chForwardAgent} = Gtk3::CheckButton->new_with_label('Forward Agent');
     $hbox1->pack_start($w{chForwardAgent}, 1, 1, 0);
     $w{chForwardAgent}->set_tooltip_text('[-A] : Forward or not the SSH authentication agent');
+    $hbox1->pack_start($w{help}, 0, 1, 0);
 
     my $hbox2 = Gtk3::HBox->new(0, 0);
     $vboxother->add($hbox2);
@@ -455,10 +478,14 @@ sub _buildGUI
     $hbox2->pack_start($w{chNoRemoteCmd}, 1, 1, 0);
     $w{chNoRemoteCmd}->set_tooltip_text('[-N]: Do NOT execute a remote command.  This is useful for just forwarding ports (protocol version 2 only)');
 
+    $w{chRandomSocksTunnel} = Gtk3::CheckButton->new_with_label('Create random SOCKS tunnel');
+    $hbox2->pack_start($w{chRandomSocksTunnel}, 1, 1, 0);
+    $w{chRandomSocksTunnel}->set_tooltip_text('Creates a SOCKS tunnel on a random port at connection startup.  Variable SOCKS5_PORT will contain the random port.  You can use it to start local commands and launch any other programs.');
+
     $w{hbox4} = Gtk3::HBox->new(0, 0);
     $w{vbox}->pack_start($w{hbox4}, 1, 1, 0);
 
-    $w{nb} = Gtk3::Notebook->new;
+    $w{nb} = Gtk3::Notebook->new();
     $w{hbox4}->pack_start($w{nb}, 1, 1, 0);
 
     $w{vbox2} = Gtk3::VBox->new(0, 0);
@@ -470,7 +497,7 @@ sub _buildGUI
     $w{hboxorder} = Gtk3::HBox->new(0, 0);
     $w{vbox2}->pack_start($w{hboxorder}, 0, 1, 0);
 
-    $w{lblOrder} = Gtk3::Label->new('Show ordered by: ');
+    $w{lblOrder} = Gtk3::Label->new('Show ordered by  ');
     $w{hboxorder}->pack_start($w{lblOrder}, 0, 1, 0);
 
     # Build the "order" radiobuttons
@@ -493,12 +520,12 @@ sub _buildGUI
     $w{vbox2}->pack_start($w{btnadd}, 0, 1, 0);
 
     # Build a scrolled window
-    $w{sw} = Gtk3::ScrolledWindow->new;
+    $w{sw} = Gtk3::ScrolledWindow->new();
     $w{vbox2}->pack_start($w{sw}, 1, 1, 0);
     $w{sw}->set_policy('automatic', 'automatic');
     $w{sw}->set_shadow_type('none');
 
-    $w{vp} = Gtk3::Viewport->new;
+    $w{vp} = Gtk3::Viewport->new();
     $w{sw}->add($w{vp});
     $w{vp}->set_shadow_type('GTK_SHADOW_NONE');
 
@@ -515,7 +542,7 @@ sub _buildGUI
     $w{hboxorder2} = Gtk3::HBox->new(0, 0);
     $w{vbox3}->pack_start($w{hboxorder2}, 0, 1, 0);
 
-    $w{lblOrder2} = Gtk3::Label->new('Show ordered by: ');
+    $w{lblOrder2} = Gtk3::Label->new('Show ordered by  ');
     $w{hboxorder2}->pack_start($w{lblOrder2}, 0, 1, 0);
 
     # Build the "order" radiobuttons
@@ -538,12 +565,12 @@ sub _buildGUI
     $w{vbox3}->pack_start($w{btnaddRemote}, 0, 1, 0);
 
     # Build a scrolled window
-    $w{swRemote} = Gtk3::ScrolledWindow->new;
+    $w{swRemote} = Gtk3::ScrolledWindow->new();
     $w{vbox3}->pack_start($w{swRemote}, 1, 1, 0);
     $w{swRemote}->set_policy('automatic', 'automatic');
     $w{swRemote}->set_shadow_type('none');
 
-    $w{vpRemote} = Gtk3::Viewport->new;
+    $w{vpRemote} = Gtk3::Viewport->new();
     $w{swRemote}->add($w{vpRemote});
     $w{vpRemote}->set_shadow_type('GTK_SHADOW_NONE');
 
@@ -560,7 +587,7 @@ sub _buildGUI
     $w{hboxorder3} = Gtk3::HBox->new(0, 0);
     $w{vbox33}->pack_start($w{hboxorder3}, 0, 1, 0);
 
-    $w{lblOrder3} = Gtk3::Label->new('Show ordered by: ');
+    $w{lblOrder3} = Gtk3::Label->new('Show ordered by  ');
     $w{hboxorder3}->pack_start($w{lblOrder3}, 0, 1, 0);
 
     # Build the "order" radiobuttons
@@ -579,12 +606,12 @@ sub _buildGUI
     $w{vbox33}->pack_start($w{btnaddDynamic}, 0, 1, 0);
 
     # Build a scrolled window
-    $w{swDynamic} = Gtk3::ScrolledWindow->new;
+    $w{swDynamic} = Gtk3::ScrolledWindow->new();
     $w{vbox33}->pack_start($w{swDynamic}, 1, 1, 0);
     $w{swDynamic}->set_policy('automatic', 'automatic');
     $w{swDynamic}->set_shadow_type('none');
 
-    $w{vpDynamic} = Gtk3::Viewport->new;
+    $w{vpDynamic} = Gtk3::Viewport->new();
     $w{swDynamic}->add($w{vpDynamic});
     $w{vpDynamic}->set_shadow_type('GTK_SHADOW_NONE');
 
@@ -603,12 +630,12 @@ sub _buildGUI
     $w{vboxAdvOpt}->pack_start($w{btnaddAdvOpt}, 0, 1, 0);
 
     # Build a scrolled window
-    $w{swAdvOpt} = Gtk3::ScrolledWindow->new;
+    $w{swAdvOpt} = Gtk3::ScrolledWindow->new();
     $w{vboxAdvOpt}->pack_start($w{swAdvOpt}, 1, 1, 0);
     $w{swAdvOpt}->set_policy('automatic', 'automatic');
     $w{swAdvOpt}->set_shadow_type('none');
 
-    $w{vpAdvOpt} = Gtk3::Viewport->new;
+    $w{vpAdvOpt} = Gtk3::Viewport->new();
     $w{swAdvOpt}->add($w{vpAdvOpt});
     $w{vpAdvOpt}->set_shadow_type('GTK_SHADOW_NONE');
 
@@ -638,7 +665,8 @@ sub _buildGUI
         }
         push(@{$$opt_hash{forwardPort}}, {'localIP' => '', 'localPort' => $local_port, 'remoteIP' => 'localhost', 'remotePort' => 1});
         $$self{cfg} = _parseOptionsToCfg($opt_hash);
-        $self->update($$self{cfg});
+        $$self{cfg_array} = $self->get_cfg_array();
+        $self->update($$self{cfg}, $$self{cfg_array});
         return 1;
     });
 
@@ -654,7 +682,8 @@ sub _buildGUI
         }
         push(@{$$opt_hash{remotePort}}, {'localIP' => '', 'localPort' => $local_port, 'remoteIP' => 'localhost', 'remotePort' => 1});
         $$self{cfg} = _parseOptionsToCfg($opt_hash);
-        $self->update($$self{cfg});
+        $$self{cfg_array} = $self->get_cfg_array();
+        $self->update($$self{cfg}, $$self{cfg_array});
         return 1;
     });
 
@@ -669,7 +698,8 @@ sub _buildGUI
         }
         push(@{$$opt_hash{dynamicForward}}, {'dynamicIP' => 'localhost', 'dynamicPort' => $local_port});
         $$self{cfg} = _parseOptionsToCfg($opt_hash);
-        $self->update($$self{cfg});
+        $$self{cfg_array} = $self->get_cfg_array();
+        $self->update($$self{cfg}, $$self{cfg_array});
         return 1;
     });
 
@@ -678,7 +708,8 @@ sub _buildGUI
         my $opt_hash = _parseCfgToOptions($$self{cfg});
         push(@{$$opt_hash{advancedOption}}, {'option' => 'SSH option (right-click here to show list)', 'value' => 'value'});
         $$self{cfg} = _parseOptionsToCfg($opt_hash);
-        $self->update($$self{cfg});
+        $$self{cfg_array} = $self->get_cfg_array();
+        $self->update($$self{cfg}, $$self{cfg_array});
         return 1;
     });
 
@@ -703,16 +734,16 @@ sub _buildForward
     # Make an HBox to contain local address, local port, remote address, remote port and delete
     $w{hbox} = Gtk3::HBox->new(0, 0);
 
-    $w{frPFLocalIP} = Gtk3::Frame->new('Local Address:');
+    $w{frPFLocalIP} = Gtk3::Frame->new('Local Address ');
     $w{hbox}->pack_start($w{frPFLocalIP}, 1, 1, 0);
     $w{frPFLocalIP}->set_shadow_type('GTK_SHADOW_NONE');
 
-    $w{entryPFLocalIP} = Gtk3::Entry->new;
+    $w{entryPFLocalIP} = Gtk3::Entry->new();
     $w{frPFLocalIP}->add($w{entryPFLocalIP});
     $w{entryPFLocalIP}->set_size_request(30, 20);
     $w{entryPFLocalIP}->set_text($localIP);
 
-    $w{frPFLocalPort} = Gtk3::Frame->new('Port:');
+    $w{frPFLocalPort} = Gtk3::Frame->new('Port ');
     $w{hbox}->pack_start($w{frPFLocalPort}, 0, 1, 0);
     $w{frPFLocalPort}->set_shadow_type('GTK_SHADOW_NONE');
 
@@ -721,16 +752,16 @@ sub _buildForward
     $w{spinPFLocalPort}->set_size_request(30, 20);
     $w{spinPFLocalPort}->set_value($localPort);
 
-    $w{frPFRemoteIP} = Gtk3::Frame->new('Remote Address:');
+    $w{frPFRemoteIP} = Gtk3::Frame->new('Remote Address ');
     $w{hbox}->pack_start($w{frPFRemoteIP}, 1, 1, 0);
     $w{frPFRemoteIP}->set_shadow_type('GTK_SHADOW_NONE');
 
-    $w{entryPFRemoteIP} = Gtk3::Entry->new;
+    $w{entryPFRemoteIP} = Gtk3::Entry->new();
     $w{frPFRemoteIP}->add($w{entryPFRemoteIP});
     $w{entryPFRemoteIP}->set_size_request(30, 20);
     $w{entryPFRemoteIP}->set_text($remoteIP);
 
-    $w{frPFRemotePort} = Gtk3::Frame->new('Port:');
+    $w{frPFRemotePort} = Gtk3::Frame->new('Port ');
     $w{hbox}->pack_start($w{frPFRemotePort}, 0, 1, 0);
     $w{frPFRemotePort}->set_shadow_type('GTK_SHADOW_NONE');
 
@@ -745,7 +776,7 @@ sub _buildForward
 
     # Add built control to main container
     $$self{gui}{vbForward}->pack_start($w{hbox}, 0, 1, 0);
-    $$self{gui}{vbForward}->show_all;
+    $$self{gui}{vbForward}->show_all();
 
     $$self{list}[$w{position}] = \%w;
 
@@ -756,7 +787,8 @@ sub _buildForward
         $$self{cfg} = $self->get_cfg();
         splice(@{$$self{list}}, $w{position}, 1);
         $$self{cfg} = $self->get_cfg();
-        $self->update($$self{cfg});
+        $$self{cfg_array} = $self->get_cfg_array();
+        $self->update($$self{cfg}, $$self{cfg_array});
         return 1;
     });
 
@@ -821,16 +853,16 @@ sub _buildRemote
     # Make an HBox to contain local address, local port, remote address, remote port and delete
     $w{hbox} = Gtk3::HBox->new(0, 0);
 
-    $w{frPFLocalIP} = Gtk3::Frame->new('Remote Address:');
+    $w{frPFLocalIP} = Gtk3::Frame->new('Remote Address ');
     $w{hbox}->pack_start($w{frPFLocalIP}, 1, 1, 0);
     $w{frPFLocalIP}->set_shadow_type('GTK_SHADOW_NONE');
 
-    $w{entryPFLocalIP} = Gtk3::Entry->new;
+    $w{entryPFLocalIP} = Gtk3::Entry->new();
     $w{frPFLocalIP}->add($w{entryPFLocalIP});
     $w{entryPFLocalIP}->set_size_request(30, 20);
     $w{entryPFLocalIP}->set_text($localIP);
 
-    $w{frPFLocalPort} = Gtk3::Frame->new('Port:');
+    $w{frPFLocalPort} = Gtk3::Frame->new('Port ');
     $w{hbox}->pack_start($w{frPFLocalPort}, 0, 1, 0);
     $w{frPFLocalPort}->set_shadow_type('GTK_SHADOW_NONE');
 
@@ -839,16 +871,16 @@ sub _buildRemote
     $w{spinPFLocalPort}->set_size_request(30, 20);
     $w{spinPFLocalPort}->set_value($localPort);
 
-    $w{frPFRemoteIP} = Gtk3::Frame->new('Local Address:');
+    $w{frPFRemoteIP} = Gtk3::Frame->new('Local Address ');
     $w{hbox}->pack_start($w{frPFRemoteIP}, 1, 1, 0);
     $w{frPFRemoteIP}->set_shadow_type('GTK_SHADOW_NONE');
 
-    $w{entryPFRemoteIP} = Gtk3::Entry->new;
+    $w{entryPFRemoteIP} = Gtk3::Entry->new();
     $w{frPFRemoteIP}->add($w{entryPFRemoteIP});
     $w{entryPFRemoteIP}->set_size_request(30, 20);
     $w{entryPFRemoteIP}->set_text($remoteIP);
 
-    $w{frPFRemotePort} = Gtk3::Frame->new('Port:');
+    $w{frPFRemotePort} = Gtk3::Frame->new('Port ');
     $w{hbox}->pack_start($w{frPFRemotePort}, 0, 1, 0);
     $w{frPFRemotePort}->set_shadow_type('GTK_SHADOW_NONE');
 
@@ -863,7 +895,7 @@ sub _buildRemote
 
     # Add built control to main container
     $$self{gui}{vbRemote}->pack_start($w{hbox}, 0, 1, 0);
-    $$self{gui}{vbRemote}->show_all;
+    $$self{gui}{vbRemote}->show_all();
 
     $$self{listRemote}[$w{position}] = \%w;
 
@@ -875,7 +907,8 @@ sub _buildRemote
         $$self{cfg} = $self->get_cfg();
         splice(@{$$self{listRemote}}, $w{position}, 1);
         $$self{cfg} = $self->get_cfg();
-        $self->update($$self{cfg});
+        $$self{cfg_array} = $self->get_cfg_array();
+        $self->update($$self{cfg}, $$self{cfg_array});
         return 1;
     });
 
@@ -940,17 +973,17 @@ sub _buildDynamic
     # Make an HBox to contain local address, local port, remote address, remote port and delete
     $w{hbox} = Gtk3::HBox->new(0, 0);
 
-    $w{frPFLocalIP} = Gtk3::Frame->new('Bind Address:');
+    $w{frPFLocalIP} = Gtk3::Frame->new('Bind Address ');
     $w{hbox}->pack_start($w{frPFLocalIP}, 1, 1, 0);
     $w{frPFLocalIP}->set_shadow_type('GTK_SHADOW_NONE');
 
-    $w{entryPFLocalIP} = Gtk3::Entry->new;
+    $w{entryPFLocalIP} = Gtk3::Entry->new();
     $w{frPFLocalIP}->add($w{entryPFLocalIP});
     $w{entryPFLocalIP}->set_size_request(30, 20);
     $w{entryPFLocalIP}->set_text($localIP);
     $w{entryPFLocalIP}->set_tooltip_text('Leave blank to bind to any interface');
 
-    $w{frPFLocalPort} = Gtk3::Frame->new('Local Port:');
+    $w{frPFLocalPort} = Gtk3::Frame->new('Local Port ');
     $w{hbox}->pack_start($w{frPFLocalPort}, 0, 1, 0);
     $w{frPFLocalPort}->set_shadow_type('GTK_SHADOW_NONE');
 
@@ -965,7 +998,7 @@ sub _buildDynamic
 
     # Add built control to main container
     $$self{gui}{vbDynamic}->pack_start($w{hbox}, 0, 1, 0);
-    $$self{gui}{vbDynamic}->show_all;
+    $$self{gui}{vbDynamic}->show_all();
 
     $$self{listDynamic}[$w{position}] = \%w;
 
@@ -977,7 +1010,8 @@ sub _buildDynamic
         $$self{cfg} = $self->get_cfg();
         splice(@{$$self{listDynamic}}, $w{position}, 1);
         $$self{cfg} = $self->get_cfg();
-        $self->update($$self{cfg});
+        $$self{cfg_array} = $self->get_cfg_array();
+        $self->update($$self{cfg}, $$self{cfg_array});
         return 1;
     });
 
@@ -1023,20 +1057,20 @@ sub _buildAdvOpt
     # Make an HBox to contain option, value and delete
     $w{hbox} = Gtk3::HBox->new(0, 0);
 
-    $w{frAdvOptOption} = Gtk3::Frame->new('Option:');
+    $w{frAdvOptOption} = Gtk3::Frame->new('Option ');
     $w{hbox}->pack_start($w{frAdvOptOption}, 1, 1, 0);
     $w{frAdvOptOption}->set_shadow_type('GTK_SHADOW_NONE');
 
-    $w{entryAdvOptOption} = Gtk3::Entry->new;
+    $w{entryAdvOptOption} = Gtk3::Entry->new();
     $w{frAdvOptOption}->add($w{entryAdvOptOption});
     $w{entryAdvOptOption}->set_size_request(30, 20);
     $w{entryAdvOptOption}->set_text($option);
 
-    $w{frAdvOptValue} = Gtk3::Frame->new('Value:');
+    $w{frAdvOptValue} = Gtk3::Frame->new('Value ');
     $w{hbox}->pack_start($w{frAdvOptValue}, 1, 1, 0);
     $w{frAdvOptValue}->set_shadow_type('GTK_SHADOW_NONE');
 
-    $w{entryAdvOptValue} = Gtk3::Entry->new;
+    $w{entryAdvOptValue} = Gtk3::Entry->new();
     $w{frAdvOptValue}->add($w{entryAdvOptValue});
     $w{entryAdvOptValue}->set_size_request(30, 20);
     $w{entryAdvOptValue}->set_text($value);
@@ -1047,7 +1081,7 @@ sub _buildAdvOpt
 
     # Add built control to main container
     $$self{gui}{vbAdvOpt}->pack_start($w{hbox}, 0, 1, 0);
-    $$self{gui}{vbAdvOpt}->show_all;
+    $$self{gui}{vbAdvOpt}->show_all();
     $$self{listAdvOpt}[$w{position}] = \%w;
 
     # Setup some callbacks
@@ -1056,7 +1090,8 @@ sub _buildAdvOpt
         $$self{cfg} = $self->get_cfg();
         splice(@{$$self{listAdvOpt}}, $w{position}, 1);
         $$self{cfg} = $self->get_cfg();
-        $self->update($$self{cfg});
+        $$self{cfg_array} = $self->get_cfg_array();
+        $self->update($$self{cfg}, $$self{cfg_array});
         return 1;
     });
 
diff --git a/lib/method/PACMethod_telnet.pm b/lib/method/PACMethod_telnet.pm
index d8c8df38..a4291813 100644
--- a/lib/method/PACMethod_telnet.pm
+++ b/lib/method/PACMethod_telnet.pm
@@ -3,7 +3,7 @@ package PACMethod_telnet;
 ###############################################################################
 # This file is part of Ásbrú Connection Manager
 #
-# Copyright (C) 2017-2020 Ásbrú Connection Manager team (https://asbru-cm.net)
+# Copyright (C) 2017-2022 Ásbrú Connection Manager team (https://asbru-cm.net)
 # Copyright (C) 2010-2016 David Torrejon Vaquerizas
 #
 # Ásbrú Connection Manager is free software: you can redistribute it and/or
@@ -57,6 +57,7 @@ sub new
     $self->{container} = shift;
 
     $self->{cfg} = undef;
+    $self->{cfg_array} = undef;
     $self->{gui} = undef;
     $self->{frame} = {};
 
@@ -70,8 +71,10 @@ sub update
 {
     my $self = shift;
     my $cfg = shift;
+    my $cfg_array = shift;
 
     defined $cfg and $$self{cfg} = $cfg;
+    defined $cfg_array and $$self{cfg_array} = $cfg_array;
 
     my $options = _parseCfgToOptions($$self{cfg});
 
@@ -82,6 +85,15 @@ sub update
     return 1;
 }
 
+sub get_cfg_array
+{
+    my $self = shift;
+
+    my %options_array;
+
+    return \%options_array;
+}
+
 sub get_cfg
 {
     my $self = shift;
diff --git a/lib/method/PACMethod_tigervnc.pm b/lib/method/PACMethod_tigervnc.pm
index f91fd8a9..ea62df3f 100644
--- a/lib/method/PACMethod_tigervnc.pm
+++ b/lib/method/PACMethod_tigervnc.pm
@@ -3,7 +3,7 @@ package PACMethod_tigervnc;
 ###############################################################################
 # This file is part of Ásbrú Connection Manager
 #
-# Copyright (C) 2017-2020 Ásbrú Connection Manager team (https://asbru-cm.net)
+# Copyright (C) 2017-2022 Ásbrú Connection Manager team (https://asbru-cm.net)
 # Copyright (C) 2010-2016 David Torrejon Vaquerizas
 #
 # Ásbrú Connection Manager is free software: you can redistribute it and/or
@@ -60,6 +60,7 @@ sub new {
     $self->{container} = shift;
 
     $self->{cfg} = undef;
+    $self->{cfg_array} = undef;
     $self->{gui} = undef;
     $self->{frame} = {};
 
@@ -72,8 +73,10 @@ sub new {
 sub update {
     my $self = shift;
     my $cfg = shift;
+    my $cfg_array = shift;
 
     defined $cfg and $$self{cfg} = $cfg;
+    defined $cfg_array and $$self{cfg_array} = $cfg_array;
 
     my $options = _parseCfgToOptions($$self{cfg});
 
@@ -83,10 +86,20 @@ sub update {
     $$self{gui}{spQuality}->set_value($$options{quality});
     $$self{gui}{spCompressLevel}->set_value($$options{compressLevel});
     $$self{gui}{cbColours}->set_active($REVCOLOURS{$$options{colours}});
+    $$self{gui}{chShowDotNoCursor}->set_active($$options{showDotCursor});
 
     return 1;
 }
 
+sub get_cfg_array
+{
+    my $self = shift;
+
+    my %options_array;
+
+    return \%options_array;
+}
+
 sub get_cfg {
     my $self = shift;
 
@@ -98,6 +111,7 @@ sub get_cfg {
     $options{quality} = $$self{gui}{spQuality}->get_value;
     $options{compressLevel} = $$self{gui}{spCompressLevel}->get_value;
     $options{colours} = $$self{gui}{cbColours}->get_active_text;
+    $options{showDotCursor} = $$self{gui}{chShowDotNoCursor}->get_active;
 
     return _parseOptionsToCfg(\%options);
 }
@@ -131,6 +145,7 @@ sub _parseCfgToOptions {
         $opt =~ /^ViewOnly=(\d+)$/go        and    $hash{viewOnly} = $1;
         $opt =~ /^CompressLevel=(\d+)$/go    and    $hash{compressLevel} = $1;
         $opt =~ /^QualityLevel=(\d+)$/go    and    $hash{quality} = $1;
+        $opt =~ /^DotWhenNoCursor=(\d+)$/go        and    $hash{showDotCursor} = $1;
     }
 
     return \%hash;
@@ -148,6 +163,7 @@ sub _parseOptionsToCfg {
     $txt .= ' -ViewOnly='        . ($$hash{viewOnly}    || '0');
     $txt .= ' -CompressLevel='    . $$hash{compressLevel};
     $txt .= ' -QualityLevel='    . $$hash{quality};
+    $txt .= ' -DotWhenNoCursor=' . ($$hash{showDotCursor}    || '0');
 
     return $txt;
 }
@@ -214,6 +230,10 @@ sub _buildGUI {
     $w{hbox2}->pack_start($w{chViewOnly}, 0, 1, 0);
     $w{chViewOnly}->set_tooltip_text('[-ViewOnly] : View only mode');
 
+    $w{chShowDotNoCursor} = Gtk3::CheckButton->new_with_label('Show dot as cursor');
+    $w{hbox2}->pack_start($w{chShowDotNoCursor}, 0, 1, 0);
+    $w{chShowDotNoCursor}->set_tooltip_text('[-DotWhenNoCursor] : Show the dot cursor when the server sends an invisible cursor');
+
     $$self{gui} = \%w;
 
     return 1;
diff --git a/lib/method/PACMethod_vncviewer.pm b/lib/method/PACMethod_vncviewer.pm
index 482fc6be..443857d6 100644
--- a/lib/method/PACMethod_vncviewer.pm
+++ b/lib/method/PACMethod_vncviewer.pm
@@ -3,7 +3,7 @@ package PACMethod_vncviewer;
 ###############################################################################
 # This file is part of Ásbrú Connection Manager
 #
-# Copyright (C) 2017-2020 Ásbrú Connection Manager team (https://asbru-cm.net)
+# Copyright (C) 2017-2022 Ásbrú Connection Manager team (https://asbru-cm.net)
 # Copyright (C) 2010-2016 David Torrejon Vaquerizas
 #
 # Ásbrú Connection Manager is free software: you can redistribute it and/or
@@ -60,6 +60,7 @@ sub new {
     $self->{container} = shift;
 
     $self->{cfg} = undef;
+    $self->{cfg_array} = undef;
     $self->{gui} = undef;
     $self->{frame} = {};
 
@@ -72,9 +73,10 @@ sub new {
 sub update {
     my $self = shift;
     my $cfg = shift;
-    my $method = shift;
+    my $cfg_array = shift;
 
     defined $cfg and $$self{cfg} = $cfg;
+    defined $cfg_array and $$self{cfg_array} = $cfg_array;
 
     my $options = _parseCfgToOptions($$self{cfg});
 
@@ -89,6 +91,15 @@ sub update {
     return 1;
 }
 
+sub get_cfg_array
+{
+    my $self = shift;
+
+    my %options_array;
+
+    return \%options_array;
+}
+
 sub get_cfg {
     my $self = shift;
 
diff --git a/lib/method/PACMethod_xfreerdp.pm b/lib/method/PACMethod_xfreerdp.pm
index 8b3633dc..45516a12 100644
--- a/lib/method/PACMethod_xfreerdp.pm
+++ b/lib/method/PACMethod_xfreerdp.pm
@@ -3,7 +3,7 @@ package PACMethod_xfreerdp;
 ###############################################################################
 # This file is part of Ásbrú Connection Manager
 #
-# Copyright (C) 2017-2020 Ásbrú Connection Manager team (https://asbru-cm.net)
+# Copyright (C) 2017-2022 Ásbrú Connection Manager team (https://asbru-cm.net)
 # Copyright (C) 2010-2016 David Torrejon Vaquerizas
 #
 # Ásbrú Connection Manager is free software: you can redistribute it and/or
@@ -57,6 +57,7 @@ sub new {
     $self->{container} = shift;
 
     $self->{cfg} = undef;
+    $self->{cfg_array} = undef;
     $self->{gui} = undef;
     $self->{frame} = {};
 
@@ -69,9 +70,10 @@ sub new {
 sub update {
     my $self = shift;
     my $cfg = shift;
-    my $method = shift;
+    my $cfg_array = shift;
 
     defined $cfg and $$self{cfg} = $cfg;
+    defined $cfg_array and $$self{cfg_array} = $cfg_array;
 
     my $options = _parseCfgToOptions($$self{cfg});
 
@@ -100,6 +102,7 @@ sub update {
     $$self{gui}{chNoRDP}->set_active($$options{noRDP} // 0);
     $$self{gui}{chNoTLS}->set_active($$options{noTLS} // 0);
     $$self{gui}{chNoNLA}->set_active($$options{noNLA} // 0);
+    $$self{gui}{cbTlsSecLevel}->set_active($$options{tlsSecLevel} // 0);
     $$self{gui}{chFontSmooth}->set_active($$options{fontSmooth} // 0);
     $$self{gui}{chNoGrabKbd}->set_active($$options{noGrabKbd} // 0);
     $$self{gui}{entryStartupShell}->set_text($$options{startupshell} // '');
@@ -117,6 +120,15 @@ sub update {
     return 1;
 }
 
+sub get_cfg_array
+{
+    my $self = shift;
+
+    my %options_array;
+
+    return \%options_array;
+}
+
 sub get_cfg {
     my $self = shift;
 
@@ -145,6 +157,7 @@ sub get_cfg {
     $options{noRDP} = $$self{gui}{chNoRDP}->get_active;
     $options{noTLS} = $$self{gui}{chNoTLS}->get_active;
     $options{noNLA} = $$self{gui}{chNoNLA}->get_active;
+    $options{tlsSecLevel} = $$self{gui}{cbTlsSecLevel}->get_active();
     $options{fontSmooth} = $$self{gui}{chFontSmooth}->get_active;
     $options{noGrabKbd} = $$self{gui}{chNoGrabKbd}->get_active;
     $options{startupshell} = $$self{gui}{entryStartupShell}->get_chars(0, -1);
@@ -197,8 +210,9 @@ sub _parseCfgToOptions {
     $hash{noRDP} = 0;
     $hash{noTLS} = 0;
     $hash{noNLA} = 0;
+    $hash{tlsSecLevel} = 0;
     $hash{fontSmooth} = 0;
-        $hash{noGrabKbd} = 0;
+    $hash{noGrabKbd} = 0;
     $hash{startupshell} = '';
     $hash{otherOptions} = '';
 
@@ -227,6 +241,7 @@ sub _parseCfgToOptions {
         elsif ($opt eq '-sec-rdp')    {$hash{noRDP} = 1;}
         elsif ($opt eq '-sec-tls')    {$hash{noTLS} = 1;}
         elsif ($opt eq '-sec-nla')    {$hash{noNLA} = 1;}
+        elsif ($opt =~ /^\/tls-seclevel:([0-5])$/go) {$hash{tlsSecLevel} = $1;}
         elsif ($opt eq '+fonts')    {$hash{fontSmooth} = 1;}
         elsif ($opt eq '-grab-keyboard')    {$hash{noGrabKbd} = 1;}
         elsif ($opt =~ /^\/drive:(.+),(.+)$/g)
@@ -263,7 +278,7 @@ sub _parseOptionsToCfg {
     $txt .= ' /shell:' . $$hash{startupshell} if $$hash{startupshell} ne '';
     $txt .= ' /d:' . $$hash{domain} if $$hash{domain} ne '';
     $txt .= ' +clipboard' if $$hash{redirClipboard};
-        $txt .= ' /sound:sys:alsa' if $$hash{redirSound};
+    $txt .= ' /sound:sys:alsa' if $$hash{redirSound};
     $txt .= ' /cert-ignore' if $$hash{ignoreCert};
     $txt .= ' -authentication' if $$hash{noAuth};
     $txt .= ' -fast-path' if $$hash{nofastPath};
@@ -273,6 +288,7 @@ sub _parseOptionsToCfg {
     $txt .= ' -sec-rdp' if $$hash{noRDP};
     $txt .= ' -sec-tls' if $$hash{noTLS};
     $txt .= ' -sec-nla' if $$hash{noNLA};
+    $txt .= ' /tls-seclevel:' . $$hash{tlsSecLevel} if $$hash{tlsSecLevel}>0;
     $txt .= ' +fonts' if $$hash{fontSmooth};
     $txt .= ' -grab-keyboard' if $$hash{noGrabKbd};
 
@@ -308,7 +324,9 @@ sub _buildGUI {
 
                 $w{cbBPP} = Gtk3::ComboBoxText->new;
                 $w{frBPP}->add($w{cbBPP});
-                foreach my $bpp (8, 15, 16, 24, 32) {$w{cbBPP}->append_text($bpp);};
+                foreach my $bpp (8, 15, 16, 24, 32) {
+                    $w{cbBPP}->append_text($bpp);
+                };
 
             $w{chAttachToConsole} = Gtk3::CheckButton->new_with_label('Attach to console');
             $w{hbox1}->pack_start($w{chAttachToConsole}, 0, 1, 0);
@@ -368,6 +386,17 @@ sub _buildGUI {
             $w{hbox4}->pack_start($w{chNoNLA}, 0, 1, 0);
             $w{chNoNLA}->set_tooltip_text("-sec-nla: disable network level authentication");
 
+            $w{frTlsSecLevel} = Gtk3::Frame->new('TLS Security Level:');
+            $w{hbox4}->pack_start($w{frTlsSecLevel}, 0, 1, 0);
+            $w{frTlsSecLevel}->set_shadow_type('GTK_SHADOW_NONE');
+            $w{frTlsSecLevel}->set_tooltip_text('[/tls-seclevel:] : set the TLS security level (0, 1, 2, 3, 4 or 5)');
+
+                $w{cbTlsSecLevel} = Gtk3::ComboBoxText->new;
+                $w{frTlsSecLevel}->add($w{cbTlsSecLevel});
+                foreach my $seclvl (0, 1, 2, 3, 4, 5) {
+                    $w{cbTlsSecLevel}->append_text($seclvl);
+                };
+
         $w{hboxss} = Gtk3::HBox->new(0, 5);
         $w{vbox}->pack_start($w{hboxss}, 0, 1, 5);
 
@@ -496,7 +525,8 @@ sub _buildGUI {
         my $opt_hash = _parseCfgToOptions($$self{cfg});
         push(@{$$opt_hash{redirDisk}}, {'redirDiskShare' => $ENV{'USER'}, 'redirDiskPath' => $ENV{'HOME'}});
         $$self{cfg} = _parseOptionsToCfg($opt_hash);
-        $self->update($$self{cfg});
+        $$self{cfg_array} = $self->get_cfg_array();
+        $self->update($$self{cfg}, $$self{cfg_array});
         return 1;
     });
 
@@ -548,7 +578,8 @@ sub _buildRedir {
         $$self{cfg} = $self->get_cfg();
         splice(@{$$self{listRedir}}, $w{position}, 1);
         $$self{cfg} = $self->get_cfg();
-        $self->update($$self{cfg});
+        $$self{cfg_array} = $self->get_cfg_array();
+        $self->update($$self{cfg}, $$self{cfg_array});
         return 1;
     });
 
diff --git a/mkdocs.yml b/mkdocs.yml
new file mode 100644
index 00000000..490c3e3c
--- /dev/null
+++ b/mkdocs.yml
@@ -0,0 +1,74 @@
+site_name: Ásbrú Connection Manager - Docs
+docs_dir: doc
+site_dir: out
+site_url: https://docs.asbru-cm.net
+site_author: Ásbrú Connection Manager
+site_description: Ásbrú Connection Manager user and developer documentation
+repo_url: https://github.com/asbru-cm/asbru-cm
+edit_uri: edit/master/doc
+repo_name: GitHub
+theme:
+    name: material
+    palette:
+        primary: deep purple
+        accent: pink
+extra_css:
+    - stylesheets/custom.css
+nav:
+  - Home: 'index.md'
+  - 1. General:
+      - News: General/News.md
+      - Installation: General/Installation.md
+      - Upgrade: General/Upgrade.md
+      - Changelog: General/Changelog.md
+      - Warning:   General/sensitive-info-notice.md
+  - 2. User's Manual:
+      - Quick Start: Manual/QuickStart.md
+      - Preferences:
+        - General: Manual/Preferences/Preferences.md
+        - Main Options:
+          - Behaviour: Manual/Preferences/MainOptions.md
+          - Look&Feel: Manual/Preferences/LookAndFeel.md
+          - Advanced: Manual/Preferences/MOAdvanced.md
+        - Terminal Options:
+          - Behaviour: Manual/Preferences/TermOptions.md
+          - Look&Feel: Manual/Preferences/TermLookAndFeel.md
+          - Advanced: Manual/Preferences/TermAdvanced.md
+        - Shell Options: Manual/Preferences/ShellOptions.md
+        - Networking: Manual/Preferences/Networking.md
+        - Global Variables: Manual/Preferences/GlobalVariables.md
+        - Local Commands: Manual/Preferences/LocalCommands.md
+        - Remote Commands: Manual/Preferences/RemoteCommands.md
+        - KeePass: Manual/Preferences/KeePassXC.md
+        - KeyBindings: Manual/Preferences/KeyBindings.md
+        - Systemtray Extensions: Manual/Preferences/SytemTrayExtensions.md
+      - Command Line: Manual/CommandLine.md
+      - Connections:
+        - Configure: Manual/Connections/SSH.md
+        - Methods:
+            - SSH: Manual/Connections/SSH_Terminal.md
+            - RDP: Manual/Connections/RDP.md
+      - References:
+        - Substitution: Manual/Substitutions.md
+  - 3. Contributed Articles:
+      - Clusters: Managing/Clusters.md
+      - Templates: Managing/Templates.md
+      - Expect: Managing/Expect.md
+      - Jump Server: Managing/JumpServer.md
+      - Incognito Browser: Managing/IncognitoBrowser.md
+      - Redistributing: General/Redistribution.md
+      - AppImage Packaging: General/AppImagePackaging.md
+  - 4. Contributing:
+      - Contributing: Contributing/index.md
+      - Coding standards: Contributing/CODING_STANDARD.md
+      - Code of conduct: Contributing/CODE_OF_CONDUCT.md
+      - Financially: Contributing/Financial_Contribution.md
+
+markdown_extensions:
+    - admonition
+    - attr_list
+    - toc:
+        permalink: true
+        toc_depth: 6
+    - codehilite:
+        guess_lang: false
diff --git a/res/asbru-scripts-manager.svg b/res/asbru-scripts-manager.svg
deleted file mode 100644
index bc32b384..00000000
--- a/res/asbru-scripts-manager.svg
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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="50"
-   height="50"
-   id="svg6078"
-   version="1.1"
-   inkscape:version="0.92.3 (2405546, 2018-03-11)"
-   sodipodi:docname="asbru-scripts-manager.svg">
-  <defs
-     id="defs6080">
-    <radialGradient
-       gradientTransform="matrix(0.11132546,0,0,0.11147819,369.97746,527.37073)"
-       id="radialGradient3763"
-       gradientUnits="userSpaceOnUse"
-       cy="40"
-       cx="30"
-       r="86.098999"
-       inkscape:collect="always">
-      <stop
-         id="stop3759"
-         style="stop-color:#a5d48f;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3761"
-         style="stop-color:#008e00;stop-opacity:1"
-         offset="1" />
-    </radialGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.2"
-     inkscape:cx="5.005758"
-     inkscape:cy="25.383797"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="1938"
-     inkscape:window-height="1204"
-     inkscape:window-x="0"
-     inkscape:window-y="28"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata6083">
-    <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 />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-354.27996,-507.74598)">
-    <g
-       transform="matrix(0.07478351,0,0,0.07478351,354.21698,505.70464)"
-       id="g5241"
-       style="stroke-width:26.74386406;stroke-miterlimit:4;stroke-dasharray:none" />
-    <path
-       sodipodi:nodetypes="cssc"
-       inkscape:connector-curvature="0"
-       id="path5245"
-       d="m 370.95527,516.91674 c 0,0 -9.55901,19.57945 -10.23642,27.72225 -0.67741,8.14279 1.12901,7.84398 1.88169,8.66572 0.75268,0.82176 25.02743,1.79865 25.02743,1.79865"
-       style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       sodipodi:nodetypes="cssc"
-       inkscape:connector-curvature="0"
-       id="path5247"
-       d="m 389.39908,555.38394 c 0,0 5.587,0.37331 6.1457,-5.45035 0.44911,-4.68136 -4.05057,-4.55441 -5.44733,-4.55441 -1.39675,0 -5.37749,-0.11199 -5.37749,-0.11199"
-       style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       sodipodi:nodetypes="ccssc"
-       inkscape:connector-curvature="0"
-       id="path5249"
-       d="m 390.19174,518.45647 -21.77349,-1.5426 c 0,0 -3.50292,-0.38503 -3.40827,-3.2346 0.0947,-2.84956 4.20851,-3.3299 4.52402,-3.36121 0.31549,-0.0313 22.15959,0.95839 22.15959,0.95839"
-       style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       sodipodi:nodetypes="csssscc"
-       inkscape:connector-curvature="0"
-       id="path5251"
-       d="m 391.42638,545.41284 c 0,0 -1.72855,0.0595 -2.75758,0.584 -1.11675,0.56919 -2.19481,1.62382 -1.83501,3.54714 0.69136,3.6956 2.46913,3.14126 3.45679,2.95648 0.98765,-0.18478 1.77778,-1.42544 1.67901,-1.8214 -0.0988,-0.39596 -0.0988,-0.39596 -0.0988,-0.39596 l -4.93826,-0.29037"
-       style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <g
-       style="stroke-width:26.74386406;stroke-miterlimit:4;stroke-dasharray:none"
-       id="g5255"
-       transform="matrix(0.07478351,0,0,0.07478351,359.87985,468.76028)" />
-    <path
-       id="path5259"
-       style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 391.80834,511.25288 c 1.39675,0 5.89644,-0.12695 5.44733,4.55441 -0.18883,1.96831 -0.95206,3.22871 -1.92137,4.09229 -1.88847,1.91458 -5.569,9.2221 -7.44085,14.23417 -1.06052,2.83969 -6.14606,16.38693 -3.62755,19.05304 2.51851,2.66611 6.07406,2.13816 6.07406,2.13816"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cscasc" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 393.13727,511.28653 c 0,0 -1.72856,0.0595 -2.75759,0.58401 -1.11674,0.56919 -2.19481,1.62382 -1.835,3.54714 0.69136,3.6956 1.93841,3.0459 3.45679,2.95648 0.82765,-0.0487 1.41037,-1.04289 1.679,-1.82141 0.13174,-0.38175 -0.0988,-1.20662 -0.0988,-1.20662 l -4.93826,-0.29037"
-       id="path5261"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cssaacc" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path2987"
-       style="fill:url(#radialGradient3763);stroke:#000000;stroke-width:0.10474527;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 385.56305,534.0594 c 0,3.47556 -12.02315,10.42655 -15.02895,8.68861 -3.00579,-1.73795 -3.00579,-15.63927 0,-17.37722 3.0058,-1.73805 15.02895,5.21305 15.02895,8.68861 z" />
-    <path
-       style="opacity:1;fill:#fff6d5;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.00892857;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 24.264687,9.3603514 C 18.862901,8.9761942 14.207698,8.6169513 13.919791,8.5620338 13.261676,8.4365 12.539804,8.1200939 12.093807,7.7616809 11.604378,7.3683653 11.349561,6.8668993 11.295237,6.1901435 c -0.03939,-0.490748 -0.01283,-0.634734 0.195694,-1.0609496 0.405817,-0.8294591 1.366885,-1.4467828 2.863041,-1.8390199 0.813927,-0.2133814 0.205211,-0.2233087 8.616072,0.1405151 2.725446,0.1178931 6.54241,0.2805925 8.482143,0.3615543 1.939732,0.080962 3.576744,0.1615037 3.637804,0.1789821 0.06237,0.017853 -0.0847,0.2148471 -0.3356,0.4495388 -0.991586,0.927513 -1.29455,2.2507086 -0.897181,3.9184406 0.105278,0.4418475 0.288029,1.0143921 0.406113,1.2723214 l 0.214698,0.4689627 -0.195952,-0.01084 c -0.107775,-0.006 -4.615597,-0.3251454 -10.017382,-0.7093026 z"
-       id="path840"
-       inkscape:connector-curvature="0"
-       transform="translate(354.27996,507.74598)" />
-    <path
-       style="opacity:1;fill:#fff6d5;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.00892857;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 35.771117,9.9608086 C 35.479071,9.7150678 35.165841,9.0833828 34.969185,8.3435693 c -0.06466,-0.2432521 -0.109,-0.4480389 -0.09853,-0.4550817 0.01047,-0.00704 0.802515,0.038553 1.760104,0.1013234 0.957589,0.062771 1.851562,0.1168878 1.986607,0.1202603 0.223638,0.00558 0.245536,0.036345 0.245536,0.3449028 0,0.2242498 -0.0981,0.5009825 -0.290179,0.8186162 -0.435013,0.7193459 -0.59244,0.8028657 -1.632795,0.8662477 -0.868054,0.05288 -0.898792,0.04818 -1.16881,-0.1790294 z"
-       id="path842"
-       inkscape:connector-curvature="0"
-       transform="translate(354.27996,507.74598)" />
-    <path
-       style="opacity:1;fill:#fff6d5;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.00892857;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 28.059329,46.589174 c -0.76116,-0.03965 -2.589285,-0.135063 -4.0625,-0.212022 C 15.138537,45.914407 9.4196452,45.442383 8.7266671,45.116789 8.2166845,44.877174 7.5579683,44.216371 7.3521373,43.737903 6.9001662,42.687268 6.7433965,40.79858 6.8966271,38.250132 6.9527278,37.317096 7.0774043,36.091649 7.173686,35.526917 7.8619902,31.489727 10.361445,24.475915 14.160309,15.9215 c 0.951221,-2.141992 2.695093,-5.916845 2.76631,-5.9880624 0.02722,-0.027215 7.217319,0.4701584 15.82021,1.0943584 3.607099,0.26172 4.949506,0.253944 5.59463,-0.03241 C 39.169274,10.627944 39.952515,9.3641355 39.94442,8.4089096 39.94202,8.1251514 39.88688,7.7121821 39.821905,7.4912 L 39.703763,7.0894173 37.787796,6.9783154 C 36.734014,6.9172094 35.616056,6.8432002 35.303445,6.8138505 L 34.73506,6.7604875 34.78701,6.4403318 c 0.128754,-0.7934113 0.991928,-1.6580413 1.977674,-1.9810073 1.628971,-0.5337103 3.130856,-0.4338087 4.333894,0.28828 0.933382,0.5602355 1.336932,1.3882316 1.334198,2.7374825 -0.0034,1.6812229 -0.505125,2.931313 -1.704589,4.247187 -2.152523,2.36143 -5.492624,8.783268 -7.848178,15.089286 -1.917005,5.131982 -3.313058,9.898051 -3.896818,13.303572 -0.216078,1.260549 -0.223013,3.8305 -0.01217,4.51068 0.204285,0.659028 0.588433,1.218903 1.149467,1.675284 l 0.462881,0.376536 -0.570057,-0.01318 c -0.31353,-0.0072 -1.192823,-0.04562 -1.953984,-0.08528 z M 19.443258,35.080282 c 4.662545,-1.255549 10.751486,-5.4016 11.770917,-8.014993 0.297581,-0.762874 0.167858,-1.406391 -0.478234,-2.37238 -1.742648,-2.605475 -7.33216,-6.114722 -11.426612,-7.173937 -1.180927,-0.305501 -2.3857,-0.320823 -2.970392,-0.03778 -1.495042,0.723738 -2.39102,4.040548 -2.390483,8.849297 5.54e-4,4.963335 0.958953,8.294173 2.558686,8.892507 0.485404,0.181551 2.006504,0.107616 2.936118,-0.142714 z"
-       id="path844"
-       inkscape:connector-curvature="0"
-       transform="translate(354.27996,507.74598)" />
-    <path
-       style="opacity:1;fill:#fff6d5;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.00892857;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 33.550401,46.857214 c -1.082674,-0.264695 -2.104955,-0.809655 -2.818834,-1.50267 -0.707632,-0.686951 -0.791093,-0.900765 -0.860697,-2.204988 -0.05542,-1.038431 0.05459,-2.145168 0.387901,-3.902366 0.221152,-1.165909 0.244881,-1.232238 0.423666,-1.184255 0.104166,0.02796 0.780305,0.05138 1.502532,0.05205 l 1.313139,0.0012 -0.430783,0.402947 c -0.428867,0.401155 -0.912231,1.193596 -1.028364,1.685932 -0.192932,0.817916 0.04078,2.39541 0.513117,3.463456 0.26613,0.601767 0.850392,1.263225 1.351452,1.530012 0.288672,0.153702 0.513474,0.192152 1.120085,0.191577 1.156622,-0.0011 1.691798,-0.198921 2.36601,-0.874579 0.723611,-0.725163 0.923369,-1.217084 0.777203,-1.913933 -0.05691,-0.271307 -0.124966,-0.514784 -0.151242,-0.54106 -0.02627,-0.02628 -1.142138,-0.110888 -2.479694,-0.188027 l -2.43192,-0.140254 -0.02669,-0.615174 c -0.06415,-1.47881 1.009796,-2.450746 3.084218,-2.79126 0.853995,-0.140182 0.95773,-0.139995 1.685689,0.003 1.919183,0.377087 2.790177,1.29009 2.874001,3.012615 0.07902,1.623763 -0.507636,3.289415 -1.504108,4.270536 -0.596061,0.586878 -1.525933,1.086515 -2.407758,1.293732 -0.824159,0.193666 -2.361915,0.17076 -3.258928,-0.04855 z"
-       id="path846"
-       inkscape:connector-curvature="0"
-       transform="translate(354.27996,507.74598)" />
-    <path
-       style="opacity:1;fill:#fff6d5;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.00892857;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 33.595044,46.817004 c -1.279042,-0.273916 -2.96424,-1.366017 -3.418533,-2.215396 -0.18377,-0.34359 -0.197353,-0.484468 -0.194874,-2.021119 0.0026,-1.605139 0.149278,-2.827571 0.495527,-4.129465 l 0.08905,-0.334821 0.509952,4.62e-4 c 0.280473,2.54e-4 0.895594,0.026 1.366935,0.05722 l 0.856983,0.05676 -0.3929,0.410052 c -0.216095,0.22553 -0.52138,0.671198 -0.678412,0.990375 -0.265706,0.540066 -0.284467,0.639266 -0.270444,1.43005 0.01667,0.939983 0.238489,1.931385 0.605912,2.708054 0.28951,0.611973 1.019323,1.347349 1.531145,1.542816 0.545648,0.208385 1.776534,0.137822 2.418504,-0.138644 0.529372,-0.227976 1.387991,-1.068618 1.593264,-1.559906 0.216439,-0.51801 0.143261,-1.420415 -0.126581,-1.560956 -0.07945,-0.04138 -0.887758,-0.120932 -1.796241,-0.176783 -0.908482,-0.05585 -1.967966,-0.12562 -2.354409,-0.155044 l -0.702623,-0.0535 0.03937,-0.750092 c 0.03421,-0.651711 0.07396,-0.799308 0.303109,-1.125345 0.647476,-0.921247 1.853369,-1.428945 3.42884,-1.44359 1.998027,-0.01857 3.350114,0.800644 3.668337,2.222611 0.06368,0.28456 0.08839,0.841794 0.06197,1.397732 -0.117707,2.476963 -1.491576,4.277847 -3.702921,4.853829 -0.648067,0.1688 -2.532001,0.165803 -3.330955,-0.0053 z"
-       id="path848"
-       inkscape:connector-curvature="0"
-       transform="translate(354.27996,507.74598)" />
-  </g>
-</svg>
diff --git a/res/asbru.css b/res/asbru.css
deleted file mode 100644
index 16b054a8..00000000
--- a/res/asbru.css
+++ /dev/null
@@ -1,13 +0,0 @@
-.dnd-icon {
-  border: 1px solid #000000;
-}
-
-.banner-fill {
-  background-image: linear-gradient(to right, #007aff, #2fedde);
-  padding: 0.25em 0;
-}
-.banner-text {
-  color: #EEE;
-  text-shadow: 0px 0px 8px rgba(17, 17, 17, 0.75);
-  font-size: 2.5em;
-}
diff --git a/res/asbru.glade b/res/asbru.glade
index 0ad2414d..97d17802 100644
--- a/res/asbru.glade
+++ b/res/asbru.glade
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 
+<!-- Generated with glade 3.22.2 
 
 This file is part of Ásbrú Connection Manager.
 
-Copyright (C) 2017-2019 Ásbrú Connection Manager team (https://asbru-cm.net)
+Copyright (C) 2017-2021 Ásbrú Connection Manager team (https://asbru-cm.net)
 Copyright (C) 2010-2016 David Torrejon Vaquerizas
 
 Ásbrú Connection Manager is free software: you can redistribute it and/or
@@ -26,7 +26,7 @@ If not, see <http://www.gnu.org/licenses/>.
   <!-- interface-license-type gplv3 -->
   <!-- interface-name \303\201sbr\303\272 Connection Manager -->
   <!-- interface-description \303\201sbr\303\272 Connection Manager is a user interface that helps organizing remote terminal sessions and automating repetitive tasks. https://www.asbru-cm.net/ -->
-  <!-- interface-copyright 2017 \303\201sbr\303\272 Connection Manager team (https://asbru-cm.net), 2010-2016 David Torrejon Vaquerizas -->
+  <!-- interface-copyright 2017-2021 \303\201sbr\303\272 Connection Manager team (https://asbru-cm.net), 2010-2016 David Torrejon Vaquerizas -->
   <!-- interface-authors \303\201sbr\303\272 Connection Manager team (https://asbru-cm.net), 2010-2016 David Torrejon Vaquerizas -->
   <object class="GtkAdjustment" id="adjConnPort">
     <property name="lower">1</property>
@@ -75,7 +75,7 @@ If not, see <http://www.gnu.org/licenses/>.
     <property name="modal">True</property>
     <property name="window_position">center</property>
     <property name="destroy_with_parent">True</property>
-    <child>
+    <child type="titlebar">
       <placeholder/>
     </child>
     <child>
@@ -157,16 +157,76 @@ If not, see <http://www.gnu.org/licenses/>.
                             <property name="margin_bottom">5</property>
                             <property name="orientation">vertical</property>
                             <child>
-                              <object class="GtkFrame" id="frameConnection">
+                              <object class="GtkBox" id="vboxConnectionHost">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="border_width">2</property>
-                                <property name="label_xalign">0</property>
+                                <property name="orientation">vertical</property>
+                                <child>
+                                  <object class="GtkBox">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <child>
+                                      <object class="GtkLabel" id="label91">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="label" translatable="yes">&lt;b&gt; Host&lt;/b&gt;</property>
+                                        <property name="use_markup">True</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLinkButton" id="linkHelpConn1">
+                                        <property name="label" translatable="yes">Help</property>
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="focus_on_click">False</property>
+                                        <property name="receives_default">True</property>
+                                        <property name="tooltip_text" translatable="yes">Open Online Help</property>
+                                        <property name="relief">none</property>
+                                        <property name="always_show_image">True</property>
+                                        <property name="uri">https://docs.asbru-cm.net/Manual/Connections/SSH/</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="pack_type">end</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkButton" id="btnCheckKPX">
+                                        <property name="label" translatable="yes">KeePass</property>
+                                        <property name="use_action_appearance">False</property>
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="receives_default">True</property>
+                                        <property name="tooltip_markup" translatable="yes">Search KeePass database</property>
+                                        <property name="halign">end</property>
+                                        <property name="always_show_image">True</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="padding">12</property>
+                                        <property name="pack_type">end</property>
+                                        <property name="position">2</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
                                 <child>
                                   <object class="GtkAlignment" id="alignConnection">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="left_padding">12</property>
                                     <child>
                                       <object class="GtkBox" id="vbox21">
                                         <property name="visible">True</property>
@@ -177,6 +237,7 @@ If not, see <http://www.gnu.org/licenses/>.
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
                                             <property name="spacing">5</property>
+                                            <property name="baseline_position">top</property>
                                             <child>
                                               <object class="GtkBox" id="vbox22">
                                                 <property name="visible">True</property>
@@ -203,6 +264,7 @@ If not, see <http://www.gnu.org/licenses/>.
                                                       <object class="GtkComboBoxText" id="comboMethod">
                                                         <property name="visible">True</property>
                                                         <property name="can_focus">False</property>
+                                                        <property name="valign">start</property>
                                                       </object>
                                                       <packing>
                                                         <property name="expand">True</property>
@@ -244,11 +306,12 @@ If not, see <http://www.gnu.org/licenses/>.
                                                         <property name="tooltip_text" translatable="yes">If checked, 'sudo' command will be prepended to the connection method, along with the "-p &lt;selected_prompt&gt;" command line option configured in "Preferences -&gt; Main Options -&gt; Advanced", and the also selected password will be used when that prompt is found</property>
                                                         <child>
                                                           <object class="GtkCheckButton" id="cbEditUseSudo">
+                                                            <property name="label" translatable="yes"> </property>
                                                             <property name="use_action_appearance">False</property>
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">True</property>
                                                             <property name="receives_default">False</property>
-                                                            <property name="xalign">0.5</property>
+                                                            <property name="xalign">0</property>
                                                             <property name="draw_indicator">True</property>
                                                           </object>
                                                           <packing>
@@ -261,7 +324,7 @@ If not, see <http://www.gnu.org/licenses/>.
                                                           <object class="GtkLabel" id="label88">
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">False</property>
-                                                            <property name="label" translatable="yes"> Run with &lt;span foreground="red"&gt;'sudo'&lt;/span&gt;</property>
+                                                            <property name="label" translatable="yes">Run with &lt;span foreground="red"&gt;&lt;b&gt;sudo&lt;/b&gt;&lt;/span&gt;</property>
                                                             <property name="use_markup">True</property>
                                                             <property name="xalign">0</property>
                                                           </object>
@@ -279,15 +342,38 @@ If not, see <http://www.gnu.org/licenses/>.
                                                       </packing>
                                                     </child>
                                                     <child>
-                                                      <object class="GtkCheckButton" id="cbAutossh">
-                                                        <property name="label" translatable="yes">Use 'autossh'</property>
-                                                        <property name="use_action_appearance">False</property>
+                                                      <object class="GtkBox">
                                                         <property name="visible">True</property>
-                                                        <property name="can_focus">True</property>
-                                                        <property name="receives_default">False</property>
-                                                        <property name="border_width">2</property>
-                                                        <property name="xalign">0.5</property>
-                                                        <property name="draw_indicator">True</property>
+                                                        <property name="can_focus">False</property>
+                                                        <child>
+                                                          <object class="GtkCheckButton" id="cbAutossh">
+                                                            <property name="label" translatable="yes"> </property>
+                                                            <property name="use_action_appearance">False</property>
+                                                            <property name="visible">True</property>
+                                                            <property name="can_focus">True</property>
+                                                            <property name="receives_default">False</property>
+                                                            <property name="xalign">0</property>
+                                                            <property name="draw_indicator">True</property>
+                                                          </object>
+                                                          <packing>
+                                                            <property name="expand">False</property>
+                                                            <property name="fill">True</property>
+                                                            <property name="position">0</property>
+                                                          </packing>
+                                                        </child>
+                                                        <child>
+                                                          <object class="GtkLabel">
+                                                            <property name="visible">True</property>
+                                                            <property name="can_focus">False</property>
+                                                            <property name="label" translatable="yes">Use &lt;i&gt;autossh&lt;/i&gt;</property>
+                                                            <property name="use_markup">True</property>
+                                                          </object>
+                                                          <packing>
+                                                            <property name="expand">False</property>
+                                                            <property name="fill">True</property>
+                                                            <property name="position">1</property>
+                                                          </packing>
+                                                        </child>
                                                       </object>
                                                       <packing>
                                                         <property name="expand">False</property>
@@ -309,18 +395,6 @@ If not, see <http://www.gnu.org/licenses/>.
                                                 <property name="position">0</property>
                                               </packing>
                                             </child>
-                                            <child>
-                                              <object class="GtkSeparator" id="vseparator1">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
-                                                <property name="orientation">vertical</property>
-                                              </object>
-                                              <packing>
-                                                <property name="expand">False</property>
-                                                <property name="fill">True</property>
-                                                <property name="position">1</property>
-                                              </packing>
-                                            </child>
                                             <child>
                                               <object class="GtkBox" id="vbox31">
                                                 <property name="visible">True</property>
@@ -338,7 +412,7 @@ If not, see <http://www.gnu.org/licenses/>.
                                                           <object class="GtkLabel" id="labelIP">
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">False</property>
-                                                            <property name="label" translatable="yes">Host: </property>
+                                                            <property name="label" translatable="yes">Host </property>
                                                             <property name="use_markup">True</property>
                                                           </object>
                                                           <packing>
@@ -379,7 +453,7 @@ If not, see <http://www.gnu.org/licenses/>.
                                                           <object class="GtkLabel" id="labelPort">
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">False</property>
-                                                            <property name="label" translatable="yes"> Port: </property>
+                                                            <property name="label" translatable="yes"> Port </property>
                                                             <property name="use_markup">True</property>
                                                           </object>
                                                           <packing>
@@ -390,11 +464,13 @@ If not, see <http://www.gnu.org/licenses/>.
                                                         </child>
                                                         <child>
                                                           <object class="GtkSpinButton" id="entryPort">
-                                                            <property name="width_request">130</property>
+                                                            <property name="width_request">150</property>
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">True</property>
-                                                            <property name="has_tooltip">True</property>
-                                                            <property name="tooltip_text" translatable="yes">Port number to connect to</property>
+                                                            <property name="tooltip_text" translatable="yes">Port number to connect to.
+
+For some connection types that support it, port can be left empty or set to 0.  In that case, no port will be explicitely specified and the default port will be used.  This can be useful if you have your SSH details defined in your ~/.ssh/config, as an example.</property>
+                                                            <property name="valign">start</property>
                                                             <property name="invisible_char">•</property>
                                                             <property name="activates_default">True</property>
                                                             <property name="width_chars">6</property>
@@ -404,6 +480,7 @@ If not, see <http://www.gnu.org/licenses/>.
                                                             <property name="adjustment">adjConnPort</property>
                                                             <property name="snap_to_ticks">True</property>
                                                             <property name="numeric">True</property>
+                                                            <property name="value">22</property>
                                                           </object>
                                                           <packing>
                                                             <property name="expand">True</property>
@@ -421,8 +498,8 @@ If not, see <http://www.gnu.org/licenses/>.
                                                     </child>
                                                   </object>
                                                   <packing>
-                                                    <property name="expand">True</property>
-                                                    <property name="fill">True</property>
+                                                    <property name="expand">False</property>
+                                                    <property name="fill">False</property>
                                                     <property name="position">0</property>
                                                   </packing>
                                                 </child>
@@ -482,51 +559,50 @@ If not, see <http://www.gnu.org/licenses/>.
                                             <property name="position">0</property>
                                           </packing>
                                         </child>
-                                        <child>
-                                          <object class="GtkSeparator" id="hseparator2">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="fill">True</property>
-                                            <property name="padding">2</property>
-                                            <property name="position">1</property>
-                                          </packing>
-                                        </child>
                                         <child>
                                           <object class="GtkBox" id="hbox50">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
                                             <child>
-                                              <object class="GtkCheckButton" id="cbCfgStartupLaunch">
-                                                <property name="label" translatable="yes">Launch at startup</property>
-                                                <property name="use_action_appearance">False</property>
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">True</property>
-                                                <property name="receives_default">False</property>
-                                                <property name="has_tooltip">True</property>
-                                                <property name="tooltip_text" translatable="yes">If checked, this session will be executed upon startup</property>
-                                                <property name="xalign">0.5</property>
-                                                <property name="draw_indicator">True</property>
-                                              </object>
-                                              <packing>
-                                                <property name="expand">False</property>
-                                                <property name="fill">True</property>
-                                                <property name="padding">2</property>
-                                                <property name="position">0</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkSeparator" id="vseparator2">
+                                              <object class="GtkBox">
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">False</property>
-                                                <property name="orientation">vertical</property>
+                                                <property name="margin_right">8</property>
+                                                <child>
+                                                  <object class="GtkCheckButton" id="cbCfgStartupLaunch">
+                                                    <property name="label" translatable="yes"> </property>
+                                                    <property name="use_action_appearance">False</property>
+                                                    <property name="visible">True</property>
+                                                    <property name="can_focus">True</property>
+                                                    <property name="receives_default">False</property>
+                                                    <property name="has_tooltip">True</property>
+                                                    <property name="tooltip_text" translatable="yes">If checked, this session will be executed upon startup</property>
+                                                    <property name="xalign">0</property>
+                                                    <property name="draw_indicator">True</property>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="expand">False</property>
+                                                    <property name="fill">True</property>
+                                                    <property name="position">0</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkLabel">
+                                                    <property name="visible">True</property>
+                                                    <property name="can_focus">False</property>
+                                                    <property name="label" translatable="yes">Launch at startup</property>
+                                                    <property name="use_markup">True</property>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="expand">False</property>
+                                                    <property name="fill">True</property>
+                                                    <property name="position">1</property>
+                                                  </packing>
+                                                </child>
                                               </object>
                                               <packing>
                                                 <property name="expand">False</property>
                                                 <property name="fill">True</property>
-                                                <property name="padding">4</property>
                                                 <property name="position">1</property>
                                               </packing>
                                             </child>
@@ -539,7 +615,7 @@ If not, see <http://www.gnu.org/licenses/>.
                                                 <property name="receives_default">False</property>
                                                 <property name="has_tooltip">True</property>
                                                 <property name="tooltip_text" translatable="yes">If checked, reconnect this session when disconnection happens with exit status &lt;&gt; 0</property>
-                                                <property name="xalign">0.5</property>
+                                                <property name="xalign">0</property>
                                                 <property name="draw_indicator">True</property>
                                               </object>
                                               <packing>
@@ -548,29 +624,17 @@ If not, see <http://www.gnu.org/licenses/>.
                                                 <property name="position">2</property>
                                               </packing>
                                             </child>
-                                            <child>
-                                              <object class="GtkSeparator" id="vseparator3">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
-                                                <property name="orientation">vertical</property>
-                                              </object>
-                                              <packing>
-                                                <property name="expand">False</property>
-                                                <property name="fill">True</property>
-                                                <property name="padding">4</property>
-                                                <property name="position">3</property>
-                                              </packing>
-                                            </child>
                                             <child>
                                               <object class="GtkLabel" id="label89">
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">False</property>
+                                                <property name="margin_left">8</property>
                                                 <property name="label" translatable="yes">Wait </property>
                                               </object>
                                               <packing>
                                                 <property name="expand">False</property>
                                                 <property name="fill">True</property>
-                                                <property name="position">4</property>
+                                                <property name="position">3</property>
                                               </packing>
                                             </child>
                                             <child>
@@ -587,16 +651,18 @@ Applies to automated actions:
 - Paste from clipboard</property>
                                                 <property name="invisible_char">•</property>
                                                 <property name="activates_default">True</property>
+                                                <property name="text" translatable="yes">1</property>
                                                 <property name="primary_icon_activatable">False</property>
                                                 <property name="secondary_icon_activatable">False</property>
                                                 <property name="adjustment">adjSecondMsWait</property>
                                                 <property name="snap_to_ticks">True</property>
                                                 <property name="numeric">True</property>
+                                                <property name="value">1</property>
                                               </object>
                                               <packing>
                                                 <property name="expand">False</property>
                                                 <property name="fill">True</property>
-                                                <property name="position">5</property>
+                                                <property name="position">4</property>
                                               </packing>
                                             </child>
                                             <child>
@@ -608,10 +674,23 @@ Applies to automated actions:
                                               <packing>
                                                 <property name="expand">False</property>
                                                 <property name="fill">True</property>
-                                                <property name="position">6</property>
+                                                <property name="position">5</property>
                                               </packing>
                                             </child>
                                           </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">1</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkSeparator">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="margin_top">4</property>
+                                            <property name="margin_bottom">4</property>
+                                          </object>
                                           <packing>
                                             <property name="expand">False</property>
                                             <property name="fill">True</property>
@@ -621,14 +700,11 @@ Applies to automated actions:
                                       </object>
                                     </child>
                                   </object>
-                                </child>
-                                <child type="label">
-                                  <object class="GtkLabel" id="label91">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="label" translatable="yes">&lt;b&gt; Host: &lt;/b&gt;</property>
-                                    <property name="use_markup">True</property>
-                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">1</property>
+                                  </packing>
                                 </child>
                               </object>
                               <packing>
@@ -638,130 +714,123 @@ Applies to automated actions:
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkFrame" id="frameAuthMethod">
+                              <object class="GtkBox" id="vboxAuthMethod">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="border_width">2</property>
-                                <property name="label_xalign">0</property>
+                                <property name="orientation">vertical</property>
                                 <child>
-                                  <object class="GtkAlignment" id="alignAuthMethod">
+                                  <object class="GtkBox" id="hboxAuthMethodTitle">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="xscale">0.94999998807907104</property>
-                                    <property name="left_padding">12</property>
+                                    <property name="margin_bottom">4</property>
+                                    <child>
+                                      <object class="GtkLabel" id="label94">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="xpad">0</property>
+                                        <property name="label" translatable="yes"> &lt;b&gt;Authentication&lt;/b&gt; </property>
+                                        <property name="use_markup">True</property>
+                                        <property name="wrap">True</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkAlignment" id="alignAuthMethod">
+                                    <property name="can_focus">False</property>
                                     <child>
                                       <object class="GtkBox" id="vbox32">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="orientation">vertical</property>
                                         <child>
-                                          <object class="GtkFrame" id="frame6">
+                                          <object class="GtkBox" id="vboxAuthUserPass">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="label_xalign">0</property>
+                                            <property name="orientation">vertical</property>
+                                            <child>
+                                              <object class="GtkBox" id="hboxAuthUserPassManual">
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">False</property>
+                                                <child>
+                                                  <object class="GtkRadioButton" id="rbCfgAuthUserPass">
+                                                    <property name="label" translatable="yes">User / Password </property>
+                                                    <property name="use_action_appearance">False</property>
+                                                    <property name="visible">True</property>
+                                                    <property name="can_focus">True</property>
+                                                    <property name="receives_default">False</property>
+                                                    <property name="tooltip_text" translatable="yes">Use a user name and a password to authenticate to the target server.</property>
+                                                    <property name="xalign">0</property>
+                                                    <property name="active">True</property>
+                                                    <property name="draw_indicator">True</property>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="expand">True</property>
+                                                    <property name="fill">True</property>
+                                                    <property name="position">0</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkRadioButton" id="rbCfgAuthManual">
+                                                    <property name="label" translatable="yes">Manual</property>
+                                                    <property name="use_action_appearance">False</property>
+                                                    <property name="visible">True</property>
+                                                    <property name="can_focus">True</property>
+                                                    <property name="receives_default">False</property>
+                                                    <property name="tooltip_text" translatable="yes">Do not auto-login nor check for EXPECT.
+
+If left blank, the current user name will be used to login on the remote machine.</property>
+                                                    <property name="xalign">0</property>
+                                                    <property name="active">True</property>
+                                                    <property name="draw_indicator">True</property>
+                                                    <property name="group">rbCfgAuthUserPass</property>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="expand">True</property>
+                                                    <property name="fill">True</property>
+                                                    <property name="position">2</property>
+                                                  </packing>
+                                                </child>
+                                              </object>
+                                              <packing>
+                                                <property name="expand">False</property>
+                                                <property name="fill">True</property>
+                                                <property name="position">0</property>
+                                              </packing>
+                                            </child>
                                             <child>
                                               <object class="GtkAlignment" id="alignUserPass">
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">False</property>
                                                 <property name="xscale">0.94999998807907104</property>
-                                                <property name="left_padding">12</property>
                                                 <child>
                                                   <object class="GtkBox" id="vbox33">
                                                     <property name="visible">True</property>
                                                     <property name="can_focus">False</property>
                                                     <property name="orientation">vertical</property>
                                                     <child>
-                                                      <object class="GtkBox" id="hboxKeePass">
+                                                      <object class="GtkBox" id="hboxCfgAuthUserPass">
                                                         <property name="visible">True</property>
                                                         <property name="can_focus">False</property>
-                                                        <property name="tooltip_text" translatable="yes">Activate KeePassX integration from "Preferences" -&gt; "KeePassX Options"</property>
                                                         <child>
-                                                          <object class="GtkCheckButton" id="cbInferUserPassKPX">
-                                                            <property name="label" translatable="yes">Infer 'User / Password' from KeePassX where:</property>
-                                                            <property name="use_action_appearance">False</property>
-                                                            <property name="visible">True</property>
-                                                            <property name="can_focus">True</property>
-                                                            <property name="receives_default">False</property>
-                                                            <property name="xalign">0.5</property>
-                                                            <property name="draw_indicator">True</property>
-                                                          </object>
-                                                          <packing>
-                                                            <property name="expand">False</property>
-                                                            <property name="fill">True</property>
-                                                            <property name="position">0</property>
-                                                          </packing>
-                                                        </child>
-                                                        <child>
-                                                          <object class="GtkComboBoxText" id="comboKPXWhere">
-                                                            <property name="visible">True</property>
-                                                            <property name="can_focus">False</property>
-                                                          </object>
-                                                          <packing>
-                                                            <property name="expand">False</property>
-                                                            <property name="fill">True</property>
-                                                            <property name="position">1</property>
-                                                          </packing>
-                                                        </child>
-                                                        <child>
-                                                          <object class="GtkLabel" id="label92">
-                                                            <property name="visible">True</property>
-                                                            <property name="can_focus">False</property>
-                                                            <property name="label" translatable="yes"> matches Perl RegExp: </property>
-                                                          </object>
-                                                          <packing>
-                                                            <property name="expand">False</property>
-                                                            <property name="fill">True</property>
-                                                            <property name="position">2</property>
-                                                          </packing>
-                                                        </child>
-                                                        <child>
-                                                          <object class="GtkEntry" id="entryKPXRE">
-                                                            <property name="visible">True</property>
-                                                            <property name="can_focus">True</property>
-                                                            <property name="invisible_char">●</property>
-                                                            <property name="primary_icon_activatable">False</property>
-                                                            <property name="secondary_icon_activatable">False</property>
-                                                          </object>
-                                                          <packing>
-                                                            <property name="expand">True</property>
-                                                            <property name="fill">True</property>
-                                                            <property name="position">3</property>
-                                                          </packing>
-                                                        </child>
-                                                        <child>
-                                                          <object class="GtkButton" id="btnCheckKPX">
-                                                            <property name="label" translatable="yes">Check</property>
-                                                            <property name="use_action_appearance">False</property>
-                                                            <property name="visible">True</property>
-                                                            <property name="can_focus">True</property>
-                                                            <property name="receives_default">True</property>
-                                                          </object>
-                                                          <packing>
-                                                            <property name="expand">False</property>
-                                                            <property name="fill">True</property>
-                                                            <property name="position">4</property>
-                                                          </packing>
-                                                        </child>
-                                                      </object>
-                                                      <packing>
-                                                        <property name="expand">True</property>
-                                                        <property name="fill">True</property>
-                                                        <property name="position">0</property>
-                                                      </packing>
-                                                    </child>
-                                                    <child>
-                                                      <object class="GtkBox" id="hboxCfgAuthUserPass">
-                                                        <property name="visible">True</property>
-                                                        <property name="can_focus">False</property>
-                                                        <child>
-                                                          <object class="GtkBox" id="frameUser">
+                                                          <object class="GtkBox" id="frameUser">
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">False</property>
                                                             <child>
                                                             <object class="GtkLabel" id="labelUser">
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">False</property>
-                                                            <property name="label" translatable="yes">User: </property>
+                                                            <property name="label" translatable="yes">User </property>
                                                             <property name="use_markup">True</property>
                                                             </object>
                                                             <packing>
@@ -774,8 +843,9 @@ Applies to automated actions:
                                                             <object class="GtkEntry" id="entryUser">
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">True</property>
-                                                            <property name="has_tooltip">True</property>
-                                                            <property name="tooltip_text" translatable="yes">Username to use for connecting</property>
+                                                            <property name="tooltip_text" translatable="yes">The user to log in as on the remote machine.
+
+Can be left blank to use the currenlty connected user name.</property>
                                                             <property name="invisible_char">•</property>
                                                             <property name="activates_default">True</property>
                                                             <property name="primary_icon_activatable">False</property>
@@ -796,14 +866,14 @@ Applies to automated actions:
                                                           </packing>
                                                         </child>
                                                         <child>
-                                                          <object class="GtkBox" id="hbox51">
+                                                          <object class="GtkBox" id="hboxAuthPassword">
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">False</property>
                                                             <child>
                                                             <object class="GtkLabel" id="label93">
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">False</property>
-                                                            <property name="label" translatable="yes">  Password: </property>
+                                                            <property name="label" translatable="yes">  Password </property>
                                                             </object>
                                                             <packing>
                                                             <property name="expand">True</property>
@@ -843,7 +913,7 @@ Use &lt;&lt;ASK_PASS&gt;&gt; to use ask user for password on every connection )<
                                                             <property name="receives_default">False</property>
                                                             <property name="has_tooltip">True</property>
                                                             <property name="tooltip_text" translatable="yes">Show/hide password</property>
-                                                            <property name="xalign">0.5</property>
+                                                            <property name="xalign">0</property>
                                                             <property name="draw_indicator">True</property>
                                                             </object>
                                                             <packing>
@@ -876,39 +946,44 @@ Use &lt;&lt;ASK_PASS&gt;&gt; to use ask user for password on every connection )<
                                                   </object>
                                                 </child>
                                               </object>
-                                            </child>
-                                            <child type="label">
-                                              <object class="GtkRadioButton" id="rbCfgAuthUserPass">
-                                                <property name="label" translatable="yes">User / Password: </property>
-                                                <property name="use_action_appearance">False</property>
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">True</property>
-                                                <property name="receives_default">False</property>
-                                                <property name="tooltip_text" translatable="yes">Use a user name and a password to authenticate to the target server.</property>
-                                                <property name="xalign">0.5</property>
-                                                <property name="active">True</property>
-                                                <property name="draw_indicator">True</property>
-                                              </object>
+                                              <packing>
+                                                <property name="expand">False</property>
+                                                <property name="fill">True</property>
+                                                <property name="position">2</property>
+                                              </packing>
                                             </child>
                                           </object>
                                           <packing>
-                                            <property name="expand">True</property>
+                                            <property name="expand">False</property>
                                             <property name="fill">True</property>
                                             <property name="position">0</property>
                                           </packing>
                                         </child>
+                                        <child>
+                                          <object class="GtkSeparator">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="margin_top">4</property>
+                                            <property name="margin_bottom">4</property>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">2</property>
+                                          </packing>
+                                        </child>
                                         <child>
                                           <object class="GtkFrame" id="framePublicKey">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
                                             <property name="border_width">2</property>
                                             <property name="label_xalign">0</property>
+                                            <property name="shadow_type">none</property>
                                             <child>
                                               <object class="GtkAlignment" id="alignPublicKey">
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">False</property>
                                                 <property name="xscale">0.94999998807907104</property>
-                                                <property name="left_padding">12</property>
                                                 <child>
                                                   <object class="GtkBox" id="vbox34">
                                                     <property name="visible">True</property>
@@ -922,7 +997,7 @@ Use &lt;&lt;ASK_PASS&gt;&gt; to use ask user for password on every connection )<
                                                           <object class="GtkLabel" id="labelUser1">
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">False</property>
-                                                            <property name="label" translatable="yes">Private key file: </property>
+                                                            <property name="label" translatable="yes">Private key file </property>
                                                             <property name="use_markup">True</property>
                                                           </object>
                                                           <packing>
@@ -982,7 +1057,7 @@ If not specified or invalid, the default SSH private key of your system will be
                                                             <object class="GtkLabel" id="labelUserPassphrase">
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">False</property>
-                                                            <property name="label" translatable="yes">User: </property>
+                                                            <property name="label" translatable="yes">User </property>
                                                             <property name="use_markup">True</property>
                                                             </object>
                                                             <packing>
@@ -1020,7 +1095,7 @@ If not specified or invalid, the default SSH private key of your system will be
                                                           <object class="GtkLabel" id="labelPass1">
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">False</property>
-                                                            <property name="label" translatable="yes">  Passphrase: </property>
+                                                            <property name="label" translatable="yes">  Passphrase </property>
                                                             <property name="use_markup">True</property>
                                                           </object>
                                                           <packing>
@@ -1056,7 +1131,7 @@ If not specified or invalid, the default SSH private key of your system will be
                                                             <property name="receives_default">False</property>
                                                             <property name="has_tooltip">True</property>
                                                             <property name="tooltip_text" translatable="yes">Show/hide password</property>
-                                                            <property name="xalign">0.5</property>
+                                                            <property name="xalign">0</property>
                                                             <property name="draw_indicator">True</property>
                                                           </object>
                                                           <packing>
@@ -1078,76 +1153,35 @@ If not specified or invalid, the default SSH private key of your system will be
                                             </child>
                                             <child type="label">
                                               <object class="GtkRadioButton" id="rbCfgAuthPublicKey">
-                                                <property name="label" translatable="yes">Private Key: </property>
+                                                <property name="label" translatable="yes">Private Key </property>
                                                 <property name="use_action_appearance">False</property>
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
                                                 <property name="receives_default">False</property>
                                                 <property name="tooltip_text" translatable="yes">Use an SSH private to authenticate on the target server.</property>
-                                                <property name="xalign">0.5</property>
-                                                <property name="draw_indicator">True</property>
-                                                <property name="group">rbCfgAuthUserPass</property>
-                                              </object>
-                                            </child>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">True</property>
-                                            <property name="fill">True</property>
-                                            <property name="position">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkBox" id="alignManual__">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="has_tooltip">True</property>
-                                            <property name="tooltip_text" translatable="yes">Do no automate any password (anyway, if a username is provided, it will be passed as well)</property>
-                                            <child>
-                                              <object class="GtkRadioButton" id="rbCfgAuthManual">
-                                                <property name="label" translatable="yes">Manual:</property>
-                                                <property name="use_action_appearance">False</property>
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">True</property>
-                                                <property name="receives_default">False</property>
-                                                <property name="xalign">0.5</property>
+                                                <property name="xalign">0</property>
                                                 <property name="draw_indicator">True</property>
                                                 <property name="group">rbCfgAuthUserPass</property>
                                               </object>
-                                              <packing>
-                                                <property name="expand">False</property>
-                                                <property name="fill">True</property>
-                                                <property name="position">0</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkLabel" id="alignManual">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
-                                                <property name="label" translatable="yes">Do not auto-login nor check for EXPECT. Manual user and/or password enter.</property>
-                                                <property name="xalign">0</property>
-                                              </object>
-                                              <packing>
-                                                <property name="expand">False</property>
-                                                <property name="fill">True</property>
-                                                <property name="position">1</property>
-                                              </packing>
                                             </child>
                                           </object>
                                           <packing>
                                             <property name="expand">True</property>
                                             <property name="fill">True</property>
-                                            <property name="position">2</property>
+                                            <property name="position">3</property>
                                           </packing>
                                         </child>
                                         <child>
                                           <object class="GtkSeparator" id="hseparator4">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
+                                            <property name="margin_top">4</property>
+                                            <property name="margin_bottom">4</property>
                                           </object>
                                           <packing>
                                             <property name="expand">False</property>
                                             <property name="fill">True</property>
-                                            <property name="position">3</property>
+                                            <property name="position">4</property>
                                           </packing>
                                         </child>
                                         <child>
@@ -1159,32 +1193,31 @@ If not specified or invalid, the default SSH private key of your system will be
                                             <property name="receives_default">False</property>
                                             <property name="has_tooltip">True</property>
                                             <property name="tooltip_text" translatable="yes">Checking this may improve login speed on some systems, but may break compatibility with SSH agent, Seahorse, ...</property>
-                                            <property name="xalign">0.5</property>
+                                            <property name="halign">start</property>
+                                            <property name="margin_top">7</property>
+                                            <property name="xalign">0</property>
                                             <property name="draw_indicator">True</property>
                                           </object>
                                           <packing>
                                             <property name="expand">True</property>
                                             <property name="fill">True</property>
-                                            <property name="position">4</property>
+                                            <property name="position">6</property>
                                           </packing>
                                         </child>
                                       </object>
                                     </child>
                                   </object>
-                                </child>
-                                <child type="label">
-                                  <object class="GtkLabel" id="label94">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="label" translatable="yes"> &lt;b&gt;Authentication:&lt;/b&gt; </property>
-                                    <property name="use_markup">True</property>
-                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">1</property>
+                                  </packing>
                                 </child>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">True</property>
-                                <property name="position">1</property>
+                                <property name="position">2</property>
                               </packing>
                             </child>
                           </object>
@@ -1240,11 +1273,12 @@ If not specified or invalid, the default SSH private key of your system will be
                                 <property name="tooltip_text" translatable="yes">Allows you to send a Perl RegEx string to the connected terminal every given amount of seconds</property>
                                 <child>
                                   <object class="GtkCheckButton" id="cbEditSendString">
-                                    <property name="label" translatable="yes">Programatically send string:</property>
+                                    <property name="label" translatable="yes">Programatically send string</property>
                                     <property name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
+                                    <property name="halign">start</property>
                                     <property name="xalign">0.5</property>
                                     <property name="draw_indicator">True</property>
                                   </object>
@@ -1282,6 +1316,7 @@ If not specified or invalid, the default SSH private key of your system will be
                                         <property name="receives_default">False</property>
                                         <property name="has_tooltip">True</property>
                                         <property name="tooltip_text" translatable="yes">Append a "Return/Intro" at the end of the given string to be sent</property>
+                                        <property name="halign">start</property>
                                         <property name="xalign">0.5</property>
                                         <property name="draw_indicator">True</property>
                                       </object>
@@ -1309,6 +1344,7 @@ If not specified or invalid, the default SSH private key of your system will be
                                         <property name="can_focus">True</property>
                                         <property name="invisible_char">•</property>
                                         <property name="activates_default">True</property>
+                                        <property name="width_chars">5</property>
                                         <property name="text" translatable="yes">0</property>
                                         <property name="primary_icon_activatable">False</property>
                                         <property name="secondary_icon_activatable">False</property>
@@ -1322,6 +1358,22 @@ If not specified or invalid, the default SSH private key of your system will be
                                         <property name="position">3</property>
                                       </packing>
                                     </child>
+                                    <child>
+                                      <object class="GtkCheckButton" id="cbSendStringOnlyWhenIdle">
+                                        <property name="label" translatable="yes">Idle Only</property>
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="receives_default">False</property>
+                                        <property name="has_tooltip">True</property>
+                                        <property name="tooltip_text" translatable="yes">Restart the timer each time the terminal is updated or focused, effectively preventing the string from being sent unless the terminal has been idle for the configured period.</property>
+                                        <property name="draw_indicator">True</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">4</property>
+                                      </packing>
+                                    </child>
                                   </object>
                                   <packing>
                                     <property name="expand">True</property>
@@ -1333,7 +1385,7 @@ If not specified or invalid, the default SSH private key of your system will be
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">True</property>
-                                <property name="position">0</property>
+                                <property name="position">1</property>
                               </packing>
                             </child>
                             <child>
@@ -1353,11 +1405,12 @@ Or(manual): LD_PATH=/my/favourite/path
 Or(Global Variable): DISPLAY=&lt;GV:DISPLAY&gt;</property>
                                     <child>
                                       <object class="GtkCheckButton" id="cbEditPrependCommand">
-                                        <property name="label" translatable="yes">Prepend command: </property>
+                                        <property name="label" translatable="yes">Prepend command </property>
                                         <property name="use_action_appearance">False</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
+                                        <property name="halign">start</property>
                                         <property name="xalign">0.5</property>
                                         <property name="draw_indicator">True</property>
                                       </object>
@@ -1391,6 +1444,7 @@ Or(Global Variable): DISPLAY=&lt;GV:DISPLAY&gt;</property>
                                         <property name="receives_default">False</property>
                                         <property name="has_tooltip">True</property>
                                         <property name="tooltip_text" translatable="yes">If cheked, the resulting connectino command (eg: ssh -L 10123:localhost:10456 -l user1 10.10.10.1) will be surrounded with double quotes ("), in order to provide some more compatibility to the "Prepend command"  (eg: gksudo requires the given command to be quoted)</property>
+                                        <property name="halign">start</property>
                                         <property name="xalign">0.5</property>
                                         <property name="draw_indicator">True</property>
                                       </object>
@@ -1415,16 +1469,95 @@ Or(Global Variable): DISPLAY=&lt;GV:DISPLAY&gt;</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkBox" id="hbox59">
+                              <object class="GtkBox" id="vbox63">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="orientation">vertical</property>
+                                <child>
+                                  <object class="GtkBox" id="hbox59">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="has_tooltip">True</property>
+                                    <property name="tooltip_text" translatable="yes">Postpend this command after the string to be launched
+eg.: putting '| tc' in an SSH connection, results in executing:
+ssh -l user@10.10.10.10 | ct</property>
+                                    <child>
+                                      <object class="GtkCheckButton" id="cbEditPostpendCommand">
+                                        <property name="label" translatable="yes">Postpend command </property>
+                                        <property name="use_action_appearance">False</property>
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="receives_default">False</property>
+                                        <property name="halign">start</property>
+                                        <property name="xalign">0.5</property>
+                                        <property name="draw_indicator">True</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkEntry" id="entryEditPostpendCommand">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="invisible_char">•</property>
+                                        <property name="activates_default">True</property>
+                                        <property name="primary_icon_activatable">False</property>
+                                        <property name="secondary_icon_activatable">False</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkCheckButton" id="cbCfgQuotePostCommand">
+                                        <property name="label" translatable="yes">Surround connection command with quotes</property>
+                                        <property name="use_action_appearance">False</property>
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="receives_default">False</property>
+                                        <property name="has_tooltip">True</property>
+                                        <property name="tooltip_text" translatable="yes">If cheked, the resulting connectino command (eg: ssh -L 10123:localhost:10456 -l user1 10.10.10.1) will be surrounded with double quotes ("), in order to provide some more compatibility to the "Prepend command"  (eg: gksudo requires the given command to be quoted)</property>
+                                        <property name="halign">start</property>
+                                        <property name="xalign">0.5</property>
+                                        <property name="draw_indicator">True</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">2</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkBox" id="hbox60">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <child>
                                   <object class="GtkCheckButton" id="cbStartScript">
-                                    <property name="label" translatable="yes">Start next script when connection is launched: </property>
+                                    <property name="label" translatable="yes">Start next script when connection is launched </property>
                                     <property name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
+                                    <property name="halign">start</property>
                                     <property name="xalign">0.5</property>
                                     <property name="draw_indicator">True</property>
                                   </object>
@@ -1449,7 +1582,7 @@ Or(Global Variable): DISPLAY=&lt;GV:DISPLAY&gt;</property>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">True</property>
-                                <property name="position">2</property>
+                                <property name="position">3</property>
                               </packing>
                             </child>
                             <child>
@@ -1458,27 +1591,32 @@ Or(Global Variable): DISPLAY=&lt;GV:DISPLAY&gt;</property>
                                 <property name="can_focus">False</property>
                                 <property name="border_width">2</property>
                                 <property name="label_xalign">0</property>
+                                <property name="shadow_type">none</property>
                                 <child>
                                   <object class="GtkAlignment" id="alignment14">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="xscale">0.94999998807907104</property>
-                                    <property name="left_padding">12</property>
                                     <child>
                                       <object class="GtkBox" id="vboxEditSaveSessionLogs">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="orientation">vertical</property>
                                         <child>
-                                          <object class="GtkBox" id="hboxEditSaveSessionLogs">
+                                          <object class="GtkBox">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="border_width">2</property>
+                                            <property name="margin_left">20</property>
                                             <child>
-                                              <object class="GtkLabel" id="label97">
+                                              <object class="GtkCheckButton" id="cbCfgRemoveCtrlChars">
+                                                <property name="label" translatable="yes">Remove CONTROL characters. </property>
+                                                <property name="use_action_appearance">False</property>
                                                 <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
-                                                <property name="label" translatable="yes">Save in: </property>
+                                                <property name="can_focus">True</property>
+                                                <property name="receives_default">False</property>
+                                                <property name="halign">start</property>
+                                                <property name="xalign">0</property>
+                                                <property name="draw_indicator">True</property>
                                               </object>
                                               <packing>
                                                 <property name="expand">False</property>
@@ -1487,15 +1625,96 @@ Or(Global Variable): DISPLAY=&lt;GV:DISPLAY&gt;</property>
                                               </packing>
                                             </child>
                                             <child>
-                                              <object class="GtkFileChooserButton" id="btnEditSaveSessionLogs">
+                                              <object class="GtkCheckButton" id="cbCfgLogTimestamp">
+                                                <property name="label" translatable="yes">Add timestamp</property>
+                                                <property name="use_action_appearance">False</property>
                                                 <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
-                                                <property name="focus_on_click">False</property>
-                                                <property name="action">select-folder</property>
-                                                <property name="title" translatable="yes">Choose a folder for saving log files</property>
+                                                <property name="can_focus">True</property>
+                                                <property name="receives_default">False</property>
+                                                <property name="halign">start</property>
+                                                <property name="margin_left">20</property>
+                                                <property name="xalign">0</property>
+                                                <property name="draw_indicator">True</property>
                                               </object>
                                               <packing>
-                                                <property name="expand">True</property>
+                                                <property name="expand">False</property>
+                                                <property name="fill">True</property>
+                                                <property name="position">1</property>
+                                              </packing>
+                                            </child>
+                                            <child>
+                                              <object class="GtkLabel" id="label99">
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">False</property>
+                                                <property name="has_tooltip">True</property>
+                                                <property name="tooltip_text" translatable="yes">0 to keep all session logs</property>
+                                                <property name="label" translatable="yes"> Files to save (0=infinite): </property>
+                                                <property name="xalign">1</property>
+                                              </object>
+                                              <packing>
+                                                <property name="expand">True</property>
+                                                <property name="fill">True</property>
+                                                <property name="position">2</property>
+                                              </packing>
+                                            </child>
+                                            <child>
+                                              <object class="GtkSpinButton" id="spEditSaveSessionLogs">
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">True</property>
+                                                <property name="has_tooltip">True</property>
+                                                <property name="tooltip_text" translatable="yes">0 to keep all session logs</property>
+                                                <property name="invisible_char">•</property>
+                                                <property name="text" translatable="yes">0</property>
+                                                <property name="primary_icon_activatable">False</property>
+                                                <property name="secondary_icon_activatable">False</property>
+                                                <property name="adjustment">adjFileSave</property>
+                                                <property name="numeric">True</property>
+                                                <property name="update_policy">if-valid</property>
+                                              </object>
+                                              <packing>
+                                                <property name="expand">False</property>
+                                                <property name="fill">True</property>
+                                                <property name="pack_type">end</property>
+                                                <property name="position">3</property>
+                                              </packing>
+                                            </child>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">False</property>
+                                            <property name="position">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkBox" id="hboxEditSaveSessionLogs">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="margin_left">20</property>
+                                            <property name="border_width">2</property>
+                                            <child>
+                                              <object class="GtkLabel" id="label97">
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">False</property>
+                                                <property name="margin_right">9</property>
+                                                <property name="label" translatable="yes">Save in</property>
+                                              </object>
+                                              <packing>
+                                                <property name="expand">False</property>
+                                                <property name="fill">True</property>
+                                                <property name="position">0</property>
+                                              </packing>
+                                            </child>
+                                            <child>
+                                              <object class="GtkFileChooserButton" id="btnEditSaveSessionLogs">
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">False</property>
+                                                <property name="focus_on_click">False</property>
+                                                <property name="margin_right">5</property>
+                                                <property name="action">select-folder</property>
+                                                <property name="title" translatable="yes">Choose a folder for saving log files</property>
+                                              </object>
+                                              <packing>
+                                                <property name="expand">True</property>
                                                 <property name="fill">True</property>
                                                 <property name="position">1</property>
                                               </packing>
@@ -1507,7 +1726,7 @@ Or(Global Variable): DISPLAY=&lt;GV:DISPLAY&gt;</property>
                                                 <property name="can_focus">True</property>
                                                 <property name="receives_default">True</property>
                                                 <child>
-                                                  <object class="GtkBox" id="hbox60">
+                                                  <object class="GtkBox" id="hbox61">
                                                     <property name="visible">True</property>
                                                     <property name="can_focus">False</property>
                                                     <child>
@@ -1543,65 +1762,15 @@ Or(Global Variable): DISPLAY=&lt;GV:DISPLAY&gt;</property>
                                                 <property name="position">2</property>
                                               </packing>
                                             </child>
-                                            <child>
-                                              <object class="GtkCheckButton" id="cbCfgRemoveCtrlChars">
-                                                <property name="label" translatable="yes">Remove CONTROL characters. </property>
-                                                <property name="use_action_appearance">False</property>
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">True</property>
-                                                <property name="receives_default">False</property>
-                                                <property name="xalign">0.5</property>
-                                                <property name="draw_indicator">True</property>
-                                              </object>
-                                              <packing>
-                                                <property name="expand">False</property>
-                                                <property name="fill">True</property>
-                                                <property name="position">3</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkLabel" id="label99">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
-                                                <property name="has_tooltip">True</property>
-                                                <property name="tooltip_text" translatable="yes">0 to keep all session logs</property>
-                                                <property name="label" translatable="yes"> Files to save (0=infinite): </property>
-                                              </object>
-                                              <packing>
-                                                <property name="expand">False</property>
-                                                <property name="fill">True</property>
-                                                <property name="position">4</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkSpinButton" id="spEditSaveSessionLogs">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">True</property>
-                                                <property name="has_tooltip">True</property>
-                                                <property name="tooltip_text" translatable="yes">0 to keep all session logs</property>
-                                                <property name="invisible_char">•</property>
-                                                <property name="text" translatable="yes">0</property>
-                                                <property name="primary_icon_activatable">False</property>
-                                                <property name="secondary_icon_activatable">False</property>
-                                                <property name="adjustment">adjFileSave</property>
-                                                <property name="numeric">True</property>
-                                                <property name="update_policy">if-valid</property>
-                                              </object>
-                                              <packing>
-                                                <property name="expand">False</property>
-                                                <property name="fill">True</property>
-                                                <property name="position">5</property>
-                                              </packing>
-                                            </child>
                                           </object>
                                           <packing>
                                             <property name="expand">True</property>
                                             <property name="fill">True</property>
-                                            <property name="position">0</property>
+                                            <property name="position">1</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkBox" id="hbox61">
+                                          <object class="GtkBox" id="hbox62">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
                                             <property name="border_width">2</property>
@@ -1609,6 +1778,7 @@ Or(Global Variable): DISPLAY=&lt;GV:DISPLAY&gt;</property>
                                               <object class="GtkLabel" id="lblEditLogFileName1">
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">False</property>
+                                                <property name="margin_left">20</property>
                                                 <property name="label" translatable="yes">Logfile name pattern: </property>
                                               </object>
                                               <packing>
@@ -1625,6 +1795,7 @@ Or(Global Variable): DISPLAY=&lt;GV:DISPLAY&gt;</property>
                                                 <property name="tooltip_text" translatable="yes">Logfile pattern:
 
 &lt;UUID&gt; -&gt; UUID for this connection
+&lt;SOCKS5_PORT&gt; -&gt; Socks5 tunnel port
 &lt;TIMESTAMP&gt; -&gt; time since epoc
 &lt;DATE_Y&gt; -&gt; Year(4 digits)
 &lt;DATE_M&gt; -&gt; Month(2 digits)
@@ -1638,7 +1809,7 @@ Or(Global Variable): DISPLAY=&lt;GV:DISPLAY&gt;</property>
 &lt;USER&gt; -&gt; Username for first jump
 </property>
                                                 <property name="invisible_char">•</property>
-                                                <property name="text" translatable="yes">&lt;UUID&gt;_&lt;NAME&gt;_&lt;DATE_Y&gt;&lt;DATE_M&gt;&lt;DATE_D&gt;_&lt;TIME_H&gt;&lt;TIME_M&gt;&lt;TIME_S&gt;.txt</property>
+                                                <property name="text" translatable="yes">&lt;UUID&gt;_&lt;SOCKS5_PORT&gt;_&lt;NAME&gt;_&lt;DATE_Y&gt;&lt;DATE_M&gt;&lt;DATE_D&gt;_&lt;TIME_H&gt;&lt;TIME_M&gt;&lt;TIME_S&gt;.txt</property>
                                                 <property name="caps_lock_warning">False</property>
                                                 <property name="primary_icon_activatable">False</property>
                                                 <property name="secondary_icon_activatable">False</property>
@@ -1653,7 +1824,7 @@ Or(Global Variable): DISPLAY=&lt;GV:DISPLAY&gt;</property>
                                           <packing>
                                             <property name="expand">True</property>
                                             <property name="fill">True</property>
-                                            <property name="position">1</property>
+                                            <property name="position">2</property>
                                           </packing>
                                         </child>
                                       </object>
@@ -1662,11 +1833,12 @@ Or(Global Variable): DISPLAY=&lt;GV:DISPLAY&gt;</property>
                                 </child>
                                 <child type="label">
                                   <object class="GtkCheckButton" id="cbEditSaveSessionLogs">
-                                    <property name="label" translatable="yes">Auto save Session logs: </property>
+                                    <property name="label" translatable="yes">Auto save Session logs</property>
                                     <property name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
+                                    <property name="halign">start</property>
                                     <property name="xalign">0.5</property>
                                     <property name="draw_indicator">True</property>
                                   </object>
@@ -1675,13 +1847,15 @@ Or(Global Variable): DISPLAY=&lt;GV:DISPLAY&gt;</property>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">True</property>
-                                <property name="position">3</property>
+                                <property name="position">4</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkBox" id="hbox62">
+                              <object class="GtkBox" id="hbox63">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
+                                <property name="margin_top">6</property>
+                                <property name="margin_bottom">6</property>
                                 <child>
                                   <object class="GtkLabel" id="lblUUID">
                                     <property name="visible">True</property>
@@ -1714,9 +1888,9 @@ Or(Global Variable): DISPLAY=&lt;GV:DISPLAY&gt;</property>
                                 </child>
                               </object>
                               <packing>
-                                <property name="expand">True</property>
+                                <property name="expand">False</property>
                                 <property name="fill">True</property>
-                                <property name="position">4</property>
+                                <property name="position">5</property>
                               </packing>
                             </child>
                             <child>
@@ -1730,7 +1904,7 @@ Or(Global Variable): DISPLAY=&lt;GV:DISPLAY&gt;</property>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">True</property>
-                                <property name="position">5</property>
+                                <property name="position">6</property>
                               </packing>
                             </child>
                           </object>
@@ -1739,7 +1913,7 @@ Or(Global Variable): DISPLAY=&lt;GV:DISPLAY&gt;</property>
                           </packing>
                         </child>
                         <child type="tab">
-                          <object class="GtkBox" id="hbox63">
+                          <object class="GtkBox" id="hbox64">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <child>
@@ -1777,27 +1951,77 @@ Or(Global Variable): DISPLAY=&lt;GV:DISPLAY&gt;</property>
                           <object class="GtkBox" id="vboxEditNetworkSettings">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="margin_left">12</property>
-                            <property name="margin_right">12</property>
+                            <property name="margin_left">5</property>
+                            <property name="margin_right">5</property>
                             <property name="margin_top">12</property>
                             <property name="margin_bottom">12</property>
                             <property name="orientation">vertical</property>
                             <property name="spacing">11</property>
                             <child>
-                              <object class="GtkRadioButton" id="rbUseProxyIfCFG">
-                                <property name="label" translatable="yes">Use the global network settings</property>
+                              <object class="GtkBox">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="xalign">0</property>
-                                <property name="active">True</property>
-                                <property name="draw_indicator">True</property>
-                                <property name="tooltip_text" translatable="yes">If selected, use settings defined in the Preferences > Network Settings.</property>
+                                <property name="can_focus">False</property>
+                                <child>
+                                  <object class="GtkRadioButton" id="rbUseProxyIfCFG">
+                                    <property name="label" translatable="yes">Use global proxy options</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="tooltip_text" translatable="yes">If selected, use settings defined in the Preferences &gt; Network Settings.</property>
+                                    <property name="halign">start</property>
+                                    <property name="xalign">0</property>
+                                    <property name="active">True</property>
+                                    <property name="draw_indicator">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLinkButton" id="linkHelpNetwokSettings">
+                                    <property name="label" translatable="yes">Help</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="focus_on_click">False</property>
+                                    <property name="receives_default">True</property>
+                                    <property name="tooltip_text" translatable="yes">Open Online Help</property>
+                                    <property name="relief">none</property>
+                                    <property name="always_show_image">True</property>
+                                    <property name="uri">https://docs.asbru-cm.net/Manual/Preferences/Networking/</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="pack_type">end</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkButton" id="btnEditNetworkSettingsCheckKPX">
+                                    <property name="label" translatable="yes">KeePass</property>
+                                    <property name="use_action_appearance">False</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">True</property>
+                                    <property name="tooltip_markup" translatable="yes">Search KeePass database</property>
+                                    <property name="halign">end</property>
+                                    <property name="always_show_image">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">True</property>
+                                    <property name="fill">True</property>
+                                    <property name="padding">12</property>
+                                    <property name="pack_type">end</property>
+                                    <property name="position">2</property>
+                                  </packing>
+                                </child>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">True</property>
-                                <property name="position">0</property>
+                                <property name="position">1</property>
                               </packing>
                             </child>
                             <child>
@@ -1806,15 +2030,16 @@ Or(Global Variable): DISPLAY=&lt;GV:DISPLAY&gt;</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
+                                <property name="tooltip_text" translatable="yes">If selected, ignore any settings defined in the Preferences &gt; Network Settings and do not use any intermediate proxy or jump host to connect to the destination.</property>
+                                <property name="halign">start</property>
                                 <property name="xalign">0</property>
                                 <property name="draw_indicator">True</property>
-                                <property name="tooltip_text" translatable="yes">If selected, ignore any settings defined in the Preferences > Network Settings and do not use any intermediate proxy or jump host to connect to the destination.</property>
                                 <property name="group">rbUseProxyIfCFG</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">True</property>
-                                <property name="position">1</property>
+                                <property name="position">2</property>
                               </packing>
                             </child>
                             <child>
@@ -1828,9 +2053,8 @@ Or(Global Variable): DISPLAY=&lt;GV:DISPLAY&gt;</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
-                                    <property name="tooltip_text" translatable="yes">If selected, use a SOCKS proxy for this connection.
-
-SOCKS is an Internet protocol that exchanges network packets between a client and server through a proxy server.</property>
+                                    <property name="tooltip_text" translatable="yes">SOCKS is an Internet protocol that exchanges network packets between a client and server through a proxy server.</property>
+                                    <property name="halign">start</property>
                                     <property name="xalign">0</property>
                                     <property name="draw_indicator">True</property>
                                     <property name="group">rbUseProxyIfCFG</property>
@@ -1845,12 +2069,12 @@ SOCKS is an Internet protocol that exchanges network packets between a client an
                                   <object class="GtkBox" id="vboxCfgManualProxyConnOptions">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="spacing">12</property>
+                                    <property name="margin_left">22</property>
+                                    <property name="spacing">5</property>
                                     <child>
                                       <object class="GtkFrame" id="frame15">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
-                                        <property name="margin_left">21</property>
                                         <property name="label_xalign">0</property>
                                         <property name="shadow_type">none</property>
                                         <child>
@@ -1873,7 +2097,7 @@ SOCKS is an Internet protocol that exchanges network packets between a client an
                                           <object class="GtkLabel" id="label101">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="label" translatable="yes">IP / Host:</property>
+                                            <property name="label" translatable="yes">IP / Host</property>
                                           </object>
                                         </child>
                                       </object>
@@ -1918,7 +2142,7 @@ SOCKS is an Internet protocol that exchanges network packets between a client an
                                           <object class="GtkLabel" id="label102">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="label" translatable="yes">Port:</property>
+                                            <property name="label" translatable="yes">Port</property>
                                           </object>
                                         </child>
                                       </object>
@@ -1944,6 +2168,7 @@ SOCKS is an Internet protocol that exchanges network packets between a client an
                                                 <property name="can_focus">True</property>
                                                 <property name="tooltip_text" translatable="yes">Proxy user name</property>
                                                 <property name="invisible_char">•</property>
+                                                <property name="width_chars">18</property>
                                                 <property name="max_width_chars">10</property>
                                                 <property name="primary_icon_activatable">False</property>
                                                 <property name="secondary_icon_activatable">False</property>
@@ -1955,12 +2180,12 @@ SOCKS is an Internet protocol that exchanges network packets between a client an
                                           <object class="GtkLabel" id="label103">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="label" translatable="yes">User:</property>
+                                            <property name="label" translatable="yes">User</property>
                                           </object>
                                         </child>
                                       </object>
                                       <packing>
-                                        <property name="expand">True</property>
+                                        <property name="expand">False</property>
                                         <property name="fill">True</property>
                                         <property name="position">2</property>
                                       </packing>
@@ -1982,6 +2207,7 @@ SOCKS is an Internet protocol that exchanges network packets between a client an
                                                 <property name="tooltip_text" translatable="yes">Proxy password</property>
                                                 <property name="visibility">False</property>
                                                 <property name="invisible_char">•</property>
+                                                <property name="width_chars">18</property>
                                                 <property name="max_width_chars">10</property>
                                                 <property name="primary_icon_activatable">False</property>
                                                 <property name="secondary_icon_activatable">False</property>
@@ -1993,12 +2219,12 @@ SOCKS is an Internet protocol that exchanges network packets between a client an
                                           <object class="GtkLabel" id="label104">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="label" translatable="yes">Password:</property>
+                                            <property name="label" translatable="yes">Password</property>
                                           </object>
                                         </child>
                                       </object>
                                       <packing>
-                                        <property name="expand">True</property>
+                                        <property name="expand">False</property>
                                         <property name="fill">True</property>
                                         <property name="position">3</property>
                                       </packing>
@@ -2031,6 +2257,7 @@ SOCKS is an Internet protocol that exchanges network packets between a client an
                                     <property name="tooltip_text" translatable="yes">If selected, use a jump host for this connection.
 
 An alternative to SSH tunneling to access internal machines through gateway.</property>
+                                    <property name="halign">start</property>
                                     <property name="xalign">0</property>
                                     <property name="draw_indicator">True</property>
                                     <property name="group">rbUseProxyIfCFG</property>
@@ -2045,14 +2272,14 @@ An alternative to SSH tunneling to access internal machines through gateway.</pr
                                   <object class="GtkBox" id="vboxJumpCfgOptions">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="margin_left">21</property>
+                                    <property name="margin_left">22</property>
                                     <property name="orientation">vertical</property>
                                     <property name="spacing">4</property>
                                     <child>
                                       <object class="GtkBox" id="hbox38">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
-                                        <property name="spacing">12</property>
+                                        <property name="spacing">5</property>
                                         <child>
                                           <object class="GtkFrame" id="frame23">
                                             <property name="visible">True</property>
@@ -2079,14 +2306,14 @@ An alternative to SSH tunneling to access internal machines through gateway.</pr
                                               <object class="GtkLabel" id="label124">
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">False</property>
-                                                <property name="label" translatable="yes">IP / Host:</property>
+                                                <property name="label" translatable="yes">IP / Host</property>
                                               </object>
                                             </child>
                                           </object>
                                           <packing>
                                             <property name="expand">True</property>
                                             <property name="fill">True</property>
-                                            <property name="position">1</property>
+                                            <property name="position">0</property>
                                           </packing>
                                         </child>
                                         <child>
@@ -2122,14 +2349,14 @@ An alternative to SSH tunneling to access internal machines through gateway.</pr
                                               <object class="GtkLabel" id="label125">
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">False</property>
-                                                <property name="label" translatable="yes">Port:</property>
+                                                <property name="label" translatable="yes">Port</property>
                                               </object>
                                             </child>
                                           </object>
                                           <packing>
                                             <property name="expand">False</property>
                                             <property name="fill">True</property>
-                                            <property name="position">2</property>
+                                            <property name="position">1</property>
                                           </packing>
                                         </child>
                                         <child>
@@ -2148,6 +2375,7 @@ An alternative to SSH tunneling to access internal machines through gateway.</pr
                                                     <property name="can_focus">True</property>
                                                     <property name="tooltip_text" translatable="yes">Host server user</property>
                                                     <property name="invisible_char">•</property>
+                                                    <property name="width_chars">18</property>
                                                     <property name="primary_icon_activatable">False</property>
                                                     <property name="secondary_icon_activatable">False</property>
                                                   </object>
@@ -2158,12 +2386,50 @@ An alternative to SSH tunneling to access internal machines through gateway.</pr
                                               <object class="GtkLabel" id="label126">
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">False</property>
-                                                <property name="label" translatable="yes">User:</property>
+                                                <property name="label" translatable="yes">User</property>
                                               </object>
                                             </child>
                                           </object>
                                           <packing>
-                                            <property name="expand">True</property>
+                                            <property name="expand">False</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">2</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkFrame" id="frame2">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="label_xalign">0</property>
+                                            <property name="shadow_type">none</property>
+                                            <child>
+                                              <object class="GtkAlignment" id="alignment1">
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">False</property>
+                                                <child>
+                                                  <object class="GtkEntry" id="entryCfgJumpConnPass">
+                                                    <property name="visible">True</property>
+                                                    <property name="can_focus">True</property>
+                                                    <property name="tooltip_text" translatable="yes">Host server user</property>
+                                                    <property name="visibility">False</property>
+                                                    <property name="invisible_char">•</property>
+                                                    <property name="width_chars">18</property>
+                                                    <property name="primary_icon_activatable">False</property>
+                                                    <property name="secondary_icon_activatable">False</property>
+                                                  </object>
+                                                </child>
+                                              </object>
+                                            </child>
+                                            <child type="label">
+                                              <object class="GtkLabel" id="lblJumpPass">
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">False</property>
+                                                <property name="label" translatable="yes">Password</property>
+                                              </object>
+                                            </child>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">False</property>
                                             <property name="fill">True</property>
                                             <property name="position">3</property>
                                           </packing>
@@ -2179,10 +2445,12 @@ An alternative to SSH tunneling to access internal machines through gateway.</pr
                                       <object class="GtkBox" id="hbox34">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
+                                        <property name="spacing">5</property>
                                         <child>
                                           <object class="GtkLabel" id="labelConnKey">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
+                                            <property name="valign">center</property>
                                             <property name="label" translatable="yes">Private key file: </property>
                                             <property name="use_markup">True</property>
                                           </object>
@@ -2197,14 +2465,14 @@ An alternative to SSH tunneling to access internal machines through gateway.</pr
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
                                             <property name="focus_on_click">False</property>
-                                            <property name="tooltip_text" translatable="yes">SSH private key to use to connect to the jump host</property>
+                                            <property name="tooltip_text" translatable="yes">SSH private key to use to connect to the jump server</property>
                                             <property name="create_folders">False</property>
                                             <property name="local_only">False</property>
                                             <property name="preview_widget_active">False</property>
                                             <property name="title" translatable="yes">Select an OpenSSH Private Key</property>
                                           </object>
                                           <packing>
-                                            <property name="expand">True</property>
+                                            <property name="expand">False</property>
                                             <property name="fill">True</property>
                                             <property name="position">1</property>
                                           </packing>
@@ -2223,6 +2491,22 @@ An alternative to SSH tunneling to access internal machines through gateway.</pr
                                             <property name="position">2</property>
                                           </packing>
                                         </child>
+                                        <child>
+                                          <object class="GtkCheckButton" id="chkPseudoJumpServer">
+                                            <property name="label" translatable="yes">Pseudo jump server</property>
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="receives_default">False</property>
+                                            <property name="tooltip_markup" translatable="yes">Do not use -J option
+Connect to server and open a new local connection instead</property>
+                                            <property name="draw_indicator">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">3</property>
+                                          </packing>
+                                        </child>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -2234,7 +2518,7 @@ An alternative to SSH tunneling to access internal machines through gateway.</pr
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="fill">True</property>
-                                    <property name="position">3</property>
+                                    <property name="position">1</property>
                                   </packing>
                                 </child>
                               </object>
@@ -2332,6 +2616,7 @@ An alternative to SSH tunneling to access internal machines through gateway.</pr
                 <property name="can_focus">False</property>
                 <property name="border_width">5</property>
                 <property name="label_xalign">0</property>
+                <property name="shadow_type">none</property>
                 <child>
                   <object class="GtkAlignment" id="alignSpecific">
                     <property name="visible">True</property>
@@ -2346,7 +2631,7 @@ An alternative to SSH tunneling to access internal machines through gateway.</pr
                   <object class="GtkLabel" id="labelCmdLineOptions">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes"> Connection specific options: </property>
+                    <property name="label" translatable="yes"> Connection specific options</property>
                     <property name="use_markup">True</property>
                   </object>
                 </child>
@@ -2412,6 +2697,7 @@ An alternative to SSH tunneling to access internal machines through gateway.</pr
                 <property name="can_focus">False</property>
                 <property name="border_width">5</property>
                 <property name="label_xalign">0</property>
+                <property name="shadow_type">none</property>
                 <child>
                   <object class="GtkAlignment" id="alignPreExec">
                     <property name="visible">True</property>
@@ -2426,7 +2712,7 @@ An alternative to SSH tunneling to access internal machines through gateway.</pr
                   <object class="GtkLabel" id="label108">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes"> Pre-connections execute: </property>
+                    <property name="label" translatable="yes"> Pre-connections execute</property>
                     <property name="use_markup">True</property>
                   </object>
                 </child>
@@ -2445,7 +2731,7 @@ An alternative to SSH tunneling to access internal machines through gateway.</pr
                   <object class="GtkImage" id="image30">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="stock">gtk-goto-top</property>
+                    <property name="stock">gtk-go-up</property>
                     <property name="icon_size">1</property>
                   </object>
                   <packing>
@@ -2480,6 +2766,7 @@ An alternative to SSH tunneling to access internal machines through gateway.</pr
                 <property name="can_focus">False</property>
                 <property name="border_width">5</property>
                 <property name="label_xalign">0</property>
+                <property name="shadow_type">none</property>
                 <child>
                   <object class="GtkAlignment" id="alignPostExec">
                     <property name="visible">True</property>
@@ -2494,7 +2781,7 @@ An alternative to SSH tunneling to access internal machines through gateway.</pr
                   <object class="GtkLabel" id="label109">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes"> Post-connections execute: </property>
+                    <property name="label" translatable="yes"> Post-connections execute</property>
                     <property name="use_markup">True</property>
                   </object>
                 </child>
@@ -2512,7 +2799,7 @@ An alternative to SSH tunneling to access internal machines through gateway.</pr
                   <object class="GtkImage" id="image31">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="stock">gtk-goto-bottom</property>
+                    <property name="stock">gtk-go-down</property>
                     <property name="icon_size">1</property>
                   </object>
                   <packing>
@@ -2547,6 +2834,7 @@ An alternative to SSH tunneling to access internal machines through gateway.</pr
                 <property name="can_focus">False</property>
                 <property name="border_width">5</property>
                 <property name="label_xalign">0</property>
+                <property name="shadow_type">none</property>
                 <child>
                   <object class="GtkAlignment" id="alignExpect">
                     <property name="visible">True</property>
@@ -2561,7 +2849,7 @@ An alternative to SSH tunneling to access internal machines through gateway.</pr
                   <object class="GtkLabel" id="asdfasdfs">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes"> Expect and Execute: </property>
+                    <property name="label" translatable="yes"> Expect and Execute</property>
                     <property name="use_markup">True</property>
                   </object>
                 </child>
@@ -2579,7 +2867,7 @@ An alternative to SSH tunneling to access internal machines through gateway.</pr
                   <object class="GtkImage" id="image32">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="stock">gtk-jump-to</property>
+                    <property name="stock">gtk-execute</property>
                     <property name="icon_size">1</property>
                   </object>
                   <packing>
@@ -2613,6 +2901,7 @@ An alternative to SSH tunneling to access internal machines through gateway.</pr
                 <property name="can_focus">False</property>
                 <property name="border_width">5</property>
                 <property name="label_xalign">0</property>
+                <property name="shadow_type">none</property>
                 <child>
                   <object class="GtkAlignment" id="alignMacros">
                     <property name="visible">True</property>
@@ -2627,7 +2916,7 @@ An alternative to SSH tunneling to access internal machines through gateway.</pr
                   <object class="GtkLabel" id="label110">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes"> Remote commands list: </property>
+                    <property name="label" translatable="yes"> Remote commands list</property>
                     <property name="use_markup">True</property>
                   </object>
                 </child>
@@ -2680,6 +2969,7 @@ An alternative to SSH tunneling to access internal machines through gateway.</pr
                 <property name="can_focus">False</property>
                 <property name="border_width">5</property>
                 <property name="label_xalign">0</property>
+                <property name="shadow_type">none</property>
                 <child>
                   <object class="GtkAlignment" id="alignLocal">
                     <property name="visible">True</property>
@@ -2694,7 +2984,7 @@ An alternative to SSH tunneling to access internal machines through gateway.</pr
                   <object class="GtkLabel" id="label112">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes"> Local commands list: </property>
+                    <property name="label" translatable="yes"> Local commands list</property>
                     <property name="use_markup">True</property>
                   </object>
                 </child>
@@ -2747,6 +3037,7 @@ An alternative to SSH tunneling to access internal machines through gateway.</pr
                 <property name="can_focus">False</property>
                 <property name="border_width">5</property>
                 <property name="label_xalign">0</property>
+                <property name="shadow_type">none</property>
                 <child>
                   <object class="GtkAlignment" id="alignVar">
                     <property name="visible">True</property>
@@ -2761,7 +3052,7 @@ An alternative to SSH tunneling to access internal machines through gateway.</pr
                   <object class="GtkLabel" id="label114">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes"> User defined Variables: </property>
+                    <property name="label" translatable="yes"> User defined Variables</property>
                     <property name="use_markup">True</property>
                   </object>
                 </child>
@@ -2812,6 +3103,7 @@ An alternative to SSH tunneling to access internal machines through gateway.</pr
                 <property name="can_focus">False</property>
                 <property name="border_width">5</property>
                 <property name="label_xalign">0</property>
+                <property name="shadow_type">none</property>
                 <child>
                   <object class="GtkAlignment" id="alignTermOpts_">
                     <property name="visible">True</property>
@@ -2840,7 +3132,7 @@ An alternative to SSH tunneling to access internal machines through gateway.</pr
                   <object class="GtkLabel" id="label116">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes"> Terminal Options: </property>
+                    <property name="label" translatable="yes"> &lt;b&gt;Terminal Options&lt;/b&gt;</property>
                     <property name="use_markup">True</property>
                   </object>
                 </child>
@@ -3090,7 +3382,7 @@ An alternative to SSH tunneling to access internal machines through gateway.</pr
     <property name="modal">True</property>
     <property name="window_position">center</property>
     <property name="destroy_with_parent">True</property>
-    <child>
+    <child type="titlebar">
       <placeholder/>
     </child>
     <child>
@@ -3171,7 +3463,7 @@ An alternative to SSH tunneling to access internal machines through gateway.</pr
                           <object class="GtkLabel" id="lblLayout">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">&lt;b&gt;Main Window Layout *&lt;/b&gt;</property>
+                            <property name="label" translatable="yes">&lt;b&gt;Main Window Layout (*)&lt;/b&gt;</property>
                             <property name="use_markup">True</property>
                             <property name="track_visited_links">False</property>
                           </object>
@@ -3199,9 +3491,58 @@ An alternative to SSH tunneling to access internal machines through gateway.</pr
                           </packing>
                         </child>
                         <child>
-                          <placeholder/>
+                          <object class="GtkLabel" id="lblLayout1">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">&lt;b&gt;Icons Theme (*)&lt;/b&gt;</property>
+                            <property name="use_markup">True</property>
+                            <property name="track_visited_links">False</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">2</property>
+                          </packing>
                         </child>
-                      </object>
+                        <child>
+                          <object class="GtkComboBoxText" id="comboTheme">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="has_tooltip">True</property>
+                            <property name="active">0</property>
+                            <items>
+                              <item id="default" translatable="yes">default</item>
+                              <item id="asbru-color" translatable="yes">asbru-color</item>
+                              <item id="asbru-dark" translatable="yes">asbru-dark</item>
+                              <item id="system" translatable="yes">system</item>
+                            </items>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLinkButton" id="linkHelpMOBE">
+                            <property name="label" translatable="yes">Help</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
+                            <property name="receives_default">True</property>
+                            <property name="tooltip_text" translatable="yes">Open Online Help</property>
+                            <property name="relief">none</property>
+                            <property name="always_show_image">True</property>
+                            <property name="uri">https://docs.asbru-cm.net/Manual/Preferences/MainOptions/</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="pack_type">end</property>
+                            <property name="position">4</property>
+                          </packing>
+                        </child>
+                      </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
@@ -3209,21 +3550,34 @@ An alternative to SSH tunneling to access internal machines through gateway.</pr
                         <property name="position">0</property>
                       </packing>
                     </child>
+                    <child>
+                      <object class="GtkSeparator">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="margin_bottom">4</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
                     <child>
                       <object class="GtkBox" id="hbox18">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
+                        <property name="margin_bottom">2</property>
+                        <property name="spacing">20</property>
                         <child>
                           <object class="GtkFrame" id="frame10">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="label_xalign">0</property>
+                            <property name="shadow_type">none</property>
                             <child>
                               <object class="GtkAlignment" id="alignment16">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="border_width">2</property>
-                                <property name="left_padding">12</property>
                                 <child>
                                   <object class="GtkBox" id="vbox24">
                                     <property name="visible">True</property>
@@ -3303,14 +3657,14 @@ An alternative to SSH tunneling to access internal machines through gateway.</pr
                               <object class="GtkLabel" id="label53">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="label" translatable="yes"> Start: </property>
+                                <property name="label" translatable="yes">&lt;b&gt;At start&lt;/b&gt; </property>
                                 <property name="use_markup">True</property>
                               </object>
                             </child>
                           </object>
                           <packing>
                             <property name="expand">False</property>
-                            <property name="fill">True</property>
+                            <property name="fill">False</property>
                             <property name="position">0</property>
                           </packing>
                         </child>
@@ -3319,12 +3673,11 @@ An alternative to SSH tunneling to access internal machines through gateway.</pr
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="label_xalign">0</property>
+                            <property name="shadow_type">none</property>
                             <child>
                               <object class="GtkAlignment" id="alignment17">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="border_width">2</property>
-                                <property name="left_padding">12</property>
                                 <child>
                                   <object class="GtkBox" id="vbox25">
                                     <property name="visible">True</property>
@@ -3354,6 +3707,8 @@ An alternative to SSH tunneling to access internal machines through gateway.</pr
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
+                                        <property name="has_tooltip">True</property>
+                                        <property name="tooltip_text" translatable="yes">If checked, always ask confirmation before quiting the application.</property>
                                         <property name="xalign">0.5</property>
                                         <property name="draw_indicator">True</property>
                                       </object>
@@ -3365,11 +3720,15 @@ An alternative to SSH tunneling to access internal machines through gateway.</pr
                                     </child>
                                     <child>
                                       <object class="GtkCheckButton" id="cbCfgSaveOnExit">
-                                        <property name="label" translatable="yes">Auto save config changes</property>
+                                        <property name="label" translatable="yes">Auto save on exit</property>
                                         <property name="use_action_appearance">False</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
+                                        <property name="has_tooltip">True</property>
+                                        <property name="tooltip_text" translatable="yes">If checked, any configuration changes will be automatically saved before stopping the application.
+
+If you have the option "Automatically save every configuration change" checked, this option is not relevant.</property>
                                         <property name="xalign">0.5</property>
                                         <property name="draw_indicator">True</property>
                                       </object>
@@ -3379,73 +3738,22 @@ An alternative to SSH tunneling to access internal machines through gateway.</pr
                                         <property name="position">2</property>
                                       </packing>
                                     </child>
-                                  </object>
-                                </child>
-                              </object>
-                            </child>
-                            <child type="label">
-                              <object class="GtkLabel" id="label54">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" translatable="yes"> At exit: </property>
-                                <property name="use_markup">True</property>
-                              </object>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkFrame" id="frame14">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="border_width">2</property>
-                            <property name="label_xalign">0</property>
-                            <child>
-                              <object class="GtkAlignment" id="alignment20">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="left_padding">12</property>
-                                <child>
-                                  <object class="GtkBox" id="vbox16">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="orientation">vertical</property>
                                     <child>
-                                      <object class="GtkRadioButton" id="rbCfgCtrlTabLast">
-                                        <property name="label" translatable="yes">Last focused</property>
+                                      <object class="GtkCheckButton" id="cbCfgAutoSave">
+                                        <property name="label" translatable="yes">Automatically save every configuration change</property>
                                         <property name="use_action_appearance">False</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
-                                        <property name="xalign">0.5</property>
+                                        <property name="halign">start</property>
+                                        <property name="xalign">0</property>
                                         <property name="active">True</property>
                                         <property name="draw_indicator">True</property>
                                       </object>
                                       <packing>
-                                        <property name="expand">True</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkRadioButton" id="rbCfgCtrlTabNext">
-                                        <property name="label" translatable="yes">Next</property>
-                                        <property name="use_action_appearance">False</property>
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">False</property>
-                                        <property name="xalign">0.5</property>
-                                        <property name="draw_indicator">True</property>
-                                        <property name="group">rbCfgCtrlTabLast</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">True</property>
+                                        <property name="expand">False</property>
                                         <property name="fill">True</property>
-                                        <property name="position">1</property>
+                                        <property name="position">3</property>
                                       </packing>
                                     </child>
                                   </object>
@@ -3453,99 +3761,37 @@ An alternative to SSH tunneling to access internal machines through gateway.</pr
                               </object>
                             </child>
                             <child type="label">
-                              <object class="GtkLabel" id="label73">
+                              <object class="GtkLabel" id="label54">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="label" translatable="yes"> CTRL-TAB goes to: </property>
+                                <property name="label" translatable="yes">&lt;b&gt;At exit&lt;/b&gt;</property>
                                 <property name="use_markup">True</property>
                               </object>
                             </child>
                           </object>
                           <packing>
                             <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
+                            <property name="fill">False</property>
+                            <property name="position">1</property>
                           </packing>
                         </child>
                       </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">1</property>
+                        <property name="position">2</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkBox" id="hbox21">
+                      <object class="GtkSeparator" id="hrBehaviour">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="has_tooltip">True</property>
-                        <property name="tooltip_text" translatable="yes">Here you can select which key bindings will not be available in tabbed window (the one containing the launched connections in TABs)</property>
-                        <child>
-                          <object class="GtkLabel" id="label57">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes"> Select key bindings to disable from TABs Window: </property>
-                            <property name="use_markup">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkCheckButton" id="cbCfgCTRLDisable">
-                            <property name="label" translatable="yes">CTRL  </property>
-                            <property name="use_action_appearance">False</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="xalign">0.5</property>
-                            <property name="draw_indicator">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkCheckButton" id="cbCfgALTDisable">
-                            <property name="label" translatable="yes">ALT  </property>
-                            <property name="use_action_appearance">False</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="xalign">0.5</property>
-                            <property name="draw_indicator">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkCheckButton" id="cbCfgSHIFTDisable">
-                            <property name="label" translatable="yes">SHIFT</property>
-                            <property name="use_action_appearance">False</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="xalign">0.5</property>
-                            <property name="draw_indicator">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">3</property>
-                          </packing>
-                        </child>
+                        <property name="margin_bottom">2</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">2</property>
+                        <property name="position">4</property>
                       </packing>
                     </child>
                     <child>
@@ -3613,7 +3859,7 @@ An alternative to SSH tunneling to access internal machines through gateway.</pr
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">3</property>
+                        <property name="position">6</property>
                       </packing>
                     </child>
                     <child>
@@ -3623,13 +3869,14 @@ An alternative to SSH tunneling to access internal machines through gateway.</pr
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
+                        <property name="halign">start</property>
                         <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">4</property>
+                        <property name="position">7</property>
                       </packing>
                     </child>
                     <child>
@@ -3639,13 +3886,14 @@ An alternative to SSH tunneling to access internal machines through gateway.</pr
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
+                        <property name="halign">start</property>
                         <property name="xalign">0.5</property>
                         <property name="draw_indicator">True</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">5</property>
+                        <property name="position">8</property>
                       </packing>
                     </child>
                     <child>
@@ -3687,55 +3935,7 @@ An alternative to SSH tunneling to access internal machines through gateway.</pr
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">6</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkBox" id="hbox6">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <child>
-                          <object class="GtkCheckButton" id="cbCfgPreConnPingPort">
-                            <property name="label" translatable="yes">Check port status at connect . Timeout: </property>
-                            <property name="use_action_appearance">False</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="has_tooltip">True</property>
-                            <property name="tooltip_text" translatable="yes">Check server's ports reachability before
-connecting (timeout is in seconds)</property>
-                            <property name="xalign">0.5</property>
-                            <property name="draw_indicator">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkSpinButton" id="spCfgPingTimeout">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="invisible_char">•</property>
-                            <property name="text" translatable="yes">10</property>
-                            <property name="primary_icon_activatable">False</property>
-                            <property name="secondary_icon_activatable">False</property>
-                            <property name="adjustment">adjSecWait</property>
-                            <property name="numeric">True</property>
-                            <property name="update_policy">if-valid</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">7</property>
+                        <property name="position">9</property>
                       </packing>
                     </child>
                     <child>
@@ -3745,6 +3945,7 @@ connecting (timeout is in seconds)</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
+                        <property name="halign">start</property>
                         <property name="xalign">0.5</property>
                         <property name="active">True</property>
                         <property name="draw_indicator">True</property>
@@ -3752,24 +3953,7 @@ connecting (timeout is in seconds)</property>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">8</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkCheckButton" id="cbCfgAutoSave">
-                        <property name="label" translatable="yes">Automatically save every configuration change</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="xalign">0.5</property>
-                        <property name="active">True</property>
-                        <property name="draw_indicator">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">9</property>
+                        <property name="position">11</property>
                       </packing>
                     </child>
                     <child>
@@ -3779,13 +3963,14 @@ connecting (timeout is in seconds)</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="no_show_all">True</property>
+                        <property name="halign">start</property>
                         <property name="xalign">0.5</property>
                         <property name="draw_indicator">True</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">10</property>
+                        <property name="position">12</property>
                       </packing>
                     </child>
                     <child>
@@ -3794,11 +3979,12 @@ connecting (timeout is in seconds)</property>
                         <property name="can_focus">False</property>
                         <property name="label" translatable="yes">&lt;i&gt;(*) Requires restart to take effect&lt;/i&gt;</property>
                         <property name="use_markup">True</property>
+                        <property name="track_visited_links">False</property>
                       </object>
                       <packing>
                         <property name="expand">True</property>
                         <property name="fill">True</property>
-                        <property name="position">11</property>
+                        <property name="position">13</property>
                       </packing>
                     </child>
                   </object>
@@ -3847,100 +4033,17 @@ connecting (timeout is in seconds)</property>
                     <property name="margin_bottom">4</property>
                     <property name="orientation">vertical</property>
                     <child>
-                      <object class="GtkBox" id="hbox28">
+                      <object class="GtkBox" id="hbox33">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
-                          <object class="GtkFrame" id="frame12">
+                          <object class="GtkLabel" id="label66">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="has_tooltip">True</property>
-                            <property name="tooltip_text" translatable="yes">Select the fore/background color of Protected tree nodes</property>
-                            <property name="border_width">5</property>
-                            <property name="label_xalign">0</property>
-                            <child>
-                              <object class="GtkAlignment" id="alignment18">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="border_width">2</property>
-                                <property name="xscale">0.94999998807907104</property>
-                                <property name="left_padding">12</property>
-                                <child>
-                                  <object class="GtkBox" id="hbox41">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <child>
-                                      <object class="GtkBox" id="vbox26">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="orientation">vertical</property>
-                                        <child>
-                                          <object class="GtkRadioButton" id="rbCfgForeground">
-                                            <property name="label" translatable="yes">Foreground</property>
-                                            <property name="use_action_appearance">False</property>
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">True</property>
-                                            <property name="receives_default">False</property>
-                                            <property name="xalign">0.5</property>
-                                            <property name="draw_indicator">True</property>
-                                            <property name="group">rbCfgBackground</property>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">True</property>
-                                            <property name="fill">True</property>
-                                            <property name="position">0</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkRadioButton" id="rbCfgBackground">
-                                            <property name="label" translatable="yes">Background</property>
-                                            <property name="use_action_appearance">False</property>
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">True</property>
-                                            <property name="receives_default">False</property>
-                                            <property name="xalign">0.5</property>
-                                            <property name="active">True</property>
-                                            <property name="draw_indicator">True</property>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">True</property>
-                                            <property name="fill">True</property>
-                                            <property name="position">1</property>
-                                          </packing>
-                                        </child>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkColorButton" id="colorCfgProtected">
-                                        <property name="use_action_appearance">False</property>
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">True</property>
-                                        <property name="rgba">rgb(0,0,0)</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">True</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">1</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                </child>
-                              </object>
-                            </child>
-                            <child type="label">
-                              <object class="GtkLabel" id="label55">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" translatable="yes"> Colour Protected nodes with (*): </property>
-                                <property name="use_markup">True</property>
-                              </object>
-                            </child>
+                            <property name="label" translatable="yes">&lt;b&gt;Start on&lt;/b&gt;</property>
+                            <property name="use_markup">True</property>
+                            <property name="width_chars">12</property>
+                            <property name="xalign">0</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -3949,97 +4052,15 @@ connecting (timeout is in seconds)</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkFrame" id="frame4">
+                          <object class="GtkRadioButton" id="rbCfgStartTreeConn">
+                            <property name="label" translatable="yes">Connections</property>
+                            <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="border_width">5</property>
-                            <property name="label_xalign">0</property>
-                            <child>
-                              <object class="GtkAlignment" id="alignment8">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="border_width">2</property>
-                                <property name="xscale">0.94999998807907104</property>
-                                <property name="left_padding">12</property>
-                                <child>
-                                  <object class="GtkBox" id="vbox9">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="orientation">vertical</property>
-                                    <child>
-                                      <object class="GtkRadioButton" id="rbCfgInternalViewer">
-                                        <property name="label" translatable="yes">Internal viewer</property>
-                                        <property name="use_action_appearance">False</property>
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">False</property>
-                                        <property name="xalign">0.5</property>
-                                        <property name="draw_indicator">True</property>
-                                        <property name="group">rbCfgExternalViewer</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">True</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkBox" id="hbox29">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="has_tooltip">True</property>
-                                        <property name="tooltip_text" translatable="yes">The screenshot's file name will be appended at the end of the given command</property>
-                                        <child>
-                                          <object class="GtkRadioButton" id="rbCfgExternalViewer">
-                                            <property name="label" translatable="yes">External viewer:</property>
-                                            <property name="use_action_appearance">False</property>
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">True</property>
-                                            <property name="receives_default">False</property>
-                                            <property name="xalign">0.5</property>
-                                            <property name="active">True</property>
-                                            <property name="draw_indicator">True</property>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="fill">True</property>
-                                            <property name="position">0</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkEntry" id="entryCfgExternalViewer">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">True</property>
-                                            <property name="invisible_char">•</property>
-                                            <property name="text" translatable="yes">/usr/bin/xdg-open</property>
-                                            <property name="primary_icon_activatable">False</property>
-                                            <property name="secondary_icon_activatable">False</property>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">True</property>
-                                            <property name="fill">True</property>
-                                            <property name="position">1</property>
-                                          </packing>
-                                        </child>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">True</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">1</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                </child>
-                              </object>
-                            </child>
-                            <child type="label">
-                              <object class="GtkLabel" id="label42">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" translatable="yes"> When opening screenshots, use: </property>
-                                <property name="use_markup">True</property>
-                              </object>
-                            </child>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="xalign">0.5</property>
+                            <property name="draw_indicator">True</property>
+                            <property name="group">rbCfgStartTreeFavs</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -4047,6 +4068,76 @@ connecting (timeout is in seconds)</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
+                        <child>
+                          <object class="GtkRadioButton" id="rbCfgStartTreeFavs">
+                            <property name="label" translatable="yes">Favourites</property>
+                            <property name="use_action_appearance">False</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="xalign">0.5</property>
+                            <property name="active">True</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkRadioButton" id="rbCfgStartTreeHist">
+                            <property name="label" translatable="yes">History</property>
+                            <property name="use_action_appearance">False</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="xalign">0.5</property>
+                            <property name="draw_indicator">True</property>
+                            <property name="group">rbCfgStartTreeFavs</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkRadioButton" id="rbCfgStartTreeCluster">
+                            <property name="label" translatable="yes">Clusters</property>
+                            <property name="use_action_appearance">False</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="xalign">0.5</property>
+                            <property name="draw_indicator">True</property>
+                            <property name="group">rbCfgStartTreeFavs</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">4</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLinkButton" id="linkHelpMOLF">
+                            <property name="label" translatable="yes">Help</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
+                            <property name="receives_default">True</property>
+                            <property name="tooltip_text" translatable="yes">Open Online Help</property>
+                            <property name="relief">none</property>
+                            <property name="always_show_image">True</property>
+                            <property name="uri">https://docs.asbru-cm.net/Manual/Preferences/LookAndFeel/</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="pack_type">end</property>
+                            <property name="position">5</property>
+                          </packing>
+                        </child>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -4055,311 +4146,211 @@ connecting (timeout is in seconds)</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkFrame" id="frameTabsInMainWindow">
+                      <object class="GtkSeparator" id="hrConnections2">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="border_width">5</property>
-                        <property name="label_xalign">0</property>
+                        <property name="margin_top">4</property>
+                        <property name="margin_bottom">4</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="padding">1</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkBox">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="homogeneous">True</property>
                         <child>
-                          <object class="GtkAlignment" id="alignment9">
+                          <object class="GtkCheckButton" id="cbCfgSaveShowScreenshots">
+                            <property name="label" translatable="yes">Show screenshots</property>
+                            <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="left_padding">12</property>
-                            <child>
-                              <object class="GtkBox" id="vbox27">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="orientation">vertical</property>
-                                <child>
-                                  <object class="GtkCheckButton" id="cbCfgButtonBarAutoHide">
-                                    <property name="label" translatable="yes">Auto hide main button bar on Terminal Open</property>
-                                    <property name="use_action_appearance">False</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="has_tooltip">True</property>
-                                    <property name="tooltip_text" translatable="yes">If checked, this option will hide the the button bar when on a terminal tab (increasing the vertical space usable for the terminal)</property>
-                                    <property name="xalign">0</property>
-                                    <property name="draw_indicator">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkCheckButton" id="cbCfgConnectionsAutoHide">
-                                    <property name="label" translatable="yes">Hide connections list (on terminal open)</property>
-                                    <property name="use_action_appearance">False</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="has_tooltip">True</property>
-                                    <property name="tooltip_text" translatable="yes">If checked, the connections list will be hidden when a new terminal is open.  This can be useful to increase the space usable for the tabbed terminals.</property>
-                                    <property name="xalign">0.5</property>
-                                    <property name="draw_indicator">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkCheckButton" id="cbCfgPreventMOShowTree">
-                                    <property name="label" translatable="yes">Auto show/hide when entering/leaving connections list</property>
-                                    <property name="use_action_appearance">False</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="has_tooltip">True</property>
-                                    <property name="tooltip_text" translatable="yes">If checked, the connections list will be shown/hidden when the mouse enters/leaves the connections list area.</property>
-                                    <property name="xalign">0.5</property>
-                                    <property name="draw_indicator">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkBox" id="hbox30">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <child>
-                                      <object class="GtkLabel" id="label65">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="label" translatable="yes">Show connections on (*): </property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkImage" id="image15">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="stock">gtk-goto-first</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel" id="label60">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="label" translatable="yes"> Left</property>
-                                        <property name="xalign">0.43999999761581421</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">2</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkRadioButton" id="cbCfgTreeOnLeft">
-                                        <property name="use_action_appearance">False</property>
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="focus_on_click">False</property>
-                                        <property name="receives_default">False</property>
-                                        <property name="xalign">0.5</property>
-                                        <property name="active">True</property>
-                                        <property name="draw_indicator">True</property>
-                                        <property name="group">cbCfgTreeOnRight</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">3</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkRadioButton" id="cbCfgTreeOnRight">
-                                        <property name="use_action_appearance">False</property>
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="focus_on_click">False</property>
-                                        <property name="receives_default">False</property>
-                                        <property name="xalign">0.5</property>
-                                        <property name="active">True</property>
-                                        <property name="draw_indicator">True</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">4</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel" id="label64">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="label" translatable="yes"> Right </property>
-                                        <property name="xalign">0.43999999761581421</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">5</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkImage" id="image16">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="stock">gtk-goto-last</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">6</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">2</property>
-                                  </packing>
-                                </child>
-                              </object>
-                            </child>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="halign">start</property>
+                            <property name="xalign">0</property>
+                            <property name="draw_indicator">True</property>
                           </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
                         </child>
-                        <child type="label">
-                          <object class="GtkCheckButton" id="cbCfgTabsInMain">
-                            <property name="label" translatable="yes">Put Terminal TABS in Main Window (*): </property>
+                        <child>
+                          <object class="GtkCheckButton" id="cbCfgShowStatistics">
+                            <property name="label" translatable="yes">Show statistics</property>
                             <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
-                            <property name="has_tooltip">True</property>
-                            <property name="tooltip_text" translatable="yes">If unchecked, every terminal will be opened by default in a separate window</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">start</property>
+                            <property name="xalign">0</property>
                             <property name="draw_indicator">True</property>
                           </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
                         </child>
                       </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">1</property>
+                        <property name="position">2</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkBox" id="hbox33">
+                      <object class="GtkBox">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
+                        <property name="homogeneous">True</property>
                         <child>
-                          <object class="GtkLabel" id="label66">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Start on: </property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkRadioButton" id="rbCfgStartTreeConn">
-                            <property name="label" translatable="yes">Connections</property>
+                          <object class="GtkCheckButton" id="cbCfgShowTrayIcon">
+                            <property name="label" translatable="yes">Always show Tray icon</property>
                             <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">start</property>
+                            <property name="xalign">0</property>
+                            <property name="active">True</property>
                             <property name="draw_indicator">True</property>
-                            <property name="group">rbCfgStartTreeFavs</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">True</property>
-                            <property name="position">1</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkRadioButton" id="rbCfgStartTreeFavs">
-                            <property name="label" translatable="yes">Favourites</property>
-                            <property name="use_action_appearance">False</property>
+                          <object class="GtkBox" id="hbox48">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="xalign">0.5</property>
-                            <property name="active">True</property>
-                            <property name="draw_indicator">True</property>
+                            <property name="can_focus">False</property>
+                            <child>
+                              <object class="GtkCheckButton" id="cbCfgBWTrayIcon">
+                                <property name="label" translatable="yes">Use Black &amp; White tray icon (*) </property>
+                                <property name="use_action_appearance">False</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="halign">start</property>
+                                <property name="xalign">0</property>
+                                <property name="draw_indicator">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkImage" id="imgTrayIcon">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="stock">gtk-missing-image</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
                           </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">True</property>
-                            <property name="position">2</property>
+                            <property name="position">1</property>
                           </packing>
                         </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">3</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkBox">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="homogeneous">True</property>
                         <child>
-                          <object class="GtkRadioButton" id="rbCfgStartTreeHist">
-                            <property name="label" translatable="yes">History</property>
+                          <object class="GtkCheckButton" id="cbCfgSelectionToClipboard">
+                            <property name="label" translatable="yes">Mouse selection copies content to global clipboard</property>
                             <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
-                            <property name="xalign">0.5</property>
+                            <property name="tooltip_text" translatable="yes">not just primary clipboard</property>
+                            <property name="halign">start</property>
+                            <property name="xalign">0</property>
+                            <property name="active">True</property>
                             <property name="draw_indicator">True</property>
-                            <property name="group">rbCfgStartTreeFavs</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">True</property>
-                            <property name="position">3</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkRadioButton" id="rbCfgStartTreeCluster">
-                            <property name="label" translatable="yes">Clusters</property>
+                          <object class="GtkCheckButton" id="cbCfgAllowMoreInstances">
+                            <property name="label" translatable="yes">Allow more than one instance to run at the same time</property>
                             <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
-                            <property name="xalign">0.5</property>
+                            <property name="halign">start</property>
+                            <property name="xalign">0</property>
                             <property name="draw_indicator">True</property>
-                            <property name="group">rbCfgStartTreeFavs</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">True</property>
-                            <property name="position">4</property>
+                            <property name="position">1</property>
                           </packing>
                         </child>
                       </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">2</property>
+                        <property name="position">4</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkBox" id="hbox39">
+                      <object class="GtkSeparator" id="hrConnections">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="margin_top">4</property>
+                        <property name="margin_bottom">4</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="padding">1</property>
+                        <property name="position">6</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkBox">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
+                        <property name="homogeneous">True</property>
                         <child>
-                          <object class="GtkCheckButton" id="cbCfgShowTreeTooltips">
-                            <property name="label" translatable="yes">Show connections tooltips</property>
-                            <property name="use_action_appearance">False</property>
+                          <object class="GtkLabel" id="label65">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="xalign">0.5</property>
-                            <property name="draw_indicator">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="halign">start</property>
+                            <property name="label" translatable="yes">Show connections on (*) </property>
+                            <attributes>
+                              <attribute name="weight" value="bold"/>
+                            </attributes>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -4368,68 +4359,121 @@ connecting (timeout is in seconds)</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkSeparator" id="vseparator5">
+                          <object class="GtkBox" id="hbox30">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="margin_left">6</property>
-                            <property name="margin_right">6</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">2</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label41">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Font for info tab: </property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkFontButton" id="fontInfo">
-                            <property name="use_action_appearance">False</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="focus_on_click">False</property>
-                            <property name="receives_default">True</property>
-                            <property name="font">Sans 12</property>
-                            <property name="title" translatable="yes">Pick a Font for the Connections Tree</property>
-                            <property name="use_font">True</property>
-                            <property name="use_size">True</property>
+                            <child>
+                              <object class="GtkImage" id="image15">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="stock">gtk-go-back</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="label60">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes"> Left</property>
+                                <property name="xalign">0.43999999761581421</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkRadioButton" id="cbCfgTreeOnLeft">
+                                <property name="use_action_appearance">False</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="focus_on_click">False</property>
+                                <property name="receives_default">False</property>
+                                <property name="xalign">0</property>
+                                <property name="draw_indicator">True</property>
+                                <property name="group">cbCfgTreeOnRight</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">3</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkRadioButton" id="cbCfgTreeOnRight">
+                                <property name="use_action_appearance">False</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="focus_on_click">False</property>
+                                <property name="receives_default">False</property>
+                                <property name="margin_left">30</property>
+                                <property name="xalign">0</property>
+                                <property name="active">True</property>
+                                <property name="draw_indicator">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">4</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="label64">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes"> Right </property>
+                                <property name="xalign">0.43999999761581421</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">5</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkImage" id="image16">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="stock">gtk-go-forward</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">6</property>
+                              </packing>
+                            </child>
                           </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">True</property>
-                            <property name="position">3</property>
+                            <property name="position">1</property>
                           </packing>
                         </child>
                       </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">3</property>
+                        <property name="position">7</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkBox" id="hbox36">
+                      <object class="GtkBox" id="hbox39">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
+                        <property name="homogeneous">True</property>
                         <child>
-                          <object class="GtkCheckButton" id="cbCfgEnableTreeLines">
-                            <property name="label" translatable="yes">Show  lines in connections tree</property>
+                          <object class="GtkCheckButton" id="cbCfgShowTreeTooltips">
+                            <property name="label" translatable="yes">Show connections tooltips</property>
                             <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
+                            <property name="halign">start</property>
                             <property name="xalign">0.5</property>
                             <property name="draw_indicator">True</property>
                           </object>
@@ -4440,89 +4484,110 @@ connecting (timeout is in seconds)</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkSeparator" id="vseparator4">
+                          <object class="GtkCheckButton" id="cbCfgEnableTreeLines">
+                            <property name="label" translatable="yes">Show  lines in connections tree</property>
+                            <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_left">6</property>
-                            <property name="margin_right">6</property>
-                            <property name="orientation">vertical</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="halign">start</property>
+                            <property name="xalign">0</property>
+                            <property name="draw_indicator">True</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">True</property>
-                            <property name="padding">2</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">8</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkBox">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="homogeneous">True</property>
                         <child>
-                          <object class="GtkLabel" id="label67">
+                          <object class="GtkCheckButton" id="cbCfgEnableOverlayScrolling">
+                            <property name="label" translatable="yes">Enable overlay scrolling for connections tree</property>
+                            <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Font for the connections tree (*): </property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="tooltip_text" translatable="yes">If enabled, the scrollbars are only added as traditional widgets when a mouse is present. Otherwise, they are overlayed on top of the content, as narrow indicators.</property>
+                            <property name="halign">start</property>
+                            <property name="xalign">0</property>
+                            <property name="active">True</property>
+                            <property name="draw_indicator">True</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">True</property>
-                            <property name="position">2</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkFontButton" id="fontTree">
+                          <object class="GtkCheckButton" id="cbCfgShowTreeTitles">
+                            <property name="label" translatable="yes">Show tree titles</property>
                             <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="focus_on_click">False</property>
-                            <property name="receives_default">True</property>
-                            <property name="font">Sans 12</property>
-                            <property name="title" translatable="yes">Pick a Font for the Connections Tree</property>
-                            <property name="use_font">True</property>
-                            <property name="use_size">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="tooltip_text" translatable="yes">If enabled, the title of the currently shown tree (Connections, History, Clusters, ...) will be shown.
+
+Otherwise, only the icon will be shown and save screen space.</property>
+                            <property name="halign">start</property>
+                            <property name="xalign">0</property>
+                            <property name="active">True</property>
+                            <property name="draw_indicator">True</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">True</property>
-                            <property name="position">3</property>
+                            <property name="position">1</property>
                           </packing>
                         </child>
                       </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">4</property>
+                        <property name="position">9</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkCheckButton" id="cbCfgEnableOverlayScrolling">
-                        <property name="label" translatable="yes">Enable overlay scrolling for connections tree</property>
-                        <property name="use_action_appearance">False</property>
+                      <object class="GtkSeparator" id="hrConnections1">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="tooltip_text" translatable="yes">If enabled, the scrollbars are only added as traditional widgets when a mouse is present. Otherwise, they are overlayed on top of the content, as narrow indicators.</property>
-                        <property name="xalign">0</property>
-                        <property name="active">True</property>
-                        <property name="draw_indicator">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="margin_top">4</property>
+                        <property name="margin_bottom">4</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">5</property>
+                        <property name="padding">1</property>
+                        <property name="position">10</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkBox">
+                      <object class="GtkBox" id="hbox36">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="spacing">41</property>
+                        <property name="spacing">9</property>
                         <child>
-                          <object class="GtkCheckButton" id="cbCfgSaveShowScreenshots">
-                            <property name="label" translatable="yes">Show screenshots</property>
-                            <property name="use_action_appearance">False</property>
+                          <object class="GtkLabel" id="label41">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">Font for </property>
+                            <property name="width_chars">10</property>
                             <property name="xalign">0</property>
-                            <property name="draw_indicator">True</property>
+                            <attributes>
+                              <attribute name="weight" value="bold"/>
+                            </attributes>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -4531,14 +4596,10 @@ connecting (timeout is in seconds)</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkCheckButton" id="cbCfgShowStatistics">
-                            <property name="label" translatable="yes">Show statistics</property>
-                            <property name="use_action_appearance">False</property>
+                          <object class="GtkLabel">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="xalign">0</property>
-                            <property name="draw_indicator">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">Info tab</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -4546,169 +4607,572 @@ connecting (timeout is in seconds)</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">6</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkBox">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="spacing">14</property>
                         <child>
-                          <object class="GtkCheckButton" id="cbCfgShowTrayIcon">
-                            <property name="label" translatable="yes">Always show Tray icon</property>
+                          <object class="GtkFontButton" id="fontInfo">
                             <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="xalign">0</property>
-                            <property name="active">True</property>
-                            <property name="draw_indicator">True</property>
+                            <property name="focus_on_click">False</property>
+                            <property name="receives_default">True</property>
+                            <property name="font">Sans 12</property>
+                            <property name="title" translatable="yes">Pick a Font for the Connections Tree</property>
+                            <property name="use_font">True</property>
+                            <property name="use_size">True</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">True</property>
-                            <property name="position">0</property>
+                            <property name="position">2</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkBox" id="hbox48">
+                          <object class="GtkLabel" id="label67">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <child>
-                              <object class="GtkCheckButton" id="cbCfgBWTrayIcon">
-                                <property name="label" translatable="yes">Use Black &amp; White tray icon (*) </property>
-                                <property name="use_action_appearance">False</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="xalign">0</property>
-                                <property name="draw_indicator">True</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkImage" id="imgTrayIcon">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="stock">gtk-missing-image</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
+                            <property name="margin_left">5</property>
+                            <property name="label" translatable="yes">Connection list</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">True</property>
-                            <property name="position">1</property>
+                            <property name="position">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkFontButton" id="fontTree">
+                            <property name="use_action_appearance">False</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
+                            <property name="receives_default">True</property>
+                            <property name="font">Sans 12</property>
+                            <property name="title" translatable="yes">Pick a Font for the Connections Tree</property>
+                            <property name="use_font">True</property>
+                            <property name="use_size">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">4</property>
                           </packing>
                         </child>
                       </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">7</property>
+                        <property name="position">12</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkCheckButton" id="cbCfgSelectionToClipboard">
-                        <property name="label" translatable="yes">Mouse selection copies content to global clipboard (not just PRIMARY clipboard)</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="xalign">0.5</property>
-                        <property name="active">True</property>
-                        <property name="draw_indicator">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">9</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkCheckButton" id="cbCfgAllowMoreInstances">
-                        <property name="label" translatable="yes">Allow more than one instance to run at the same time</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="xalign">0.5</property>
-                        <property name="draw_indicator">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">10</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="lblRestartRequired1">
+                      <object class="GtkBox" id="hbox28">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">(*) Requires restart to take effect</property>
+                        <child>
+                          <object class="GtkLabel" id="lblColors">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">Color for </property>
+                            <property name="width_chars">10</property>
+                            <property name="xalign">0</property>
+                            <property name="yalign">0.079999998211860657</property>
+                            <attributes>
+                              <attribute name="weight" value="bold"/>
+                            </attributes>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkFrame" id="frame5">
+                            <property name="width_request">170</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="has_tooltip">True</property>
+                            <property name="tooltip_text" translatable="yes">Select the fore/background color of Protected tree nodes</property>
+                            <property name="border_width">5</property>
+                            <property name="label_xalign">0</property>
+                            <property name="shadow_type">none</property>
+                            <child>
+                              <object class="GtkAlignment" id="alignment13">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="border_width">0</property>
+                                <property name="xalign">0</property>
+                                <property name="xscale">0.94999998807907104</property>
+                                <child>
+                                  <object class="GtkBox" id="hbox2">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <child>
+                                      <object class="GtkBox" id="vbox8">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="orientation">vertical</property>
+                                        <child>
+                                          <object class="GtkRadioButton" id="rbCfgUnForeground">
+                                            <property name="label" translatable="yes">Foreground</property>
+                                            <property name="use_action_appearance">False</property>
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="receives_default">False</property>
+                                            <property name="xalign">0</property>
+                                            <property name="draw_indicator">True</property>
+                                            <property name="group">rbCfgUnBackground</property>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">True</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkRadioButton" id="rbCfgUnBackground">
+                                            <property name="label" translatable="yes">Background</property>
+                                            <property name="use_action_appearance">False</property>
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="receives_default">False</property>
+                                            <property name="xalign">0</property>
+                                            <property name="active">True</property>
+                                            <property name="draw_indicator">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">True</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">1</property>
+                                          </packing>
+                                        </child>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkColorButton" id="colorCfgUnProtected">
+                                        <property name="use_action_appearance">False</property>
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="receives_default">True</property>
+                                        <property name="rgba">rgb(0,0,0)</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                            <child type="label">
+                              <object class="GtkLabel" id="label49">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes">Unprotected nodes (*)</property>
+                                <property name="use_markup">True</property>
+                              </object>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkFrame" id="frame12">
+                            <property name="width_request">170</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="has_tooltip">True</property>
+                            <property name="tooltip_text" translatable="yes">Select the fore/background color of Protected tree nodes</property>
+                            <property name="border_width">5</property>
+                            <property name="label_xalign">0</property>
+                            <property name="shadow_type">none</property>
+                            <child>
+                              <object class="GtkAlignment" id="alignment18">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="border_width">0</property>
+                                <property name="xalign">0</property>
+                                <property name="xscale">0.94999998807907104</property>
+                                <child>
+                                  <object class="GtkBox" id="hbox41">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <child>
+                                      <object class="GtkBox" id="vbox26">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="orientation">vertical</property>
+                                        <child>
+                                          <object class="GtkRadioButton" id="rbCfgForeground">
+                                            <property name="label" translatable="yes">Foreground</property>
+                                            <property name="use_action_appearance">False</property>
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="receives_default">False</property>
+                                            <property name="xalign">0</property>
+                                            <property name="draw_indicator">True</property>
+                                            <property name="group">rbCfgBackground</property>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">True</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkRadioButton" id="rbCfgBackground">
+                                            <property name="label" translatable="yes">Background</property>
+                                            <property name="use_action_appearance">False</property>
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="receives_default">False</property>
+                                            <property name="xalign">0</property>
+                                            <property name="draw_indicator">True</property>
+                                            <property name="group">rbCfgForeground</property>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">True</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">1</property>
+                                          </packing>
+                                        </child>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkColorButton" id="colorCfgProtected">
+                                        <property name="use_action_appearance">False</property>
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="receives_default">True</property>
+                                        <property name="rgba">rgb(0,0,0)</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                            <child type="label">
+                              <object class="GtkLabel" id="label55">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes">Protected nodes (*)</property>
+                                <property name="use_markup">True</property>
+                              </object>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">2</property>
+                          </packing>
+                        </child>
                       </object>
                       <packing>
-                        <property name="expand">True</property>
+                        <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">11</property>
+                        <property name="position">13</property>
                       </packing>
                     </child>
-                  </object>
-                  <packing>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child type="tab">
-                  <object class="GtkBox" id="hbox22">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <child>
-                      <object class="GtkImage" id="image17">
+                      <object class="GtkSeparator">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="stock">gtk-page-setup</property>
+                        <property name="margin_top">4</property>
+                        <property name="margin_bottom">4</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">0</property>
+                        <property name="position">14</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkLabel" id="label36">
+                      <object class="GtkFrame" id="frameTabsInMainWindow">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">&lt;b&gt; Look and Feel&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="position">1</property>
-                    <property name="tab_fill">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkBox" id="vbox29">
-                    <property name="visible">True</property>
+                        <property name="border_width">0</property>
+                        <property name="label_xalign">0</property>
+                        <property name="shadow_type">none</property>
+                        <child>
+                          <object class="GtkAlignment" id="alignment9">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="left_padding">40</property>
+                            <child>
+                              <object class="GtkBox" id="vbox27">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="orientation">vertical</property>
+                                <child>
+                                  <object class="GtkBox">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="homogeneous">True</property>
+                                    <child>
+                                      <object class="GtkCheckButton" id="cbCfgConnectionsAutoHide">
+                                        <property name="label" translatable="yes">Hide connections list (on terminal open)</property>
+                                        <property name="use_action_appearance">False</property>
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="receives_default">False</property>
+                                        <property name="has_tooltip">True</property>
+                                        <property name="tooltip_text" translatable="yes">If checked, the connections list will be hidden when a new terminal is open.  This can be useful to increase the space usable for the tabbed terminals.</property>
+                                        <property name="halign">start</property>
+                                        <property name="xalign">0</property>
+                                        <property name="draw_indicator">True</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkCheckButton" id="cbCfgButtonBarAutoHide">
+                                        <property name="label" translatable="yes">Auto hide main button bar (on terminal open)</property>
+                                        <property name="use_action_appearance">False</property>
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="receives_default">False</property>
+                                        <property name="has_tooltip">True</property>
+                                        <property name="tooltip_text" translatable="yes">If checked, this option will hide the the button bar when on a terminal tab (increasing the vertical space usable for the terminal)</property>
+                                        <property name="halign">start</property>
+                                        <property name="xalign">0</property>
+                                        <property name="draw_indicator">True</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkCheckButton" id="cbCfgPreventMOShowTree">
+                                    <property name="label" translatable="yes">Auto show/hide when entering/leaving connections list</property>
+                                    <property name="use_action_appearance">False</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="has_tooltip">True</property>
+                                    <property name="tooltip_text" translatable="yes">If checked, the connections list will be shown/hidden when the mouse enters/leaves the connections list area.</property>
+                                    <property name="halign">start</property>
+                                    <property name="xalign">0.5</property>
+                                    <property name="draw_indicator">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">2</property>
+                                  </packing>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                        <child type="label">
+                          <object class="GtkCheckButton" id="cbCfgTabsInMain">
+                            <property name="label" translatable="yes">Put Terminal TABS in Main Window (*)</property>
+                            <property name="use_action_appearance">False</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="has_tooltip">True</property>
+                            <property name="tooltip_text" translatable="yes">If unchecked, every terminal will be opened by default in a separate window</property>
+                            <property name="xalign">0.5</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">15</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkSeparator">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="margin_top">4</property>
+                        <property name="margin_bottom">4</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">16</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkFrame" id="frameStatusBar">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="border_width">0</property>
+                        <property name="label_xalign">0</property>
+                        <property name="shadow_type">none</property>
+                        <child>
+                          <object class="GtkAlignment" id="alignment10">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="left_padding">40</property>
+                            <child>
+                              <object class="GtkBox" id="hbox69">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <child>
+                                  <object class="GtkBox" id="vbox38">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="orientation">vertical</property>
+                                    <child>
+                                      <object class="GtkRadioButton" id="rbCfgStatusFull">
+                                        <property name="label" translatable="yes">Use full names (Local Forwarding, Remote Forwarding, Dynamic Forwarding)</property>
+                                        <property name="use_action_appearance">False</property>
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="receives_default">False</property>
+                                        <property name="xalign">0</property>
+                                        <property name="active">True</property>
+                                        <property name="draw_indicator">True</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkRadioButton" id="rbCfgStatusShort">
+                                        <property name="label" translatable="yes">Use abreviatures (-L, -R, -D)</property>
+                                        <property name="use_action_appearance">False</property>
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="receives_default">False</property>
+                                        <property name="xalign">0</property>
+                                        <property name="draw_indicator">True</property>
+                                        <property name="group">rbCfgStatusFull</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                        <child type="label">
+                          <object class="GtkCheckButton" id="cbCfgStatusBar">
+                            <property name="label" translatable="yes">Show port forwarding information in status bar</property>
+                            <property name="use_action_appearance">False</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="has_tooltip">True</property>
+                            <property name="tooltip_text" translatable="yes">If checked, show port forwarding information in status bar when connected</property>
+                            <property name="xalign">0.5</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">17</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="lblRestartRequired1">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="margin_top">10</property>
+                        <property name="margin_bottom">10</property>
+                        <property name="label" translatable="yes">&lt;i&gt;(*) Requires restart to take effect&lt;/i&gt;</property>
+                        <property name="use_markup">True</property>
+                        <property name="justify">center</property>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">18</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child type="tab">
+                  <object class="GtkBox" id="hbox22">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <child>
+                      <object class="GtkImage" id="image17">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="stock">gtk-page-setup</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="label36">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">&lt;b&gt; Look and Feel&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="position">1</property>
+                    <property name="tab_fill">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkBox" id="vbox29">
+                    <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="margin_left">4</property>
                     <property name="margin_right">4</property>
@@ -4716,6 +5180,39 @@ connecting (timeout is in seconds)</property>
                     <property name="margin_bottom">4</property>
                     <property name="orientation">vertical</property>
                     <property name="spacing">5</property>
+                    <child>
+                      <object class="GtkBox">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <object class="GtkLinkButton" id="linkHelpMOAD">
+                            <property name="label" translatable="yes">Help</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
+                            <property name="receives_default">True</property>
+                            <property name="tooltip_text" translatable="yes">Open Online Help</property>
+                            <property name="relief">none</property>
+                            <property name="always_show_image">True</property>
+                            <property name="uri">https://docs.asbru-cm.net/Manual/Preferences/MOAdvanced/</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="pack_type">end</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
                     <child>
                       <object class="GtkGrid" id="table2">
                         <property name="visible">True</property>
@@ -4841,8 +5338,9 @@ the first parenthesis refers to "filename" and second to "linenumber"</property>
                           <object class="GtkLabel" id="label56">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">PASSWORD prompt: </property>
+                            <property name="label" translatable="yes">PASSWORD prompt </property>
                             <property name="justify">right</property>
+                            <property name="width_chars">21</property>
                             <property name="xalign">1</property>
                           </object>
                           <packing>
@@ -4854,7 +5352,7 @@ the first parenthesis refers to "filename" and second to "linenumber"</property>
                           <object class="GtkLabel" id="label70">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">USERNAME prompt: </property>
+                            <property name="label" translatable="yes">USERNAME prompt </property>
                             <property name="justify">right</property>
                             <property name="xalign">1</property>
                           </object>
@@ -4867,7 +5365,7 @@ the first parenthesis refers to "filename" and second to "linenumber"</property>
                           <object class="GtkLabel" id="label71">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Command prompt: </property>
+                            <property name="label" translatable="yes">Command prompt </property>
                             <property name="justify">right</property>
                             <property name="xalign">1</property>
                           </object>
@@ -4880,7 +5378,7 @@ the first parenthesis refers to "filename" and second to "linenumber"</property>
                           <object class="GtkLabel" id="label80">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Remote host key changed: </property>
+                            <property name="label" translatable="yes">Remote host key changed </property>
                             <property name="justify">right</property>
                             <property name="xalign">1</property>
                           </object>
@@ -4893,7 +5391,7 @@ the first parenthesis refers to "filename" and second to "linenumber"</property>
                           <object class="GtkLabel" id="label47">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Select-by-word characters: </property>
+                            <property name="label" translatable="yes">Select-by-word characters </property>
                             <property name="justify">right</property>
                             <property name="xalign">1</property>
                           </object>
@@ -4906,7 +5404,7 @@ the first parenthesis refers to "filename" and second to "linenumber"</property>
                           <object class="GtkLabel" id="label78">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Host-key verification string: </property>
+                            <property name="label" translatable="yes">Host-key verification string </property>
                             <property name="justify">right</property>
                             <property name="xalign">1</property>
                           </object>
@@ -4919,7 +5417,7 @@ the first parenthesis refers to "filename" and second to "linenumber"</property>
                           <object class="GtkLabel" id="label79">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Press any key to continue: </property>
+                            <property name="label" translatable="yes">Press any key to continue </property>
                             <property name="justify">right</property>
                             <property name="xalign">1</property>
                           </object>
@@ -4932,22 +5430,11 @@ the first parenthesis refers to "filename" and second to "linenumber"</property>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">0</property>
+                        <property name="position">2</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkSeparator" id="hseparator1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkBox" id="hbox53">
+                      <object class="GtkBox" id="hbox53">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="margin_left">5</property>
@@ -4956,9 +5443,12 @@ the first parenthesis refers to "filename" and second to "linenumber"</property>
                           <object class="GtkLabel" id="label83">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">&lt;b&gt;'sudo'&lt;/b&gt; password prompt: </property>
+                            <property name="hexpand">False</property>
+                            <property name="label" translatable="yes">&lt;b&gt;sudo&lt;/b&gt; password prompt </property>
                             <property name="use_markup">True</property>
                             <property name="justify">right</property>
+                            <property name="width_chars">21</property>
+                            <property name="xalign">1</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -4989,7 +5479,7 @@ sudo -p sudo_prompt_string ...</property>
                           <object class="GtkLabel" id="label84">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes"> , &lt;b&gt;'sudo'&lt;/b&gt; password: </property>
+                            <property name="label" translatable="yes"> , &lt;b&gt;sudo&lt;/b&gt; password </property>
                             <property name="use_markup">True</property>
                             <property name="justify">right</property>
                             <property name="xalign">1</property>
@@ -5039,46 +5529,110 @@ sudo -p sudo_prompt_string ...</property>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">2</property>
+                        <property name="position">3</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkBox" id="hboxCfgLocation">
+                      <object class="GtkFrame" id="frame4">
+                        <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="no_show_all">True</property>
-                        <property name="margin_left">5</property>
-                        <property name="margin_right">5</property>
+                        <property name="border_width">5</property>
+                        <property name="label_xalign">0</property>
+                        <property name="shadow_type">none</property>
                         <child>
-                          <object class="GtkLabel" id="label7">
+                          <object class="GtkAlignment" id="alignment8">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Config files location: </property>
+                            <property name="border_width">0</property>
+                            <property name="xalign">0</property>
+                            <property name="xscale">0.94999998807907104</property>
+                            <child>
+                              <object class="GtkBox" id="vbox9">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="orientation">vertical</property>
+                                <child>
+                                  <object class="GtkRadioButton" id="rbCfgInternalViewer">
+                                    <property name="label" translatable="yes">Internal viewer</property>
+                                    <property name="use_action_appearance">False</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="halign">start</property>
+                                    <property name="xalign">0</property>
+                                    <property name="draw_indicator">True</property>
+                                    <property name="group">rbCfgExternalViewer</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">True</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkBox" id="hbox29">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="has_tooltip">True</property>
+                                    <property name="tooltip_text" translatable="yes">The screenshot's file name will be appended at the end of the given command</property>
+                                    <child>
+                                      <object class="GtkRadioButton" id="rbCfgExternalViewer">
+                                        <property name="label" translatable="yes">External viewer</property>
+                                        <property name="use_action_appearance">False</property>
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="receives_default">False</property>
+                                        <property name="xalign">0</property>
+                                        <property name="active">True</property>
+                                        <property name="draw_indicator">True</property>
+                                        <property name="group">rbCfgInternalViewer</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkEntry" id="entryCfgExternalViewer">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="invisible_char">•</property>
+                                        <property name="text" translatable="yes">/usr/bin/xdg-open</property>
+                                        <property name="primary_icon_activatable">False</property>
+                                        <property name="secondary_icon_activatable">False</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">True</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                              </object>
+                            </child>
                           </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
                         </child>
-                        <child>
-                          <object class="GtkFileChooserButton" id="btnCfgLocation">
+                        <child type="label">
+                          <object class="GtkLabel" id="label42">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="focus_on_click">False</property>
-                            <property name="action">select-folder</property>
-                            <property name="title" translatable="yes">Choose a folder for saving config files</property>
+                            <property name="margin_bottom">3</property>
+                            <property name="label" translatable="yes">When opening screenshots, use </property>
+                            <property name="use_markup">True</property>
                           </object>
-                          <packing>
-                            <property name="expand">True</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
                         </child>
                       </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">3</property>
+                        <property name="position">4</property>
                       </packing>
                     </child>
                   </object>
@@ -5171,251 +5725,99 @@ sudo -p sudo_prompt_string ...</property>
                     <property name="margin_bottom">4</property>
                     <property name="orientation">vertical</property>
                     <child>
-                      <object class="GtkFrame" id="frameCfgSaveSessionlogs">
+                      <object class="GtkBox">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <child>
+                          <object class="GtkCheckButton" id="cbCfgCloseTermOnDisconn">
+                            <property name="label" translatable="yes">Close Terminal on disconnection: close container (TAB or Window) when connection is closed</property>
+                            <property name="use_action_appearance">False</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="has_tooltip">True</property>
+                            <property name="tooltip_text" translatable="yes">If checked, any disconnected terminal TAB/Window will be automatically closed</property>
+                            <property name="halign">start</property>
+                            <property name="margin_top">2</property>
+                            <property name="xalign">0</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLinkButton" id="linkHelpTOBE">
+                            <property name="label" translatable="yes">Help</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
+                            <property name="receives_default">True</property>
+                            <property name="tooltip_text" translatable="yes">Open Online Help</property>
+                            <property name="relief">none</property>
+                            <property name="always_show_image">True</property>
+                            <property name="uri">https://docs.asbru-cm.net/Manual/Preferences/TermOptions/</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="pack_type">end</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkCheckButton" id="cbCfgUnsplitDisconnected">
+                        <property name="label" translatable="yes">Auto unsplit disconnected Terminals: unsplit disconnected terminal if already splitted</property>
+                        <property name="use_action_appearance">False</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="has_tooltip">True</property>
+                        <property name="tooltip_text" translatable="yes">If checked, any disconnected terminal in a splitted window will be directly unsplitted to its own TAB/Window</property>
+                        <property name="halign">start</property>
+                        <property name="xalign">0.5</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkFrame" id="frame29">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
+                        <property name="margin_top">2</property>
                         <property name="border_width">2</property>
                         <property name="label_xalign">0</property>
+                        <property name="shadow_type">none</property>
                         <child>
-                          <object class="GtkAlignment" id="alignment7">
+                          <object class="GtkAlignment" id="alignment32">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xscale">0.89999997615814209</property>
-                            <property name="left_padding">12</property>
+                            <property name="xalign">0</property>
+                            <property name="xscale">0.9100000262260437</property>
                             <child>
-                              <object class="GtkBox" id="hboxCfgSaveSessionLogs">
+                              <object class="GtkBox" id="hbox17">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="orientation">vertical</property>
                                 <child>
-                                  <object class="GtkBox" id="hboxCfgSaveSessionLogsasdf">
+                                  <object class="GtkLabel" id="label33">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <child>
-                                      <object class="GtkLabel" id="label25">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="label" translatable="yes">Save in: </property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkFileChooserButton" id="btnCfgSaveSessionLogs">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="focus_on_click">False</property>
-                                        <property name="action">select-folder</property>
-                                        <property name="title" translatable="yes">Choose a folder for saving log files</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">True</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkButton" id="btnCfgOpenSessionLogs">
-                                        <property name="use_action_appearance">False</property>
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">True</property>
-                                        <child>
-                                          <object class="GtkBox" id="hbox25">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <child>
-                                              <object class="GtkImage" id="image13">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
-                                                <property name="stock">gtk-open</property>
-                                              </object>
-                                              <packing>
-                                                <property name="expand">False</property>
-                                                <property name="fill">True</property>
-                                                <property name="position">0</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkLabel" id="label35">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
-                                                <property name="label" translatable="yes">Open Folder</property>
-                                              </object>
-                                              <packing>
-                                                <property name="expand">False</property>
-                                                <property name="fill">True</property>
-                                                <property name="position">1</property>
-                                              </packing>
-                                            </child>
-                                          </object>
-                                        </child>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">2</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkCheckButton" id="cbCfgRemoveCtrlCharsConf">
-                                        <property name="label" translatable="yes">Remove CONTROL characters. </property>
-                                        <property name="use_action_appearance">False</property>
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">False</property>
-                                        <property name="xalign">0.5</property>
-                                        <property name="draw_indicator">True</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">3</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel" id="label30">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="has_tooltip">True</property>
-                                        <property name="tooltip_text" translatable="yes">0 to keep all session logs</property>
-                                        <property name="label" translatable="yes"> Files to save: </property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">4</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkSpinButton" id="spCfgSaveSessionLogs">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="has_tooltip">True</property>
-                                        <property name="tooltip_text" translatable="yes">0 to keep all session logs</property>
-                                        <property name="invisible_char">•</property>
-                                        <property name="primary_icon_activatable">False</property>
-                                        <property name="secondary_icon_activatable">False</property>
-                                        <property name="adjustment">adjustment11</property>
-                                        <property name="numeric">True</property>
-                                        <property name="update_policy">if-valid</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">5</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkBox" id="hbox24">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <child>
-                                      <object class="GtkLabel" id="lblEditLogFileName">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="label" translatable="yes">Logfile name pattern: </property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkEntry" id="entryCfgLogFileName">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="has_tooltip">True</property>
-                                        <property name="tooltip_text" translatable="yes">Logfile pattern:
-
-&lt;UUID&gt; -&gt; UUID for this connection
-&lt;TIMESTAMP&gt; -&gt; time since epoc
-&lt;DATE_Y&gt; -&gt; Year(4 digits)
-&lt;DATE_M&gt; -&gt; Month(2 digits)
-&lt;DATE_D&gt; -&gt; Day(2 digits)
-&lt;TIME_H&gt; -&gt; Hour (24h, 2 digits)
-&lt;TIME_M&gt; -&gt; Minute(2 digits)
-&lt;TIME_S&gt; -&gt; Seconds(2 digits)
-&lt;NAME&gt; -&gt; Connection's name
-&lt;TITLE&gt; -&gt; Connections's title
-&lt;IP&gt; -&gt; IP/host for first jump
-&lt;USER&gt; -&gt; Username for first jump
-</property>
-                                        <property name="invisible_char">•</property>
-                                        <property name="text" translatable="yes">&lt;UUID&gt;_&lt;NAME&gt;_&lt;DATE_Y&gt;&lt;DATE_M&gt;&lt;DATE_D&gt;_&lt;TIME_H&gt;&lt;TIME_M&gt;&lt;TIME_S&gt;.txt</property>
-                                        <property name="caps_lock_warning">False</property>
-                                        <property name="primary_icon_activatable">False</property>
-                                        <property name="secondary_icon_activatable">False</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">True</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">1</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                        <child type="label">
-                          <object class="GtkCheckButton" id="cbCfgSaveSessionLogs">
-                            <property name="label" translatable="yes">Auto save Session logs: </property>
-                            <property name="use_action_appearance">False</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="xalign">0.5</property>
-                            <property name="draw_indicator">True</property>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkFrame" id="frame29">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="margin_top">2</property>
-                        <property name="border_width">2</property>
-                        <property name="label_xalign">0</property>
-                        <child>
-                          <object class="GtkAlignment" id="alignment32">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="xscale">0.9100000262260437</property>
-                            <property name="left_padding">12</property>
-                            <child>
-                              <object class="GtkBox" id="hbox17">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <child>
-                                  <object class="GtkLabel" id="label33">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="label" translatable="yes">Time to connect:</property>
+                                    <property name="label" translatable="yes">Time to connect </property>
                                     <property name="use_markup">True</property>
+                                    <property name="xalign">0</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -5449,7 +5851,7 @@ sudo -p sudo_prompt_string ...</property>
                                   <object class="GtkLabel" id="label34">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="label" translatable="yes"> Expect Cmd exec:</property>
+                                    <property name="label" translatable="yes"> Expect Cmd exec </property>
                                     <property name="use_markup">True</property>
                                   </object>
                                   <packing>
@@ -5488,7 +5890,9 @@ sudo -p sudo_prompt_string ...</property>
                           <object class="GtkLabel" id="label32">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes"> Timeouts (seconds): </property>
+                            <property name="margin_top">2</property>
+                            <property name="margin_bottom">2</property>
+                            <property name="label" translatable="yes">&lt;b&gt;Timeouts (seconds)&lt;/b&gt;</property>
                             <property name="use_markup">True</property>
                           </object>
                         </child>
@@ -5496,146 +5900,339 @@ sudo -p sudo_prompt_string ...</property>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkCheckButton" id="cbCfgCloseTermOnDisconn">
-                        <property name="label" translatable="yes">Close Terminal on disconnection: close container (TAB or Window) when connection is closed</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="has_tooltip">True</property>
-                        <property name="tooltip_text" translatable="yes">If checked, any disconnected terminal TAB/Window will be automatically closed</property>
-                        <property name="margin_top">2</property>
-                        <property name="xalign">0.5</property>
-                        <property name="draw_indicator">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">2</property>
+                        <property name="position">3</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkCheckButton" id="cbCfgUnsplitDisconnected">
-                        <property name="label" translatable="yes">Auto unsplit disconnected Terminals: unsplit disconnected terminal if already splitted</property>
-                        <property name="use_action_appearance">False</property>
+                      <object class="GtkSeparator">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="has_tooltip">True</property>
-                        <property name="tooltip_text" translatable="yes">If checked, any disconnected terminal in a splitted window will be directly unsplitted to its own TAB/Window</property>
-                        <property name="xalign">0.5</property>
-                        <property name="draw_indicator">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="margin_top">4</property>
+                        <property name="margin_bottom">4</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">3</property>
+                        <property name="position">4</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkFrame" id="frame1">
+                      <object class="GtkFrame" id="frameCfgSaveSessionlogs">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="margin_top">7</property>
                         <property name="border_width">2</property>
                         <property name="label_xalign">0</property>
+                        <property name="shadow_type">none</property>
                         <child>
-                          <object class="GtkAlignment" id="alignment12">
+                          <object class="GtkAlignment" id="alignment7">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
+                            <property name="xalign">0</property>
                             <property name="xscale">0.89999997615814209</property>
-                            <property name="left_padding">12</property>
                             <child>
-                              <object class="GtkBox" id="vbox14">
+                              <object class="GtkBox" id="hboxCfgSaveSessionLogs">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="orientation">vertical</property>
                                 <child>
-                                  <object class="GtkFrame" id="frame13">
+                                  <object class="GtkBox">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="label_xalign">0</property>
-                                    <property name="shadow_type">none</property>
+                                    <property name="margin_left">20</property>
                                     <child>
-                                      <object class="GtkAlignment" id="alignment3">
+                                      <object class="GtkCheckButton" id="cbCfgRemoveCtrlCharsConf">
+                                        <property name="label" translatable="yes">Remove CONTROL characters. </property>
+                                        <property name="use_action_appearance">False</property>
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="receives_default">False</property>
+                                        <property name="xalign">0</property>
+                                        <property name="draw_indicator">True</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkCheckButton" id="cbCfgLogTimestam">
+                                        <property name="label" translatable="yes">Add timestamp</property>
+                                        <property name="use_action_appearance">False</property>
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="receives_default">False</property>
+                                        <property name="margin_left">20</property>
+                                        <property name="xalign">0</property>
+                                        <property name="draw_indicator">True</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel" id="label30">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
-                                        <property name="left_padding">12</property>
-                                        <child>
-                                          <object class="GtkBox" id="vboxCfgTabsOptions">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="orientation">vertical</property>
-                                            <child>
-                                              <object class="GtkBox" id="hbox43">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
-                                                <child>
-                                                  <object class="GtkLabel" id="label2">
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">False</property>
-                                                    <property name="label" translatable="yes">Switch TABs with: </property>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="expand">False</property>
-                                                    <property name="fill">True</property>
-                                                    <property name="position">0</property>
-                                                  </packing>
-                                                </child>
-                                                <child>
-                                                  <object class="GtkRadioButton" id="rbCfgSwitchTabsCtrl">
-                                                    <property name="label" translatable="yes">CONTROL-PgUp/PgDown  </property>
-                                                    <property name="use_action_appearance">False</property>
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">True</property>
-                                                    <property name="receives_default">False</property>
-                                                    <property name="xalign">0</property>
-                                                    <property name="draw_indicator">True</property>
-                                                    <property name="group">rbCfgSwitchTabsAlt</property>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="expand">False</property>
-                                                    <property name="fill">True</property>
-                                                    <property name="position">1</property>
-                                                  </packing>
-                                                </child>
-                                                <child>
-                                                  <object class="GtkRadioButton" id="rbCfgSwitchTabsAlt">
-                                                    <property name="label" translatable="yes">ALT-Left/Right</property>
-                                                    <property name="use_action_appearance">False</property>
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">True</property>
-                                                    <property name="receives_default">False</property>
-                                                    <property name="xalign">0</property>
-                                                    <property name="active">True</property>
-                                                    <property name="draw_indicator">True</property>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="expand">False</property>
-                                                    <property name="fill">True</property>
-                                                    <property name="position">2</property>
-                                                  </packing>
-                                                </child>
-                                              </object>
-                                              <packing>
-                                                <property name="expand">True</property>
-                                                <property name="fill">True</property>
-                                                <property name="position">0</property>
-                                              </packing>
-                                            </child>
+                                        <property name="has_tooltip">True</property>
+                                        <property name="tooltip_text" translatable="yes">0 to keep all session logs</property>
+                                        <property name="halign">end</property>
+                                        <property name="label" translatable="yes"> Files to save </property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">2</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkSpinButton" id="spCfgSaveSessionLogs">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="has_tooltip">True</property>
+                                        <property name="tooltip_text" translatable="yes">0 to keep all session logs</property>
+                                        <property name="invisible_char">•</property>
+                                        <property name="text" translatable="yes">0</property>
+                                        <property name="primary_icon_activatable">False</property>
+                                        <property name="secondary_icon_activatable">False</property>
+                                        <property name="adjustment">adjustment11</property>
+                                        <property name="numeric">True</property>
+                                        <property name="update_policy">if-valid</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="pack_type">end</property>
+                                        <property name="position">3</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkBox" id="hboxCfgSaveSessionLogsasdf">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="margin_left">20</property>
+                                    <child>
+                                      <object class="GtkLabel" id="label25">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="label" translatable="yes">Save in </property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkFileChooserButton" id="btnCfgSaveSessionLogs">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="focus_on_click">False</property>
+                                        <property name="action">select-folder</property>
+                                        <property name="title" translatable="yes">Choose a folder for saving log files</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkButton" id="btnCfgOpenSessionLogs">
+                                        <property name="use_action_appearance">False</property>
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="receives_default">True</property>
+                                        <child>
+                                          <object class="GtkBox" id="hbox25">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <child>
+                                              <object class="GtkImage" id="image13">
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">False</property>
+                                                <property name="stock">gtk-open</property>
+                                              </object>
+                                              <packing>
+                                                <property name="expand">False</property>
+                                                <property name="fill">True</property>
+                                                <property name="position">0</property>
+                                              </packing>
+                                            </child>
+                                            <child>
+                                              <object class="GtkLabel" id="label35">
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">False</property>
+                                                <property name="label" translatable="yes">Open Folder</property>
+                                              </object>
+                                              <packing>
+                                                <property name="expand">False</property>
+                                                <property name="fill">True</property>
+                                                <property name="position">1</property>
+                                              </packing>
+                                            </child>
+                                          </object>
+                                        </child>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">2</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">True</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkBox" id="hbox24">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="margin_left">20</property>
+                                    <child>
+                                      <object class="GtkLabel" id="lblEditLogFileName">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="label" translatable="yes">Logfile name pattern: </property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkEntry" id="entryCfgLogFileName">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="has_tooltip">True</property>
+                                        <property name="tooltip_text" translatable="yes">Logfile pattern:
+
+&lt;UUID&gt; -&gt; UUID for this connection
+&lt;SOCKS5_PORT&gt; -&gt; Socks5 tunnel port
+&lt;TIMESTAMP&gt; -&gt; time since epoc
+&lt;DATE_Y&gt; -&gt; Year(4 digits)
+&lt;DATE_M&gt; -&gt; Month(2 digits)
+&lt;DATE_D&gt; -&gt; Day(2 digits)
+&lt;TIME_H&gt; -&gt; Hour (24h, 2 digits)
+&lt;TIME_M&gt; -&gt; Minute(2 digits)
+&lt;TIME_S&gt; -&gt; Seconds(2 digits)
+&lt;NAME&gt; -&gt; Connection's name
+&lt;TITLE&gt; -&gt; Connections's title
+&lt;IP&gt; -&gt; IP/host for first jump
+&lt;USER&gt; -&gt; Username for first jump
+</property>
+                                        <property name="invisible_char">•</property>
+                                        <property name="text" translatable="yes">&lt;UUID&gt;_&lt;SOCKS5_PORT&gt;_&lt;NAME&gt;_&lt;DATE_Y&gt;&lt;DATE_M&gt;&lt;DATE_D&gt;_&lt;TIME_H&gt;&lt;TIME_M&gt;&lt;TIME_S&gt;.txt</property>
+                                        <property name="caps_lock_warning">False</property>
+                                        <property name="primary_icon_activatable">False</property>
+                                        <property name="secondary_icon_activatable">False</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">True</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">2</property>
+                                  </packing>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                        <child type="label">
+                          <object class="GtkCheckButton" id="cbCfgSaveSessionLogs">
+                            <property name="label" translatable="yes">Auto save Session logs</property>
+                            <property name="use_action_appearance">False</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="xalign">0.5</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">5</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkSeparator">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="margin_top">4</property>
+                        <property name="margin_bottom">4</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">6</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkFrame" id="frame1">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="margin_top">7</property>
+                        <property name="label_xalign">0</property>
+                        <property name="shadow_type">none</property>
+                        <child>
+                          <object class="GtkAlignment" id="alignment12">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="xscale">0.89999997615814209</property>
+                            <property name="left_padding">12</property>
+                            <child>
+                              <object class="GtkBox" id="vbox14">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="orientation">vertical</property>
+                                <child>
+                                  <object class="GtkFrame" id="frame13">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="label_xalign">0</property>
+                                    <property name="shadow_type">none</property>
+                                    <child>
+                                      <object class="GtkAlignment" id="alignment3">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="left_padding">12</property>
+                                        <child>
+                                          <object class="GtkBox" id="vboxCfgTabsOptions">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="orientation">vertical</property>
                                             <child>
                                               <object class="GtkBox" id="hbox11">
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">False</property>
                                                 <child>
                                                   <object class="GtkLabel" id="label81">
+                                                    <property name="width_request">150</property>
                                                     <property name="visible">True</property>
                                                     <property name="can_focus">False</property>
-                                                    <property name="label" translatable="yes">When closing last TAB: </property>
+                                                    <property name="label" translatable="yes">When closing last TAB </property>
+                                                    <property name="xalign">0</property>
                                                   </object>
                                                   <packing>
                                                     <property name="expand">False</property>
@@ -5707,7 +6304,7 @@ sudo -p sudo_prompt_string ...</property>
                                     </child>
                                     <child type="label">
                                       <object class="GtkRadioButton" id="cbCfgNewInTab">
-                                        <property name="label" translatable="yes">Tabs:</property>
+                                        <property name="label" translatable="yes">Tabs</property>
                                         <property name="use_action_appearance">False</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
@@ -5730,8 +6327,9 @@ sudo -p sudo_prompt_string ...</property>
                                     <property name="can_focus">False</property>
                                     <child>
                                       <object class="GtkRadioButton" id="cbCfgNewInWindow">
-                                        <property name="label" translatable="yes">Windows: </property>
+                                        <property name="label" translatable="yes">Windows</property>
                                         <property name="use_action_appearance">False</property>
+                                        <property name="width_request">168</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
@@ -5751,11 +6349,12 @@ sudo -p sudo_prompt_string ...</property>
                                         <property name="can_focus">False</property>
                                         <property name="has_tooltip">True</property>
                                         <property name="tooltip_text" translatable="yes">Size in Pixels</property>
+                                        <property name="margin_left">8</property>
                                         <child>
                                           <object class="GtkLabel" id="label39">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="label" translatable="yes">Width=</property>
+                                            <property name="label" translatable="yes">Width </property>
                                           </object>
                                           <packing>
                                             <property name="expand">False</property>
@@ -5785,7 +6384,7 @@ sudo -p sudo_prompt_string ...</property>
                                           <object class="GtkLabel" id="label40">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="label" translatable="yes">  Height=</property>
+                                            <property name="label" translatable="yes">  Height </property>
                                           </object>
                                           <packing>
                                             <property name="expand">False</property>
@@ -5833,7 +6432,7 @@ sudo -p sudo_prompt_string ...</property>
                           <object class="GtkLabel" id="label38">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes"> Open NEW connections on: </property>
+                            <property name="label" translatable="yes">&lt;b&gt;Open NEW connections on&lt;/b&gt;</property>
                             <property name="use_markup">True</property>
                           </object>
                         </child>
@@ -5841,7 +6440,7 @@ sudo -p sudo_prompt_string ...</property>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">4</property>
+                        <property name="position">7</property>
                       </packing>
                     </child>
                   </object>
@@ -5890,56 +6489,256 @@ sudo -p sudo_prompt_string ...</property>
                     <property name="margin_bottom">4</property>
                     <property name="orientation">vertical</property>
                     <child>
-                      <object class="GtkBox" id="hbox20">
+                      <object class="GtkBox">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
-                          <object class="GtkFrame" id="frameTerminalUI1">
+                          <object class="GtkCheckButton" id="cbCfgStartMaximized">
+                            <property name="label" translatable="yes">Start Terminals maximized: maximize either TABBED or OWN window</property>
+                            <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="border_width">2</property>
-                            <property name="label_xalign">0</property>
-                            <child>
-                              <object class="GtkAlignment" id="alignment6">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="left_padding">12</property>
-                                <child>
-                                  <object class="GtkBox" id="vbox18">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="orientation">vertical</property>
-                                    <child>
-                                      <object class="GtkFrame" id="frame7">
-                                        <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="has_tooltip">True</property>
+                            <property name="tooltip_text" translatable="yes">If checked, Terminals will be maximized on connect</property>
+                            <property name="halign">start</property>
+                            <property name="xalign">0</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLinkButton" id="linkHelpTOLF">
+                            <property name="label" translatable="yes">Help</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
+                            <property name="receives_default">True</property>
+                            <property name="tooltip_text" translatable="yes">Open Online Help</property>
+                            <property name="relief">none</property>
+                            <property name="always_show_image">True</property>
+                            <property name="uri">https://docs.asbru-cm.net/Manual/Preferences/TermLookAndFeel/</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="pack_type">end</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkCheckButton" id="cbCfgShowTerminalStatus">
+                        <property name="label" translatable="yes">Show status bar on every terminal</property>
+                        <property name="use_action_appearance">False</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="has_tooltip">True</property>
+                        <property name="tooltip_text" translatable="yes">If checked, any disconnected terminal in a splitted window will be directly unsplitted to its own TAB/Window</property>
+                        <property name="halign">start</property>
+                        <property name="xalign">0.5</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkCheckButton" id="cbCfgChangeMainTitle">
+                        <property name="label" translatable="yes">Change main window title with terminal title</property>
+                        <property name="use_action_appearance">False</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="has_tooltip">True</property>
+                        <property name="tooltip_text" translatable="yes">If checked, main window title takes terminal title</property>
+                        <property name="halign">start</property>
+                        <property name="xalign">0</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkBox" id="hbox37">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="has_tooltip">True</property>
+                        <property name="tooltip_text" translatable="yes">Requires restarting every opened connection (closing and starting)
+Changes apply to next opened connections, not current</property>
+                        <child>
+                          <object class="GtkLabel" id="label68">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">Show MACROS: </property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkRadioButton" id="rbCfgComBoxNever">
+                            <property name="label" translatable="yes">Never  </property>
+                            <property name="use_action_appearance">False</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="xalign">0.5</property>
+                            <property name="active">True</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkRadioButton" id="rbCfgComBoxCombo">
+                            <property name="label" translatable="yes">In combo box  </property>
+                            <property name="use_action_appearance">False</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="xalign">0.5</property>
+                            <property name="draw_indicator">True</property>
+                            <property name="group">rbCfgComBoxNever</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkRadioButton" id="rbCfgComBoxButtons">
+                            <property name="label" translatable="yes">As buttons  </property>
+                            <property name="use_action_appearance">False</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="xalign">0.5</property>
+                            <property name="draw_indicator">True</property>
+                            <property name="group">rbCfgComBoxNever</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="cbCfgShowGlobalComm">
+                            <property name="label" translatable="yes">Show GLOBAL commands in terminals</property>
+                            <property name="use_action_appearance">False</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="halign">start</property>
+                            <property name="xalign">0.5</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
+                            <property name="position">4</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">3</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkSeparator">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="margin_top">2</property>
+                        <property name="margin_bottom">2</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">4</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkBox" id="hbox20">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="spacing">14</property>
+                        <child>
+                          <object class="GtkFrame" id="frameTerminalUI1">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="border_width">2</property>
+                            <property name="label_xalign">0</property>
+                            <property name="shadow_type">none</property>
+                            <child>
+                              <object class="GtkAlignment" id="alignment6">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="xalign">0</property>
+                                <child>
+                                  <object class="GtkBox" id="vbox18">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="orientation">vertical</property>
+                                    <child>
+                                      <object class="GtkBox">
+                                        <property name="visible">True</property>
                                         <property name="can_focus">False</property>
-                                        <property name="label_xalign">0</property>
-                                        <property name="shadow_type">none</property>
                                         <child>
-                                          <object class="GtkAlignment" id="alignment10">
+                                          <object class="GtkLabel" id="label18">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="left_padding">12</property>
-                                            <child>
-                                              <object class="GtkColorButton" id="colorConnected">
-                                                <property name="use_action_appearance">False</property>
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">True</property>
-                                                <property name="focus_on_click">False</property>
-                                                <property name="receives_default">True</property>
-                                                <property name="title" translatable="yes">Pick a FOREGROUND Color</property>
-                                                <property name="rgba">rgb(0,0,0)</property>
-                                              </object>
-                                            </child>
+                                            <property name="label" translatable="yes">Connected color</property>
+                                            <property name="use_markup">True</property>
+                                            <property name="width_chars">16</property>
+                                            <property name="xalign">0</property>
                                           </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">0</property>
+                                          </packing>
                                         </child>
-                                        <child type="label">
-                                          <object class="GtkLabel" id="label18">
+                                        <child>
+                                          <object class="GtkColorButton" id="colorConnected">
+                                            <property name="use_action_appearance">False</property>
                                             <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="label" translatable="yes">Connected color:</property>
-                                            <property name="use_markup">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="focus_on_click">False</property>
+                                            <property name="receives_default">True</property>
+                                            <property name="halign">start</property>
+                                            <property name="title" translatable="yes">Pick a FOREGROUND Color</property>
+                                            <property name="rgba">rgb(0,0,0)</property>
                                           </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">1</property>
+                                          </packing>
                                         </child>
                                       </object>
                                       <packing>
@@ -5949,75 +6748,83 @@ sudo -p sudo_prompt_string ...</property>
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkFrame" id="frame8">
+                                      <object class="GtkBox">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
-                                        <property name="label_xalign">0</property>
-                                        <property name="shadow_type">none</property>
                                         <child>
-                                          <object class="GtkAlignment" id="alignment11">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="left_padding">12</property>
-                                            <child>
-                                              <object class="GtkColorButton" id="colorDisconnected">
-                                                <property name="use_action_appearance">False</property>
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">True</property>
-                                                <property name="focus_on_click">False</property>
-                                                <property name="receives_default">True</property>
-                                                <property name="title" translatable="yes">Pick a BACKGROUND Color</property>
-                                                <property name="rgba">rgb(0,0,0)</property>
-                                              </object>
-                                            </child>
-                                          </object>
-                                        </child>
-                                        <child type="label">
                                           <object class="GtkLabel" id="label19">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="label" translatable="yes">Disconnected color:</property>
+                                            <property name="label" translatable="yes">Disconnected color</property>
                                             <property name="use_markup">True</property>
+                                            <property name="width_chars">16</property>
+                                            <property name="xalign">0</property>
                                           </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">0</property>
+                                          </packing>
                                         </child>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkFrame" id="frame2">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="label_xalign">0</property>
-                                        <property name="shadow_type">none</property>
                                         <child>
-                                          <object class="GtkAlignment" id="alignment4">
+                                          <object class="GtkColorButton" id="colorDisconnected">
+                                            <property name="use_action_appearance">False</property>
                                             <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="left_padding">12</property>
-                                            <child>
-                                              <object class="GtkColorButton" id="colorNewData">
-                                                <property name="use_action_appearance">False</property>
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">True</property>
-                                                <property name="focus_on_click">False</property>
-                                                <property name="receives_default">True</property>
-                                                <property name="title" translatable="yes">Pick a BACKGROUND Color</property>
-                                                <property name="rgba">rgb(0,0,0)</property>
-                                              </object>
-                                            </child>
+                                            <property name="can_focus">True</property>
+                                            <property name="focus_on_click">False</property>
+                                            <property name="receives_default">True</property>
+                                            <property name="halign">start</property>
+                                            <property name="title" translatable="yes">Pick a BACKGROUND Color</property>
+                                            <property name="rgba">rgb(0,0,0)</property>
                                           </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">1</property>
+                                          </packing>
                                         </child>
-                                        <child type="label">
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkBox">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <child>
                                           <object class="GtkLabel" id="label20">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="label" translatable="yes">New data color:</property>
+                                            <property name="label" translatable="yes">New data color</property>
                                             <property name="use_markup">True</property>
+                                            <property name="width_chars">16</property>
+                                            <property name="xalign">0</property>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkColorButton" id="colorNewData">
+                                            <property name="use_action_appearance">False</property>
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="focus_on_click">False</property>
+                                            <property name="receives_default">True</property>
+                                            <property name="halign">start</property>
+                                            <property name="title" translatable="yes">Pick a BACKGROUND Color</property>
+                                            <property name="rgba">rgb(0,0,0)</property>
                                           </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">1</property>
+                                          </packing>
                                         </child>
                                       </object>
                                       <packing>
@@ -6030,17 +6837,21 @@ sudo -p sudo_prompt_string ...</property>
                                       <object class="GtkFrame" id="frame3">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
-                                        <property name="border_width">4</property>
+                                        <property name="margin_top">4</property>
+                                        <property name="border_width">0</property>
                                         <property name="label_xalign">0</property>
+                                        <property name="shadow_type">none</property>
                                         <child>
                                           <object class="GtkAlignment" id="alignment5">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="left_padding">12</property>
+                                            <property name="xalign">0</property>
                                             <child>
                                               <object class="GtkGrid" id="table1">
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">False</property>
+                                                <property name="halign">start</property>
+                                                <property name="row_spacing">7</property>
                                                 <child>
                                                   <object class="GtkRadioButton" id="radioCfgTabsRight">
                                                     <property name="use_action_appearance">False</property>
@@ -6058,6 +6869,7 @@ sudo -p sudo_prompt_string ...</property>
                                                           <object class="GtkImage" id="image10">
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">False</property>
+                                                            <property name="halign">center</property>
                                                             <property name="stock">gtk-goto-last</property>
                                                           </object>
                                                           <packing>
@@ -6104,6 +6916,7 @@ sudo -p sudo_prompt_string ...</property>
                                                           <object class="GtkImage" id="image11">
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">False</property>
+                                                            <property name="halign">center</property>
                                                             <property name="stock">gtk-goto-top</property>
                                                           </object>
                                                           <packing>
@@ -6196,6 +7009,7 @@ sudo -p sudo_prompt_string ...</property>
                                                           <object class="GtkImage" id="image9">
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">False</property>
+                                                            <property name="halign">center</property>
                                                             <property name="stock">gtk-goto-first</property>
                                                           </object>
                                                           <packing>
@@ -6248,7 +7062,8 @@ sudo -p sudo_prompt_string ...</property>
                                           <object class="GtkLabel" id="label50">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="label" translatable="yes"> Tabs position: </property>
+                                            <property name="margin_bottom">4</property>
+                                            <property name="label" translatable="yes">Tabs position</property>
                                             <property name="use_markup">True</property>
                                           </object>
                                         </child>
@@ -6267,7 +7082,7 @@ sudo -p sudo_prompt_string ...</property>
                               <object class="GtkLabel" id="label51">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">Tabs: </property>
+                                <property name="label" translatable="yes">&lt;b&gt;Tabs&lt;/b&gt;</property>
                                 <property name="use_markup">True</property>
                               </object>
                             </child>
@@ -6284,174 +7099,114 @@ sudo -p sudo_prompt_string ...</property>
                             <property name="can_focus">False</property>
                             <property name="border_width">2</property>
                             <property name="label_xalign">0</property>
+                            <property name="shadow_type">none</property>
                             <child>
                               <object class="GtkAlignment" id="alignment37">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="left_padding">12</property>
+                                <property name="xalign">0</property>
                                 <child>
                                   <object class="GtkBox" id="vbox19">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="orientation">vertical</property>
+                                    <property name="spacing">1</property>
                                     <child>
-                                      <object class="GtkBox" id="hbox3">
+                                      <object class="GtkBox">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
+                                        <property name="spacing">10</property>
                                         <child>
-                                          <object class="GtkFrame" id="frame31">
+                                          <object class="GtkLabel" id="label61">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="label_xalign">0</property>
-                                            <property name="shadow_type">none</property>
-                                            <child>
-                                              <object class="GtkAlignment" id="alignment40">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
-                                                <property name="left_padding">12</property>
-                                                <child>
-                                                  <object class="GtkColorButton" id="colorText">
-                                                    <property name="use_action_appearance">False</property>
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">True</property>
-                                                    <property name="focus_on_click">False</property>
-                                                    <property name="receives_default">True</property>
-                                                    <property name="title" translatable="yes">Pick a FOREGROUND Color</property>
-                                                    <property name="rgba">rgb(0,0,0)</property>
-                                                  </object>
-                                                </child>
-                                              </object>
-                                            </child>
-                                            <child type="label">
-                                              <object class="GtkLabel" id="label61">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
-                                                <property name="label" translatable="yes">Text color:</property>
-                                                <property name="use_markup">True</property>
-                                              </object>
-                                            </child>
+                                            <property name="label" translatable="yes">Text color</property>
+                                            <property name="use_markup">True</property>
+                                            <property name="xalign">0</property>
                                           </object>
                                           <packing>
-                                            <property name="expand">True</property>
+                                            <property name="expand">False</property>
                                             <property name="fill">True</property>
                                             <property name="position">0</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkFrame" id="frame32">
+                                          <object class="GtkColorButton" id="colorText">
+                                            <property name="use_action_appearance">False</property>
                                             <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="label_xalign">0</property>
-                                            <property name="shadow_type">none</property>
-                                            <child>
-                                              <object class="GtkAlignment" id="alignment41">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
-                                                <property name="left_padding">12</property>
-                                                <child>
-                                                  <object class="GtkColorButton" id="colorBack">
-                                                    <property name="use_action_appearance">False</property>
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">True</property>
-                                                    <property name="focus_on_click">False</property>
-                                                    <property name="receives_default">True</property>
-                                                    <property name="title" translatable="yes">Pick a BACKGROUND Color</property>
-                                                    <property name="rgba">rgb(255,255,255)</property>
-                                                  </object>
-                                                </child>
-                                              </object>
-                                            </child>
-                                            <child type="label">
-                                              <object class="GtkLabel" id="label62">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
-                                                <property name="label" translatable="yes">Back color:</property>
-                                                <property name="use_markup">True</property>
-                                              </object>
-                                            </child>
+                                            <property name="can_focus">True</property>
+                                            <property name="focus_on_click">False</property>
+                                            <property name="receives_default">True</property>
+                                            <property name="halign">start</property>
+                                            <property name="title" translatable="yes">Pick a FOREGROUND Color</property>
+                                            <property name="rgba">rgb(0,0,0)</property>
                                           </object>
                                           <packing>
-                                            <property name="expand">True</property>
+                                            <property name="expand">False</property>
                                             <property name="fill">True</property>
                                             <property name="position">1</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkFrame" id="frame9">
+                                          <object class="GtkLabel" id="label62">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="label_xalign">0</property>
-                                            <property name="shadow_type">none</property>
-                                            <child>
-                                              <object class="GtkAlignment" id="alignment15">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
-                                                <property name="left_padding">12</property>
-                                                <child>
-                                                  <object class="GtkColorButton" id="colorBold">
-                                                    <property name="use_action_appearance">False</property>
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">True</property>
-                                                    <property name="focus_on_click">False</property>
-                                                    <property name="receives_default">True</property>
-                                                    <property name="title" translatable="yes">Pick a BOLD Color</property>
-                                                    <property name="rgba">rgb(0,0,0)</property>
-                                                  </object>
-                                                </child>
-                                              </object>
-                                            </child>
-                                            <child type="label">
-                                              <object class="GtkBox" id="hbox27">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
-                                                <child>
-                                                  <object class="GtkLabel" id="label52">
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">False</property>
-                                                    <property name="label" translatable="yes">Bold Color ( same as text </property>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="expand">True</property>
-                                                    <property name="fill">True</property>
-                                                    <property name="position">0</property>
-                                                  </packing>
-                                                </child>
-                                                <child>
-                                                  <object class="GtkCheckButton" id="cbBoldAsText">
-                                                    <property name="use_action_appearance">False</property>
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">True</property>
-                                                    <property name="receives_default">False</property>
-                                                    <property name="xalign">0.5</property>
-                                                    <property name="draw_indicator">True</property>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="expand">True</property>
-                                                    <property name="fill">True</property>
-                                                    <property name="position">1</property>
-                                                  </packing>
-                                                </child>
-                                                <child>
-                                                  <object class="GtkLabel" id="label58">
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">False</property>
-                                                    <property name="label" translatable="yes">):</property>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="expand">True</property>
-                                                    <property name="fill">True</property>
-                                                    <property name="position">2</property>
-                                                  </packing>
-                                                </child>
-                                              </object>
-                                            </child>
+                                            <property name="label" translatable="yes">Back color</property>
+                                            <property name="use_markup">True</property>
                                           </object>
                                           <packing>
-                                            <property name="expand">True</property>
+                                            <property name="expand">False</property>
                                             <property name="fill">True</property>
                                             <property name="position">2</property>
                                           </packing>
                                         </child>
+                                        <child>
+                                          <object class="GtkColorButton" id="colorBack">
+                                            <property name="use_action_appearance">False</property>
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="focus_on_click">False</property>
+                                            <property name="receives_default">True</property>
+                                            <property name="halign">start</property>
+                                            <property name="title" translatable="yes">Pick a BACKGROUND Color</property>
+                                            <property name="rgba">rgb(255,255,255)</property>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">3</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label52">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="label" translatable="yes">Bold Color</property>
+                                            <property name="use_markup">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">4</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkColorButton" id="colorBold">
+                                            <property name="use_action_appearance">False</property>
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="focus_on_click">False</property>
+                                            <property name="receives_default">True</property>
+                                            <property name="halign">start</property>
+                                            <property name="title" translatable="yes">Pick a BOLD Color</property>
+                                            <property name="rgba">rgb(0,0,0)</property>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">5</property>
+                                          </packing>
+                                        </child>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -6460,96 +7215,150 @@ sudo -p sudo_prompt_string ...</property>
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkCheckButton" id="chkBoldIsBrigth">
-                                        <property name="label" translatable="yes">Bold is also bright</property>
-                                        <property name="use_action_appearance">True</property>
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">False</property>
-                                        <property name="xalign">0</property>
-                                        <property name="draw_indicator">True</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkFrame" id="frame33">
+                                      <object class="GtkBox">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
-                                        <property name="label_xalign">0</property>
-                                        <property name="shadow_type">none</property>
                                         <child>
-                                          <object class="GtkAlignment" id="alignment42">
+                                          <object class="GtkLabel">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="left_padding">12</property>
-                                            <child>
-                                              <object class="GtkFontButton" id="fontTerminal">
-                                                <property name="use_action_appearance">False</property>
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">True</property>
-                                                <property name="focus_on_click">False</property>
-                                                <property name="receives_default">True</property>
-                                                <property name="font">Sans 12</property>
-                                                <property name="title" translatable="yes">Pick a Font for the Terminal</property>
-                                                <property name="use_font">True</property>
-                                                <property name="use_size">True</property>
-                                              </object>
-                                            </child>
+                                            <property name="label" translatable="yes">Bold is</property>
+                                            <property name="use_markup">True</property>
+                                            <property name="width_chars">14</property>
+                                            <property name="xalign">0</property>
                                           </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">0</property>
+                                          </packing>
                                         </child>
-                                        <child type="label">
-                                          <object class="GtkLabel" id="label63">
+                                        <child>
+                                          <object class="GtkCheckButton" id="chkBoldIsBrigth">
+                                            <property name="label" translatable="yes">also bright</property>
+                                            <property name="use_action_appearance">True</property>
                                             <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="label" translatable="yes">Font:</property>
-                                            <property name="use_markup">True</property>
-                                            <property name="yalign">0.49000000953674316</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="receives_default">False</property>
+                                            <property name="halign">start</property>
+                                            <property name="margin_right">16</property>
+                                            <property name="xalign">0</property>
+                                            <property name="draw_indicator">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">1</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkCheckButton" id="cbBoldAsText">
+                                            <property name="label" translatable="yes">same as text</property>
+                                            <property name="use_action_appearance">False</property>
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="receives_default">False</property>
+                                            <property name="halign">start</property>
+                                            <property name="xalign">0</property>
+                                            <property name="draw_indicator">True</property>
                                           </object>
+                                          <packing>
+                                            <property name="expand">True</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">2</property>
+                                          </packing>
                                         </child>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
                                         <property name="fill">True</property>
-                                        <property name="position">2</property>
+                                        <property name="position">1</property>
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkFrame" id="frameMethod1">
+                                      <object class="GtkBox">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
-                                        <property name="label_xalign">0</property>
-                                        <property name="shadow_type">none</property>
                                         <child>
-                                          <object class="GtkAlignment" id="alignMethod1">
+                                          <object class="GtkLabel" id="label63">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="left_padding">12</property>
-                                            <child>
-                                              <object class="GtkComboBoxText" id="comboCursorShape">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
-                                                <property name="has_tooltip">True</property>
-                                                <property name="active">0</property>
-                                                <items>
-                                                  <item id="block" translatable="yes">block</item>
-                                                  <item id="ibeam" translatable="yes">ibeam</item>
-                                                  <item id="underline" translatable="yes">underline</item>
-                                                </items>
-                                              </object>
-                                            </child>
+                                            <property name="label" translatable="yes">Font</property>
+                                            <property name="use_markup">True</property>
+                                            <property name="width_chars">14</property>
+                                            <property name="xalign">0</property>
+                                            <property name="yalign">0.49000000953674316</property>
                                           </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">0</property>
+                                          </packing>
                                         </child>
-                                        <child type="label">
+                                        <child>
+                                          <object class="GtkFontButton" id="fontTerminal">
+                                            <property name="use_action_appearance">False</property>
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="focus_on_click">False</property>
+                                            <property name="receives_default">True</property>
+                                            <property name="halign">start</property>
+                                            <property name="font">Sans 12</property>
+                                            <property name="title" translatable="yes">Pick a Font for the Terminal</property>
+                                            <property name="use_font">True</property>
+                                            <property name="use_size">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">1</property>
+                                          </packing>
+                                        </child>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">2</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkBox">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <child>
                                           <object class="GtkLabel" id="label59">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="label" translatable="yes">Cursor shape:</property>
+                                            <property name="label" translatable="yes">Cursor shape</property>
                                             <property name="use_markup">True</property>
+                                            <property name="width_chars">14</property>
+                                            <property name="xalign">0</property>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkComboBoxText" id="comboCursorShape">
+                                            <property name="width_request">150</property>
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="has_tooltip">True</property>
+                                            <property name="halign">start</property>
+                                            <property name="active">0</property>
+                                            <items>
+                                              <item id="block" translatable="yes">block</item>
+                                              <item id="ibeam" translatable="yes">ibeam</item>
+                                              <item id="underline" translatable="yes">underline</item>
+                                            </items>
                                           </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">1</property>
+                                          </packing>
                                         </child>
                                       </object>
                                       <packing>
@@ -6559,40 +7368,48 @@ sudo -p sudo_prompt_string ...</property>
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkFrame" id="frameTimeOutCommand1">
+                                      <object class="GtkBox">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
-                                        <property name="label_xalign">0</property>
-                                        <property name="shadow_type">none</property>
                                         <child>
-                                          <object class="GtkAlignment" id="alignment38">
+                                          <object class="GtkLabel" id="label69">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="left_padding">12</property>
-                                            <child>
-                                              <object class="GtkSpinButton" id="spCfgTerminalScrollback">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">True</property>
-                                                <property name="invisible_char">•</property>
-                                                <property name="xalign">1</property>
-                                                <property name="primary_icon_stock">gtk-media-rewind</property>
-                                                <property name="secondary_icon_activatable">False</property>
-                                                <property name="adjustment">adjLinesBack</property>
-                                                <property name="climb_rate">0.5</property>
-                                                <property name="snap_to_ticks">True</property>
-                                                <property name="numeric">True</property>
-                                                <property name="update_policy">if-valid</property>
-                                              </object>
-                                            </child>
+                                            <property name="label" translatable="yes">Scrollback lines</property>
+                                            <property name="use_markup">True</property>
+                                            <property name="width_chars">14</property>
+                                            <property name="xalign">0</property>
                                           </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">0</property>
+                                          </packing>
                                         </child>
-                                        <child type="label">
-                                          <object class="GtkLabel" id="label69">
+                                        <child>
+                                          <object class="GtkSpinButton" id="spCfgTerminalScrollback">
+                                            <property name="width_request">150</property>
                                             <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="label" translatable="yes">Scrollback lines:</property>
-                                            <property name="use_markup">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="tooltip_text" translatable="yes">If positive, sets the length of the scrollback buffer used by the terminal.
+If 0, disables the scrollback buffer.
+If -1, means an "infinitive scrollback".</property>
+                                            <property name="halign">start</property>
+                                            <property name="invisible_char">•</property>
+                                            <property name="text" translatable="yes">0</property>
+                                            <property name="xalign">1</property>
+                                            <property name="secondary_icon_activatable">False</property>
+                                            <property name="adjustment">adjLinesBack</property>
+                                            <property name="climb_rate">0.5</property>
+                                            <property name="snap_to_ticks">True</property>
+                                            <property name="numeric">True</property>
+                                            <property name="update_policy">if-valid</property>
                                           </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">1</property>
+                                          </packing>
                                         </child>
                                       </object>
                                       <packing>
@@ -6602,37 +7419,62 @@ sudo -p sudo_prompt_string ...</property>
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkFrame" id="frameTimeOutCommand2">
+                                      <object class="GtkBox">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
-                                        <property name="label_xalign">0</property>
-                                        <property name="shadow_type">none</property>
                                         <child>
-                                          <object class="GtkAlignment" id="alignment2">
+                                          <object class="GtkLabel" id="label72">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="left_padding">12</property>
-                                            <child>
-                                              <object class="GtkScale" id="spCfgTerminalTransparency">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">True</property>
-                                                <property name="adjustment">adjTransparency</property>
-                                                <property name="show_fill_level">True</property>
-                                                <property name="fill_level">1</property>
-                                                <property name="round_digits">2</property>
-                                                <property name="digits">2</property>
-                                                <property name="value_pos">left</property>
-                                              </object>
-                                            </child>
+                                            <property name="label" translatable="yes">Transparency (*)</property>
+                                            <property name="use_markup">True</property>
+                                            <property name="width_chars">14</property>
+                                            <property name="xalign">0</property>
                                           </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">0</property>
+                                          </packing>
                                         </child>
-                                        <child type="label">
-                                          <object class="GtkLabel" id="label72">
+                                        <child>
+                                          <object class="GtkCheckButton" id="cbCfgTerminalSupportTransparency">
                                             <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="label" translatable="yes">Transparency:</property>
-                                            <property name="use_markup">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="receives_default">False</property>
+                                            <property name="tooltip_text" translatable="yes">If checked, transparency is supported for any terminals and you can specify here the default transparency level.
+
+When checked for the first time, a restart of the application is required to take effect.
+
+If unchecked, transparency is not supported.
+
+If you don't use transparency, leave ths option unchecked as it will slightly improve rendering performances.</property>
+                                            <property name="use_stock">True</property>
+                                            <property name="active">True</property>
+                                            <property name="draw_indicator">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">1</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkScale" id="spCfgTerminalTransparency">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="adjustment">adjTransparency</property>
+                                            <property name="show_fill_level">True</property>
+                                            <property name="fill_level">1</property>
+                                            <property name="digits">2</property>
+                                            <property name="draw_value">False</property>
+                                            <property name="value_pos">left</property>
                                           </object>
+                                          <packing>
+                                            <property name="expand">True</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">2</property>
+                                          </packing>
                                         </child>
                                       </object>
                                       <packing>
@@ -6642,418 +7484,337 @@ sudo -p sudo_prompt_string ...</property>
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkFrame" id="Colors">
+                                      <object class="GtkBox">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
-                                        <property name="label_xalign">0</property>
-                                        <property name="shadow_type">none</property>
                                         <child>
-                                          <object class="GtkAlignment" id="alignment1">
+                                          <object class="GtkLabel" id="label82">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="margin_bottom">3</property>
+                                            <property name="label" translatable="yes">Colors</property>
+                                            <property name="use_markup">True</property>
+                                            <property name="width_chars">14</property>
+                                            <property name="xalign">0</property>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkGrid" id="table3">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="left_padding">12</property>
+                                            <property name="halign">start</property>
                                             <child>
-                                              <object class="GtkGrid" id="table3">
+                                              <object class="GtkColorButton" id="colorBlack">
+                                                <property name="use_action_appearance">False</property>
                                                 <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
-                                                <child>
-                                                  <object class="GtkColorButton" id="colorBlack">
-                                                    <property name="use_action_appearance">False</property>
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">True</property>
-                                                    <property name="receives_default">True</property>
-                                                    <property name="rgba">rgb(0,0,0)</property>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="left_attach">0</property>
-                                                    <property name="top_attach">0</property>
-                                                  </packing>
-                                                </child>
-                                                <child>
-                                                  <object class="GtkColorButton" id="colorRed">
-                                                    <property name="use_action_appearance">False</property>
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">True</property>
-                                                    <property name="receives_default">True</property>
-                                                    <property name="rgba">rgb(204,0,0)</property>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="left_attach">1</property>
-                                                    <property name="top_attach">0</property>
-                                                  </packing>
-                                                </child>
-                                                <child>
-                                                  <object class="GtkColorButton" id="colorGreen">
-                                                    <property name="use_action_appearance">False</property>
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">True</property>
-                                                    <property name="receives_default">True</property>
-                                                    <property name="rgba">rgb(78,154,6)</property>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="left_attach">2</property>
-                                                    <property name="top_attach">0</property>
-                                                  </packing>
-                                                </child>
-                                                <child>
-                                                  <object class="GtkColorButton" id="colorYellow">
-                                                    <property name="use_action_appearance">False</property>
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">True</property>
-                                                    <property name="receives_default">True</property>
-                                                    <property name="rgba">rgb(196,160,0)</property>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="left_attach">3</property>
-                                                    <property name="top_attach">0</property>
-                                                  </packing>
-                                                </child>
-                                                <child>
-                                                  <object class="GtkColorButton" id="colorBlue">
-                                                    <property name="use_action_appearance">False</property>
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">True</property>
-                                                    <property name="receives_default">True</property>
-                                                    <property name="rgba">rgb(32,74,135)</property>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="left_attach">4</property>
-                                                    <property name="top_attach">0</property>
-                                                  </packing>
-                                                </child>
-                                                <child>
-                                                  <object class="GtkColorButton" id="colorMagenta">
-                                                    <property name="use_action_appearance">False</property>
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">True</property>
-                                                    <property name="receives_default">True</property>
-                                                    <property name="rgba">rgb(92,53,102)</property>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="left_attach">5</property>
-                                                    <property name="top_attach">0</property>
-                                                  </packing>
-                                                </child>
-                                                <child>
-                                                  <object class="GtkColorButton" id="colorCyan">
-                                                    <property name="use_action_appearance">False</property>
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">True</property>
-                                                    <property name="receives_default">True</property>
-                                                    <property name="rgba">rgb(6,152,154)</property>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="left_attach">6</property>
-                                                    <property name="top_attach">0</property>
-                                                  </packing>
-                                                </child>
-                                                <child>
-                                                  <object class="GtkColorButton" id="colorWhite">
-                                                    <property name="use_action_appearance">False</property>
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">True</property>
-                                                    <property name="receives_default">True</property>
-                                                    <property name="rgba">rgb(211,215,207)</property>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="left_attach">7</property>
-                                                    <property name="top_attach">0</property>
-                                                  </packing>
-                                                </child>
-                                                <child>
-                                                  <object class="GtkColorButton" id="colorBrightRed">
-                                                    <property name="use_action_appearance">False</property>
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">True</property>
-                                                    <property name="receives_default">True</property>
-                                                    <property name="rgba">rgb(239,41,41)</property>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="left_attach">1</property>
-                                                    <property name="top_attach">1</property>
-                                                  </packing>
-                                                </child>
-                                                <child>
-                                                  <object class="GtkColorButton" id="colorBrightGreen">
-                                                    <property name="use_action_appearance">False</property>
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">True</property>
-                                                    <property name="receives_default">True</property>
-                                                    <property name="rgba">rgb(138,226,52)</property>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="left_attach">2</property>
-                                                    <property name="top_attach">1</property>
-                                                  </packing>
-                                                </child>
-                                                <child>
-                                                  <object class="GtkColorButton" id="colorBrightYellow">
-                                                    <property name="use_action_appearance">False</property>
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">True</property>
-                                                    <property name="receives_default">True</property>
-                                                    <property name="rgba">rgb(252,233,79)</property>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="left_attach">3</property>
-                                                    <property name="top_attach">1</property>
-                                                  </packing>
-                                                </child>
-                                                <child>
-                                                  <object class="GtkColorButton" id="colorBrightBlue">
-                                                    <property name="use_action_appearance">False</property>
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">True</property>
-                                                    <property name="receives_default">True</property>
-                                                    <property name="rgba">rgb(114,159,207)</property>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="left_attach">4</property>
-                                                    <property name="top_attach">1</property>
-                                                  </packing>
-                                                </child>
-                                                <child>
-                                                  <object class="GtkColorButton" id="colorBrightMagenta">
-                                                    <property name="use_action_appearance">False</property>
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">True</property>
-                                                    <property name="receives_default">True</property>
-                                                    <property name="rgba">rgb(173,127,168)</property>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="left_attach">5</property>
-                                                    <property name="top_attach">1</property>
-                                                  </packing>
-                                                </child>
-                                                <child>
-                                                  <object class="GtkColorButton" id="colorBrightCyan">
-                                                    <property name="use_action_appearance">False</property>
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">True</property>
-                                                    <property name="receives_default">True</property>
-                                                    <property name="rgba">rgb(52,226,226)</property>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="left_attach">6</property>
-                                                    <property name="top_attach">1</property>
-                                                  </packing>
-                                                </child>
-                                                <child>
-                                                  <object class="GtkColorButton" id="colorBrightWhite">
-                                                    <property name="use_action_appearance">False</property>
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">True</property>
-                                                    <property name="receives_default">True</property>
-                                                    <property name="rgba">rgb(238,238,236)</property>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="left_attach">7</property>
-                                                    <property name="top_attach">1</property>
-                                                  </packing>
-                                                </child>
-                                                <child>
-                                                  <object class="GtkColorButton" id="colorBrightBlack">
-                                                    <property name="use_action_appearance">False</property>
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">True</property>
-                                                    <property name="receives_default">True</property>
-                                                    <property name="rgba">rgb(85,87,83)</property>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="left_attach">0</property>
-                                                    <property name="top_attach">1</property>
-                                                  </packing>
-                                                </child>
+                                                <property name="can_focus">True</property>
+                                                <property name="receives_default">True</property>
+                                                <property name="rgba">rgb(0,0,0)</property>
+                                                <style>
+                                                  <class name="button-cp"/>
+                                                </style>
                                               </object>
+                                              <packing>
+                                                <property name="left_attach">0</property>
+                                                <property name="top_attach">0</property>
+                                              </packing>
                                             </child>
-                                          </object>
-                                        </child>
-                                        <child type="label">
-                                          <object class="GtkLabel" id="label82">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="label" translatable="yes">Colors:</property>
-                                            <property name="use_markup">True</property>
-                                          </object>
-                                        </child>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">True</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">6</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                </child>
-                              </object>
-                            </child>
-                            <child type="label">
-                              <object class="GtkLabel" id="label74">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" translatable="yes"> Terminal UI: </property>
-                                <property name="use_markup">True</property>
-                              </object>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">True</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkCheckButton" id="cbCfgStartMaximized">
-                        <property name="label" translatable="yes">Start Terminals maximized: maximize either TABBED or OWN window</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="has_tooltip">True</property>
-                        <property name="tooltip_text" translatable="yes">If checked, Terminals will be maximized on connect</property>
-                        <property name="xalign">0.5</property>
-                        <property name="draw_indicator">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkCheckButton" id="cbCfgShowTerminalStatus">
-                        <property name="label" translatable="yes">Show status bar on every terminal</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="has_tooltip">True</property>
-                        <property name="tooltip_text" translatable="yes">If checked, any disconnected terminal in a splitted window will be directly unsplitted to its own TAB/Window</property>
-                        <property name="xalign">0.5</property>
-                        <property name="draw_indicator">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkBox" id="hbox37">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="has_tooltip">True</property>
-                        <property name="tooltip_text" translatable="yes">Requires restarting every opened connection (closing and starting)
-Changes apply to next opened connections, not current</property>
-                        <child>
-                          <object class="GtkLabel" id="label68">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Show MACROS: </property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkRadioButton" id="rbCfgComBoxNever">
-                            <property name="label" translatable="yes">Never  </property>
-                            <property name="use_action_appearance">False</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="xalign">0.5</property>
-                            <property name="active">True</property>
-                            <property name="draw_indicator">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkRadioButton" id="rbCfgComBoxCombo">
-                            <property name="label" translatable="yes">In combo box  </property>
-                            <property name="use_action_appearance">False</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="xalign">0.5</property>
-                            <property name="draw_indicator">True</property>
-                            <property name="group">rbCfgComBoxNever</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkRadioButton" id="rbCfgComBoxButtons">
-                            <property name="label" translatable="yes">As buttons  </property>
-                            <property name="use_action_appearance">False</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="xalign">0.5</property>
-                            <property name="draw_indicator">True</property>
-                            <property name="group">rbCfgComBoxNever</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">3</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkCheckButton" id="cbCfgShowGlobalComm">
-                            <property name="label" translatable="yes">Show GLOBAL commands in terminals</property>
-                            <property name="use_action_appearance">False</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="xalign">0.5</property>
-                            <property name="draw_indicator">True</property>
+                                            <child>
+                                              <object class="GtkColorButton" id="colorRed">
+                                                <property name="use_action_appearance">False</property>
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">True</property>
+                                                <property name="receives_default">True</property>
+                                                <property name="rgba">rgb(204,0,0)</property>
+                                                <style>
+                                                  <class name="button-cp"/>
+                                                </style>
+                                              </object>
+                                              <packing>
+                                                <property name="left_attach">1</property>
+                                                <property name="top_attach">0</property>
+                                              </packing>
+                                            </child>
+                                            <child>
+                                              <object class="GtkColorButton" id="colorGreen">
+                                                <property name="use_action_appearance">False</property>
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">True</property>
+                                                <property name="receives_default">True</property>
+                                                <property name="rgba">rgb(78,154,6)</property>
+                                                <style>
+                                                  <class name="button-cp"/>
+                                                </style>
+                                              </object>
+                                              <packing>
+                                                <property name="left_attach">2</property>
+                                                <property name="top_attach">0</property>
+                                              </packing>
+                                            </child>
+                                            <child>
+                                              <object class="GtkColorButton" id="colorYellow">
+                                                <property name="use_action_appearance">False</property>
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">True</property>
+                                                <property name="receives_default">True</property>
+                                                <property name="rgba">rgb(196,160,0)</property>
+                                                <style>
+                                                  <class name="button-cp"/>
+                                                </style>
+                                              </object>
+                                              <packing>
+                                                <property name="left_attach">3</property>
+                                                <property name="top_attach">0</property>
+                                              </packing>
+                                            </child>
+                                            <child>
+                                              <object class="GtkColorButton" id="colorBlue">
+                                                <property name="use_action_appearance">False</property>
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">True</property>
+                                                <property name="receives_default">True</property>
+                                                <property name="rgba">rgb(32,74,135)</property>
+                                                <style>
+                                                  <class name="button-cp"/>
+                                                </style>
+                                              </object>
+                                              <packing>
+                                                <property name="left_attach">4</property>
+                                                <property name="top_attach">0</property>
+                                              </packing>
+                                            </child>
+                                            <child>
+                                              <object class="GtkColorButton" id="colorMagenta">
+                                                <property name="use_action_appearance">False</property>
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">True</property>
+                                                <property name="receives_default">True</property>
+                                                <property name="rgba">rgb(92,53,102)</property>
+                                                <style>
+                                                  <class name="button-cp"/>
+                                                </style>
+                                              </object>
+                                              <packing>
+                                                <property name="left_attach">5</property>
+                                                <property name="top_attach">0</property>
+                                              </packing>
+                                            </child>
+                                            <child>
+                                              <object class="GtkColorButton" id="colorCyan">
+                                                <property name="use_action_appearance">False</property>
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">True</property>
+                                                <property name="receives_default">True</property>
+                                                <property name="rgba">rgb(6,152,154)</property>
+                                                <style>
+                                                  <class name="button-cp"/>
+                                                </style>
+                                              </object>
+                                              <packing>
+                                                <property name="left_attach">6</property>
+                                                <property name="top_attach">0</property>
+                                              </packing>
+                                            </child>
+                                            <child>
+                                              <object class="GtkColorButton" id="colorWhite">
+                                                <property name="use_action_appearance">False</property>
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">True</property>
+                                                <property name="receives_default">True</property>
+                                                <property name="rgba">rgb(211,215,207)</property>
+                                                <style>
+                                                  <class name="button-cp"/>
+                                                </style>
+                                              </object>
+                                              <packing>
+                                                <property name="left_attach">7</property>
+                                                <property name="top_attach">0</property>
+                                              </packing>
+                                            </child>
+                                            <child>
+                                              <object class="GtkColorButton" id="colorBrightRed">
+                                                <property name="use_action_appearance">False</property>
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">True</property>
+                                                <property name="receives_default">True</property>
+                                                <property name="rgba">rgb(239,41,41)</property>
+                                                <style>
+                                                  <class name="button-cp"/>
+                                                </style>
+                                              </object>
+                                              <packing>
+                                                <property name="left_attach">1</property>
+                                                <property name="top_attach">1</property>
+                                              </packing>
+                                            </child>
+                                            <child>
+                                              <object class="GtkColorButton" id="colorBrightGreen">
+                                                <property name="use_action_appearance">False</property>
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">True</property>
+                                                <property name="receives_default">True</property>
+                                                <property name="rgba">rgb(138,226,52)</property>
+                                                <style>
+                                                  <class name="button-cp"/>
+                                                </style>
+                                              </object>
+                                              <packing>
+                                                <property name="left_attach">2</property>
+                                                <property name="top_attach">1</property>
+                                              </packing>
+                                            </child>
+                                            <child>
+                                              <object class="GtkColorButton" id="colorBrightYellow">
+                                                <property name="use_action_appearance">False</property>
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">True</property>
+                                                <property name="receives_default">True</property>
+                                                <property name="rgba">rgb(252,233,79)</property>
+                                                <style>
+                                                  <class name="button-cp"/>
+                                                </style>
+                                              </object>
+                                              <packing>
+                                                <property name="left_attach">3</property>
+                                                <property name="top_attach">1</property>
+                                              </packing>
+                                            </child>
+                                            <child>
+                                              <object class="GtkColorButton" id="colorBrightBlue">
+                                                <property name="use_action_appearance">False</property>
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">True</property>
+                                                <property name="receives_default">True</property>
+                                                <property name="rgba">rgb(114,159,207)</property>
+                                                <style>
+                                                  <class name="button-cp"/>
+                                                </style>
+                                              </object>
+                                              <packing>
+                                                <property name="left_attach">4</property>
+                                                <property name="top_attach">1</property>
+                                              </packing>
+                                            </child>
+                                            <child>
+                                              <object class="GtkColorButton" id="colorBrightMagenta">
+                                                <property name="use_action_appearance">False</property>
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">True</property>
+                                                <property name="receives_default">True</property>
+                                                <property name="rgba">rgb(173,127,168)</property>
+                                                <style>
+                                                  <class name="button-cp"/>
+                                                </style>
+                                              </object>
+                                              <packing>
+                                                <property name="left_attach">5</property>
+                                                <property name="top_attach">1</property>
+                                              </packing>
+                                            </child>
+                                            <child>
+                                              <object class="GtkColorButton" id="colorBrightCyan">
+                                                <property name="use_action_appearance">False</property>
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">True</property>
+                                                <property name="receives_default">True</property>
+                                                <property name="rgba">rgb(52,226,226)</property>
+                                                <style>
+                                                  <class name="button-cp"/>
+                                                </style>
+                                              </object>
+                                              <packing>
+                                                <property name="left_attach">6</property>
+                                                <property name="top_attach">1</property>
+                                              </packing>
+                                            </child>
+                                            <child>
+                                              <object class="GtkColorButton" id="colorBrightWhite">
+                                                <property name="use_action_appearance">False</property>
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">True</property>
+                                                <property name="receives_default">True</property>
+                                                <property name="rgba">rgb(238,238,236)</property>
+                                                <style>
+                                                  <class name="button-cp"/>
+                                                </style>
+                                              </object>
+                                              <packing>
+                                                <property name="left_attach">7</property>
+                                                <property name="top_attach">1</property>
+                                              </packing>
+                                            </child>
+                                            <child>
+                                              <object class="GtkColorButton" id="colorBrightBlack">
+                                                <property name="use_action_appearance">False</property>
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">True</property>
+                                                <property name="receives_default">True</property>
+                                                <property name="rgba">rgb(85,87,83)</property>
+                                                <style>
+                                                  <class name="button-cp"/>
+                                                </style>
+                                              </object>
+                                              <packing>
+                                                <property name="left_attach">0</property>
+                                                <property name="top_attach">1</property>
+                                              </packing>
+                                            </child>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">1</property>
+                                          </packing>
+                                        </child>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">6</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                            <child type="label">
+                              <object class="GtkLabel" id="label74">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes">&lt;b&gt;Terminal UI&lt;/b&gt;</property>
+                                <property name="use_markup">True</property>
+                              </object>
+                            </child>
                           </object>
                           <packing>
                             <property name="expand">True</property>
                             <property name="fill">True</property>
-                            <property name="position">4</property>
+                            <property name="position">1</property>
                           </packing>
                         </child>
                       </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">3</property>
+                        <property name="position">5</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkCheckButton" id="cbCfgChangeMainTitle">
-                        <property name="label" translatable="yes">Change main window title with terminal title</property>
-                        <property name="use_action_appearance">False</property>
+                      <object class="GtkLabel" id="lblRestartRequired2">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="has_tooltip">True</property>
-                        <property name="tooltip_text" translatable="yes">If checked, main window title takes terminal title</property>
-                        <property name="xalign">0</property>
-                        <property name="draw_indicator">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">&lt;i&gt;(*) Requires restart to take effect&lt;/i&gt;</property>
+                        <property name="use_markup">True</property>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
+                        <property name="expand">True</property>
                         <property name="fill">True</property>
-                        <property name="position">4</property>
+                        <property name="position">6</property>
                       </packing>
                     </child>
                   </object>
@@ -7115,8 +7876,10 @@ Changes apply to next opened connections, not current</property>
                           <object class="GtkLabel" id="label44">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Character encoding: </property>
+                            <property name="label" translatable="yes">Character encoding</property>
                             <property name="use_markup">True</property>
+                            <property name="width_chars">16</property>
+                            <property name="xalign">0</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -7141,19 +7904,6 @@ Changes apply to next opened connections, not current</property>
                                 <property name="position">0</property>
                               </packing>
                             </child>
-                            <child>
-                              <object class="GtkLabel" id="cfgLblCharEncode">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">encoding description</property>
-                                <property name="selectable">True</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -7161,6 +7911,38 @@ Changes apply to next opened connections, not current</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
+                        <child>
+                          <object class="GtkLabel" id="cfgLblCharEncode">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">encoding description</property>
+                            <property name="selectable">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLinkButton" id="linkHelpTOAD">
+                            <property name="label" translatable="yes">Help</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
+                            <property name="receives_default">True</property>
+                            <property name="tooltip_text" translatable="yes">Open Online Help</property>
+                            <property name="relief">none</property>
+                            <property name="always_show_image">True</property>
+                            <property name="uri">https://docs.asbru-cm.net/Manual/Preferences/TermAdvanced/</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="pack_type">end</property>
+                            <property name="position">3</property>
+                          </packing>
+                        </child>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -7177,7 +7959,9 @@ Changes apply to next opened connections, not current</property>
                           <object class="GtkLabel" id="label48">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Backspace: </property>
+                            <property name="label" translatable="yes">Backspace</property>
+                            <property name="width_chars">16</property>
+                            <property name="xalign">0</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -7212,39 +7996,91 @@ Changes apply to next opened connections, not current</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkCheckButton" id="cbCfgExpectDebug">
-                        <property name="label" translatable="yes">Expect DEBUG: make Expect object show information on what's going on, in order to aid in debugging</property>
-                        <property name="use_action_appearance">False</property>
+                      <object class="GtkBox">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="has_tooltip">True</property>
-                        <property name="tooltip_text" translatable="yes">If checked, lots of debug info will be output on every terminal. It will also save a .yml (YAML) config faile is "Save" button is clicked. BEWARE!! This option will make appear plain text passwords!!</property>
-                        <property name="xalign">0.5</property>
-                        <property name="draw_indicator">True</property>
+                        <property name="can_focus">False</property>
+                        <child>
+                          <object class="GtkCheckButton" id="cbCfgExpectDebug">
+                            <property name="label" translatable="yes">Expect DEBUG</property>
+                            <property name="use_action_appearance">False</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="has_tooltip">True</property>
+                            <property name="tooltip_text" translatable="yes">If checked, lots of debug info will be output on every terminal. It will also save a .yml (YAML) config faile is "Save" button is clicked. BEWARE!! This option will make appear plain text passwords!!</property>
+                            <property name="halign">start</property>
+                            <property name="xalign">0</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="margin_left">9</property>
+                            <property name="label" translatable="yes">&lt;span color="#888888"&gt;&lt;i&gt;make Expect object show information on what's going on, in order to aid in debugging&lt;/i&gt;&lt;/span&gt;</property>
+                            <property name="use_markup">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
                       </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">4</property>
+                        <property name="position">2</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkCheckButton" id="cbCfgHideConnSubMenu">
-                        <property name="label" translatable="yes">Hide Connections submenu: if UNchecked, there may be big delays to show right-click submenu</property>
-                        <property name="use_action_appearance">False</property>
+                      <object class="GtkBox">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="has_tooltip">True</property>
-                        <property name="tooltip_text" translatable="yes">This options allows you (if unchecked) to prevent the Connections submenu from appearing when right-click on any terminal. That will speed up showing the right-click submenu</property>
-                        <property name="xalign">0.5</property>
-                        <property name="draw_indicator">True</property>
+                        <property name="can_focus">False</property>
+                        <child>
+                          <object class="GtkCheckButton" id="cbCfgHideConnSubMenu">
+                            <property name="label" translatable="yes">Hide Connections submenu</property>
+                            <property name="use_action_appearance">False</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="has_tooltip">True</property>
+                            <property name="tooltip_text" translatable="yes">This options allows you (if unchecked) to prevent the Connections submenu from appearing when right-click on any terminal. That will speed up showing the right-click submenu</property>
+                            <property name="halign">start</property>
+                            <property name="xalign">0</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="margin_left">6</property>
+                            <property name="label" translatable="yes">&lt;span color="#888888"&gt;&lt;i&gt;if &lt;b&gt;unchecked&lt;/b&gt;, there may be big delays to show right-click submenu&lt;/i&gt;&lt;/span&gt;</property>
+                            <property name="use_markup">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
                       </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">5</property>
+                        <property name="position">3</property>
                       </packing>
                     </child>
                     <child>
@@ -7254,13 +8090,14 @@ Changes apply to next opened connections, not current</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
+                        <property name="halign">start</property>
                         <property name="xalign">0.5</property>
                         <property name="draw_indicator">True</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">6</property>
+                        <property name="position">4</property>
                       </packing>
                     </child>
                     <child>
@@ -7272,65 +8109,100 @@ Changes apply to next opened connections, not current</property>
                         <property name="receives_default">False</property>
                         <property name="has_tooltip">True</property>
                         <property name="tooltip_text" translatable="yes">If checked, a confirmation window will popup when chaining executions</property>
+                        <property name="halign">start</property>
                         <property name="xalign">0.5</property>
                         <property name="draw_indicator">True</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">8</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkCheckButton" id="cbCfgSkip1stChainExpect">
-                        <property name="label" translatable="yes">Skip first Chain expect (which uses to be a &lt;command prompt&gt; expect command)</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="has_tooltip">True</property>
-                        <property name="tooltip_text" translatable="yes">If checked, first expect in the chain will be skipped (ie: skip any command prompt not matching the actual one)</property>
-                        <property name="xalign">0.5</property>
-                        <property name="draw_indicator">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">9</property>
+                        <property name="position">5</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkCheckButton" id="cbCfgUseShellToConnect">
-                        <property name="label" translatable="yes">Use login shell to start connections: if checked, it may resolve some problems with ENVironment varibles</property>
-                        <property name="use_action_appearance">False</property>
+                      <object class="GtkBox">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="xalign">0.5</property>
-                        <property name="draw_indicator">True</property>
+                        <property name="can_focus">False</property>
+                        <child>
+                          <object class="GtkCheckButton" id="cbCfgSkip1stChainExpect">
+                            <property name="label" translatable="yes">Skip first Chain expect</property>
+                            <property name="use_action_appearance">False</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="has_tooltip">True</property>
+                            <property name="tooltip_text" translatable="yes">If checked, first expect in the chain will be skipped (ie: skip any command prompt not matching the actual one)</property>
+                            <property name="halign">start</property>
+                            <property name="xalign">0</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="margin_left">6</property>
+                            <property name="label" translatable="yes">&lt;span color="#888888"&gt;&lt;i&gt;which uses to be a &lt;b&gt;command prompt&lt;/b&gt; expect command&lt;/i&gt;&lt;/span&gt;</property>
+                            <property name="use_markup">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
                       </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">10</property>
+                        <property name="position">7</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkCheckButton" id="cbCfgPreventF11">
-                        <property name="label" translatable="yes">Prevent F11 from going 'fullscreen'</property>
-                        <property name="use_action_appearance">False</property>
+                      <object class="GtkBox">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="has_tooltip">True</property>
-                        <property name="tooltip_text" translatable="yes">If checked, ignore any F11 key press</property>
-                        <property name="xalign">0.5</property>
-                        <property name="draw_indicator">True</property>
+                        <property name="can_focus">False</property>
+                        <child>
+                          <object class="GtkCheckButton" id="cbCfgUseShellToConnect">
+                            <property name="label" translatable="yes">Use login shell to start connections</property>
+                            <property name="use_action_appearance">False</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="halign">start</property>
+                            <property name="xalign">0</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="margin_left">6</property>
+                            <property name="label" translatable="yes">&lt;span color="#888888"&gt;&lt;i&gt;if checked, it may resolve some problems with &lt;b&gt;ENV&lt;/b&gt;ironment varibles&lt;/i&gt;&lt;/span&gt;</property>
+                            <property name="use_markup">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
                       </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">11</property>
+                        <property name="position">9</property>
                       </packing>
                     </child>
                   </object>
@@ -7428,16 +8300,65 @@ Changes apply to next opened connections, not current</property>
                     <property name="margin_bottom">4</property>
                     <property name="orientation">vertical</property>
                     <property name="spacing">8</property>
+                    <child>
+                      <object class="GtkBox">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <child>
+                          <object class="GtkCheckButton" id="cbCfgAutoStartShell">
+                            <property name="label" translatable="yes">Start a shell upon startup</property>
+                            <property name="use_action_appearance">False</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="halign">start</property>
+                            <property name="xalign">0</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLinkButton" id="linkHelpLocalShell">
+                            <property name="label" translatable="yes">Help</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="focus_on_click">False</property>
+                            <property name="receives_default">True</property>
+                            <property name="tooltip_text" translatable="yes">Open Online Help</property>
+                            <property name="relief">none</property>
+                            <property name="always_show_image">True</property>
+                            <property name="uri">https://docs.asbru-cm.net/Manual/Preferences/ShellOptions/</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="pack_type">end</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
                     <child>
                       <object class="GtkBox" id="hbox5">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
                           <object class="GtkLabel" id="label8">
+                            <property name="width_request">100</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Shell Binary: </property>
+                            <property name="label" translatable="yes">Shell Binary</property>
                             <property name="justify">right</property>
+                            <property name="xalign">0</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -7465,7 +8386,7 @@ Changes apply to next opened connections, not current</property>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">0</property>
+                        <property name="position">1</property>
                       </packing>
                     </child>
                     <child>
@@ -7474,10 +8395,12 @@ Changes apply to next opened connections, not current</property>
                         <property name="can_focus">False</property>
                         <child>
                           <object class="GtkLabel" id="label76">
+                            <property name="width_request">100</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Shell Options: </property>
+                            <property name="label" translatable="yes">Shell Options</property>
                             <property name="justify">right</property>
+                            <property name="xalign">0</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -7505,7 +8428,7 @@ Changes apply to next opened connections, not current</property>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">1</property>
+                        <property name="position">3</property>
                       </packing>
                     </child>
                     <child>
@@ -7514,10 +8437,12 @@ Changes apply to next opened connections, not current</property>
                         <property name="can_focus">False</property>
                         <child>
                           <object class="GtkLabel" id="label77">
+                            <property name="width_request">100</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Initial Directory: </property>
+                            <property name="label" translatable="yes">Initial Directory</property>
                             <property name="justify">right</property>
+                            <property name="xalign">0</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -7542,22 +8467,6 @@ Changes apply to next opened connections, not current</property>
                           </packing>
                         </child>
                       </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkCheckButton" id="cbCfgAutoStartShell">
-                        <property name="label" translatable="yes">Start a shell upon startup</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="xalign">0.5</property>
-                        <property name="draw_indicator">True</property>
-                      </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
@@ -7692,39 +8601,87 @@ Changes apply to next opened connections, not current</property>
               <object class="GtkFrame" id="frameCfgProxy">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="margin_top">8</property>
                 <property name="label_xalign">0</property>
+                <property name="label_yalign">0</property>
                 <property name="shadow_type">none</property>
                 <child>
                   <object class="GtkAlignment" id="aCfgProxy">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xscale">0.94999998807907104</property>
-                    <property name="left_padding">4</property>
                     <child>
                       <object class="GtkBox" id="vboxProxy">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="orientation">vertical</property>
-                        <property name="spacing">16</property>
+                        <property name="spacing">8</property>
                         <child>
-                          <object class="GtkRadioButton" id="cbCfgProxyNo">
-                            <property name="label" translatable="yes">Use a direct connection</property>
+                          <object class="GtkBox">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="xalign">0</property>
-                            <property name="active">True</property>
-                            <property name="draw_indicator">True</property>
-                            <property name="tooltip_text" translatable="yes">If selected, do not use any intermediate proxy or jump host to connect to the destination.
+                            <property name="can_focus">False</property>
+                            <child>
+                              <object class="GtkRadioButton" id="cbCfgProxyNo">
+                                <property name="label" translatable="yes">Do not use proxy</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="tooltip_text" translatable="yes">If selected, do not use any intermediate proxy or jump host to connect to the destination.
                             
 For each connection, it is still possible to define a particular proxy or jump host.
 </property>
+                                <property name="halign">start</property>
+                                <property name="xalign">0</property>
+                                <property name="active">True</property>
+                                <property name="draw_indicator">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLinkButton" id="linkHelpGlobalNetwork">
+                                <property name="label" translatable="yes">Help</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="focus_on_click">False</property>
+                                <property name="receives_default">True</property>
+                                <property name="tooltip_text" translatable="yes">Open Online Help</property>
+                                <property name="relief">none</property>
+                                <property name="always_show_image">True</property>
+                                <property name="uri">https://docs.asbru-cm.net/Manual/Preferences/Networking/</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="pack_type">end</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkButton" id="btnCfgProxyCheckKPX">
+                                <property name="label" translatable="yes">KeePass</property>
+                                <property name="use_action_appearance">False</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">True</property>
+                                <property name="tooltip_markup" translatable="yes">Search KeePass database</property>
+                                <property name="halign">end</property>
+                                <property name="always_show_image">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="padding">12</property>
+                                <property name="pack_type">end</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
                           </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">True</property>
-                            <property name="position">0</property>
+                            <property name="position">1</property>
                           </packing>
                         </child>
                         <child>
@@ -7734,17 +8691,18 @@ For each connection, it is still possible to define a particular proxy or jump h
                             <property name="orientation">vertical</property>
                             <child>
                               <object class="GtkRadioButton" id="cbCfgProxyManual">
-                                <property name="label" translatable="yes">Use a SOCKS proxy</property>
+                                <property name="label" translatable="yes">SOCKS proxy</property>
                                 <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
-                                <property name="tooltip_text" translatable="yes">If selected, use a SOCKS proxy for all SSH/RDP/VNC/SFTP connections.
+                                <property name="tooltip_text" translatable="yes">If selected, use a SOCKS proxy for all connections.
 
 SOCKS is an Internet protocol that exchanges network packets between a client and server through a proxy server.
 
 For all other types of connection, this setting will be ignored.
 </property>
+                                <property name="halign">start</property>
                                 <property name="xalign">0</property>
                                 <property name="draw_indicator">True</property>
                                 <property name="group">cbCfgProxyNo</property>
@@ -7759,8 +8717,8 @@ For all other types of connection, this setting will be ignored.
                               <object class="GtkBox" id="hboxPrefProxyManualOptions">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="margin_left">21</property>
-                                <property name="spacing">12</property>
+                                <property name="margin_left">22</property>
+                                <property name="spacing">5</property>
                                 <child>
                                   <object class="GtkFrame" id="frame24">
                                     <property name="visible">True</property>
@@ -7787,7 +8745,7 @@ For all other types of connection, this setting will be ignored.
                                       <object class="GtkLabel" id="label26">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
-                                        <property name="label" translatable="yes">IP / Host:</property>
+                                        <property name="label" translatable="yes">IP / Host</property>
                                       </object>
                                     </child>
                                   </object>
@@ -7827,7 +8785,7 @@ For all other types of connection, this setting will be ignored.
                                       <object class="GtkLabel" id="label27">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
-                                        <property name="label" translatable="yes">Port:</property>
+                                        <property name="label" translatable="yes">Port</property>
                                       </object>
                                     </child>
                                   </object>
@@ -7852,8 +8810,8 @@ For all other types of connection, this setting will be ignored.
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="tooltip_text" translatable="yes">Proxy user name</property>
-                                            <property name="max_length">14</property>
                                             <property name="invisible_char">•</property>
+                                            <property name="width_chars">18</property>
                                             <property name="primary_icon_activatable">False</property>
                                             <property name="secondary_icon_activatable">False</property>
                                           </object>
@@ -7864,12 +8822,12 @@ For all other types of connection, this setting will be ignored.
                                       <object class="GtkLabel" id="label28">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
-                                        <property name="label" translatable="yes">User:</property>
+                                        <property name="label" translatable="yes">User</property>
                                       </object>
                                     </child>
                                   </object>
                                   <packing>
-                                    <property name="expand">True</property>
+                                    <property name="expand">False</property>
                                     <property name="fill">True</property>
                                     <property name="position">2</property>
                                   </packing>
@@ -7891,6 +8849,7 @@ For all other types of connection, this setting will be ignored.
                                             <property name="tooltip_text" translatable="yes">Proxy password</property>
                                             <property name="visibility">False</property>
                                             <property name="invisible_char">•</property>
+                                            <property name="width_chars">18</property>
                                             <property name="primary_icon_activatable">False</property>
                                             <property name="secondary_icon_activatable">False</property>
                                           </object>
@@ -7901,12 +8860,12 @@ For all other types of connection, this setting will be ignored.
                                       <object class="GtkLabel" id="label29">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
-                                        <property name="label" translatable="yes">Password:</property>
+                                        <property name="label" translatable="yes">Password</property>
                                       </object>
                                     </child>
                                   </object>
                                   <packing>
-                                    <property name="expand">True</property>
+                                    <property name="expand">False</property>
                                     <property name="fill">True</property>
                                     <property name="position">3</property>
                                   </packing>
@@ -7929,10 +8888,11 @@ For all other types of connection, this setting will be ignored.
                           <object class="GtkBox" id="vboxPrefJumpCfg">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
+                            <property name="margin_left">3</property>
                             <property name="orientation">vertical</property>
                             <child>
                               <object class="GtkRadioButton" id="cbCfgProxyJump">
-                                <property name="label" translatable="yes">Use a Jump Host</property>
+                                <property name="label" translatable="yes">Use Jump Server</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -7942,6 +8902,7 @@ Jump host is an alternative to SSH tunneling to access internal machines through
 
 For all other types of connection, this setting will be ignored.
 </property>
+                                <property name="halign">start</property>
                                 <property name="xalign">0</property>
                                 <property name="draw_indicator">True</property>
                                 <property name="group">cbCfgProxyNo</property>
@@ -7956,13 +8917,14 @@ For all other types of connection, this setting will be ignored.
                               <object class="GtkBox" id="vboxPrefJumpCfgOptions">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="margin_left">21</property>
+                                <property name="margin_left">22</property>
                                 <property name="orientation">vertical</property>
+                                <property name="spacing">3</property>
                                 <child>
                                   <object class="GtkBox" id="hbox1">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="spacing">12</property>
+                                    <property name="spacing">5</property>
                                     <child>
                                       <object class="GtkFrame" id="frame19">
                                         <property name="visible">True</property>
@@ -7977,7 +8939,7 @@ For all other types of connection, this setting will be ignored.
                                               <object class="GtkEntry" id="entryCfgJumpIP">
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
-                                                <property name="tooltip_text" translatable="yes">Host name or IP address of the jump host</property>
+                                                <property name="tooltip_text" translatable="yes">Host name or IP address of the jump server</property>
                                                 <property name="invisible_char">•</property>
                                                 <property name="primary_icon_activatable">False</property>
                                                 <property name="secondary_icon_activatable">False</property>
@@ -7989,14 +8951,14 @@ For all other types of connection, this setting will be ignored.
                                           <object class="GtkLabel" id="label120">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="label" translatable="yes">IP / Host:</property>
+                                            <property name="label" translatable="yes">IP / Host</property>
                                           </object>
                                         </child>
                                       </object>
                                       <packing>
                                         <property name="expand">True</property>
                                         <property name="fill">True</property>
-                                        <property name="position">1</property>
+                                        <property name="position">0</property>
                                       </packing>
                                     </child>
                                     <child>
@@ -8029,14 +8991,14 @@ For all other types of connection, this setting will be ignored.
                                           <object class="GtkLabel" id="label121">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="label" translatable="yes">Port:</property>
+                                            <property name="label" translatable="yes">Port</property>
                                           </object>
                                         </child>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
                                         <property name="fill">True</property>
-                                        <property name="position">2</property>
+                                        <property name="position">1</property>
                                       </packing>
                                     </child>
                                     <child>
@@ -8054,8 +9016,8 @@ For all other types of connection, this setting will be ignored.
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
                                                 <property name="tooltip_text" translatable="yes">Host server user</property>
-                                                <property name="max_length">14</property>
                                                 <property name="invisible_char">•</property>
+                                                <property name="width_chars">18</property>
                                                 <property name="primary_icon_activatable">False</property>
                                                 <property name="secondary_icon_activatable">False</property>
                                               </object>
@@ -8066,12 +9028,50 @@ For all other types of connection, this setting will be ignored.
                                           <object class="GtkLabel" id="label122">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="label" translatable="yes">User:</property>
+                                            <property name="label" translatable="yes">User</property>
                                           </object>
                                         </child>
                                       </object>
                                       <packing>
-                                        <property name="expand">True</property>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">2</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkFrame" id="frame7">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="label_xalign">0</property>
+                                        <property name="shadow_type">none</property>
+                                        <child>
+                                          <object class="GtkAlignment" id="alignment2">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <child>
+                                              <object class="GtkEntry" id="entryCfgJumpPass">
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">True</property>
+                                                <property name="tooltip_text" translatable="yes">Proxy password</property>
+                                                <property name="visibility">False</property>
+                                                <property name="invisible_char">•</property>
+                                                <property name="width_chars">18</property>
+                                                <property name="primary_icon_activatable">False</property>
+                                                <property name="secondary_icon_activatable">False</property>
+                                              </object>
+                                            </child>
+                                          </object>
+                                        </child>
+                                        <child type="label">
+                                          <object class="GtkLabel" id="label58">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="label" translatable="yes">Password</property>
+                                          </object>
+                                        </child>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
                                         <property name="fill">True</property>
                                         <property name="position">3</property>
                                       </packing>
@@ -8087,11 +9087,12 @@ For all other types of connection, this setting will be ignored.
                                   <object class="GtkBox" id="hbox42">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
+                                    <property name="spacing">5</property>
                                     <child>
                                       <object class="GtkLabel" id="labelConnKey1">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
-                                        <property name="label" translatable="yes">Private key file: </property>
+                                        <property name="label" translatable="yes">Private key file </property>
                                         <property name="use_markup">True</property>
                                       </object>
                                       <packing>
@@ -8105,14 +9106,14 @@ For all other types of connection, this setting will be ignored.
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="focus_on_click">False</property>
-                                        <property name="tooltip_text" translatable="yes">SSH private key to use to connect to the jump host</property>
+                                        <property name="tooltip_text" translatable="yes">SSH private key to use to connect to the jump server</property>
                                         <property name="create_folders">False</property>
                                         <property name="local_only">False</property>
                                         <property name="preview_widget_active">False</property>
                                         <property name="title" translatable="yes">Select an OpenSSH Private Key</property>
                                       </object>
                                       <packing>
-                                        <property name="expand">True</property>
+                                        <property name="expand">False</property>
                                         <property name="fill">True</property>
                                         <property name="position">1</property>
                                       </packing>
@@ -8156,12 +9157,19 @@ For all other types of connection, this setting will be ignored.
                     </child>
                   </object>
                 </child>
-                <child type="label_item">
-                  <placeholder/>
+                <child type="label">
+                  <object class="GtkLabel">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="margin_bottom">4</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Global Network Settings&lt;/b&gt;</property>
+                    <property name="use_markup">True</property>
+                  </object>
                 </child>
               </object>
               <packing>
                 <property name="position">3</property>
+                <property name="tab_fill">False</property>
               </packing>
             </child>
             <child type="tab">
@@ -8217,7 +9225,6 @@ For all other types of connection, this setting will be ignored.
                     <property name="can_focus">False</property>
                     <property name="has_tooltip">True</property>
                     <property name="tooltip_text" translatable="yes">Use &lt;GV:variable name&gt; anywhere to refer to the given value</property>
-                    <property name="left_padding">12</property>
                     <child>
                       <placeholder/>
                     </child>
@@ -8227,7 +9234,7 @@ For all other types of connection, this setting will be ignored.
                   <object class="GtkLabel" id="label14">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes"> User defined Global Variables: </property>
+                    <property name="label" translatable="yes">&lt;b&gt;User defined Global Variables&lt;/b&gt;</property>
                     <property name="use_markup">True</property>
                   </object>
                 </child>
@@ -8288,7 +9295,6 @@ For all other types of connection, this setting will be ignored.
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="has_tooltip">True</property>
-                    <property name="left_padding">12</property>
                     <child>
                       <placeholder/>
                     </child>
@@ -8298,7 +9304,7 @@ For all other types of connection, this setting will be ignored.
                   <object class="GtkLabel" id="label43">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes"> Global common local commands list: </property>
+                    <property name="label" translatable="yes">&lt;b&gt;Global common local commands list&lt;/b&gt;</property>
                     <property name="use_markup">True</property>
                   </object>
                 </child>
@@ -8359,7 +9365,6 @@ For all other types of connection, this setting will be ignored.
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="has_tooltip">True</property>
-                    <property name="left_padding">12</property>
                     <child>
                       <placeholder/>
                     </child>
@@ -8369,7 +9374,7 @@ For all other types of connection, this setting will be ignored.
                   <object class="GtkLabel" id="label46">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes"> Global common remote commands list: </property>
+                    <property name="label" translatable="yes">&lt;b&gt;Global common remote commands list&lt;/b&gt;</property>
                     <property name="use_markup">True</property>
                   </object>
                 </child>
@@ -8430,7 +9435,6 @@ For all other types of connection, this setting will be ignored.
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="has_tooltip">True</property>
-                    <property name="left_padding">12</property>
                     <child>
                       <placeholder/>
                     </child>
@@ -8440,7 +9444,11 @@ For all other types of connection, this setting will be ignored.
                   <object class="GtkLabel" id="label75">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes"> KeePass Options: </property>
+                    <property name="margin_bottom">8</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Integration of a KeePass database file&lt;/b&gt;
+&lt;small&gt;
+Ásbrú is using the command line interface of &lt;a href="https://keepassxc.org"&gt;KeePassXC&lt;/a&gt;
+to read any KeePass database file and use any entry to automate connection inside Ásbrú.&lt;/small&gt;</property>
                     <property name="use_markup">True</property>
                   </object>
                 </child>
@@ -8471,7 +9479,7 @@ For all other types of connection, this setting will be ignored.
                   <object class="GtkLabel" id="label17">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">KeePassX Options</property>
+                    <property name="label" translatable="yes">KeePass Integration</property>
                   </object>
                   <packing>
                     <property name="expand">True</property>
@@ -8485,6 +9493,69 @@ For all other types of connection, this setting will be ignored.
                 <property name="tab_fill">False</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkFrame" id="frameKeyBindings">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label_xalign">0</property>
+                <property name="shadow_type">none</property>
+                <child>
+                  <object class="GtkAlignment" id="alignKeyBindings">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <child>
+                      <placeholder/>
+                    </child>
+                  </object>
+                </child>
+                <child type="label">
+                  <object class="GtkLabel">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Keybindings&lt;/b&gt;</property>
+                    <property name="use_markup">True</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="position">8</property>
+              </packing>
+            </child>
+            <child type="tab">
+              <object class="GtkBox" id="vboxKB">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
+                <child>
+                  <object class="GtkImage">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="stock">gtk-select-font</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="lblKB">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">Keybindings</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="position">8</property>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
           </object>
           <packing>
             <property name="expand">True</property>
diff --git a/res/asbru.yml b/res/asbru.yml
new file mode 100644
index 00000000..64981948
--- /dev/null
+++ b/res/asbru.yml
@@ -0,0 +1,52 @@
+---
+defaults:
+  auto accept key: 1
+  auto hide connections list: ''
+  back color: '#000000000000'
+  close terminal on disconnect: ''
+  close to tray: 1
+  command prompt: '[#%\$>]|\:\/\s*$'
+  connected color: '#0c0cbaba0000'
+  cursor shape: block
+  debug: ''
+  disconnected color: '#ffff00000000'
+  global variables: {}
+  hide on connect: ''
+  force split tabs to 50%: 0
+  intro reconnects: ''
+  minimize to tray: ''
+  new data color: '#00008888ffff'
+  only one instance: 1
+  open connections in tabs: 1
+  ping port before connect: ''
+  ping port timeout: 1
+  proxy ip: ''
+  proxy pass: ''
+  proxy port: ''
+  proxy user: ''
+  record command history: 1
+  save on exit: ''
+  save session logs: ''
+  screenshots external viewer: /usr/bin/xdg-open
+  screenshots use external viewer: ''
+  session logs amount: 10
+  shell binary: /bin/bash
+  shell options: -login
+  show screenshots: 1
+  start iconified: ''
+  start main maximized: 1
+  start maximized: ''
+  tabs in main window: 1
+  tabs position: top
+  terminal font: Monospace 9
+  terminal scrollback lines: 5000
+  terminal transparency: 0.3
+  terminal windows hsize: 1024
+  terminal windows vsize: 768
+  text color: '#cc62cc62cc62'
+  timeout command: 40
+  timeout connect: 40
+  use bw icon: ''
+  use proxy: ''
+  use system proxy: 1
+environments: {}
diff --git a/res/asbru_cluster_manager.png b/res/asbru_cluster_manager.png
deleted file mode 100644
index 6170123e..00000000
Binary files a/res/asbru_cluster_manager.png and /dev/null differ
diff --git a/res/asbru_cluster_manager_off.png b/res/asbru_cluster_manager_off.png
deleted file mode 100644
index d0ee7f8f..00000000
Binary files a/res/asbru_cluster_manager_off.png and /dev/null differ
diff --git a/res/asbru_favourite_off.png b/res/asbru_favourite_off.png
deleted file mode 100644
index 87c7ea3b..00000000
Binary files a/res/asbru_favourite_off.png and /dev/null differ
diff --git a/res/asbru_favourite_on.png b/res/asbru_favourite_on.png
deleted file mode 100644
index 4ababc67..00000000
Binary files a/res/asbru_favourite_on.png and /dev/null differ
diff --git a/res/asbru_group.png b/res/asbru_group.png
deleted file mode 100644
index f347568e..00000000
Binary files a/res/asbru_group.png and /dev/null differ
diff --git a/res/asbru_group_add_16x16.png b/res/asbru_group_add_16x16.png
deleted file mode 100644
index b536cf12..00000000
Binary files a/res/asbru_group_add_16x16.png and /dev/null differ
diff --git a/res/asbru_group_closed_16x16.png b/res/asbru_group_closed_16x16.png
deleted file mode 100644
index 80b365fe..00000000
Binary files a/res/asbru_group_closed_16x16.png and /dev/null differ
diff --git a/res/asbru_group_open_16x16.png b/res/asbru_group_open_16x16.png
deleted file mode 100644
index 25ebce35..00000000
Binary files a/res/asbru_group_open_16x16.png and /dev/null differ
diff --git a/res/asbru_history.png b/res/asbru_history.png
deleted file mode 100644
index e6a20d0c..00000000
Binary files a/res/asbru_history.png and /dev/null differ
diff --git a/res/asbru_method_ftp.jpg b/res/asbru_method_ftp.jpg
deleted file mode 100644
index 8f923bd8..00000000
Binary files a/res/asbru_method_ftp.jpg and /dev/null differ
diff --git a/res/asbru_method_generic.jpg b/res/asbru_method_generic.jpg
deleted file mode 100644
index 0e0379d2..00000000
Binary files a/res/asbru_method_generic.jpg and /dev/null differ
diff --git a/res/asbru_method_mosh.png b/res/asbru_method_mosh.png
deleted file mode 100644
index 2408ec9c..00000000
Binary files a/res/asbru_method_mosh.png and /dev/null differ
diff --git a/res/asbru_method_rdesktop.jpg b/res/asbru_method_rdesktop.jpg
deleted file mode 100644
index 81decda3..00000000
Binary files a/res/asbru_method_rdesktop.jpg and /dev/null differ
diff --git a/res/asbru_method_sftp.jpg b/res/asbru_method_sftp.jpg
deleted file mode 100644
index 59f97e0a..00000000
Binary files a/res/asbru_method_sftp.jpg and /dev/null differ
diff --git a/res/asbru_method_ssh.jpg b/res/asbru_method_ssh.jpg
deleted file mode 100644
index 5b1ad7fc..00000000
Binary files a/res/asbru_method_ssh.jpg and /dev/null differ
diff --git a/res/asbru_method_ssh.svg b/res/asbru_method_ssh.svg
deleted file mode 100644
index 9e5a3f5a..00000000
--- a/res/asbru_method_ssh.svg
+++ /dev/null
@@ -1,71 +0,0 @@
-<?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"
-   height="32px"
-   version="1.1"
-   viewBox="0 0 32 32"
-   width="32px"
-   id="svg11"
-   sodipodi:docname="iconfinder_icon-114-lock_314692.svg"
-   inkscape:version="0.92.3 (2405546, 2018-03-11)">
-  <metadata
-     id="metadata15">
-    <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>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1329"
-     inkscape:window-height="920"
-     id="namedview13"
-     showgrid="false"
-     inkscape:zoom="7.375"
-     inkscape:cx="16"
-     inkscape:cy="16"
-     inkscape:window-x="175"
-     inkscape:window-y="69"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg11" />
-  <title
-     id="title2" />
-  <desc
-     id="desc4" />
-  <defs
-     id="defs6" />
-  <g
-     fill="none"
-     fill-rule="evenodd"
-     id="Page-1"
-     stroke="none"
-     stroke-width="1"
-     style="fill:#008000">
-    <g
-       fill="#157EFB"
-       id="icon-114-lock"
-       style="fill:#008000">
-      <path
-         d="M16,21.9146472 L16,24.5089948 C16,24.7801695 16.2319336,25 16.5,25 C16.7761424,25 17,24.7721195 17,24.5089948 L17,21.9146472 C17.5825962,21.708729 18,21.1531095 18,20.5 C18,19.6715728 17.3284272,19 16.5,19 C15.6715728,19 15,19.6715728 15,20.5 C15,21.1531095 15.4174038,21.708729 16,21.9146472 L16,21.9146472 Z M9,14.0000125 L9,10.499235 C9,6.35670485 12.3578644,3 16.5,3 C20.6337072,3 24,6.35752188 24,10.499235 L24,14.0000125 C25.6591471,14.0047488 27,15.3503174 27,17.0094776 L27,26.9905224 C27,28.6633689 25.6529197,30 23.991212,30 L9.00878799,30 C7.34559019,30 6,28.652611 6,26.9905224 L6,17.0094776 C6,15.339581 7.34233349,14.0047152 9,14.0000125 L9,14.0000125 L9,14.0000125 Z M12,14 L12,10.5008537 C12,8.0092478 14.0147186,6 16.5,6 C18.9802243,6 21,8.01510082 21,10.5008537 L21,14 L12,14 L12,14 L12,14 Z"
-         id="lock"
-         style="fill:#008000" />
-    </g>
-  </g>
-</svg>
diff --git a/res/asbru_method_telnet.jpg b/res/asbru_method_telnet.jpg
deleted file mode 100644
index 27b08132..00000000
Binary files a/res/asbru_method_telnet.jpg and /dev/null differ
diff --git a/res/asbru_method_vncviewer.jpg b/res/asbru_method_vncviewer.jpg
deleted file mode 100644
index c10217cd..00000000
Binary files a/res/asbru_method_vncviewer.jpg and /dev/null differ
diff --git a/res/asbru_node_add_16x16.png b/res/asbru_node_add_16x16.png
deleted file mode 100644
index e0e1f14a..00000000
Binary files a/res/asbru_node_add_16x16.png and /dev/null differ
diff --git a/res/asbru_quick_connect.png b/res/asbru_quick_connect.png
deleted file mode 100644
index 48e1fddb..00000000
Binary files a/res/asbru_quick_connect.png and /dev/null differ
diff --git a/res/asbru_shell.png b/res/asbru_shell.png
deleted file mode 100644
index ec5dd37c..00000000
Binary files a/res/asbru_shell.png and /dev/null differ
diff --git a/res/asbru_treelist.png b/res/asbru_treelist.png
deleted file mode 100644
index fae2566b..00000000
Binary files a/res/asbru_treelist.png and /dev/null differ
diff --git a/res/asbru_wol.png b/res/asbru_wol.png
deleted file mode 100644
index c5e1af16..00000000
Binary files a/res/asbru_wol.png and /dev/null differ
diff --git a/res/org.asbru.cm.appdata.xml b/res/org.asbru.cm.appdata.xml
new file mode 100644
index 00000000..1fde5be5
--- /dev/null
+++ b/res/org.asbru.cm.appdata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop-application">
+	<id>org.asbru.cm</id>
+	<metadata_license>CC0-1.0</metadata_license>
+	<project_license>GPL-3.0</project_license>
+	<name>asbru-cm</name>
+	<summary>User interface that helps organizing remote terminal sessions and automating repetitive tasks</summary>
+	<description>
+		<p>Ásbrú Connection Manager is a user interface that helps organizing remote terminal sessions and automating repetitive tasks.</p>
+	</description>
+	<launchable type="desktop-id">asbru-cm.desktop</launchable>
+	<url type="homepage">https://asbru-cm.net/</url>
+	<screenshots>
+		<screenshot type="default">
+			<image>https://asbru-cm.net/assets/img/screenshots/05-asbru-connection-split-connections-display.png</image>
+		</screenshot>
+	</screenshots>
+	<provides>
+		<id>asbru-cm.desktop</id>
+	</provides>
+</component>
\ No newline at end of file
diff --git a/res/sample2.pl b/res/sample2.pl
index c1820703..21ebbc92 100644
--- a/res/sample2.pl
+++ b/res/sample2.pl
@@ -60,10 +60,10 @@ sub CONNECTION
 	my $out = $COMMON{del_esc}( $TERMINAL{out1} );
 	
 	# Use local system 'echo' to write output to a file (this system call is *blocking*)
-	system( "echo \"$out\" > $TERMINAL{name}.uptime" );
+	system( "$ENV{'ASBRU_ENV_FOR_EXTERNAL'} echo \"$out\" > $TERMINAL{name}.uptime" );
 	
 	# Finally, start a program in OUR PC with captured output (in background '&', so it is non-blocking)
-	system( "gedit --new-document $TERMINAL{name}.uptime &" );
+	system( "$ENV{'ASBRU_ENV_FOR_EXTERNAL'} gedit --new-document $TERMINAL{name}.uptime &" );
 	
 	return 1;
 }
diff --git a/res/sample3.pl b/res/sample3.pl
index 24061be6..19ee5bac 100644
--- a/res/sample3.pl
+++ b/res/sample3.pl
@@ -1,6 +1,6 @@
-# PAC Script 'sample3.pl'
+# Ásbrú Script 'sample3.pl'
 #
-# This PAC Script sample will show you how to:
+# This Ásbrú Script sample will show you how to:
 # - retrieve PAC's configuration (both a copy and a reference!)
 # - lookup/modify config values
 # - save a copy of PAC's config
@@ -12,32 +12,32 @@
 sub SESSION
 {
 	# We're going to start some sessions, so, make some GUI advice to the user
-	$PAC{msg}( "Modifying PAC configuration.\nPlease, wait..." );
-	
+	$PAC{msg}( "Modifying Ásbrú configuration.\nPlease, wait..." );
+
 	# Retrieve a COPY of PAC's configuration
 	my $copy_cfg = $COMMON{cfg}();
 	# Retrieve a REFERENCE (CAUTION!! VERY DANGEROUS!!) to PAC's configuration
-	# This allows you to change PAC config in REAL-TIME
+	# This allows you to change Ásbrú config in REAL-TIME
 	my $cfg = $COMMON{cfg}( 1 );
-	
+
 	#use Data::Dumper;
 	#print Dumper( $$copy_cfg{defaults} );
 	#print Dumper( $$copy_cfg{environments} );
-	
+
 	# Now, modifying $cfg, will result in a modification of PAC's configuration! (non persistent, unles you press "Save"
 	# on PAC's main GUI)
 	$$copy_cfg{defaults}{'tree on right side'} = 1;
-	
-	# Export current modified PAC configuration to file /tmp/my_pac_config_file.yml (YAML format is mandatory)
-	$PAC{msg}( "Saving PAC configuration.\nPlease, wait..." );
-	my $file = $PAC{cfg_export}( '/tmp/my_pac_config_file.yml' );
-	
+
+	# Export current modified Ásbrú configuration to file /tmp/my_asbru_config_file.yml (YAML format is mandatory)
+	$PAC{msg}( "Saving Ásbrú configuration.\nPlease, wait..." );
+	my $file = $PAC{cfg_export}( '/tmp/my_asbru_config_file.yml' );
+
 	# Now, restore PAC's original configuration
 	$cfg = $copy_cfg;
-	
+
 	# Sessions have been established, finish the advice (close the GUI dialog)
-	$PAC{msg}( "PAC Script finished (saved file '$file')", 1 );
-	
+	$PAC{msg}( "Ásbrú Script finished (saved file '$file')", 1 );
+
 	return 1;
 }
 
diff --git a/res/sample4.pl b/res/sample4.pl
index 45e33a75..60e7099c 100644
--- a/res/sample4.pl
+++ b/res/sample4.pl
@@ -45,10 +45,10 @@ sub CONNECTION
 	}
 	
 	# Use local system 'echo' to write output to a file (this system call is *blocking*)
-	system( "echo \"$out\" > /tmp/$TERMINAL{name}.command" );
+	system( "$ENV{'ASBRU_ENV_FOR_EXTERNAL'} echo \"$out\" > /tmp/$TERMINAL{name}.command" );
 	
 	# Finally, start a program in OUR PC with captured output (in background '&', so it is non-blocking)
-	system( "nohup gedit --new-document /tmp/$TERMINAL{name}.command &" );
+	system( "$ENV{'ASBRU_ENV_FOR_EXTERNAL'} nohup gedit --new-document /tmp/$TERMINAL{name}.command &" );
 	
 	return 1;
 }
diff --git a/res/asbru-cluster.svg b/res/themes/asbru-color/asbru-cluster.svg
similarity index 100%
rename from res/asbru-cluster.svg
rename to res/themes/asbru-color/asbru-cluster.svg
diff --git a/res/asbru-edit.svg b/res/themes/asbru-color/asbru-edit.svg
similarity index 100%
rename from res/asbru-edit.svg
rename to res/themes/asbru-color/asbru-edit.svg
diff --git a/res/themes/asbru-color/asbru-help.svg b/res/themes/asbru-color/asbru-help.svg
new file mode 100644
index 00000000..4f91a4f0
--- /dev/null
+++ b/res/themes/asbru-color/asbru-help.svg
@@ -0,0 +1,66 @@
+<?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"
+   height="32"
+   version="1.1"
+   viewBox="0 0 32 32"
+   width="32"
+   id="svg9"
+   sodipodi:docname="asbru_method_generic.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata13">
+    <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>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview11"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="-14.440678"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg9" />
+  <defs
+     id="defs4" />
+  <g
+     id="Icons with numbers"
+     style="fill:#00aad4;fill-rule:evenodd;stroke:none;stroke-width:0.5"
+     transform="scale(2)">
+    <g
+       id="Group"
+       transform="translate(-48,-432)"
+       style="fill:#00aad4;stroke-width:0.5">
+      <path
+         d="M 54.879684,443.0591 V 445 h 2.351085 v -1.9409 z M 56,448 c -4.418278,0 -8,-3.58172 -8,-8 0,-4.41828 3.581722,-8 8,-8 4.418278,0 8,3.58172 8,8 0,4.41828 -3.581722,8 -8,8 z m -2.42998,-12.48959 c -0.983569,0.5328 -1.506903,1.4372 -1.57002,2.71323 h 2.280079 c 0,-0.37162 0.127546,-0.72979 0.382643,-1.07455 0.255097,-0.34475 0.687702,-0.51712 1.29783,-0.51712 0.620648,0 1.047994,0.13991 1.282052,0.41974 0.234057,0.27983 0.351084,0.58988 0.351084,0.93016 0,0.2955 -0.105193,0.56637 -0.315582,0.81262 l -0.457593,0.39624 -0.575937,0.38281 c -0.56805,0.37609 -0.920447,0.70853 -1.057199,0.99731 -0.136753,0.28879 -0.220907,0.81151 -0.252466,1.56817 h 2.130178 c 0.0053,-0.35818 0.03945,-0.62234 0.102564,-0.79248 0.09994,-0.26864 0.302431,-0.50369 0.607495,-0.70517 l 0.560158,-0.36938 c 0.56805,-0.37609 0.952004,-0.68502 1.151874,-0.92679 C 59.829062,438.94672 60,438.45646 60,437.87441 60,436.92522 59.606842,436.20887 58.820513,435.72532 58.034184,435.24177 57.046686,435 55.857988,435 c -0.904672,0 -1.667321,0.17014 -2.287968,0.51041 z m 0,0"
+         id="Oval 318"
+         inkscape:connector-curvature="0"
+         style="stroke-width:0.5;fill:#00aad4" />
+    </g>
+  </g>
+</svg>
diff --git a/res/asbru-preferences.svg b/res/themes/asbru-color/asbru-preferences.svg
similarity index 100%
rename from res/asbru-preferences.svg
rename to res/themes/asbru-color/asbru-preferences.svg
diff --git a/res/themes/asbru-color/asbru-scripts-manager.svg b/res/themes/asbru-color/asbru-scripts-manager.svg
new file mode 100644
index 00000000..78784a63
--- /dev/null
+++ b/res/themes/asbru-color/asbru-scripts-manager.svg
@@ -0,0 +1,53 @@
+<?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"
+   height="50"
+   version="1.1"
+   viewBox="0 0 50 50"
+   width="50"
+   xml:space="preserve"
+   id="svg8"
+   sodipodi:docname="asbru-scripts-manager.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
+     id="metadata14"><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="defs12" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview10"
+     showgrid="false"
+     inkscape:zoom="12.977448"
+     inkscape:cx="26.865016"
+     inkscape:cy="24.757956"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg8" /><rect
+     style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:7.55905533;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+     id="rect816"
+     width="37.294964"
+     height="46.987442"
+     x="5.9805918"
+     y="0.37190047" /><path
+     d="M 43.435991,2.8232009 H 40.690016 9.2413148 V 47.792534 50.052677 H 43.435991 Z M 28.627135,30.614031 c -0.587239,-0.587109 -1.397342,-0.95174 -2.288162,-0.95174 -0.895317,0 -1.705421,0.364631 -2.288674,0.95174 -0.58724,0.583384 -0.947757,1.393487 -0.947757,2.288677 0,0.891203 0.360388,1.70118 0.947757,2.288675 0.583253,0.583256 1.393357,0.947885 2.288674,0.947885 0.89082,0 1.700923,-0.364629 2.288162,-0.947885 0.58724,-0.587367 0.948142,-1.397472 0.948142,-2.288675 0,-0.89519 -0.360902,-1.705293 -0.948142,-2.288677 z m -2.288162,-1.944226 c 1.16651,0 2.227755,0.474008 2.993261,1.239643 0.765505,0.765506 1.239641,1.822766 1.239641,2.99326 0,1.166508 -0.474007,2.227881 -1.239641,2.993388 -0.765378,0.765506 -1.826751,1.239513 -2.993261,1.239513 -1.170879,0 -2.227755,-0.474007 -2.993645,-1.239513 -0.765505,-0.765507 -1.239511,-1.82688 -1.239511,-2.993388 0,-1.170494 0.474006,-2.227754 1.239511,-2.99326 0.76589,-0.765635 1.822639,-1.239643 2.993645,-1.239643 z m -10.673506,4.961778 v -1.887416 l 2.884013,-0.433521 0.109247,-0.46578 0.138038,-0.461669 -2.280579,-1.814799 1.158412,-2.005016 2.713971,1.065229 0.328001,-0.348308 0.352677,-0.328129 -1.069471,-2.713842 2.005018,-1.158412 1.818654,2.280322 0.457812,-0.13778 0.465524,-0.109249 0.433521,-2.884012 h 2.31708 l 0.433522,2.884012 0.465394,0.109249 0.457941,0.13778 1.818654,-2.280322 2.005018,1.158412 -1.069471,2.713842 0.352806,0.328129 0.323887,0.348308 2.718085,-1.065229 1.158413,2.005016 -2.284694,1.814799 0.142024,0.461669 0.109247,0.46578 2.884011,0.433521 v 2.316825 l -2.884011,0.433263 -0.109247,0.461925 -0.142024,0.461796 2.284694,1.814541 -1.158413,2.009259 -2.718085,-1.069341 -0.323887,0.348307 -0.352806,0.327999 1.069471,2.713972 -2.005018,1.15854 -1.818654,-2.28045 -0.457941,0.137652 -0.465394,0.113361 -0.433522,2.884012 h -2.31708 l -0.433521,-2.888125 -0.465524,-0.109376 -0.457812,-0.137653 -1.818654,2.280452 -2.005018,-1.158541 1.069471,-2.713971 -0.348693,-0.328001 c -0.113231,-0.109377 -0.222737,-0.22685 -0.327872,-0.348308 l -2.718084,1.069343 -1.158412,-2.009259 2.280579,-1.814541 -0.138038,-0.461797 -0.109247,-0.461925 -2.884013,-0.433264 z m 0.996339,-0.728875 v 0.299723 l 2.750603,0.413213 0.0563,0.364504 c 0.0365,0.247284 0.08933,0.490201 0.150247,0.720905 0.06439,0.247158 0.141637,0.482234 0.230963,0.704842 l 0.129427,0.340211 -2.17493,1.733568 0.30358,0.522461 2.588144,-1.016646 0.230961,0.283401 c 0.146136,0.182508 0.312192,0.368743 0.494444,0.54701 0.174023,0.178267 0.360388,0.344323 0.550736,0.498171 l 0.283659,0.230833 -1.016647,2.5884 0.522334,0.299726 1.733954,-2.171203 0.340082,0.129811 c 0.218752,0.08496 0.457812,0.161945 0.700472,0.226722 0.247155,0.0649 0.486214,0.117474 0.725404,0.153976 l 0.360389,0.05668 0.417326,2.750346 h 0.603561 l 0.413086,-2.750346 0.36039,-0.05668 c 0.247284,-0.04049 0.490329,-0.08907 0.721291,-0.153976 0.250757,-0.06478 0.485702,-0.141765 0.708568,-0.226722 l 0.340083,-0.129811 1.729842,2.171203 0.522332,-0.299726 -1.016775,-2.592384 0.283787,-0.226849 c 0.186235,-0.153848 0.372471,-0.319904 0.550737,-0.498171 0.182251,-0.182379 0.348693,-0.364502 0.494314,-0.54701 l 0.230963,-0.283401 2.588272,1.016646 0.303581,-0.522461 -2.17506,-1.733568 0.129426,-0.340211 c 0.08521,-0.226849 0.166443,-0.461926 0.230963,-0.704842 0.06092,-0.230704 0.113746,-0.473748 0.150249,-0.720905 l 0.05642,-0.364504 2.750473,-0.413213 v -0.603432 l -2.750473,-0.413214 -0.05642,-0.360518 c -0.0365,-0.251142 -0.08933,-0.490072 -0.150249,-0.725147 -0.06452,-0.243046 -0.145749,-0.477864 -0.230963,-0.704713 l -0.129426,-0.34021 2.17506,-1.729586 -0.303581,-0.526573 -2.588272,1.020631 -0.230963,-0.287514 c -0.145626,-0.182251 -0.312068,-0.364632 -0.494319,-0.546883 -0.178266,-0.178266 -0.364502,-0.344194 -0.550737,-0.498168 l -0.283787,-0.22685 1.016775,-2.588401 -0.522332,-0.303709 -1.729842,2.171073 -0.340083,-0.129682 c -0.222736,-0.08496 -0.457811,-0.161944 -0.708568,-0.226851 -0.230962,-0.06066 -0.474007,-0.11336 -0.721291,-0.153717 l -0.36039,-0.0527 -0.413086,-2.750344 h -0.603561 l -0.417326,2.746361 -0.360389,0.05668 c -0.23906,0.03637 -0.47812,0.08907 -0.725404,0.153717 -0.24266,0.06491 -0.48172,0.141894 -0.700472,0.226851 l -0.340082,0.133668 -1.733954,-2.175059 -0.522334,0.303709 1.016647,2.588401 -0.283659,0.22685 c -0.190348,0.153974 -0.376713,0.324016 -0.550736,0.498168 -0.182252,0.182251 -0.348179,0.364632 -0.494444,0.546883 l -0.230961,0.287514 -2.588144,-1.020631 -0.30358,0.526573 2.17493,1.729586 -0.129427,0.34021 c -0.08933,0.222737 -0.166443,0.457684 -0.230963,0.704713 -0.06092,0.230962 -0.113746,0.474005 -0.150247,0.721035 l -0.0563,0.364502 -2.750603,0.413214 z M 12.817828,6.7685876 c -0.275176,0 -0.498041,-0.2228652 -0.498041,-0.4943144 0,-0.2754326 0.222865,-0.498169 0.498041,-0.498169 h 9.369089 c 0.27556,0 0.498426,0.2227364 0.498426,0.498169 0,0.2713203 -0.222866,0.4943144 -0.498426,0.4943144 z m 0,3.0986535 c -0.275176,0 -0.498041,-0.222867 -0.498041,-0.4983 0,-0.27556 0.222865,-0.498169 0.498041,-0.498169 h 9.369089 c 0.27556,0 0.498426,0.222609 0.498426,0.498169 0,0.275433 -0.222866,0.4983 -0.498426,0.4983 z m 0,3.3375809 c -0.275176,0 -0.498041,-0.222736 -0.498041,-0.498169 0,-0.27132 0.222865,-0.498299 0.498041,-0.498299 h 26.555559 c 0.275691,0 0.498427,0.226979 0.498427,0.498299 0,0.275433 -0.222736,0.498169 -0.498427,0.498169 z m 0,3.341825 c -0.275176,0 -0.498041,-0.222865 -0.498041,-0.498299 0,-0.27556 0.222865,-0.498298 0.498041,-0.498298 h 26.555559 c 0.275691,0 0.498427,0.222738 0.498427,0.498298 0,0.275434 -0.222736,0.498299 -0.498427,0.498299 z m 0,3.337583 c -0.275176,0 -0.498041,-0.222736 -0.498041,-0.494185 0,-0.275561 0.222865,-0.498169 0.498041,-0.498169 h 26.555559 c 0.275691,0 0.498427,0.222608 0.498427,0.498169 0,0.27132 -0.222736,0.494185 -0.498427,0.494185 z M 8.7428888,1.8267331 H 40.179379 V 0.05267758 H 37.676321 5.9805918 V 45.188069 47.282284 h 2.264384 V 2.325031 c 0,-0.2755615 0.222737,-0.4982979 0.497913,-0.4982979 z"
+     style="clip-rule:evenodd;fill:#ffcc00;fill-rule:evenodd;stroke-width:1"
+     id="path2"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccccccscscscscscscscscscccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccsccccccccccccccccccccccccccccccccsssssssssssssssssssssssssssssssssssscccccccss" /><g
+     id="Layer_1"
+     transform="translate(0,-462)" /></svg>
\ No newline at end of file
diff --git a/res/asbru-wol.svg b/res/themes/asbru-color/asbru-wol.svg
similarity index 100%
rename from res/asbru-wol.svg
rename to res/themes/asbru-color/asbru-wol.svg
diff --git a/res/themes/asbru-color/asbru.css b/res/themes/asbru-color/asbru.css
new file mode 100644
index 00000000..38a4db2e
--- /dev/null
+++ b/res/themes/asbru-color/asbru.css
@@ -0,0 +1,78 @@
+button {
+    border: 1px solid #dddddd;
+    margin: 1px;
+}
+radiobutton, checkbutton {
+    border: 1px solid rgba(1,1,1,0);
+    margin: 1px;
+}
+button:hover {
+    border: 1px solid #555555;
+    color: #000000;
+    background-color: #ffffff;
+}
+button:focus,
+entry:focus {
+    color: #000000;
+    background-color:#FFEBBB;
+}
+spinbutton {
+    color: #000000;
+    font-size: 0.9em;
+    border: 1px solid #dddddd;
+    background-color: #dddddd;
+    border-radius: 0px;
+    padding: 0px;
+    margin: 0px;
+}
+spinbutton:hover {
+    border: 1px solid #555555;
+    background-color: #ffffff;
+}
+checkbutton:hover, radiobutton:hover {
+    border: 1px solid #555555;
+}
+.button-cp {
+    border: 1px solid rgba(1,1,1,0);
+    border-radius: 0px;
+    padding: 0px;
+    margin: 0px;
+}
+tooltip {
+    font-size: 0.8em;
+}
+.dnd-icon {
+  border: 1px solid #000000;
+}
+
+.banner-fill {
+  background-image: linear-gradient(to right, #007aff, #2fedde);
+  padding: 0.25em 0;
+}
+.banner-text {
+  color: #EEE;
+  text-shadow: 0px 0px 8px rgba(17, 17, 17, 0.75);
+  font-size: 2.5em;
+}
+messagedialog {
+  border: 1px solid #888888;
+}
+messagedialog > box {
+  margin: 2px;
+  margin-top: 16px;
+}
+.w-entervalue {
+}
+.w-renamenode {
+}
+.w-warning {
+    background-color: #FFFFEB;
+}
+.w-error {
+    background-color: #F17E84;
+}
+.w-info {
+}
+.w-confirm {
+}
+
diff --git a/res/asbru_buttonbar_hide.png b/res/themes/asbru-color/asbru_buttonbar_hide.png
similarity index 100%
rename from res/asbru_buttonbar_hide.png
rename to res/themes/asbru-color/asbru_buttonbar_hide.png
diff --git a/res/asbru_buttonbar_show.png b/res/themes/asbru-color/asbru_buttonbar_show.png
similarity index 100%
rename from res/asbru_buttonbar_show.png
rename to res/themes/asbru-color/asbru_buttonbar_show.png
diff --git a/res/asbru_chain.png b/res/themes/asbru-color/asbru_chain.png
similarity index 100%
rename from res/asbru_chain.png
rename to res/themes/asbru-color/asbru_chain.png
diff --git a/res/asbru_cluster_auto.png b/res/themes/asbru-color/asbru_cluster_auto.png
similarity index 100%
rename from res/asbru_cluster_auto.png
rename to res/themes/asbru-color/asbru_cluster_auto.png
diff --git a/res/themes/asbru-color/asbru_cluster_connection.svg b/res/themes/asbru-color/asbru_cluster_connection.svg
new file mode 100644
index 00000000..a294bac1
--- /dev/null
+++ b/res/themes/asbru-color/asbru_cluster_connection.svg
@@ -0,0 +1,44 @@
+<?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"
+   id="Layer_1_1_"
+   version="1.1"
+   viewBox="0 0 16 16"
+   xml:space="preserve"
+   sodipodi:docname="asbru_cluster_connection.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   width="16"
+   height="16"><metadata
+     id="metadata9"><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="defs7" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview5"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="-14.508475"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1_1_" /><path
+     d="m 13.266949,4.4830516 c 0.966876,0 1.75,-0.7831245 1.75,-1.7500001 0,-0.9668745 -0.783124,-1.75 -1.75,-1.75 -0.966875,0 -1.75,0.7831255 -1.75,1.75 0,0.49175 0.203876,0.9345001 0.530251,1.2521256 l -1.380751,2.4158748 c -0.28175,-0.10325 -0.581875,-0.168 -0.8995004,-0.168 -0.7,0 -1.3326254,0.27825 -1.8033754,0.725374 L 4.3839488,4.2739261 c 0.084875,-0.2056245 0.133,-0.4296245 0.133,-0.6658745 0,-0.9668747 -0.783125,-1.7500001 -1.7499998,-1.7500001 -0.9668749,0 -1.7499999,0.7831254 -1.7499999,1.7500001 0,0.9668745 0.783125,1.7500003 1.7499999,1.7500003 0.4129999,0 0.7874999,-0.1487505 1.0867499,-0.3876258 l 3.5892497,2.6923758 c -0.1863754,0.359624 -0.301,0.762124 -0.301,1.19525 0,0.273874 0.054249,0.5337499 0.1321246,0.7822499 L 3.5194489,11.658925 C 3.2901989,11.54955 3.037324,11.48305 2.766949,11.48305 c -0.9668749,0 -1.7499999,0.783124 -1.7499999,1.75 0,0.966875 0.783125,1.75 1.7499999,1.75 0.9668748,0 1.7499998,-0.783125 1.7499998,-1.75 0,-0.355249 -0.1076249,-0.685125 -0.2896249,-0.961625 l 3.4413747,-1.850624 c 0.4786246,0.641374 1.2363746,1.062249 2.09825,1.062249 0.4357514,0 0.8408764,-0.116375 1.2031254,-0.3045 l 0.854875,1.064875 c -0.193375,0.281749 -0.308,0.622125 -0.308,0.989625 0,0.966875 0.783125,1.75 1.75,1.75 0.966876,0 1.75,-0.783125 1.75,-1.75 0,-0.966876 -0.783124,-1.75 -1.75,-1.75 -0.280875,0 -0.5425,0.07263 -0.777875,0.189875 l -0.817249,-1.0185 c 0.443624,-0.469875 0.720124,-1.0989991 0.720124,-1.7963731 0,-0.81725 -0.3815,-1.53825 -0.966875,-2.0195 l 1.385125,-2.4237503 c 0.146126,0.040245 0.2975,0.068245 0.45675,0.068245 z"
+     id="path2"
+     style="fill:#aaccff;stroke:#0044aa;stroke-width:1.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     inkscape:connector-curvature="0" /></svg>
\ No newline at end of file
diff --git a/res/themes/asbru-color/asbru_cluster_manager.svg b/res/themes/asbru-color/asbru_cluster_manager.svg
new file mode 100644
index 00000000..5e975921
--- /dev/null
+++ b/res/themes/asbru-color/asbru_cluster_manager.svg
@@ -0,0 +1,44 @@
+<?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"
+   id="Layer_1_1_"
+   version="1.1"
+   viewBox="0 0 32 32"
+   xml:space="preserve"
+   sodipodi:docname="asbru_cluster_manager.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   width="32"
+   height="32"><metadata
+     id="metadata9"><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="defs7" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview5"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1_1_" /><path
+     d="m 27.266949,8.4830534 c 2.071877,0 3.75,-1.6781241 3.75,-3.7500002 0,-2.0718741 -1.678123,-3.75000018 -3.75,-3.75000018 -2.071875,0 -3.75,1.67812608 -3.75,3.75000018 0,1.05375 0.436877,2.0025 1.136252,2.6831261 l -2.958752,5.1768747 c -0.60375,-0.22125 -1.246875,-0.36 -1.927501,-0.36 -1.5,0 -2.855626,0.59625 -3.864376,1.554373 L 8.2319484,8.0349273 c 0.1818761,-0.440624 0.285,-0.9206241 0.285,-1.4268741 0,-2.0718741 -1.6781249,-3.7500001 -3.7499995,-3.7500001 -2.0718749,0 -3.7499998,1.678126 -3.7499998,3.7500001 0,2.0718741 1.6781249,3.7500008 3.7499998,3.7500008 0.8849997,0 1.6874998,-0.318751 2.3287498,-0.8306267 l 7.6912493,5.7693767 c -0.399376,0.770623 -0.645,1.633123 -0.645,2.56125 0,0.586873 0.116248,1.14375 0.283124,1.67625 L 6.3794487,23.859926 C 5.8881986,23.62555 5.3463238,23.48305 4.7669489,23.48305 c -2.0718749,0 -3.7499998,1.678124 -3.7499998,3.75 0,2.071876 1.6781249,3.75 3.7499998,3.75 2.0718746,0 3.7499995,-1.678124 3.7499995,-3.75 0,-0.761248 -0.2306248,-1.468124 -0.6206248,-2.060624 l 7.3743744,-3.965624 c 1.025624,1.374374 2.649374,2.276248 4.49625,2.276248 0.933753,0 1.801877,-0.249374 2.578126,-0.6525 l 1.831875,2.281876 c -0.414375,0.603748 -0.66,1.333124 -0.66,2.120624 0,2.071876 1.678125,3.75 3.75,3.75 2.071877,0 3.75,-1.678124 3.75,-3.75 0,-2.071876 -1.678123,-3.75 -3.75,-3.75 -0.601875,0 -1.1625,0.15564 -1.666875,0.406876 l -1.751248,-2.1825 c 0.950623,-1.006876 1.543123,-2.354999 1.543123,-3.849372 0,-1.75125 -0.8175,-3.29625 -2.071875,-4.3275 l 2.968125,-5.1937507 c 0.313127,0.08624 0.6375,0.14624 0.97875,0.14624 z"
+     id="path2"
+     style="fill:#aaccff;stroke:#0044aa;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     inkscape:connector-curvature="0" /></svg>
\ No newline at end of file
diff --git a/res/asbru_cluster_manager2.png b/res/themes/asbru-color/asbru_cluster_manager2.png
similarity index 100%
rename from res/asbru_cluster_manager2.png
rename to res/themes/asbru-color/asbru_cluster_manager2.png
diff --git a/res/themes/asbru-color/asbru_cluster_manager_off.svg b/res/themes/asbru-color/asbru_cluster_manager_off.svg
new file mode 100644
index 00000000..aa41909b
--- /dev/null
+++ b/res/themes/asbru-color/asbru_cluster_manager_off.svg
@@ -0,0 +1,44 @@
+<?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"
+   id="Layer_1_1_"
+   version="1.1"
+   viewBox="0 0 16 16"
+   xml:space="preserve"
+   sodipodi:docname="asbru_cluster_manager_off.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   width="16"
+   height="16"><metadata
+     id="metadata9"><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="defs7" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview5"
+     showgrid="false"
+     inkscape:zoom="52.125"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1_1_" /><path
+     d="m 13.266949,4.4830516 c 0.966876,0 1.75,-0.7831245 1.75,-1.7500001 0,-0.9668745 -0.783124,-1.75 -1.75,-1.75 -0.966875,0 -1.75,0.7831255 -1.75,1.75 0,0.49175 0.203876,0.9345001 0.530251,1.2521256 l -1.380751,2.4158748 c -0.28175,-0.10325 -0.581875,-0.168 -0.8995004,-0.168 -0.7,0 -1.3326254,0.27825 -1.8033754,0.725374 L 4.3839488,4.2739261 c 0.084875,-0.2056245 0.133,-0.4296245 0.133,-0.6658745 0,-0.9668747 -0.783125,-1.7500001 -1.7499998,-1.7500001 -0.9668749,0 -1.7499999,0.7831254 -1.7499999,1.7500001 0,0.9668745 0.783125,1.7500003 1.7499999,1.7500003 0.4129999,0 0.7874999,-0.1487505 1.0867499,-0.3876258 l 3.5892497,2.6923758 c -0.1863754,0.359624 -0.301,0.762124 -0.301,1.19525 0,0.273874 0.054249,0.5337499 0.1321246,0.7822499 L 3.5194489,11.658925 C 3.2901989,11.54955 3.037324,11.48305 2.766949,11.48305 c -0.9668749,0 -1.7499999,0.783124 -1.7499999,1.75 0,0.966875 0.783125,1.75 1.7499999,1.75 0.9668748,0 1.7499998,-0.783125 1.7499998,-1.75 0,-0.355249 -0.1076249,-0.685125 -0.2896249,-0.961625 l 3.4413747,-1.850624 c 0.4786246,0.641374 1.2363746,1.062249 2.09825,1.062249 0.4357514,0 0.8408764,-0.116375 1.2031254,-0.3045 l 0.854875,1.064875 c -0.193375,0.281749 -0.308,0.622125 -0.308,0.989625 0,0.966875 0.783125,1.75 1.75,1.75 0.966876,0 1.75,-0.783125 1.75,-1.75 0,-0.966876 -0.783124,-1.75 -1.75,-1.75 -0.280875,0 -0.5425,0.07263 -0.777875,0.189875 l -0.817249,-1.0185 c 0.443624,-0.469875 0.720124,-1.0989991 0.720124,-1.7963731 0,-0.81725 -0.3815,-1.53825 -0.966875,-2.0195 l 1.385125,-2.4237503 c 0.146126,0.040245 0.2975,0.068245 0.45675,0.068245 z"
+     id="path2"
+     style="fill:#ff8080;stroke:#aa0000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     inkscape:connector-curvature="0" /></svg>
\ No newline at end of file
diff --git a/res/asbru_drag_terminal32x32.png b/res/themes/asbru-color/asbru_drag_terminal32x32.png
similarity index 100%
rename from res/asbru_drag_terminal32x32.png
rename to res/themes/asbru-color/asbru_drag_terminal32x32.png
diff --git a/res/themes/asbru-color/asbru_favourite_off.svg b/res/themes/asbru-color/asbru_favourite_off.svg
new file mode 100644
index 00000000..cd554050
--- /dev/null
+++ b/res/themes/asbru-color/asbru_favourite_off.svg
@@ -0,0 +1,56 @@
+<?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"
+   enable-background="new 0 0 64 64"
+   height="32"
+   version="1.1"
+   viewBox="0 0 32 32"
+   width="32"
+   xml:space="preserve"
+   id="svg20"
+   sodipodi:docname="asbru_favourite_off.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
+     id="metadata26"><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="defs24" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1810"
+     inkscape:window-height="905"
+     id="namedview22"
+     showgrid="false"
+     inkscape:zoom="14.389266"
+     inkscape:cx="5.4418896"
+     inkscape:cy="8.3395498"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg20" /><g
+     id="g844"><circle
+       r="14.735541"
+       style="fill:#e9ddaf;stroke:#ffd42a;stroke-width:2.4000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="circle2"
+       cy="15.983025"
+       cx="16.071079" /><g
+       transform="matrix(0.5196023,0,0,0.5196023,-0.55619493,-0.64424733)"
+       id="g14"
+       style="fill:#ff9955;stroke-width:1.92454886"><path
+         style="fill:#ff9955;stroke-width:1.92454886"
+         inkscape:connector-curvature="0"
+         id="path12"
+         d="m 52.872,26.063 c -0.31,-0.951 -1.133,-1.645 -2.121,-1.79 L 39.424,22.628 34.357,12.365 C 33.913,11.466 33.001,10.898 32,10.898 c -1.001,0 -1.913,0.568 -2.357,1.467 L 24.579,22.628 13.25,24.273 c -0.991,0.145 -1.813,0.838 -2.121,1.79 -0.31,0.951 -0.053,1.995 0.665,2.694 l 8.197,7.99 -1.934,11.283 c -0.168,0.986 0.237,1.982 1.046,2.57 0.455,0.334 0.996,0.502 1.543,0.502 0.418,0 0.838,-0.1 1.222,-0.302 L 32,45.473 42.132,50.8 c 0.384,0.202 0.804,0.302 1.222,0.302 0.544,0 1.088,-0.168 1.545,-0.502 0.809,-0.589 1.214,-1.585 1.046,-2.57 l -1.935,-11.284 8.197,-7.99 c 0.715,-0.696 0.973,-1.742 0.665,-2.693 z" /></g></g><g
+     id="Layer_2"
+     transform="translate(0,-32)" /></svg>
\ No newline at end of file
diff --git a/res/themes/asbru-color/asbru_favourite_on.svg b/res/themes/asbru-color/asbru_favourite_on.svg
new file mode 100644
index 00000000..739a25ea
--- /dev/null
+++ b/res/themes/asbru-color/asbru_favourite_on.svg
@@ -0,0 +1,58 @@
+<?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"
+   enable-background="new 0 0 64 64"
+   height="16"
+   version="1.1"
+   viewBox="0 0 16 16"
+   width="16"
+   xml:space="preserve"
+   id="svg20"
+   sodipodi:docname="asbru_favourite_on.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
+     id="metadata26"><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="defs24" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1810"
+     inkscape:window-height="905"
+     id="namedview22"
+     showgrid="false"
+     inkscape:zoom="14.389266"
+     inkscape:cx="6.393277"
+     inkscape:cy="0"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg20" /><g
+     id="g835"
+     transform="matrix(1.2333333,0,0,1.2333333,-2.0189156,-1.8317346)"
+     style="stroke-width:0.81081086"><circle
+       style="fill:#ffe680;stroke:#ffd42a;stroke-width:0.81081086;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="circle2"
+       r="6"
+       cy="8.0389948"
+       cx="8.0999956" /><g
+       transform="matrix(0.20113637,0,0,0.20113637,1.6636317,1.6026312)"
+       id="g14"
+       style="fill:#ff7f2a;stroke-width:4.03114986"><path
+         style="fill:#ff7f2a;stroke-width:4.03114986"
+         inkscape:connector-curvature="0"
+         id="path12"
+         d="m 52.872,26.063 c -0.31,-0.951 -1.133,-1.645 -2.121,-1.79 L 39.424,22.628 34.357,12.365 C 33.913,11.466 33.001,10.898 32,10.898 c -1.001,0 -1.913,0.568 -2.357,1.467 L 24.579,22.628 13.25,24.273 c -0.991,0.145 -1.813,0.838 -2.121,1.79 -0.31,0.951 -0.053,1.995 0.665,2.694 l 8.197,7.99 -1.934,11.283 c -0.168,0.986 0.237,1.982 1.046,2.57 0.455,0.334 0.996,0.502 1.543,0.502 0.418,0 0.838,-0.1 1.222,-0.302 L 32,45.473 42.132,50.8 c 0.384,0.202 0.804,0.302 1.222,0.302 0.544,0 1.088,-0.168 1.545,-0.502 0.809,-0.589 1.214,-1.585 1.046,-2.57 l -1.935,-11.284 8.197,-7.99 c 0.715,-0.696 0.973,-1.742 0.665,-2.693 z" /></g></g><g
+     id="Layer_2"
+     transform="translate(0,-48)" /></svg>
\ No newline at end of file
diff --git a/res/themes/asbru-color/asbru_group.svg b/res/themes/asbru-color/asbru_group.svg
new file mode 100644
index 00000000..eb71c256
--- /dev/null
+++ b/res/themes/asbru-color/asbru_group.svg
@@ -0,0 +1,82 @@
+<?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"
+   enable-background="new 0 0 200 200"
+   height="16"
+   id="Layer_1"
+   version="1.1"
+   viewBox="0 0 16 16"
+   width="16"
+   xml:space="preserve"
+   sodipodi:docname="asbru_group.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
+     id="metadata9"><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="defs7" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview5"
+     showgrid="false"
+     inkscape:zoom="22.366364"
+     inkscape:cx="5.3448441"
+     inkscape:cy="8.4745763"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1" /><circle
+     style="opacity:1;fill:#ff6600;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:7.55905533;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+     id="path812"
+     cx="8.0119495"
+     cy="7.9880486"
+     r="8" /><circle
+     style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:7.55905533;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+     id="path814"
+     cx="7.2757797"
+     cy="13.73174"
+     r="2"
+     inkscape:transform-center-x="33.979596"
+     inkscape:transform-center-y="-19.851237" /><circle
+     style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:7.55905533;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+     id="path814-7"
+     cx="12.222208"
+     cy="5.5214815"
+     r="2"
+     inkscape:transform-center-x="33.979596"
+     inkscape:transform-center-y="-19.851237" /><circle
+     style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:7.55905533;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+     id="path814-0"
+     cx="5.1580291"
+     cy="3.3306911"
+     inkscape:transform-center-x="33.979596"
+     inkscape:transform-center-y="-19.851237"
+     r="2" /><path
+     style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 0.08941999,6.9238712 6.2123724,13.092495 5.2400835,13.046114 C 3.0123979,12.459303 1.4904345,8.7391172 0.08941999,6.9238712 Z"
+     id="path837"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccc" /><path
+     style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 1.1374018,12.156337 11.113137,6.2071141 10.92858,6.8666442 C 9.1487554,9.7125141 3.9046135,11.042187 1.1374018,12.156337 Z"
+     id="path837-4"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccc" /><path
+     style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 12.300309,14.704657 5.2707209,3.8823307 6.6186331,4.492337 c 2.4471893,2.0184944 4.2314849,7.159638 5.6816739,10.212326 z"
+     id="path837-8"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccc" /></svg>
\ No newline at end of file
diff --git a/res/themes/asbru-color/asbru_group_add_16x16.svg b/res/themes/asbru-color/asbru_group_add_16x16.svg
new file mode 100644
index 00000000..642027e3
--- /dev/null
+++ b/res/themes/asbru-color/asbru_group_add_16x16.svg
@@ -0,0 +1,107 @@
+<?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"
+   height="32"
+   version="1.1"
+   viewBox="0 0 32 32"
+   width="32"
+   id="svg9"
+   sodipodi:docname="asbru_group_add_16x16.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata13">
+    <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>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview11"
+     showgrid="false"
+     inkscape:zoom="26.0625"
+     inkscape:cx="16"
+     inkscape:cy="16"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg9" />
+  <defs
+     id="defs4">
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path839"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+  </defs>
+  <g
+     id="g838"
+     transform="matrix(2,0,0,2,0,-31.999999)"
+     style="stroke-width:0.5">
+    <g
+       transform="matrix(1,0,0,1.3333333,0,13.333333)"
+       style="fill:#ffcc00;fill-rule:evenodd;stroke:none;stroke-width:0.5"
+       id="Icons with numbers">
+      <g
+         style="fill:#ffcc00;stroke-width:0.5"
+         transform="translate(-240)"
+         id="Group">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ffcc00;stroke-width:0.5"
+           id="Rectangle 136"
+           d="m 241.00087,4 h 13.99826 C 255.55537,4 256,4.4456547 256,4.9953976 V 13.004602 C 256,13.544336 255.55189,14 254.99913,14 H 241.00087 C 240.44463,14 240,13.554345 240,13.004602 V 4.9953976 C 240,4.4556644 240.44811,4 241.00087,4 Z M 243,2 h 4 l 1,1 h -6 z m 0,0" />
+      </g>
+    </g>
+    <g
+       style="stroke:#008000;stroke-width:0.40967742;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+       transform="matrix(0.73228346,0,0,0.73228346,5.9786627,22.093771)"
+       id="g837">
+      <rect
+         style="opacity:1;fill:#008000;fill-opacity:1;stroke:#008000;stroke-width:0.40967742;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+         id="rect818"
+         width="9.7458029"
+         height="2.2254195"
+         x="3.1270988"
+         y="6.88729" />
+      <rect
+         style="opacity:1;fill:#008000;fill-opacity:1;stroke:#008000;stroke-width:0.40967742;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+         id="rect818-0"
+         width="9.7458029"
+         height="2.2254195"
+         x="3.1270983"
+         y="-9.11271"
+         transform="rotate(90)" />
+    </g>
+  </g>
+</svg>
diff --git a/res/asbru_group_closed_16x16.svg b/res/themes/asbru-color/asbru_group_closed_16x16.svg
similarity index 89%
rename from res/asbru_group_closed_16x16.svg
rename to res/themes/asbru-color/asbru_group_closed_16x16.svg
index 2efb1569..3f961d36 100644
--- a/res/asbru_group_closed_16x16.svg
+++ b/res/themes/asbru-color/asbru_group_closed_16x16.svg
@@ -7,10 +7,10 @@
    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"
-   height="16px"
+   height="16"
    version="1.1"
    viewBox="0 0 16 16"
-   width="16px"
+   width="16"
    id="svg9"
    sodipodi:docname="asbru_group_closed_16x16.svg"
    inkscape:version="0.92.3 (2405546, 2018-03-11)">
@@ -39,8 +39,8 @@
      inkscape:window-height="1021"
      id="namedview11"
      showgrid="false"
-     inkscape:zoom="14.75"
-     inkscape:cx="-14.372881"
+     inkscape:zoom="52.125"
+     inkscape:cx="-4.7002398"
      inkscape:cy="8"
      inkscape:window-x="0"
      inkscape:window-y="30"
@@ -51,15 +51,15 @@
   <g
      id="Icons with numbers"
      style="fill:#ffcc00;fill-rule:evenodd;stroke:none;stroke-width:1"
-     transform="matrix(1,0,0,1.3333333,0,-2.6666667)">
+     transform="matrix(1,0,0,1.3333332,0,-2.6666669)">
     <g
        id="Group"
        transform="translate(-240)"
-       style="fill:#ffcc00">
+       style="fill:#ffcc00;stroke-width:1">
       <path
          d="m 241.00087,4 h 13.99826 C 255.55537,4 256,4.4456547 256,4.9953976 V 13.004602 C 256,13.544336 255.55189,14 254.99913,14 H 241.00087 C 240.44463,14 240,13.554345 240,13.004602 V 4.9953976 C 240,4.4556644 240.44811,4 241.00087,4 Z M 243,2 h 4 l 1,1 h -6 z m 0,0"
          id="Rectangle 136"
-         style="fill:#ffcc00"
+         style="fill:#ffcc00;stroke-width:1"
          inkscape:connector-curvature="0" />
     </g>
   </g>
diff --git a/res/asbru_group_open_16x16.svg b/res/themes/asbru-color/asbru_group_open_16x16.svg
similarity index 71%
rename from res/asbru_group_open_16x16.svg
rename to res/themes/asbru-color/asbru_group_open_16x16.svg
index 94d5d713..729b1bcb 100644
--- a/res/asbru_group_open_16x16.svg
+++ b/res/themes/asbru-color/asbru_group_open_16x16.svg
@@ -31,22 +31,19 @@
      inkscape:window-height="1021"
      id="namedview37"
      showgrid="false"
-     inkscape:zoom="2.95"
-     inkscape:cx="-66.949153"
-     inkscape:cy="12.881356"
+     inkscape:zoom="52.125"
+     inkscape:cx="8"
+     inkscape:cy="8"
      inkscape:window-x="0"
      inkscape:window-y="30"
      inkscape:window-maximized="1"
      inkscape:current-layer="Capa_1"
      scale-x="1.3"
-     showguides="false" /><g
-     id="g4"
-     style="fill:#ffcc00"
-     transform="matrix(0.16000022,0,0,0.2,-1.625673e-4,9.9999998e-8)"><path
-       d="m 95.351,25 h -90.7 c -4.604,0 -4.834,2.241 -4.584,4.979 L 4.194,75.02 C 4.444,77.759 5.093,80 9.69,80 h 80.621 c 4.688,0 5.244,-2.241 5.494,-4.979 L 99.932,29.98 C 100.183,27.241 99.954,25 95.351,25 Z M 92.022,14 C 91.467,11.8 88.747,10 85.975,10 H 51.903 C 49.132,10 45.258,8.412 43.296,6.472 L 40.317,3.529 C 38.354,1.588 34.481,0 31.71,0 H 15.431 C 12.66,0 10.142,2.236 9.837,4.97 L 8.376,18 H 93.03 Z"
-       id="path2"
-       style="fill:#ffcc00"
-       inkscape:connector-curvature="0" /></g><g
+     showguides="false" /><path
+     inkscape:connector-curvature="0"
+     style="fill:#ed6912;fill-opacity:1;stroke-width:0.17888558"
+     id="path2"
+     d="M 15.256018,5.0000002 H 0.74399844 c -0.736641,0 -0.77344105,0.4482 -0.73344099,0.9958 L 0.67087834,15.004 c 0.04,0.5478 0.14384019,0.995999 0.87936116,0.995999 H 14.449617 c 0.750081,0 0.839041,-0.448199 0.879042,-0.995799 l 0.66032,-9.0081998 c 0.04016,-0.5478 0.0035,-0.996 -0.732961,-0.996 z m -0.53264,-2.1999999 c -0.0888,-0.4399999 -0.524001,-0.8 -0.967523,-0.8 H 8.3043287 c -0.4433607,0 -1.0632015,-0.3176 -1.3771219,-0.7056 L 6.4505662,0.70580042 C 6.1364857,0.3176004 5.5168049,3.9333338e-7 5.0734442,3.9333338e-7 H 2.4688007 C 2.0254402,3.9333338e-7 1.6225596,0.4472003 1.5737595,0.99400042 L 1.3399993,3.6000003 H 14.884658 Z" /><g
      id="g6"
      transform="translate(0,-64)" /><g
      id="g8"
diff --git a/res/themes/asbru-color/asbru_history.svg b/res/themes/asbru-color/asbru_history.svg
new file mode 100644
index 00000000..c00957ed
--- /dev/null
+++ b/res/themes/asbru-color/asbru_history.svg
@@ -0,0 +1,64 @@
+<?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"
+   height="32"
+   id="clock"
+   viewBox="0 0 32 32"
+   width="32"
+   version="1.1"
+   sodipodi:docname="asbru_history.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata9">
+    <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="defs7" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview5"
+     showgrid="false"
+     inkscape:zoom="26.0625"
+     inkscape:cx="16"
+     inkscape:cy="16"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="clock" />
+  <ellipse
+     style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:7.09063911;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+     id="path812"
+     cx="15.894855"
+     cy="15.875745"
+     rx="12.344953"
+     ry="12.402431" />
+  <path
+     d="M 16,0 C 7.163444,0 0,7.163444 0,16 0,24.836556 7.163444,32 16,32 24.836556,32 32,24.836556 32,16 32,7.163444 24.836556,0 16,0 m 0,4 C 22.627417,4 28,9.372583 28,16 28,22.627417 22.627417,28 16,28 9.372583,28 4,22.627417 4,16 4,9.372583 9.372583,4 16,4 m -2,2 0.613909,10.981415 7.846523,4.289568 0.446643,-0.775779 L 16.35012,16.016187 14.776979,5.8848921 Z"
+     id="path2"
+     style="fill:#2c5aa0"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="csssccssscccccccc" />
+</svg>
diff --git a/res/asbru_keepass.png b/res/themes/asbru-color/asbru_keepass.png
similarity index 100%
rename from res/asbru_keepass.png
rename to res/themes/asbru-color/asbru_keepass.png
diff --git a/res/asbru_method_3270.jpg b/res/themes/asbru-color/asbru_method_3270.jpg
similarity index 100%
rename from res/asbru_method_3270.jpg
rename to res/themes/asbru-color/asbru_method_3270.jpg
diff --git a/res/asbru_method_cadaver.png b/res/themes/asbru-color/asbru_method_cadaver.png
similarity index 100%
rename from res/asbru_method_cadaver.png
rename to res/themes/asbru-color/asbru_method_cadaver.png
diff --git a/res/asbru_method_cu.jpg b/res/themes/asbru-color/asbru_method_cu.jpg
similarity index 100%
rename from res/asbru_method_cu.jpg
rename to res/themes/asbru-color/asbru_method_cu.jpg
diff --git a/res/themes/asbru-color/asbru_method_ftp.svg b/res/themes/asbru-color/asbru_method_ftp.svg
new file mode 100644
index 00000000..04db778c
--- /dev/null
+++ b/res/themes/asbru-color/asbru_method_ftp.svg
@@ -0,0 +1,45 @@
+<?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"
+   enable-background="new 0 0 200 200"
+   height="32"
+   id="Layer_1"
+   version="1.1"
+   viewBox="0 0 32 32"
+   width="32"
+   xml:space="preserve"
+   sodipodi:docname="asbru_method_ftp.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
+     id="metadata9"><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="defs7" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview5"
+     showgrid="false"
+     inkscape:zoom="29.203762"
+     inkscape:cx="16.056412"
+     inkscape:cy="16.180629"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1" /><path
+     d="M 31.55641,8.3513739 V 13.71682 c -0.20336,0.858595 -0.653945,1.647139 -1.319515,2.286746 -0.9362,0.898425 -2.18395,1.39359 -3.511525,1.39359 h -8.347061 v -1.633501 c 0,-0.690286 -0.564975,-1.255037 -1.255345,-1.255037 h -2.133265 c -0.69006,0 -1.25488,0.564906 -1.25488,1.255037 v 1.633501 H 5.3872988 c -1.327575,0 -2.5750151,-0.495165 -3.5115251,-1.39359 C 1.2095837,15.364889 0.75977365,14.575725 0.55641364,13.71744 V 8.3513739 c 0,-1.156624 0.94705006,-2.1035585 2.10397006,-2.1035585 H 29.45275 c 1.156765,0 2.10366,0.9469345 2.10366,2.1035585 z M 17.123119,20.285539 c 0.110515,0 0.20274,-0.09237 0.20274,-0.202716 v -1.63381 -1.051857 -1.633501 c 0,-0.110346 -0.09223,-0.203335 -0.20274,-0.203335 h -2.13342 c -0.11005,0 -0.20336,0.09299 -0.20336,0.203335 v 1.633501 1.051857 1.63381 c 0,0.110347 0.09331,0.202716 0.20336,0.202716 z M 30.96586,16.762198 c -1.13398,1.087503 -2.63903,1.68697 -4.24049,1.68697 h -8.347061 v 1.63381 c 0,0.689356 -0.564975,1.254572 -1.255345,1.254572 h -2.133265 c -0.69006,0 -1.25488,-0.565061 -1.25488,-1.254572 v -1.63381 H 5.3872988 c -1.60115,0 -3.1065101,-0.599467 -4.2403351,-1.68697 C 0.93151365,16.555299 0.73435365,16.33569 0.55641364,16.105233 v 11.389406 c 0,1.157554 0.94705006,2.103714 2.10397006,2.103714 H 29.45275 c 1.156765,0 2.10366,-0.94616 2.10366,-2.103714 V 16.105233 c -0.17825,0.230457 -0.374635,0.450066 -0.59055,0.656965 z M 20.907289,2.6567484 C 20.496229,2.2457385 19.957604,2.0403885 19.419444,2.0403885 h -6.72545 c -0.53847,0 -1.077405,0.20535 -1.488155,0.6163599 -0.41044,0.4106999 -0.61597,0.9491042 -0.61597,1.4873536 v 1.0518567 h 1.787925 V 4.144102 c 0,-0.059668 0.01628,-0.1469221 0.093,-0.2231728 0.07595,-0.076251 0.16306,-0.092834 0.2232,-0.092834 h 6.725605 c 0.05921,0 0.14663,0.016583 0.222735,0.092834 0.07657,0.076251 0.09285,0.163505 0.09285,0.2231728 v 1.0518567 h 1.787925 V 4.144102 c -1.6e-4,-0.5382494 -0.20538,-1.0764987 -0.61582,-1.4873536 z"
+     id="path2"
+     inkscape:connector-curvature="0"
+     style="fill:#aa0000;stroke:#ffffff;stroke-width:1;stroke-opacity:1" /></svg>
\ No newline at end of file
diff --git a/res/themes/asbru-color/asbru_method_generic.svg b/res/themes/asbru-color/asbru_method_generic.svg
new file mode 100644
index 00000000..4f91a4f0
--- /dev/null
+++ b/res/themes/asbru-color/asbru_method_generic.svg
@@ -0,0 +1,66 @@
+<?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"
+   height="32"
+   version="1.1"
+   viewBox="0 0 32 32"
+   width="32"
+   id="svg9"
+   sodipodi:docname="asbru_method_generic.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata13">
+    <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>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview11"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="-14.440678"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg9" />
+  <defs
+     id="defs4" />
+  <g
+     id="Icons with numbers"
+     style="fill:#00aad4;fill-rule:evenodd;stroke:none;stroke-width:0.5"
+     transform="scale(2)">
+    <g
+       id="Group"
+       transform="translate(-48,-432)"
+       style="fill:#00aad4;stroke-width:0.5">
+      <path
+         d="M 54.879684,443.0591 V 445 h 2.351085 v -1.9409 z M 56,448 c -4.418278,0 -8,-3.58172 -8,-8 0,-4.41828 3.581722,-8 8,-8 4.418278,0 8,3.58172 8,8 0,4.41828 -3.581722,8 -8,8 z m -2.42998,-12.48959 c -0.983569,0.5328 -1.506903,1.4372 -1.57002,2.71323 h 2.280079 c 0,-0.37162 0.127546,-0.72979 0.382643,-1.07455 0.255097,-0.34475 0.687702,-0.51712 1.29783,-0.51712 0.620648,0 1.047994,0.13991 1.282052,0.41974 0.234057,0.27983 0.351084,0.58988 0.351084,0.93016 0,0.2955 -0.105193,0.56637 -0.315582,0.81262 l -0.457593,0.39624 -0.575937,0.38281 c -0.56805,0.37609 -0.920447,0.70853 -1.057199,0.99731 -0.136753,0.28879 -0.220907,0.81151 -0.252466,1.56817 h 2.130178 c 0.0053,-0.35818 0.03945,-0.62234 0.102564,-0.79248 0.09994,-0.26864 0.302431,-0.50369 0.607495,-0.70517 l 0.560158,-0.36938 c 0.56805,-0.37609 0.952004,-0.68502 1.151874,-0.92679 C 59.829062,438.94672 60,438.45646 60,437.87441 60,436.92522 59.606842,436.20887 58.820513,435.72532 58.034184,435.24177 57.046686,435 55.857988,435 c -0.904672,0 -1.667321,0.17014 -2.287968,0.51041 z m 0,0"
+         id="Oval 318"
+         inkscape:connector-curvature="0"
+         style="stroke-width:0.5;fill:#00aad4" />
+    </g>
+  </g>
+</svg>
diff --git a/res/themes/asbru-color/asbru_method_mosh.svg b/res/themes/asbru-color/asbru_method_mosh.svg
new file mode 100644
index 00000000..47d4adda
--- /dev/null
+++ b/res/themes/asbru-color/asbru_method_mosh.svg
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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="32mm"
+   height="32mm"
+   viewBox="0 0 32 32"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="asbru_method_mosh.svg">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="6.8957031"
+     inkscape:cx="60.472441"
+     inkscape:cy="60.472441"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5">
+    <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>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-265)">
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+       id="rect815"
+       width="28.201439"
+       height="19.529974"
+       x="1.8992805"
+       y="271.02399" />
+    <rect
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+       id="rect815-2"
+       width="16.767389"
+       height="2.9838984"
+       x="7.5203829"
+       y="276.35336" />
+    <g
+       id="g906"
+       transform="matrix(0.85488233,0,0,0.62461017,2.2473141,107.31378)"
+       style="stroke-width:1.36849201">
+      <rect
+         y="285.91129"
+         x="13.582733"
+         height="1.3045554"
+         width="4.8345346"
+         id="rect815-2-1"
+         style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:2.73698401;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" />
+      <rect
+         y="286.17984"
+         x="21.520235"
+         height="1.0359701"
+         width="4.8345346"
+         id="rect815-2-1-7"
+         style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:2.73698401;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" />
+      <rect
+         y="285.87289"
+         x="5.6452365"
+         height="1.3429247"
+         width="4.8345346"
+         id="rect815-2-1-8"
+         style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:2.73698401;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" />
+    </g>
+  </g>
+</svg>
diff --git a/res/asbru_method_rdesktop.svg b/res/themes/asbru-color/asbru_method_rdesktop.svg
similarity index 100%
rename from res/asbru_method_rdesktop.svg
rename to res/themes/asbru-color/asbru_method_rdesktop.svg
diff --git a/res/asbru_method_remote-tty.jpg b/res/themes/asbru-color/asbru_method_remote-tty.jpg
similarity index 100%
rename from res/asbru_method_remote-tty.jpg
rename to res/themes/asbru-color/asbru_method_remote-tty.jpg
diff --git a/res/themes/asbru-color/asbru_method_sftp.svg b/res/themes/asbru-color/asbru_method_sftp.svg
new file mode 100644
index 00000000..c0628b84
--- /dev/null
+++ b/res/themes/asbru-color/asbru_method_sftp.svg
@@ -0,0 +1,45 @@
+<?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"
+   enable-background="new 0 0 200 200"
+   height="32"
+   id="Layer_1"
+   version="1.1"
+   viewBox="0 0 32 32"
+   width="32"
+   xml:space="preserve"
+   sodipodi:docname="asbru_method_sftp.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
+     id="metadata9"><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="defs7" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview5"
+     showgrid="false"
+     inkscape:zoom="26.0625"
+     inkscape:cx="3.2997602"
+     inkscape:cy="16"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1" /><path
+     d="m 31.498797,7.6600216 v 5.3654454 c -0.20336,0.858595 -0.653945,1.647139 -1.319515,2.286746 -0.9362,0.898426 -2.18395,1.39359 -3.511525,1.39359 h -8.34706 v -1.633501 c 0,-0.690285 -0.564975,-1.255036 -1.255345,-1.255036 h -2.133265 c -0.69006,0 -1.25488,0.564906 -1.25488,1.255036 v 1.633501 H 5.3296859 c -1.327575,0 -2.575015,-0.495164 -3.511525,-1.39359 -0.66619,-0.638677 -1.116,-1.427841 -1.31936,-2.286126 V 7.6600216 c 0,-1.1566239 0.94705,-2.1035584 2.10397,-2.1035584 H 29.395137 c 1.156765,0 2.10366,0.9469345 2.10366,2.1035584 z M 17.065507,19.594186 c 0.110515,0 0.20274,-0.09237 0.20274,-0.202715 V 17.75766 16.705803 15.072302 c 0,-0.110346 -0.09222,-0.203335 -0.20274,-0.203335 h -2.13342 c -0.11005,0 -0.20336,0.09299 -0.20336,0.203335 v 1.633501 1.051857 1.633811 c 0,0.110346 0.09331,0.202715 0.20336,0.202715 z m 13.84274,-3.52334 c -1.13398,1.087502 -2.63903,1.686969 -4.24049,1.686969 h -8.34706 v 1.633811 c 0,0.689356 -0.564975,1.254572 -1.255345,1.254572 h -2.133265 c -0.69006,0 -1.25488,-0.565062 -1.25488,-1.254572 V 17.757815 H 5.3296859 c -1.60115,0 -3.10651,-0.599467 -4.240335,-1.686969 -0.21545,-0.2069 -0.41261,-0.426508 -0.59055,-0.656965 v 11.389406 c 0,1.157553 0.94705,2.103713 2.10397,2.103713 H 29.395137 c 1.156765,0 2.10366,-0.94616 2.10366,-2.103713 V 15.413881 c -0.17825,0.230457 -0.374635,0.450065 -0.59055,0.656965 z M 20.849677,1.9653962 C 20.438617,1.5543863 19.899992,1.3490364 19.361832,1.3490364 h -6.72545 c -0.53847,0 -1.077405,0.2053499 -1.488155,0.6163598 -0.41044,0.4106999 -0.61597,0.9491042 -0.61597,1.4873536 v 1.0518567 h 1.787925 V 3.4527498 c 0,-0.059668 0.01628,-0.1469221 0.093,-0.2231728 0.07595,-0.076251 0.16306,-0.092834 0.2232,-0.092834 h 6.725605 c 0.05921,0 0.14663,0.016583 0.222735,0.092834 0.07657,0.076251 0.09285,0.163505 0.09285,0.2231728 v 1.0518567 h 1.787925 V 3.4527498 c -1.6e-4,-0.5382494 -0.20538,-1.0764987 -0.61582,-1.4873536 z"
+     id="path2"
+     inkscape:connector-curvature="0"
+     style="fill:#447821;stroke:#ffffff;stroke-width:0.99999994;stroke-opacity:1" /></svg>
\ No newline at end of file
diff --git a/res/themes/asbru-color/asbru_method_ssh.svg b/res/themes/asbru-color/asbru_method_ssh.svg
new file mode 100644
index 00000000..ed344d54
--- /dev/null
+++ b/res/themes/asbru-color/asbru_method_ssh.svg
@@ -0,0 +1,67 @@
+<?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"
+   height="32px"
+   version="1.1"
+   viewBox="0 0 32 32"
+   width="32px"
+   id="svg11"
+   sodipodi:docname="asbru_method_ssh.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata15">
+    <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>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview13"
+     showgrid="false"
+     inkscape:zoom="20.270834"
+     inkscape:cx="16.091127"
+     inkscape:cy="20.614595"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg11" />
+  <desc
+     id="desc4" />
+  <defs
+     id="defs6" />
+  <g
+     id="Page-1"
+     style="fill:#217821;fill-rule:evenodd;stroke:none;stroke-width:0.84375"
+     transform="matrix(1.1851852,0,0,1.1851852,-3.5555558,-3.5555558)">
+    <g
+       id="icon-114-lock"
+       style="fill:#217821;stroke-width:0.84375">
+      <path
+         d="m 16,21.914647 v 2.594348 C 16,24.780169 16.231934,25 16.5,25 16.776142,25 17,24.772119 17,24.508995 V 21.914647 C 17.582596,21.708729 18,21.153109 18,20.5 18,19.671573 17.328427,19 16.5,19 15.671573,19 15,19.671573 15,20.5 c 0,0.653109 0.417404,1.208729 1,1.414647 z M 9,14.000013 V 10.499235 C 9,6.3567048 12.357864,3 16.5,3 20.633707,3 24,6.3575219 24,10.499235 v 3.500778 c 1.659147,0.0047 3,1.350304 3,3.009465 v 9.981044 C 27,28.663369 25.65292,30 23.991212,30 H 9.008788 C 7.3455902,30 6,28.652611 6,26.990522 V 17.009478 C 6,15.339581 7.3423335,14.004715 9,14.000013 Z M 12,14 V 10.500854 C 12,8.0092478 14.014719,6 16.5,6 18.980224,6 21,8.0151008 21,10.500854 V 14 Z"
+         id="lock"
+         style="fill:#217821;stroke-width:0.84375"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>
diff --git a/res/themes/asbru-color/asbru_method_telnet.svg b/res/themes/asbru-color/asbru_method_telnet.svg
new file mode 100644
index 00000000..9b8bd059
--- /dev/null
+++ b/res/themes/asbru-color/asbru_method_telnet.svg
@@ -0,0 +1,67 @@
+<?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"
+   height="32px"
+   version="1.1"
+   viewBox="0 0 32 32"
+   width="32px"
+   id="svg11"
+   sodipodi:docname="asbru_method_telnet.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata15">
+    <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>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview13"
+     showgrid="false"
+     inkscape:zoom="26.0625"
+     inkscape:cx="16"
+     inkscape:cy="16"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg11" />
+  <desc
+     id="desc4" />
+  <defs
+     id="defs6" />
+  <g
+     id="Page-1"
+     style="fill:#d40000;fill-rule:evenodd;stroke:none;stroke-width:0.96875012"
+     transform="matrix(1.0322581,0,0,1.0322581,-0.5161296,-1.0322586)">
+    <g
+       id="icon-115-lock-open"
+       style="fill:#d40000;stroke-width:0.96875012">
+      <path
+         d="m 20,23.914647 v 2.594348 C 20,26.780169 20.231934,27 20.5,27 20.776142,27 21,26.772119 21,26.508995 V 23.914647 C 21.582596,23.708729 22,23.153109 22,22.5 22,21.671573 21.328427,21 20.5,21 19.671573,21 19,21.671573 19,22.5 c 0,0.653109 0.417404,1.208729 1,1.414647 z M 13,8.4999175 C 13,6.0146817 10.980224,4 8.5,4 6.0147186,4 4,6.0168811 4,8.4999175 V 10 12.499167 C 4,13.321455 3.3284271,14 2.5,14 1.6657972,14 1,13.328054 1,12.499167 V 10 8.499235 C 1,4.3567048 4.3578644,1 8.5,1 12.633707,1 16,4.3575219 16,8.499235 V 16 H 27.991212 C 29.65441,16 31,17.347389 31,19.009478 v 9.981044 C 31,30.663369 29.65292,32 27.991212,32 H 13.008788 C 11.34559,32 10,30.652611 10,28.990522 v -9.981044 c 0,-1.669897 1.342334,-3.004763 3,-3.009466 z"
+         id="lock-open"
+         style="fill:#d40000;stroke-width:0.96875012"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>
diff --git a/res/asbru_method_vncviewer.svg b/res/themes/asbru-color/asbru_method_vncviewer.svg
similarity index 100%
rename from res/asbru_method_vncviewer.svg
rename to res/themes/asbru-color/asbru_method_vncviewer.svg
diff --git a/res/themes/asbru-color/asbru_node_add_16x16.svg b/res/themes/asbru-color/asbru_node_add_16x16.svg
new file mode 100644
index 00000000..eb1a749d
--- /dev/null
+++ b/res/themes/asbru-color/asbru_node_add_16x16.svg
@@ -0,0 +1,75 @@
+<?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"
+   id="Layer_1_1_"
+   version="1.1"
+   viewBox="0 0 32 32"
+   xml:space="preserve"
+   sodipodi:docname="asbru_node_add_16x16.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   width="32"
+   height="32"><metadata
+     id="metadata9"><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="defs7" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview5"
+     showgrid="false"
+     inkscape:zoom="26.0625"
+     inkscape:cx="16"
+     inkscape:cy="16"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1_1_" /><path
+     d="M 7.3188612,17.259575 H 23.863547 c 3.547916,0 6.434043,-2.725788 6.434043,-6.076596 0,-3.3508084 -2.886127,-6.0765963 -6.434043,-6.0765963 H 8.2380101 c 0,-1.9184671 -1.6452765,-3.4723392 -3.6765958,-3.4723392 -2.031319,0 -3.67659552,1.5538721 -3.67659552,3.4723392 0,1.9184691 1.64527652,3.4723412 3.67659552,3.4723412 1.3566638,0 2.529498,-0.7031494 3.1673873,-1.7361706 H 23.863547 c 2.533176,0 4.595744,1.9479822 4.595744,4.3404257 0,2.392443 -2.062568,4.340425 -4.595744,4.340425 H 7.3188612 c -3.5479149,0 -6.43404242,2.725788 -6.43404242,6.076591 0,3.35081 2.88612752,6.076594 6.43404242,6.076594 H 23.453606 c 0.636053,1.033025 1.808887,1.736172 3.167389,1.736172 2.031318,0 3.676595,-1.553872 3.676595,-3.472339 0,-1.918469 -1.645277,-3.472343 -3.676595,-3.472343 -2.031319,0 -3.676596,1.553874 -3.676596,3.472343 H 7.3188612 c -2.5331744,0 -4.5957446,-1.947986 -4.5957446,-4.340427 0,-2.392442 2.0625702,-4.34042 4.5957446,-4.34042 z"
+     id="path2"
+     style="fill:#ffcc00;stroke:#ffcc00;stroke-width:0.60000002;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1"
+     inkscape:connector-curvature="0" /><circle
+     style="opacity:0;fill:#ff0000;fill-opacity:1;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none"
+     id="path829"
+     cx="-9.3279467"
+     cy="-9.8042545"
+     r="0" /><circle
+     style="opacity:1;fill:#ff0000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+     id="path835"
+     cx="5.7869463"
+     cy="5.9914875"
+     r="5.7191491" /><circle
+     style="opacity:1;fill:#ffcc00;fill-opacity:1;stroke:#808080;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+     id="path835-6"
+     cx="26.348646"
+     cy="26.280851"
+     r="5.7191491" /><g
+     id="g837"
+     transform="matrix(1.9373429,0,0,1.9373429,6.0036167,6.197711)"
+     style="fill:#225500;stroke:#225500;stroke-width:0.30970252;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"><rect
+       y="6.88729"
+       x="3.1270988"
+       height="2.2254195"
+       width="9.7458029"
+       id="rect818"
+       style="opacity:1;fill:#225500;fill-opacity:1;stroke:#225500;stroke-width:0.30970252;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" /><rect
+       transform="rotate(90)"
+       y="-9.11271"
+       x="3.1270983"
+       height="2.2254195"
+       width="9.7458029"
+       id="rect818-0"
+       style="opacity:1;fill:#225500;fill-opacity:1;stroke:#225500;stroke-width:0.30970252;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" /></g></svg>
\ No newline at end of file
diff --git a/res/asbru_prompt.png b/res/themes/asbru-color/asbru_prompt.png
similarity index 100%
rename from res/asbru_prompt.png
rename to res/themes/asbru-color/asbru_prompt.png
diff --git a/res/asbru_protected.png b/res/themes/asbru-color/asbru_protected.png
similarity index 100%
rename from res/asbru_protected.png
rename to res/themes/asbru-color/asbru_protected.png
diff --git a/res/themes/asbru-color/asbru_quick_connect.svg b/res/themes/asbru-color/asbru_quick_connect.svg
new file mode 100644
index 00000000..385f397b
--- /dev/null
+++ b/res/themes/asbru-color/asbru_quick_connect.svg
@@ -0,0 +1,44 @@
+<?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"
+   height="32"
+   id="Layer_1"
+   version="1.1"
+   viewBox="0 0 32 32"
+   width="32"
+   xml:space="preserve"
+   sodipodi:docname="asbru_quick_connect.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
+     id="metadata9"><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="defs7" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview5"
+     showgrid="false"
+     inkscape:zoom="7.8954133"
+     inkscape:cx="-29.032781"
+     inkscape:cy="-3.2542373"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1" /><path
+     d="M 20.214619,-0.08375616 6.9062849,18.582909 H 14.889617 L 12.431284,31.916243 25.739618,13.249576 h -7.983332 z"
+     id="path2"
+     inkscape:connector-curvature="0"
+     style="stroke-width:1;fill:#00aad4" /></svg>
\ No newline at end of file
diff --git a/res/asbru_script.png b/res/themes/asbru-color/asbru_script.png
similarity index 100%
rename from res/asbru_script.png
rename to res/themes/asbru-color/asbru_script.png
diff --git a/res/themes/asbru-color/asbru_shell.svg b/res/themes/asbru-color/asbru_shell.svg
new file mode 100644
index 00000000..5f203639
--- /dev/null
+++ b/res/themes/asbru-color/asbru_shell.svg
@@ -0,0 +1,63 @@
+<?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"
+   height="512"
+   width="512"
+   version="1.1"
+   id="svg4"
+   sodipodi:docname="asbru_shell.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata10">
+    <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="defs8" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="1.1649148"
+     inkscape:cx="282.0339"
+     inkscape:cy="271.18644"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4" />
+  <rect
+     style="opacity:1;fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:7.55905581;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+     id="rect817"
+     width="343.40387"
+     height="266.97235"
+     x="65.240822"
+     y="81.925621" />
+  <path
+     d="M 475.287,0.3623481 H 36.42986 c -20.199999,0 -36.5714281,19.0934309 -36.5714281,42.6519929 V 469.53405 c 0,23.55856 16.3714291,42.65199 36.5714281,42.65199 H 475.287 c 20.2,0 36.57143,-19.09343 36.57143,-42.65199 V 43.014341 C 511.85843,19.455779 495.487,0.3623481 475.287,0.3623481 Z M 73.001289,298.9261 146.14414,213.62212 73.001289,128.31819 109.57272,85.666302 219.287,213.62212 109.57272,341.57809 Z M 405.06058,343.29495 219.287,341.57809 V 298.9261 l 184.91515,0 z"
+     id="path2"
+     inkscape:connector-curvature="0"
+     style="fill:#4d4d4d;stroke-width:1"
+     sodipodi:nodetypes="ssssssssscccccccccccc" />
+</svg>
diff --git a/res/asbru_tab.png b/res/themes/asbru-color/asbru_tab.png
similarity index 100%
rename from res/asbru_tab.png
rename to res/themes/asbru-color/asbru_tab.png
diff --git a/res/themes/asbru-color/asbru_treelist.svg b/res/themes/asbru-color/asbru_treelist.svg
new file mode 100644
index 00000000..4bd8554f
--- /dev/null
+++ b/res/themes/asbru-color/asbru_treelist.svg
@@ -0,0 +1,86 @@
+<?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"
+   height="16"
+   viewBox="0 0 16 16"
+   width="16"
+   version="1.1"
+   id="svg4"
+   sodipodi:docname="asbru_treelist.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata10">
+    <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="defs8" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1687"
+     inkscape:window-height="978"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="52.311231"
+     inkscape:cx="8.077014"
+     inkscape:cy="7.609346"
+     inkscape:window-x="194"
+     inkscape:window-y="51"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg4" />
+  <rect
+     style="opacity:1;fill:#008000;fill-opacity:1;stroke:#008000;stroke-width:1.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+     id="rect817"
+     width="8.7747412"
+     height="2.3712707"
+     x="6.4718328"
+     y="2.984359" />
+  <rect
+     style="opacity:1;fill:#ffcc00;fill-opacity:1;stroke:#ffcc00;stroke-width:1.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+     id="rect817-8"
+     width="3.6917095"
+     height="2.3712707"
+     x="0.73416901"
+     y="3.0152664" />
+  <rect
+     style="opacity:1;fill:#008000;fill-opacity:1;stroke:#008000;stroke-width:1.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+     id="rect817-6"
+     width="6.8878584"
+     height="2.3712707"
+     x="8.493495"
+     y="7.2050185" />
+  <rect
+     style="opacity:1;fill:#d45500;fill-opacity:1;stroke:#d45500;stroke-width:1.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+     id="rect817-8-2"
+     width="3.6917095"
+     height="2.3712707"
+     x="3.0061305"
+     y="7.2359362" />
+  <rect
+     style="opacity:1;fill:#008000;fill-opacity:1;stroke:#008000;stroke-width:1.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+     id="rect817-6-9"
+     width="6.8878584"
+     height="2.3712707"
+     x="8.4583416"
+     y="11.588383" />
+</svg>
diff --git a/res/asbru_unprotected.png b/res/themes/asbru-color/asbru_unprotected.png
similarity index 100%
rename from res/asbru_unprotected.png
rename to res/themes/asbru-color/asbru_unprotected.png
diff --git a/res/themes/asbru-color/asbru_wol.svg b/res/themes/asbru-color/asbru_wol.svg
new file mode 100644
index 00000000..5e14540d
--- /dev/null
+++ b/res/themes/asbru-color/asbru_wol.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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="32"
+   viewBox="0 0 32 32"
+   width="32"
+   version="1.1"
+   id="svg6"
+   sodipodi:docname="asbru_wol.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata12">
+    <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="defs10">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient872">
+      <stop
+         style="stop-color:#00aa00;stop-opacity:1;"
+         offset="0"
+         id="stop868" />
+      <stop
+         style="stop-color:#00aa00;stop-opacity:0;"
+         offset="1"
+         id="stop870" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient872"
+       id="radialGradient874"
+       cx="16.398134"
+       cy="25.057543"
+       fx="16.398134"
+       fy="25.057543"
+       r="6.693624"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(8.8460339,0.19906688)" />
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1499"
+     inkscape:window-height="865"
+     id="namedview8"
+     showgrid="false"
+     inkscape:zoom="20.09375"
+     inkscape:cx="16"
+     inkscape:cy="16"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg6" />
+  <path
+     d="M 0,-16 H 48 V 32 H 0 Z"
+     id="path2"
+     inkscape:connector-curvature="0"
+     style="fill:none" />
+  <path
+     d="M 9.1857824,2.43527 7.1532259,0.75247158 0.01288136,9.3512252 7.1532259,17.956594 9.1857824,16.273796 3.4444703,9.3512252 Z M 8.1695042,10.671067 H 10.809187 V 8.0313833 H 8.1695042 Z M 21.367922,8.0313833 h -2.639683 v 2.6396837 h 2.639683 z m -7.919051,2.6396837 h 2.639684 V 8.0313833 h -2.639684 z m 8.93533,-9.9251946 -2.032557,1.6827984 5.741312,6.9225544 -5.741312,6.9159708 2.032557,1.682798 7.140344,-8.5987688 z"
+     id="path4"
+     inkscape:connector-curvature="0"
+     style="stroke-width:1" />
+  <circle
+     style="opacity:1;fill:url(#radialGradient874);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:7.55905533;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+     id="path822"
+     cx="25.244165"
+     cy="25.256609"
+     r="6.693624" />
+</svg>
diff --git a/res/themes/asbru-color/gtk-delete.svg b/res/themes/asbru-color/gtk-delete.svg
new file mode 100644
index 00000000..d2bedaef
--- /dev/null
+++ b/res/themes/asbru-color/gtk-delete.svg
@@ -0,0 +1,44 @@
+<?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"
+   id="Layer_1_1_"
+   version="1.1"
+   viewBox="0 0 32 32"
+   xml:space="preserve"
+   sodipodi:docname="gtk-delete.svg"
+   width="32"
+   height="32"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
+     id="metadata9"><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="defs7" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview5"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="-13.355932"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1_1_" /><path
+     d="M 16,0 C 14.896,0 14,0.896 14,2 H 0 v 4 h 2 v 22 c 0,2.21 1.79,4 4,4 h 20 c 2.21,0 4,-1.79 4,-4 V 6 h 2 V 2 H 18 C 18,0.896 17.104,0 16,0 Z M 8,28 H 6 V 10 h 2 z m 6,0 H 12 V 10 h 2 z m 6,0 H 18 V 10 h 2 z m 6,0 H 24 V 10 h 2 z"
+     id="path2"
+     inkscape:connector-curvature="0"
+     style="stroke-width:1;fill:#aa0000" /></svg>
\ No newline at end of file
diff --git a/res/themes/asbru-color/gtk-edit.svg b/res/themes/asbru-color/gtk-edit.svg
new file mode 100644
index 00000000..da911158
--- /dev/null
+++ b/res/themes/asbru-color/gtk-edit.svg
@@ -0,0 +1,67 @@
+<?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"
+   height="32px"
+   version="1.1"
+   viewBox="0 0 32 32"
+   width="32px"
+   id="svg11"
+   sodipodi:docname="gtk-edit.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata15">
+    <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>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview13"
+     showgrid="false"
+     inkscape:zoom="26.0625"
+     inkscape:cx="-9.4772182"
+     inkscape:cy="16"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg11" />
+  <desc
+     id="desc4" />
+  <defs
+     id="defs6" />
+  <g
+     id="Page-1"
+     style="fill:#0088aa;fill-rule:evenodd;stroke:none;stroke-width:0.84906781;fill-opacity:1"
+     transform="matrix(1.1777622,0,0,1.1777622,-3.3807443,-3.2989684)">
+    <g
+       id="icon-136-document-edit"
+       style="fill:#0088aa;stroke-width:0.84906781;fill-opacity:1">
+      <path
+         d="M 26.443228,12.150335 15.157013,23.449906 v 0 L 12.551447,20.84434 23.843538,9.5506451 Z M 27.149916,11.44281 28.879095,9.7115841 C 29.269069,9.3211489 29.266195,8.6865042 28.8743,8.295685 L 27.694487,7.11911 C 27.301865,6.7275656 26.669258,6.7245247 26.277913,7.1159253 L 24.550595,8.8434882 Z M 11.903706,21.610813 11.26416,24.72351 14.399065,24.106171 Z M 22,18 V 28.002578 C 22,29.109075 21.105724,30 20.002578,30 H 4.9974219 C 3.8909254,30 3,29.101288 3,27.99267 V 5.0073299 C 3,3.8983383 3.8992496,3 5.0085302,3 H 15 V 9.0018986 C 15,10.113294 15.898081,11 17.005919,11 H 21 l 4.580107,-4.5801067 c 0.792674,-0.7926743 2.051284,-0.7885027 2.830143,-0.00964 l 1.1795,1.1794992 c 0.776438,0.7764385 0.774542,2.0459582 -0.0096,2.8301435 z M 16,3 V 8.9970707 C 16,9.5509732 16.450975,10 16.990778,10 H 22 Z"
+         id="document-edit"
+         style="fill:#0088aa;stroke-width:0.84906781;fill-opacity:1"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>
diff --git a/res/themes/asbru-color/gtk-find.svg b/res/themes/asbru-color/gtk-find.svg
new file mode 100644
index 00000000..1f78c535
--- /dev/null
+++ b/res/themes/asbru-color/gtk-find.svg
@@ -0,0 +1,55 @@
+<?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"
+   height="32"
+   width="32"
+   version="1.1"
+   id="svg4"
+   sodipodi:docname="gtk-find.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata10">
+    <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="defs8" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="12.95122"
+     inkscape:cx="-8.6346506"
+     inkscape:cy="10"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4" />
+  <path
+     d="m 30.961667,26.87326 -7.697992,-7.697992 c 1.098901,-1.794154 1.765169,-3.884732 1.765169,-6.145262 0,-6.5517821 -5.31482,-11.8656452 -11.865646,-11.8656452 -6.5517834,0 -11.8656461,5.3138631 -11.8656461,11.8656452 0,6.550826 5.3138627,11.865646 11.8656461,11.865646 2.26053,0 4.351108,-0.666268 6.145262,-1.761307 l 7.697992,7.69413 c 0.540752,0.540753 1.436855,0.53689 1.977607,0 l 1.977608,-1.977608 c 0.540753,-0.540752 0.540753,-1.436855 0,-1.977607 z M 13.163198,20.940437 c -4.3685044,0 -7.9104308,-3.541927 -7.9104308,-7.910431 0,-4.3685035 3.5419264,-7.9104298 7.9104308,-7.9104298 4.368504,0 7.910431,3.5419263 7.910431,7.9104298 0,4.368504 -3.541927,7.910431 -7.910431,7.910431 z"
+     id="path2"
+     inkscape:connector-curvature="0"
+     style="stroke-width:1;fill:#0088aa" />
+</svg>
diff --git a/res/themes/asbru-color/gtk-spell-check.svg b/res/themes/asbru-color/gtk-spell-check.svg
new file mode 100644
index 00000000..b9a6f146
--- /dev/null
+++ b/res/themes/asbru-color/gtk-spell-check.svg
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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="32"
+   height="32"
+   viewBox="0 0 8.4666659 8.4666659"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="gtk-spell-check.svg">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="17.497415"
+     inkscape:cx="-0.34209718"
+     inkscape:cy="20.846388"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5">
+    <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>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-288.53334)">
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:3.52777767px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#0088aa;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+       x="0.30242562"
+       y="292.20654"
+       id="text817"><tspan
+         sodipodi:role="line"
+         id="tspan815"
+         x="0.30242562"
+         y="292.20654"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:3.52777767px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.26458332px;fill:#0088aa;">ABC</tspan></text>
+    <g
+       id="g848"
+       style="fill:#447821;stroke:none;stroke-width:0.81602418"
+       transform="matrix(1.2254539,0,0,1.2254539,-0.77539418,-67.044897)">
+      <rect
+         transform="rotate(45)"
+         y="206.14658"
+         x="208.99654"
+         height="0.83167046"
+         width="2.8730433"
+         id="rect819"
+         style="opacity:1;fill:#447821;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.63204837;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" />
+      <rect
+         transform="rotate(-45)"
+         inkscape:transform-center-y="4.8319891"
+         inkscape:transform-center-x="4.1049014"
+         y="211.03792"
+         x="-206.97824"
+         height="0.83167046"
+         width="4.4305353"
+         id="rect819-3"
+         style="opacity:1;fill:#447821;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.63204837;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" />
+    </g>
+  </g>
+</svg>
diff --git a/res/themes/asbru-dark/asbru-cluster.svg b/res/themes/asbru-dark/asbru-cluster.svg
new file mode 100644
index 00000000..d178ae40
--- /dev/null
+++ b/res/themes/asbru-dark/asbru-cluster.svg
@@ -0,0 +1,885 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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"
+   id="svg3327"
+   sodipodi:docname="asbru-cluster.svg"
+   viewBox="0 0 50 49.999999"
+   version="1.1"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   width="50"
+   height="50">
+  <defs
+     id="defs165" />
+  <sodipodi:namedview
+     id="base"
+     bordercolor="#666666"
+     inkscape:pageshadow="2"
+     inkscape:window-y="28"
+     fit-margin-left="0"
+     pagecolor="#ffffff"
+     fit-margin-top="0"
+     inkscape:window-maximized="1"
+     inkscape:zoom="3.959798"
+     inkscape:window-x="0"
+     inkscape:window-height="1412"
+     showgrid="false"
+     borderopacity="1.0"
+     inkscape:current-layer="layer1"
+     inkscape:cx="48.181346"
+     inkscape:cy="18.904047"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="2560"
+     inkscape:pageopacity="0.0"
+     inkscape:document-units="px" />
+  <g
+     id="layer1"
+     inkscape:label="レイヤー 1"
+     inkscape:groupmode="layer"
+     transform="translate(-112.53,-481.26001)">
+    <g
+       id="g5204"
+       transform="matrix(0.78017703,0,0,0.78017703,90.885763,444.84324)">
+      <path
+         id="rect5126"
+         style="color:#000000;fill:#4d4d4d;fill-rule:evenodd;stroke:#cccccc;stroke-width:0.20812"
+         inkscape:connector-curvature="0"
+         d="m 33,52.362 h 54.145 v 11 H 33 Z" />
+      <path
+         id="rect5128"
+         style="color:#000000;fill:#afdde9;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 38,54.362 h 18 v 2 H 38 Z" />
+      <path
+         id="path5130"
+         style="color:#000000;fill:#008080;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(0.0625,2.9375)" />
+      <path
+         id="path5132"
+         style="color:#000000;fill:#afdde9;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 79,55.362 c 0,0.55228 -0.44772,1 -1,1 -0.55228,0 -1,-0.44772 -1,-1 0,-0.55228 0.44772,-1 1,-1 0.55228,0 1,0.44772 1,1 z"
+         transform="translate(4)" />
+      <path
+         id="path5134"
+         style="color:#000000;fill:#008080;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(21.062,2.9375)" />
+      <path
+         id="path5136"
+         style="color:#000000;fill:#008080;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(19.062,2.9375)" />
+      <path
+         id="path5138"
+         style="color:#000000;fill:#008080;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(17.062,2.9375)" />
+      <g
+         id="g5140"
+         style="stroke:#1a1a1a;stroke-width:0.1">
+        <path
+           id="path5142"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="M 37.047,60.425 H 83.094"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5144"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 38.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5146"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 40.062,60.425 v 1.9579" />
+        <path
+           id="path5148"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 42.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5150"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 44.062,60.425 v 1.9579" />
+        <path
+           id="path5152"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 46.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5154"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 48.062,60.425 v 1.9579" />
+        <path
+           id="path5156"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 50.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5158"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 62.062,60.425 v 1.9579" />
+        <path
+           id="path5160"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 52.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5162"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 68.062,60.425 v 1.9579" />
+        <path
+           id="path5164"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 66.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5166"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 64.062,60.425 v 1.9579" />
+        <path
+           id="path5168"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 60.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5170"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 58.062,60.425 v 1.9579" />
+        <path
+           id="path5172"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 54.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5174"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 56.062,60.425 v 1.9579" />
+        <path
+           id="path5176"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 70.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5178"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 72.062,60.425 v 1.9579" />
+        <path
+           id="path5180"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 74.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5182"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 76.062,60.425 v 1.9579" />
+        <path
+           id="path5184"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 78.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5186"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 80.062,60.425 v 1.9579" />
+        <path
+           id="path5188"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 82.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+      </g>
+      <path
+         id="rect5192"
+         style="color:#000000;fill:#4d4d4d;fill-rule:evenodd;stroke:#cccccc;stroke-width:0.050956"
+         inkscape:connector-curvature="0"
+         d="m 87.255,52.362 h 3.2457 v 11 h -3.246 z" />
+      <path
+         id="path5194"
+         style="color:#000000;fill:#1a1a1a;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(31.28,0.42989)" />
+      <path
+         id="path5196"
+         style="color:#000000;fill:#1a1a1a;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(31.28,9.5901)" />
+      <path
+         id="rect5198"
+         style="color:#000000;fill:#4d4d4d;fill-rule:evenodd;stroke:#cccccc;stroke-width:0.050956"
+         inkscape:connector-curvature="0"
+         d="m 29.618,52.362 h 3.2457 v 11 h -3.246 z" />
+      <path
+         id="path5200"
+         style="color:#000000;fill:#1a1a1a;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(-26.357,0.42989)" />
+      <path
+         id="path5202"
+         style="color:#000000;fill:#1a1a1a;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(-26.357,9.5901)" />
+    </g>
+    <g
+       id="g5204-2"
+       transform="matrix(0.78017703,0,0,0.78017703,90.885763,456.10555)">
+      <path
+         id="rect5126-0"
+         style="color:#000000;fill:#4d4d4d;fill-rule:evenodd;stroke:#cccccc;stroke-width:0.20812"
+         inkscape:connector-curvature="0"
+         d="m 33,52.362 h 54.145 v 11 H 33 Z" />
+      <path
+         id="rect5128-0"
+         style="color:#000000;fill:#afdde9;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 38,54.362 h 18 v 2 H 38 Z" />
+      <path
+         id="path5130-9"
+         style="color:#000000;fill:#008080;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(0.0625,2.9375)" />
+      <path
+         id="path5132-4"
+         style="color:#000000;fill:#afdde9;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 79,55.362 c 0,0.55228 -0.44772,1 -1,1 -0.55228,0 -1,-0.44772 -1,-1 0,-0.55228 0.44772,-1 1,-1 0.55228,0 1,0.44772 1,1 z"
+         transform="translate(4)" />
+      <path
+         id="path5134-5"
+         style="color:#000000;fill:#008080;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(21.062,2.9375)" />
+      <path
+         id="path5136-6"
+         style="color:#000000;fill:#008080;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(19.062,2.9375)" />
+      <path
+         id="path5138-7"
+         style="color:#000000;fill:#008080;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(17.062,2.9375)" />
+      <g
+         id="g5140-6"
+         style="stroke:#1a1a1a;stroke-width:0.1">
+        <path
+           id="path5142-6"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="M 37.047,60.425 H 83.094"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5144-6"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 38.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5146-1"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 40.062,60.425 v 1.9579" />
+        <path
+           id="path5148-1"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 42.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5150-7"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 44.062,60.425 v 1.9579" />
+        <path
+           id="path5152-4"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 46.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5154-8"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 48.062,60.425 v 1.9579" />
+        <path
+           id="path5156-8"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 50.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5158-5"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 62.062,60.425 v 1.9579" />
+        <path
+           id="path5160-3"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 52.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5162-8"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 68.062,60.425 v 1.9579" />
+        <path
+           id="path5164-0"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 66.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5166-4"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 64.062,60.425 v 1.9579" />
+        <path
+           id="path5168-4"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 60.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5170-9"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 58.062,60.425 v 1.9579" />
+        <path
+           id="path5172-5"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 54.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5174-3"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 56.062,60.425 v 1.9579" />
+        <path
+           id="path5176-3"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 70.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5178-8"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 72.062,60.425 v 1.9579" />
+        <path
+           id="path5180-7"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 74.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5182-8"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 76.062,60.425 v 1.9579" />
+        <path
+           id="path5184-7"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 78.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5186-5"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 80.062,60.425 v 1.9579" />
+        <path
+           id="path5188-5"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 82.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+      </g>
+      <path
+         id="rect5192-4"
+         style="color:#000000;fill:#4d4d4d;fill-rule:evenodd;stroke:#cccccc;stroke-width:0.050956"
+         inkscape:connector-curvature="0"
+         d="m 87.255,52.362 h 3.2457 v 11 h -3.246 z" />
+      <path
+         id="path5194-4"
+         style="color:#000000;fill:#1a1a1a;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(31.28,0.42989)" />
+      <path
+         id="path5196-2"
+         style="color:#000000;fill:#1a1a1a;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(31.28,9.5901)" />
+      <path
+         id="rect5198-4"
+         style="color:#000000;fill:#4d4d4d;fill-rule:evenodd;stroke:#cccccc;stroke-width:0.050956"
+         inkscape:connector-curvature="0"
+         d="m 29.618,52.362 h 3.2457 v 11 h -3.246 z" />
+      <path
+         id="path5200-3"
+         style="color:#000000;fill:#1a1a1a;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(-26.357,0.42989)" />
+      <path
+         id="path5202-8"
+         style="color:#000000;fill:#1a1a1a;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(-26.357,9.5901)" />
+    </g>
+    <g
+       id="g5204-1"
+       transform="matrix(0.78017703,0,0,0.78017703,90.885763,467.36785)">
+      <path
+         id="rect5126-4"
+         style="color:#000000;fill:#4d4d4d;fill-rule:evenodd;stroke:#cccccc;stroke-width:0.20812"
+         inkscape:connector-curvature="0"
+         d="m 33,52.362 h 54.145 v 11 H 33 Z" />
+      <path
+         id="rect5128-8"
+         style="color:#000000;fill:#afdde9;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 38,54.362 h 18 v 2 H 38 Z" />
+      <path
+         id="path5130-0"
+         style="color:#000000;fill:#008080;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(0.0625,2.9375)" />
+      <path
+         id="path5132-1"
+         style="color:#000000;fill:#afdde9;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 79,55.362 c 0,0.55228 -0.44772,1 -1,1 -0.55228,0 -1,-0.44772 -1,-1 0,-0.55228 0.44772,-1 1,-1 0.55228,0 1,0.44772 1,1 z"
+         transform="translate(4)" />
+      <path
+         id="path5134-6"
+         style="color:#000000;fill:#008080;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(21.062,2.9375)" />
+      <path
+         id="path5136-2"
+         style="color:#000000;fill:#008080;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(19.062,2.9375)" />
+      <path
+         id="path5138-5"
+         style="color:#000000;fill:#008080;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(17.062,2.9375)" />
+      <g
+         id="g5140-1"
+         style="stroke:#1a1a1a;stroke-width:0.1">
+        <path
+           id="path5142-4"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="M 37.047,60.425 H 83.094"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5144-7"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 38.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5146-8"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 40.062,60.425 v 1.9579" />
+        <path
+           id="path5148-5"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 42.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5150-6"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 44.062,60.425 v 1.9579" />
+        <path
+           id="path5152-6"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 46.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5154-2"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 48.062,60.425 v 1.9579" />
+        <path
+           id="path5156-85"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 50.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5158-0"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 62.062,60.425 v 1.9579" />
+        <path
+           id="path5160-8"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 52.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5162-3"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 68.062,60.425 v 1.9579" />
+        <path
+           id="path5164-8"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 66.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5166-40"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 64.062,60.425 v 1.9579" />
+        <path
+           id="path5168-9"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 60.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5170-2"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 58.062,60.425 v 1.9579" />
+        <path
+           id="path5172-54"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 54.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5174-9"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 56.062,60.425 v 1.9579" />
+        <path
+           id="path5176-4"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 70.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5178-81"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 72.062,60.425 v 1.9579" />
+        <path
+           id="path5180-3"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 74.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5182-9"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 76.062,60.425 v 1.9579" />
+        <path
+           id="path5184-1"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 78.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5186-2"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 80.062,60.425 v 1.9579" />
+        <path
+           id="path5188-1"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 82.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+      </g>
+      <path
+         id="rect5192-1"
+         style="color:#000000;fill:#4d4d4d;fill-rule:evenodd;stroke:#cccccc;stroke-width:0.050956"
+         inkscape:connector-curvature="0"
+         d="m 87.255,52.362 h 3.2457 v 11 h -3.246 z" />
+      <path
+         id="path5194-7"
+         style="color:#000000;fill:#1a1a1a;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(31.28,0.42989)" />
+      <path
+         id="path5196-0"
+         style="color:#000000;fill:#1a1a1a;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(31.28,9.5901)" />
+      <path
+         id="rect5198-5"
+         style="color:#000000;fill:#4d4d4d;fill-rule:evenodd;stroke:#cccccc;stroke-width:0.050956"
+         inkscape:connector-curvature="0"
+         d="m 29.618,52.362 h 3.2457 v 11 h -3.246 z" />
+      <path
+         id="path5200-7"
+         style="color:#000000;fill:#1a1a1a;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(-26.357,0.42989)" />
+      <path
+         id="path5202-5"
+         style="color:#000000;fill:#1a1a1a;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(-26.357,9.5901)" />
+    </g>
+    <g
+       id="g5204-2-1"
+       transform="matrix(0.78017703,0,0,0.78017703,90.885763,478.63184)">
+      <path
+         id="rect5126-0-2"
+         style="color:#000000;fill:#4d4d4d;fill-rule:evenodd;stroke:#cccccc;stroke-width:0.20812"
+         inkscape:connector-curvature="0"
+         d="m 33,52.362 h 54.145 v 11 H 33 Z" />
+      <path
+         id="rect5128-0-4"
+         style="color:#000000;fill:#afdde9;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 38,54.362 h 18 v 2 H 38 Z" />
+      <path
+         id="path5130-9-3"
+         style="color:#000000;fill:#008080;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(0.0625,2.9375)" />
+      <path
+         id="path5132-4-7"
+         style="color:#000000;fill:#afdde9;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 79,55.362 c 0,0.55228 -0.44772,1 -1,1 -0.55228,0 -1,-0.44772 -1,-1 0,-0.55228 0.44772,-1 1,-1 0.55228,0 1,0.44772 1,1 z"
+         transform="translate(4)" />
+      <path
+         id="path5134-5-9"
+         style="color:#000000;fill:#008080;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(21.062,2.9375)" />
+      <path
+         id="path5136-6-8"
+         style="color:#000000;fill:#008080;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(19.062,2.9375)" />
+      <path
+         id="path5138-7-1"
+         style="color:#000000;fill:#008080;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(17.062,2.9375)" />
+      <g
+         id="g5140-6-3"
+         style="stroke:#1a1a1a;stroke-width:0.1">
+        <path
+           id="path5142-6-4"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="M 37.047,60.425 H 83.094"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5144-6-3"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 38.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5146-1-6"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 40.062,60.425 v 1.9579" />
+        <path
+           id="path5148-1-1"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 42.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5150-7-8"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 44.062,60.425 v 1.9579" />
+        <path
+           id="path5152-4-7"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 46.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5154-8-0"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 48.062,60.425 v 1.9579" />
+        <path
+           id="path5156-8-3"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 50.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5158-5-1"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 62.062,60.425 v 1.9579" />
+        <path
+           id="path5160-3-0"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 52.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5162-8-9"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 68.062,60.425 v 1.9579" />
+        <path
+           id="path5164-0-5"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 66.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5166-4-4"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 64.062,60.425 v 1.9579" />
+        <path
+           id="path5168-4-8"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 60.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5170-9-5"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 58.062,60.425 v 1.9579" />
+        <path
+           id="path5172-5-5"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 54.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5174-3-1"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 56.062,60.425 v 1.9579" />
+        <path
+           id="path5176-3-4"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 70.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5178-8-4"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 72.062,60.425 v 1.9579" />
+        <path
+           id="path5180-7-0"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 74.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5182-8-5"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 76.062,60.425 v 1.9579" />
+        <path
+           id="path5184-7-8"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 78.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5186-5-3"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 80.062,60.425 v 1.9579" />
+        <path
+           id="path5188-5-8"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 82.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+      </g>
+      <path
+         id="rect5192-4-8"
+         style="color:#000000;fill:#4d4d4d;fill-rule:evenodd;stroke:#cccccc;stroke-width:0.050956"
+         inkscape:connector-curvature="0"
+         d="m 87.255,52.362 h 3.2457 v 11 h -3.246 z" />
+      <path
+         id="path5194-4-1"
+         style="color:#000000;fill:#1a1a1a;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(31.28,0.42989)" />
+      <path
+         id="path5196-2-6"
+         style="color:#000000;fill:#1a1a1a;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(31.28,9.5901)" />
+      <path
+         id="rect5198-4-0"
+         style="color:#000000;fill:#4d4d4d;fill-rule:evenodd;stroke:#cccccc;stroke-width:0.050956"
+         inkscape:connector-curvature="0"
+         d="m 29.618,52.362 h 3.2457 v 11 h -3.246 z" />
+      <path
+         id="path5200-3-1"
+         style="color:#000000;fill:#1a1a1a;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(-26.357,0.42989)" />
+      <path
+         id="path5202-8-8"
+         style="color:#000000;fill:#1a1a1a;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(-26.357,9.5901)" />
+    </g>
+  </g>
+  <metadata
+     id="metadata162">
+    <rdf:RDF>
+      <cc:Work>
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+        <dc:publisher>
+          <cc:Agent
+             rdf:about="http://openclipart.org/">
+            <dc:title>Openclipart</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:title></dc:title>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+</svg>
diff --git a/res/themes/asbru-dark/asbru-edit.svg b/res/themes/asbru-dark/asbru-edit.svg
new file mode 100644
index 00000000..5b112806
--- /dev/null
+++ b/res/themes/asbru-dark/asbru-edit.svg
@@ -0,0 +1,587 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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="50"
+   height="50"
+   viewBox="0 0 50 50"
+   version="1.1"
+   id="svg3519"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="asbru-edit.svg">
+  <defs
+     id="defs3513">
+    <linearGradient
+       id="linearGradient24875"
+       y2="367.54999"
+       gradientUnits="userSpaceOnUse"
+       x2="379.88"
+       gradientTransform="matrix(0.7071,0.7071,-0.7071,0.7071,362.27,-93.062)"
+       y1="367.54999"
+       x1="368.17001"
+       inkscape:collect="always">
+      <stop
+         id="stop8086"
+         style="stop-color:#3F3F3F"
+         offset="0" />
+      <stop
+         id="stop8088"
+         style="stop-color:#FFFFFF"
+         offset=".3315" />
+      <stop
+         id="stop8090"
+         style="stop-color:#FFFFFF"
+         offset=".5281" />
+      <stop
+         id="stop8092"
+         style="stop-color:#333333"
+         offset=".6854" />
+      <stop
+         id="stop8094"
+         style="stop-color:#A4A4A4"
+         offset=".8427" />
+      <stop
+         id="stop8096"
+         style="stop-color:#9A9A9A"
+         offset=".8705" />
+      <stop
+         id="stop8098"
+         style="stop-color:#7D7D7D"
+         offset=".9192" />
+      <stop
+         id="stop8100"
+         style="stop-color:#4E4E4E"
+         offset=".9826" />
+      <stop
+         id="stop8102"
+         style="stop-color:#3F3F3F"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient24877"
+       y2="408.34"
+       gradientUnits="userSpaceOnUse"
+       x2="379.88"
+       gradientTransform="matrix(0.7071,0.7071,-0.7071,0.7071,362.27,-93.062)"
+       y1="408.34"
+       x1="368.17001"
+       inkscape:collect="always">
+      <stop
+         id="stop8107"
+         style="stop-color:#E4BD96"
+         offset="0" />
+      <stop
+         id="stop8109"
+         style="stop-color:#D59658"
+         offset=".2303" />
+      <stop
+         id="stop8111"
+         style="stop-color:#E4BD96"
+         offset=".5" />
+      <stop
+         id="stop8113"
+         style="stop-color:#D59658"
+         offset=".7753" />
+      <stop
+         id="stop8115"
+         style="stop-color:#E4BD96"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient24879"
+       y2="413.64001"
+       gradientUnits="userSpaceOnUse"
+       x2="376.51001"
+       gradientTransform="matrix(0.7071,0.7071,-0.7071,0.7071,362.27,-93.062)"
+       y1="414.03"
+       x1="372.07001"
+       inkscape:collect="always">
+      <stop
+         id="stop8120"
+         style="stop-color:#191919"
+         offset="0" />
+      <stop
+         id="stop8122"
+         style="stop-color:#666666"
+         offset=".3708" />
+      <stop
+         id="stop8124"
+         style="stop-color:#565656"
+         offset=".3921" />
+      <stop
+         id="stop8126"
+         style="stop-color:#3B3B3B"
+         offset=".4356" />
+      <stop
+         id="stop8128"
+         style="stop-color:#252525"
+         offset=".4857" />
+      <stop
+         id="stop8130"
+         style="stop-color:#161616"
+         offset=".5443" />
+      <stop
+         id="stop8132"
+         style="stop-color:#0D0D0D"
+         offset=".6166" />
+      <stop
+         id="stop8134"
+         style="stop-color:#060606"
+         offset=".7181" />
+      <stop
+         id="stop8136"
+         style="stop-color:#000000"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient24881"
+       y2="404.66"
+       gradientUnits="userSpaceOnUse"
+       x2="374.17001"
+       gradientTransform="matrix(0.7071,0.7071,-0.7071,0.7071,362.27,-93.062)"
+       y1="370.19"
+       x1="374.17001"
+       inkscape:collect="always">
+      <stop
+         id="stop8143"
+         style="stop-color:#FFFF00"
+         offset="0" />
+      <stop
+         id="stop8145"
+         style="stop-color:#FFEC00"
+         offset=".1047" />
+      <stop
+         id="stop8147"
+         style="stop-color:#FFD800"
+         offset=".2571" />
+      <stop
+         id="stop8149"
+         style="stop-color:#FFCA00"
+         offset=".4309" />
+      <stop
+         id="stop8151"
+         style="stop-color:#FFC200"
+         offset=".6427" />
+      <stop
+         id="stop8153"
+         style="stop-color:#FFBF00"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient24883"
+       y2="370.19"
+       gradientUnits="userSpaceOnUse"
+       x2="378.12"
+       gradientTransform="matrix(0.7071,0.7071,-0.7071,0.7071,362.27,-93.062)"
+       y1="402.64999"
+       x1="378.12"
+       inkscape:collect="always">
+      <stop
+         id="stop8158"
+         style="stop-color:#FFBF00"
+         offset="0" />
+      <stop
+         id="stop8160"
+         style="stop-color:#F2B407"
+         offset=".0202" />
+      <stop
+         id="stop8162"
+         style="stop-color:#BC8712"
+         offset=".128" />
+      <stop
+         id="stop8164"
+         style="stop-color:#946818"
+         offset=".2457" />
+      <stop
+         id="stop8166"
+         style="stop-color:#78531A"
+         offset=".3747" />
+      <stop
+         id="stop8168"
+         style="stop-color:#67461B"
+         offset=".521" />
+      <stop
+         id="stop8170"
+         style="stop-color:#5D3F1B"
+         offset=".6993" />
+      <stop
+         id="stop8172"
+         style="stop-color:#5A3D1B"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient24885"
+       y2="370.19"
+       gradientUnits="userSpaceOnUse"
+       x2="369.95999"
+       gradientTransform="matrix(0.7071,0.7071,-0.7071,0.7071,362.27,-93.062)"
+       y1="402.23001"
+       x1="369.95999"
+       inkscape:collect="always">
+      <stop
+         id="stop8177"
+         style="stop-color:#FFBF00"
+         offset="0" />
+      <stop
+         id="stop8179"
+         style="stop-color:#F2B407"
+         offset=".0202" />
+      <stop
+         id="stop8181"
+         style="stop-color:#BC8712"
+         offset=".128" />
+      <stop
+         id="stop8183"
+         style="stop-color:#946818"
+         offset=".2457" />
+      <stop
+         id="stop8185"
+         style="stop-color:#78531A"
+         offset=".3747" />
+      <stop
+         id="stop8187"
+         style="stop-color:#67461B"
+         offset=".521" />
+      <stop
+         id="stop8189"
+         style="stop-color:#5D3F1B"
+         offset=".6993" />
+      <stop
+         id="stop8191"
+         style="stop-color:#5A3D1B"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient24887"
+       y2="385.26999"
+       gradientUnits="userSpaceOnUse"
+       x2="511.01999"
+       gradientTransform="matrix(-0.6676,-0.0135,0.0308,-1.5277,669.76,1053.2)"
+       y1="385.26999"
+       x1="504.91"
+       inkscape:collect="always">
+      <stop
+         id="stop8230"
+         style="stop-color:#FFFFFF"
+         offset="0" />
+      <stop
+         id="stop8232"
+         style="stop-color:#070606"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient24889"
+       y2="281.03"
+       gradientUnits="userSpaceOnUse"
+       x2="382.51001"
+       gradientTransform="matrix(0.6676,0.0135,-0.0308,1.5277,101.91,23.36)"
+       y1="281.03"
+       x1="376.39001"
+       inkscape:collect="always">
+      <stop
+         id="stop8237"
+         style="stop-color:#FFFFFF"
+         offset="0" />
+      <stop
+         id="stop8239"
+         style="stop-color:#070606"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient24891"
+       y2="348.26001"
+       gradientUnits="userSpaceOnUse"
+       x2="421.85001"
+       gradientTransform="matrix(0.0268,0.6979,1.5269,-0.0586,-202.31,183.83)"
+       y1="348.26001"
+       x1="415.73999"
+       inkscape:collect="always">
+      <stop
+         id="stop8246"
+         style="stop-color:#FFFFFF"
+         offset="0" />
+      <stop
+         id="stop8248"
+         style="stop-color:#070606"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient24893"
+       y2="317.95001"
+       gradientUnits="userSpaceOnUse"
+       x2="472.57001"
+       gradientTransform="matrix(-0.0268,-0.6979,-1.5269,0.0586,838.57,760.49)"
+       y1="317.95001"
+       x1="466.45999"
+       inkscape:collect="always">
+      <stop
+         id="stop8253"
+         style="stop-color:#FFFFFF"
+         offset="0" />
+      <stop
+         id="stop8255"
+         style="stop-color:#070606"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient24895"
+       y2="359.76999"
+       gradientUnits="userSpaceOnUse"
+       x2="373.92999"
+       gradientTransform="matrix(0.7071,0.7071,-0.7071,0.7071,362.27,-93.062)"
+       y1="357.67999"
+       x1="373.92999"
+       inkscape:collect="always">
+      <stop
+         id="stop8262"
+         style="stop-color:#FFFFFF"
+         offset="0" />
+      <stop
+         id="stop8264"
+         style="stop-color:#FAFAFA"
+         offset=".1075" />
+      <stop
+         id="stop8266"
+         style="stop-color:#ECECEC"
+         offset=".2312" />
+      <stop
+         id="stop8268"
+         style="stop-color:#D5D5D5"
+         offset=".363" />
+      <stop
+         id="stop8270"
+         style="stop-color:#B5B5B5"
+         offset=".5005" />
+      <stop
+         id="stop8272"
+         style="stop-color:#8B8B8B"
+         offset=".6425" />
+      <stop
+         id="stop8274"
+         style="stop-color:#585858"
+         offset=".7882" />
+      <stop
+         id="stop8276"
+         style="stop-color:#1D1D1D"
+         offset=".9342" />
+      <stop
+         id="stop8278"
+         style="stop-color:#000000"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient24897"
+       y2="373.48001"
+       gradientUnits="userSpaceOnUse"
+       x2="439.42001"
+       gradientTransform="matrix(0.7208,0.7218,-2.8534,2.8493,1118.2,-943.64)"
+       y1="373.48001"
+       x1="433.31"
+       inkscape:collect="always">
+      <stop
+         id="stop8285"
+         style="stop-color:#FFFFFF"
+         offset="0" />
+      <stop
+         id="stop8287"
+         style="stop-color:#070606"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient24899"
+       y2="293.31"
+       gradientUnits="userSpaceOnUse"
+       x2="453.57001"
+       gradientTransform="matrix(-0.7208,-0.7218,2.8534,-2.8493,-149.55,1592)"
+       y1="293.31"
+       x1="447.45999"
+       inkscape:collect="always">
+      <stop
+         id="stop8292"
+         style="stop-color:#FFFFFF"
+         offset="0" />
+      <stop
+         id="stop8294"
+         style="stop-color:#070606"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient24901"
+       y2="377.45999"
+       gradientUnits="userSpaceOnUse"
+       x2="523"
+       gradientTransform="matrix(-0.7208,-0.7218,2.8534,-2.8493,-335.13,1877.4)"
+       y1="377.45999"
+       x1="516.89001"
+       inkscape:collect="always">
+      <stop
+         id="stop8301"
+         style="stop-color:#FFFFFF"
+         offset="0" />
+      <stop
+         id="stop8303"
+         style="stop-color:#070606"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient24903"
+       y2="289.32999"
+       gradientUnits="userSpaceOnUse"
+       x2="369.98999"
+       gradientTransform="matrix(0.7208,0.7218,-2.8534,2.8493,932.61,-658.29)"
+       y1="289.32999"
+       x1="363.88"
+       inkscape:collect="always">
+      <stop
+         id="stop8308"
+         style="stop-color:#FFFFFF"
+         offset="0" />
+      <stop
+         id="stop8310"
+         style="stop-color:#070606"
+         offset="1" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.919596"
+     inkscape:cx="-18.556451"
+     inkscape:cy="-10.736188"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="2560"
+     inkscape:window-height="1412"
+     inkscape:window-x="0"
+     inkscape:window-y="28"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata3516">
+    <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 />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-283.77083)">
+    <path
+       d="m 48.529996,293.99022 c 2.319869,-2.32778 -5.779876,-10.61854 -8.200694,-8.20069 -2.035823,2.03384 -4.956442,4.95545 -4.956442,4.95545 l 8.200695,8.19971 c 9.89e-4,0 2.837483,-2.83749 4.956441,-4.95447 z"
+       inkscape:connector-curvature="0"
+       style="fill:#bf0000;stroke-width:0.98970485"
+       id="path8083" />
+    <polygon
+       points="368.49,437.95 373.5,432.94 365.22,424.66 360.2,429.67 "
+       style="fill:url(#linearGradient24875)"
+       id="polygon8104"
+       transform="matrix(0.98970484,0,0,0.98970484,-324.11367,-131.50368)" />
+    <polygon
+       points="331.55,466.54 340.29,449.59 348.57,457.87 "
+       style="fill:url(#linearGradient24877)"
+       id="polygon8117"
+       transform="matrix(0.98970484,0,0,0.98970484,-324.11367,-131.50368)" />
+    <polygon
+       points="331.55,466.54 338.04,463.23 334.88,460.07 "
+       style="fill:url(#linearGradient24879)"
+       id="polygon8138"
+       transform="matrix(0.98970484,0,0,0.98970484,-324.11367,-131.50368)" />
+    <g
+       id="g8140"
+       transform="matrix(0.98970484,0,0,0.98970484,-324.11367,-131.50368)">
+      <polygon
+         points="365.1,433.29 363.33,431.52 351.78,443.07 341.51,453.35 341.14,453.48 340.75,453.87 340.73,457.66 344.46,457.64 344.81,456.65 355.08,446.37 366.63,434.82 "
+         style="fill:url(#linearGradient24881)"
+         id="polygon8155" />
+      <polyline
+         points="343.72 457.81 348.57 457.87 358.85 447.59 369.12 437.31 366.63 434.82 355.08 446.37 343.68 457.77"
+         style="fill:url(#linearGradient24883)"
+         id="polyline8174" />
+      <polyline
+         points="341.51 453.35 351.78 443.07 363.33 431.52 360.85 429.03 350.57 439.31 340.29 449.59 340.72 454.22"
+         style="fill:url(#linearGradient24885)"
+         id="polyline8193" />
+    </g>
+    <g
+       style="opacity:0.6"
+       id="g8227"
+       transform="matrix(0.98970484,0,0,0.98970484,-324.11367,-131.50368)">
+      <polygon
+         points="340.72,457.64 340.72,457.68 344.54,457.98 344.56,457.55 "
+         style="fill:url(#linearGradient24887)"
+         id="polygon8234" />
+      <polygon
+         points="348.37,457.79 344.54,457.55 344.52,457.98 348.37,457.88 "
+         style="fill:url(#linearGradient24889)"
+         id="polygon8241" />
+    </g>
+    <g
+       style="opacity:0.3"
+       id="g8243"
+       transform="matrix(0.98970484,0,0,0.98970484,-324.11367,-131.50368)">
+      <polygon
+         points="340.8,457.56 340.75,457.57 340.37,453.57 340.8,453.55 "
+         style="fill:url(#linearGradient24891)"
+         id="polygon8250" />
+      <polygon
+         points="340.49,449.57 340.8,453.57 340.37,453.59 340.4,449.58 "
+         style="fill:url(#linearGradient24893)"
+         id="polygon8257" />
+    </g>
+    <g
+       style="opacity:0.4"
+       id="g8259"
+       transform="matrix(0.98970484,0,0,0.98970484,-324.11367,-131.50368)">
+      <path
+         d="m 368.81,421.68 c 0.497,1.194 2.282,2.853 3.47,4.036 1.199,1.201 2.859,3.009 4.062,3.513 0.33,-1.042 -1.069,-3.456 -2.579,-4.968 -1.506,-1.503 -3.908,-2.901 -4.953,-2.581 z"
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient24895)"
+         id="path8280" />
+    </g>
+    <g
+       style="opacity:0.6"
+       id="g8282"
+       transform="matrix(0.98970484,0,0,0.98970484,-324.11367,-131.50368)">
+      <polygon
+         points="369,437.4 369.09,437.31 365.12,432.99 364.56,433.56 "
+         style="fill:url(#linearGradient24897)"
+         id="polygon8289" />
+      <polygon
+         points="360.74,429.13 364.58,433.58 365.15,433.02 360.9,428.97 "
+         style="fill:url(#linearGradient24899)"
+         id="polygon8296" />
+    </g>
+    <g
+       style="opacity:0.6"
+       id="g8298"
+       transform="matrix(0.98970484,0,0,0.98970484,-324.11367,-131.50368)">
+      <polygon
+         points="365.19,424.64 365.1,424.72 369.06,429.05 369.62,428.48 "
+         style="fill:url(#linearGradient24901)"
+         id="polygon8305" />
+      <polygon
+         points="373.44,432.91 369.61,428.46 369.04,429.02 373.28,433.08 "
+         style="fill:url(#linearGradient24903)"
+         id="polygon8312" />
+    </g>
+  </g>
+</svg>
diff --git a/res/themes/asbru-dark/asbru-help.svg b/res/themes/asbru-dark/asbru-help.svg
new file mode 100644
index 00000000..4f91a4f0
--- /dev/null
+++ b/res/themes/asbru-dark/asbru-help.svg
@@ -0,0 +1,66 @@
+<?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"
+   height="32"
+   version="1.1"
+   viewBox="0 0 32 32"
+   width="32"
+   id="svg9"
+   sodipodi:docname="asbru_method_generic.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata13">
+    <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>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview11"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="-14.440678"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg9" />
+  <defs
+     id="defs4" />
+  <g
+     id="Icons with numbers"
+     style="fill:#00aad4;fill-rule:evenodd;stroke:none;stroke-width:0.5"
+     transform="scale(2)">
+    <g
+       id="Group"
+       transform="translate(-48,-432)"
+       style="fill:#00aad4;stroke-width:0.5">
+      <path
+         d="M 54.879684,443.0591 V 445 h 2.351085 v -1.9409 z M 56,448 c -4.418278,0 -8,-3.58172 -8,-8 0,-4.41828 3.581722,-8 8,-8 4.418278,0 8,3.58172 8,8 0,4.41828 -3.581722,8 -8,8 z m -2.42998,-12.48959 c -0.983569,0.5328 -1.506903,1.4372 -1.57002,2.71323 h 2.280079 c 0,-0.37162 0.127546,-0.72979 0.382643,-1.07455 0.255097,-0.34475 0.687702,-0.51712 1.29783,-0.51712 0.620648,0 1.047994,0.13991 1.282052,0.41974 0.234057,0.27983 0.351084,0.58988 0.351084,0.93016 0,0.2955 -0.105193,0.56637 -0.315582,0.81262 l -0.457593,0.39624 -0.575937,0.38281 c -0.56805,0.37609 -0.920447,0.70853 -1.057199,0.99731 -0.136753,0.28879 -0.220907,0.81151 -0.252466,1.56817 h 2.130178 c 0.0053,-0.35818 0.03945,-0.62234 0.102564,-0.79248 0.09994,-0.26864 0.302431,-0.50369 0.607495,-0.70517 l 0.560158,-0.36938 c 0.56805,-0.37609 0.952004,-0.68502 1.151874,-0.92679 C 59.829062,438.94672 60,438.45646 60,437.87441 60,436.92522 59.606842,436.20887 58.820513,435.72532 58.034184,435.24177 57.046686,435 55.857988,435 c -0.904672,0 -1.667321,0.17014 -2.287968,0.51041 z m 0,0"
+         id="Oval 318"
+         inkscape:connector-curvature="0"
+         style="stroke-width:0.5;fill:#00aad4" />
+    </g>
+  </g>
+</svg>
diff --git a/res/themes/asbru-dark/asbru-preferences.svg b/res/themes/asbru-dark/asbru-preferences.svg
new file mode 100644
index 00000000..16253cbf
--- /dev/null
+++ b/res/themes/asbru-dark/asbru-preferences.svg
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--part of the rodentia icon theme by sixsixfive released under CC0 (https://creativecommons.org/publicdomain/zero/1.0/) on openclipart-->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 48 48">
+ <defs id="0">
+  <linearGradient id="F">
+   <stop id="b" stop-color="#555753"/>
+   <stop id="c" offset="1" stop-color="#eeeeec"/>
+  </linearGradient>
+  <linearGradient id="G">
+   <stop id="d" stop-color="#fff" stop-opacity="0.8"/>
+   <stop id="e" offset="1" stop-color="#fff" stop-opacity="0"/>
+  </linearGradient>
+  <linearGradient id="H">
+   <stop id="f" stop-color="#2e3436"/>
+   <stop id="g" offset="1" stop-color="#555753"/>
+  </linearGradient>
+  <linearGradient id="I">
+   <stop id="h" stop-color="#eeeeec"/>
+   <stop id="i" offset="1" stop-color="#d3d7cf"/>
+  </linearGradient>
+  <linearGradient id="J">
+   <stop id="j" stop-color="#d3d7cf"/>
+   <stop id="k" offset="1" stop-color="#babdb6"/>
+  </linearGradient>
+  <linearGradient id="K">
+   <stop id="l" stop-color="#2e3436"/>
+   <stop id="m" offset="1" stop-color="#2e3436" stop-opacity="0"/>
+  </linearGradient>
+  <radialGradient cx="24.708" cy="42.11" r="22.16" id="L" xlink:href="#K" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.09589041,0,38.073311)"/>
+  <linearGradient y1="9.03" x2="0" y2="38.969" id="M" xlink:href="#J" gradientUnits="userSpaceOnUse"/>
+  <linearGradient y1="8.979" x2="0" y2="39.02" id="N" xlink:href="#G" gradientUnits="userSpaceOnUse"/>
+  <linearGradient y1="36.22" x2="0" y2="11.781" id="O" xlink:href="#J" gradientUnits="userSpaceOnUse"/>
+  <linearGradient x1="12.28" x2="16.719" id="P" xlink:href="#H" gradientUnits="userSpaceOnUse"/>
+  <linearGradient x1="21.78" x2="26.22" id="Q" xlink:href="#H" gradientUnits="userSpaceOnUse"/>
+  <linearGradient x1="31.18" x2="35.619" id="R" xlink:href="#H" gradientUnits="userSpaceOnUse"/>
+  <linearGradient y1="35.19" x2="0" y2="12.813" id="S" xlink:href="#G" gradientUnits="userSpaceOnUse"/>
+  <linearGradient y1="20.16" x2="0" y2="23.594" id="T" xlink:href="#I" gradientUnits="userSpaceOnUse"/>
+  <linearGradient y1="14.515" x2="0" y2="33.485" id="U" xlink:href="#F" gradientUnits="userSpaceOnUse"/>
+ </defs>
+ <path d="m 46.866049,42.111389 a 22.158171,2.1247561 0 1 1 -44.3163416,0 22.158171,2.1247561 0 1 1 44.3163416,0 z" transform="matrix(1.0493151,0,0,-1.4518947,-1.9263496,100.27038)" id="1" opacity="0.8" fill="url(#L)"/>
+ <path d="m 5.21875,7.9375 c -1.108,0 -2,0.892 -2,2 l 0,28.125 c 0,1.108 0.892,2 2,2 l 37.5625,0 c 1.108,0 2,-0.892 2,-2 l 0,-28.125 c 0,-1.108 -0.892,-2 -2,-2 l -37.5625,0 z" id="2" fill="#555753"/>
+ <path d="m 5.21875,9.03125 c -0.5241331,0 -0.90625,0.3821169 -0.90625,0.90625 l 0,28.125 c 0,0.524133 0.3821169,0.90625 0.90625,0.90625 l 37.5625,0 c 0.524133,0 0.90625,-0.382117 0.90625,-0.90625 l 0,-28.125 c 0,-0.5241331 -0.382117,-0.90625 -0.90625,-0.90625 l -37.5625,0 z" id="3" fill="url(#M)"/>
+ <path d="m 5.21875,9.5 c -0.2768191,0 -0.4375,0.1606809 -0.4375,0.4375 l 0,28.125 c 0,0.276819 0.1606809,0.4375 0.4375,0.4375 l 37.5625,0 c 0.276819,0 0.4375,-0.160681 0.4375,-0.4375 l 0,-28.125 C 43.21875,9.6606809 43.058069,9.5 42.78125,9.5 l -37.5625,0 z" id="4" opacity="0.8" fill="none" stroke="url(#N)" stroke-linejoin="round" stroke-linecap="round" stroke-width="1.042"/>
+ <path d="m 7.5625,12.28125 0,23.4375 32.875,0 0,-23.4375 -32.875,0 z" id="5" fill="url(#O)" stroke="#888a85"/>
+ <g id="6" stroke="url(#U)">
+  <rect width="4.439" height="18" x="21.78" y="15" id="V" fill="url(#Q)" stroke-linejoin="round" stroke-linecap="square" stroke-width="0.97" rx="2.1"/>
+  <rect width="4.439" height="18" x="12.28" y="15" id="W" fill="url(#P)" stroke-linejoin="round" stroke-linecap="square" stroke-width="0.97" rx="2.1"/>
+  <rect width="4.439" height="18" x="31.18" y="15" id="X" fill="url(#R)" stroke-linejoin="round" stroke-linecap="square" stroke-width="0.97" rx="2.1"/>
+ </g>
+ <g id="7">
+  <rect width="8.698" height="5.125" x="10.151" y="19.802" id="Y" fill="#2e3436" rx="1"/>
+  <rect width="8.698" height="5.125" x="19.651" y="25.862" id="Z" fill="#2e3436" rx="1"/>
+  <rect width="8.698" height="5.125" x="29.05" y="19.802" id="a" fill="#2e3436" rx="1"/>
+ </g>
+ <rect width="8.698" height="5.125" x="10.151" y="19.302" id="8" fill="#888a85" rx="1"/>
+ <path d="M 11.15625,20.15625 C 11.052832,20.15625 11,20.209082 11,20.3125 l 0,3.125 c 0,0.103418 0.05283,0.15625 0.15625,0.15625 l 6.6875,0 C 17.947168,23.59375 18,23.54092 18,23.4375 l 0,-3.125 c 0,-0.103417 -0.05283,-0.15625 -0.15625,-0.15625 l -6.6875,0 z" id="9" fill="url(#T)"/>
+ <rect width="8.698" height="5.125" x="19.651" y="25.363" id="A" fill="#888a85" rx="1"/>
+ <path d="M 11.15625,20.15625 C 11.052832,20.15625 11,20.209082 11,20.3125 l 0,3.125 c 0,0.103418 0.05283,0.15625 0.15625,0.15625 l 6.6875,0 C 17.947168,23.59375 18,23.54092 18,23.4375 l 0,-3.125 c 0,-0.103417 -0.05283,-0.15625 -0.15625,-0.15625 l -6.6875,0 z" transform="translate(9.5002949,6.0606237)" id="B" fill="url(#T)"/>
+ <rect width="8.698" height="5.125" x="29.05" y="19.302" id="C" fill="#888a85" rx="1"/>
+ <path d="M 11.15625,20.15625 C 11.052832,20.15625 11,20.209082 11,20.3125 l 0,3.125 c 0,0.103418 0.05283,0.15625 0.15625,0.15625 l 6.6875,0 C 17.947168,23.59375 18,23.54092 18,23.4375 l 0,-3.125 c 0,-0.103417 -0.05283,-0.15625 -0.15625,-0.15625 l -6.6875,0 z" transform="translate(18.900005,-4.6484992e-8)" id="D" fill="url(#T)"/>
+ <path d="m 8.59375,13.3125 0,21.375 30.8125,0 0,-21.375 -30.8125,0 z" id="E" opacity="0.8" fill="none" stroke="url(#S)"/>
+</svg>
diff --git a/res/themes/asbru-dark/asbru-scripts-manager.svg b/res/themes/asbru-dark/asbru-scripts-manager.svg
new file mode 100644
index 00000000..78784a63
--- /dev/null
+++ b/res/themes/asbru-dark/asbru-scripts-manager.svg
@@ -0,0 +1,53 @@
+<?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"
+   height="50"
+   version="1.1"
+   viewBox="0 0 50 50"
+   width="50"
+   xml:space="preserve"
+   id="svg8"
+   sodipodi:docname="asbru-scripts-manager.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
+     id="metadata14"><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="defs12" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview10"
+     showgrid="false"
+     inkscape:zoom="12.977448"
+     inkscape:cx="26.865016"
+     inkscape:cy="24.757956"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg8" /><rect
+     style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:7.55905533;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+     id="rect816"
+     width="37.294964"
+     height="46.987442"
+     x="5.9805918"
+     y="0.37190047" /><path
+     d="M 43.435991,2.8232009 H 40.690016 9.2413148 V 47.792534 50.052677 H 43.435991 Z M 28.627135,30.614031 c -0.587239,-0.587109 -1.397342,-0.95174 -2.288162,-0.95174 -0.895317,0 -1.705421,0.364631 -2.288674,0.95174 -0.58724,0.583384 -0.947757,1.393487 -0.947757,2.288677 0,0.891203 0.360388,1.70118 0.947757,2.288675 0.583253,0.583256 1.393357,0.947885 2.288674,0.947885 0.89082,0 1.700923,-0.364629 2.288162,-0.947885 0.58724,-0.587367 0.948142,-1.397472 0.948142,-2.288675 0,-0.89519 -0.360902,-1.705293 -0.948142,-2.288677 z m -2.288162,-1.944226 c 1.16651,0 2.227755,0.474008 2.993261,1.239643 0.765505,0.765506 1.239641,1.822766 1.239641,2.99326 0,1.166508 -0.474007,2.227881 -1.239641,2.993388 -0.765378,0.765506 -1.826751,1.239513 -2.993261,1.239513 -1.170879,0 -2.227755,-0.474007 -2.993645,-1.239513 -0.765505,-0.765507 -1.239511,-1.82688 -1.239511,-2.993388 0,-1.170494 0.474006,-2.227754 1.239511,-2.99326 0.76589,-0.765635 1.822639,-1.239643 2.993645,-1.239643 z m -10.673506,4.961778 v -1.887416 l 2.884013,-0.433521 0.109247,-0.46578 0.138038,-0.461669 -2.280579,-1.814799 1.158412,-2.005016 2.713971,1.065229 0.328001,-0.348308 0.352677,-0.328129 -1.069471,-2.713842 2.005018,-1.158412 1.818654,2.280322 0.457812,-0.13778 0.465524,-0.109249 0.433521,-2.884012 h 2.31708 l 0.433522,2.884012 0.465394,0.109249 0.457941,0.13778 1.818654,-2.280322 2.005018,1.158412 -1.069471,2.713842 0.352806,0.328129 0.323887,0.348308 2.718085,-1.065229 1.158413,2.005016 -2.284694,1.814799 0.142024,0.461669 0.109247,0.46578 2.884011,0.433521 v 2.316825 l -2.884011,0.433263 -0.109247,0.461925 -0.142024,0.461796 2.284694,1.814541 -1.158413,2.009259 -2.718085,-1.069341 -0.323887,0.348307 -0.352806,0.327999 1.069471,2.713972 -2.005018,1.15854 -1.818654,-2.28045 -0.457941,0.137652 -0.465394,0.113361 -0.433522,2.884012 h -2.31708 l -0.433521,-2.888125 -0.465524,-0.109376 -0.457812,-0.137653 -1.818654,2.280452 -2.005018,-1.158541 1.069471,-2.713971 -0.348693,-0.328001 c -0.113231,-0.109377 -0.222737,-0.22685 -0.327872,-0.348308 l -2.718084,1.069343 -1.158412,-2.009259 2.280579,-1.814541 -0.138038,-0.461797 -0.109247,-0.461925 -2.884013,-0.433264 z m 0.996339,-0.728875 v 0.299723 l 2.750603,0.413213 0.0563,0.364504 c 0.0365,0.247284 0.08933,0.490201 0.150247,0.720905 0.06439,0.247158 0.141637,0.482234 0.230963,0.704842 l 0.129427,0.340211 -2.17493,1.733568 0.30358,0.522461 2.588144,-1.016646 0.230961,0.283401 c 0.146136,0.182508 0.312192,0.368743 0.494444,0.54701 0.174023,0.178267 0.360388,0.344323 0.550736,0.498171 l 0.283659,0.230833 -1.016647,2.5884 0.522334,0.299726 1.733954,-2.171203 0.340082,0.129811 c 0.218752,0.08496 0.457812,0.161945 0.700472,0.226722 0.247155,0.0649 0.486214,0.117474 0.725404,0.153976 l 0.360389,0.05668 0.417326,2.750346 h 0.603561 l 0.413086,-2.750346 0.36039,-0.05668 c 0.247284,-0.04049 0.490329,-0.08907 0.721291,-0.153976 0.250757,-0.06478 0.485702,-0.141765 0.708568,-0.226722 l 0.340083,-0.129811 1.729842,2.171203 0.522332,-0.299726 -1.016775,-2.592384 0.283787,-0.226849 c 0.186235,-0.153848 0.372471,-0.319904 0.550737,-0.498171 0.182251,-0.182379 0.348693,-0.364502 0.494314,-0.54701 l 0.230963,-0.283401 2.588272,1.016646 0.303581,-0.522461 -2.17506,-1.733568 0.129426,-0.340211 c 0.08521,-0.226849 0.166443,-0.461926 0.230963,-0.704842 0.06092,-0.230704 0.113746,-0.473748 0.150249,-0.720905 l 0.05642,-0.364504 2.750473,-0.413213 v -0.603432 l -2.750473,-0.413214 -0.05642,-0.360518 c -0.0365,-0.251142 -0.08933,-0.490072 -0.150249,-0.725147 -0.06452,-0.243046 -0.145749,-0.477864 -0.230963,-0.704713 l -0.129426,-0.34021 2.17506,-1.729586 -0.303581,-0.526573 -2.588272,1.020631 -0.230963,-0.287514 c -0.145626,-0.182251 -0.312068,-0.364632 -0.494319,-0.546883 -0.178266,-0.178266 -0.364502,-0.344194 -0.550737,-0.498168 l -0.283787,-0.22685 1.016775,-2.588401 -0.522332,-0.303709 -1.729842,2.171073 -0.340083,-0.129682 c -0.222736,-0.08496 -0.457811,-0.161944 -0.708568,-0.226851 -0.230962,-0.06066 -0.474007,-0.11336 -0.721291,-0.153717 l -0.36039,-0.0527 -0.413086,-2.750344 h -0.603561 l -0.417326,2.746361 -0.360389,0.05668 c -0.23906,0.03637 -0.47812,0.08907 -0.725404,0.153717 -0.24266,0.06491 -0.48172,0.141894 -0.700472,0.226851 l -0.340082,0.133668 -1.733954,-2.175059 -0.522334,0.303709 1.016647,2.588401 -0.283659,0.22685 c -0.190348,0.153974 -0.376713,0.324016 -0.550736,0.498168 -0.182252,0.182251 -0.348179,0.364632 -0.494444,0.546883 l -0.230961,0.287514 -2.588144,-1.020631 -0.30358,0.526573 2.17493,1.729586 -0.129427,0.34021 c -0.08933,0.222737 -0.166443,0.457684 -0.230963,0.704713 -0.06092,0.230962 -0.113746,0.474005 -0.150247,0.721035 l -0.0563,0.364502 -2.750603,0.413214 z M 12.817828,6.7685876 c -0.275176,0 -0.498041,-0.2228652 -0.498041,-0.4943144 0,-0.2754326 0.222865,-0.498169 0.498041,-0.498169 h 9.369089 c 0.27556,0 0.498426,0.2227364 0.498426,0.498169 0,0.2713203 -0.222866,0.4943144 -0.498426,0.4943144 z m 0,3.0986535 c -0.275176,0 -0.498041,-0.222867 -0.498041,-0.4983 0,-0.27556 0.222865,-0.498169 0.498041,-0.498169 h 9.369089 c 0.27556,0 0.498426,0.222609 0.498426,0.498169 0,0.275433 -0.222866,0.4983 -0.498426,0.4983 z m 0,3.3375809 c -0.275176,0 -0.498041,-0.222736 -0.498041,-0.498169 0,-0.27132 0.222865,-0.498299 0.498041,-0.498299 h 26.555559 c 0.275691,0 0.498427,0.226979 0.498427,0.498299 0,0.275433 -0.222736,0.498169 -0.498427,0.498169 z m 0,3.341825 c -0.275176,0 -0.498041,-0.222865 -0.498041,-0.498299 0,-0.27556 0.222865,-0.498298 0.498041,-0.498298 h 26.555559 c 0.275691,0 0.498427,0.222738 0.498427,0.498298 0,0.275434 -0.222736,0.498299 -0.498427,0.498299 z m 0,3.337583 c -0.275176,0 -0.498041,-0.222736 -0.498041,-0.494185 0,-0.275561 0.222865,-0.498169 0.498041,-0.498169 h 26.555559 c 0.275691,0 0.498427,0.222608 0.498427,0.498169 0,0.27132 -0.222736,0.494185 -0.498427,0.494185 z M 8.7428888,1.8267331 H 40.179379 V 0.05267758 H 37.676321 5.9805918 V 45.188069 47.282284 h 2.264384 V 2.325031 c 0,-0.2755615 0.222737,-0.4982979 0.497913,-0.4982979 z"
+     style="clip-rule:evenodd;fill:#ffcc00;fill-rule:evenodd;stroke-width:1"
+     id="path2"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccccccscscscscscscscscscccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccsccccccccccccccccccccccccccccccccsssssssssssssssssssssssssssssssssssscccccccss" /><g
+     id="Layer_1"
+     transform="translate(0,-462)" /></svg>
\ No newline at end of file
diff --git a/res/themes/asbru-dark/asbru-wol.svg b/res/themes/asbru-dark/asbru-wol.svg
new file mode 100644
index 00000000..071ad8c3
--- /dev/null
+++ b/res/themes/asbru-dark/asbru-wol.svg
@@ -0,0 +1,270 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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"
+   id="svg3389"
+   sodipodi:docname="asbru-wol.svg"
+   viewBox="0 0 50 50"
+   version="1.1"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   width="50"
+   height="50">
+  <defs
+     id="defs3391">
+    <filter
+       id="filter18963-0"
+       width="1.122"
+       y="-2.1965001"
+       x="-0.061012998"
+       height="5.3929"
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         id="feGaussianBlur18965-9"
+         stdDeviation="3.889576"
+         inkscape:collect="always" />
+    </filter>
+    <linearGradient
+       id="linearGradient3534"
+       y2="1186.4"
+       gradientUnits="userSpaceOnUse"
+       y1="1113.2"
+       gradientTransform="matrix(0.4426619,0,0,0.4380449,-698.43282,-277.88632)"
+       x2="1627.3"
+       x1="1577"
+       inkscape:collect="always">
+      <stop
+         id="stop18945-8"
+         style="stop-color:#ffffff"
+         offset="0" />
+      <stop
+         id="stop18947-2"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <filter
+       id="filter22422-4"
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         id="feGaussianBlur22424-5"
+         stdDeviation="1.2317302"
+         inkscape:collect="always" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     bordercolor="#666666"
+     inkscape:pageshadow="2"
+     inkscape:window-y="28"
+     pagecolor="#ffffff"
+     inkscape:window-height="1412"
+     inkscape:window-maximized="1"
+     inkscape:zoom="15.839192"
+     inkscape:window-x="0"
+     showgrid="false"
+     borderopacity="1.0"
+     inkscape:current-layer="layer4"
+     inkscape:cx="48.633059"
+     inkscape:cy="18.175828"
+     inkscape:window-width="2560"
+     inkscape:pageopacity="0.0"
+     inkscape:document-units="px" />
+  <g
+     id="layer5"
+     inkscape:label="background"
+     inkscape:groupmode="layer"
+     transform="translate(0,-220)">
+    <rect
+       id="rect17756"
+       style="fill:#333333;stroke-width:0.18394427"
+       ry="6.839232"
+       height="42.779919"
+       width="43.030083"
+       y="220.75952"
+       x="1.3548651" />
+  </g>
+  <g
+     id="layer2"
+     inkscape:label="shadow"
+     inkscape:groupmode="layer"
+     transform="translate(0,-220)">
+    <ellipse
+       id="path18953"
+       style="fill:#000000;filter:url(#filter18963-0)"
+       transform="matrix(0.25662065,0,0,0.31141765,-422.33246,-423.69894)"
+       cx="1732.25"
+       cy="2215.875"
+       rx="76.5"
+       ry="2.125" />
+    <path
+       id="rect17756-0"
+       sodipodi:nodetypes="ccccccc"
+       style="fill:url(#linearGradient3534);stroke-width:0.18394427"
+       d="m 8.758788,221.43317 h 28.835103 c 2.957272,0.13552 4.239916,1.46697 4.239916,1.46697 -21.273155,15.17173 -33.628692,27.95218 -36.9470465,39.28499 0,0 -2.9053997,-3.22289 -2.9053997,-5.51152 v -28.53528 c -0.2630219,-3.71512 2.6876097,-6.99135 6.7766902,-6.70606 z"
+       inkscape:connector-curvature="0" />
+    <g
+       id="g16145-0-1-0"
+       style="fill:none;stroke:#ffffff;stroke-width:1.57270002;filter:url(#filter22422-4)"
+       transform="matrix(0.26451186,0,0,0.26298512,117.77759,404.6941)">
+      <path
+         id="rect15862-1-3-9"
+         style="fill:none;stroke:#ffffff;stroke-width:1.57270002"
+         d="m -397.75,-670.05 c -6.2826,0 -11.358,5.0754 -11.358,11.358 v 16.04 c 0,6.2826 5.0754,11.358 11.358,11.358 h 3.6415 v 8.9304 h -18.641 v 8.5836 h 50.287 v 8.9737 h -4.3785 c -6.2826,0 -11.315,5.0321 -11.315,11.315 v 16.083 c 0,6.2826 5.0321,11.315 11.315,11.315 h 16.083 c 6.2826,0 11.315,-5.0321 11.315,-11.315 v -16.083 c 0,-6.2826 -5.0321,-11.315 -11.315,-11.315 h -4.3785 v -8.9737 h 50.287 v -8.5836 h -19.335 v -8.9304 h 4.3351 c 6.2826,0 11.358,-5.0754 11.358,-11.358 v -16.04 c 0,-6.2826 -5.0754,-11.358 -11.358,-11.358 h -16.04 c -6.2826,0 -11.358,5.0754 -11.358,11.358 v 16.04 c 0,6.2826 5.0754,11.358 11.358,11.358 h 4.3351 v 8.9304 h -55.186 v -8.9304 h 5.0288 c 6.2826,0 11.358,-5.0754 11.358,-11.358 v -16.04 c 0,-6.2826 -5.0754,-11.358 -11.358,-11.358 h -16.04 z m 1.9942,6.7194 c 0.24998,-0.0252 0.52346,0 0.78033,0 h 10.491 c 4.1097,0 7.4131,3.3034 7.4131,7.4131 v 10.491 c 0,4.1097 -3.3034,7.4131 -7.4131,7.4131 h -10.491 c -4.1097,0 -7.4131,-3.3034 -7.4131,-7.4131 v -10.491 c 0,-3.8528 2.883,-7.0345 6.6327,-7.4131 z m 61.862,0 c 0.24998,-0.0252 0.52346,0 0.78032,0 h 10.491 c 4.1097,0 7.4131,3.3034 7.4131,7.4131 v 10.491 c 0,4.1097 -3.3034,7.4131 -7.4131,7.4131 h -10.491 c -4.1097,0 -7.4131,-3.3034 -7.4131,-7.4131 v -10.491 c 0,-3.8528 2.883,-7.0345 6.6328,-7.4131 z m -30.172,65.2 h 10.534 c 4.1097,0 7.4131,3.3034 7.4131,7.4131 v 10.534 c 0,4.1097 -3.3034,7.4131 -7.4131,7.4131 h -10.534 c -4.1097,0 -7.4131,-3.3034 -7.4131,-7.4131 v -10.534 c 0,-4.1097 3.3034,-7.4131 7.4131,-7.4131 z"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+  <g
+     id="layer3"
+     inkscape:label="border"
+     inkscape:groupmode="layer"
+     transform="translate(0,-220)">
+    <rect
+       id="rect17756-2"
+       style="fill:none;stroke:#131312;stroke-width:1.36161077"
+       ry="6.839232"
+       height="42.779919"
+       width="43.030083"
+       y="220.75952"
+       x="1.3252683" />
+  </g>
+  <g
+     id="layer4"
+     inkscape:label="Symbol"
+     inkscape:groupmode="layer"
+     transform="translate(0,-220)">
+    <g
+       id="g16145-0-1"
+       style="fill:#ffffff;stroke:#ffffff"
+       transform="matrix(0.26451186,0,0,0.26298512,117.77759,404.6941)">
+      <path
+         id="rect15862-1-3"
+         style="fill:#ffffff;stroke:#ffffff"
+         d="m -397.75,-670.05 c -6.2826,0 -11.358,5.0754 -11.358,11.358 v 16.04 c 0,6.2826 5.0754,11.358 11.358,11.358 h 3.6415 v 8.9304 h -18.641 v 8.5836 h 50.287 v 8.9737 h -4.3785 c -6.2826,0 -11.315,5.0321 -11.315,11.315 v 16.083 c 0,6.2826 5.0321,11.315 11.315,11.315 h 16.083 c 6.2826,0 11.315,-5.0321 11.315,-11.315 v -16.083 c 0,-6.2826 -5.0321,-11.315 -11.315,-11.315 h -4.3785 v -8.9737 h 50.287 v -8.5836 h -19.335 v -8.9304 h 4.3351 c 6.2826,0 11.358,-5.0754 11.358,-11.358 v -16.04 c 0,-6.2826 -5.0754,-11.358 -11.358,-11.358 h -16.04 c -6.2826,0 -11.358,5.0754 -11.358,11.358 v 16.04 c 0,6.2826 5.0754,11.358 11.358,11.358 h 4.3351 v 8.9304 h -55.186 v -8.9304 h 5.0288 c 6.2826,0 11.358,-5.0754 11.358,-11.358 v -16.04 c 0,-6.2826 -5.0754,-11.358 -11.358,-11.358 h -16.04 z m 1.9942,6.7194 c 0.24998,-0.0252 0.52346,0 0.78033,0 h 10.491 c 4.1097,0 7.4131,3.3034 7.4131,7.4131 v 10.491 c 0,4.1097 -3.3034,7.4131 -7.4131,7.4131 h -10.491 c -4.1097,0 -7.4131,-3.3034 -7.4131,-7.4131 v -10.491 c 0,-3.8528 2.883,-7.0345 6.6327,-7.4131 z m 61.862,0 c 0.24998,-0.0252 0.52346,0 0.78032,0 h 10.491 c 4.1097,0 7.4131,3.3034 7.4131,7.4131 v 10.491 c 0,4.1097 -3.3034,7.4131 -7.4131,7.4131 h -10.491 c -4.1097,0 -7.4131,-3.3034 -7.4131,-7.4131 v -10.491 c 0,-3.8528 2.883,-7.0345 6.6328,-7.4131 z m -30.172,65.2 h 10.534 c 4.1097,0 7.4131,3.3034 7.4131,7.4131 v 10.534 c 0,4.1097 -3.3034,7.4131 -7.4131,7.4131 h -10.534 c -4.1097,0 -7.4131,-3.3034 -7.4131,-7.4131 v -10.534 c 0,-4.1097 3.3034,-7.4131 7.4131,-7.4131 z"
+         inkscape:connector-curvature="0" />
+    </g>
+    <path
+       style="opacity:1;fill:#e97c25;fill-opacity:1;stroke:none;stroke-width:0.28574833;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 40.904729,250.07888 a 8.6210739,8.6210739 0 0 0 -8.62117,8.62119 8.6210739,8.6210739 0 0 0 8.62117,8.62078 8.6210739,8.6210739 0 0 0 8.621179,-8.62078 8.6210739,8.6210739 0 0 0 -8.621179,-8.62119 z m 0,0.54745 a 8.0736426,8.0736426 0 0 1 8.073781,8.07374 8.0736426,8.0736426 0 0 1 -8.073781,8.07332 8.0736426,8.0736426 0 0 1 -8.073771,-8.07332 8.0736426,8.0736426 0 0 1 8.073771,-8.07374 z"
+       id="circle4885"
+       inkscape:connector-curvature="0" />
+    <circle
+       style="opacity:1;fill:#f0cd6b;fill-opacity:1;stroke:none;stroke-width:0.28574833;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4871"
+       cx="40.904816"
+       cy="258.69995"
+       r="7.7909422" />
+    <g
+       id="g4922"
+       transform="matrix(0.04927315,-0.02324474,0.02324474,0.04927315,-134.83749,175.53715)"
+       style="fill:#6bb9f0;fill-opacity:1">
+      <path
+         sodipodi:nodetypes="cccc"
+         inkscape:connector-curvature="0"
+         id="path4924"
+         d="m 2260.9487,2542.5095 c -26.4294,0.018 -49.0929,18.8694 -53.9239,44.8535 39.3037,5.5876 74.2239,3.8691 107.8536,0 -4.8314,-25.9863 -27.4981,-44.8382 -53.9297,-44.8535 z"
+         style="opacity:1;fill:#f0cd6b;fill-opacity:1;stroke:none;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <rect
+         ry="6.109827"
+         y="2525.1899"
+         x="2254.8418"
+         height="14.116755"
+         width="12.219654"
+         id="rect4926"
+         style="opacity:1;fill:#6bb9f0;fill-opacity:1;stroke:none;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+    <path
+       style="opacity:1;fill:#f0cd6b;fill-opacity:1;stroke:none;stroke-width:0.28574833;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 35.638978,265.89867 -0.692816,1.60024 c -0.173973,0.40193 -0.126929,0.84445 0.21514,1.04632 0.342041,0.20186 0.761415,0.0366 1.019693,-0.31745 l 1.032713,-1.41559 a 8.6210739,8.6210739 0 0 1 -1.57473,-0.91352 z"
+       id="rect4934"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4944"
+       d="m 46.351968,265.89867 0.692816,1.60024 c 0.173973,0.40193 0.126929,0.84445 -0.21513,1.04632 -0.342051,0.20186 -0.761415,0.0366 -1.019693,-0.31745 l -1.032723,-1.41559 a 8.6210739,8.6210739 0 0 0 1.57473,-0.91352 z"
+       style="opacity:1;fill:#f0cd6b;fill-opacity:1;stroke:none;stroke-width:0.28574833;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <g
+       style="fill:#f0cd6b;fill-opacity:1"
+       transform="matrix(-0.04927315,-0.02324474,-0.02324474,0.04927315,216.92785,175.53715)"
+       id="g4946">
+      <path
+         style="opacity:1;fill:#f0cd6b;fill-opacity:1;stroke:none;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 2260.9487,2542.5095 c -26.4294,0.018 -49.0929,18.8694 -53.9239,44.8535 39.3037,5.5876 74.2239,3.8691 107.8536,0 -4.8314,-25.9863 -27.4981,-44.8382 -53.9297,-44.8535 z"
+         id="path4948"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccc" />
+      <rect
+         style="opacity:1;fill:#f0cd6b;fill-opacity:1;stroke:none;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect4950"
+         width="12.219654"
+         height="14.116755"
+         x="2254.8418"
+         y="2525.1899"
+         ry="6.109827" />
+    </g>
+    <path
+       style="fill:#22313f;fill-opacity:1;stroke:none;stroke-width:0.09524944"
+       d="m 40.868458,251.69703 -0.603262,0.88378 h 0.335021 v 5.82692 0.56397 0.006 h 0.55739 v -0.006 h 4.252354 v 0.31393 l 0.887725,-0.60327 -0.887944,-0.60329 v 0.33527 h -4.252135 v -0.007 -5.82691 h 0.313923 z"
+       id="path5011-3"
+       inkscape:connector-curvature="0"
+       inkscape:transform-center-x="-30.047941"
+       inkscape:transform-center-y="-30.612244"
+       sodipodi:nodetypes="cccccccccccccccccc" />
+  </g>
+  <metadata
+     id="metadata23">
+    <rdf:RDF>
+      <cc:Work>
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+        <dc:publisher>
+          <cc:Agent
+             rdf:about="http://openclipart.org/">
+            <dc:title>Openclipart</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:title></dc:title>
+        <dc:date>2010-07-19T07:43:30</dc:date>
+        <dc:description>glossy-shadow - community button in darkgrey</dc:description>
+        <dc:source>https://openclipart.org/detail/73717/community-button-by-laser_engravers</dc:source>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>laser_engravers</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>black</rdf:li>
+            <rdf:li>button</rdf:li>
+            <rdf:li>community</rdf:li>
+            <rdf:li>effect</rdf:li>
+            <rdf:li>glossy</rdf:li>
+            <rdf:li>grey</rdf:li>
+            <rdf:li>icon</rdf:li>
+            <rdf:li>network</rdf:li>
+            <rdf:li>shadow</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+</svg>
diff --git a/res/themes/asbru-dark/asbru.css b/res/themes/asbru-dark/asbru.css
new file mode 100644
index 00000000..cde65faa
--- /dev/null
+++ b/res/themes/asbru-dark/asbru.css
@@ -0,0 +1,75 @@
+button {
+    border: 1px solid rgba(1,1,1,0);
+    margin: 1px;
+}
+radiobutton, checkbutton {
+    border: 1px solid rgba(1,1,1,0);
+    margin: 1px;
+}
+button:hover {
+    border: 1px solid #555555;
+    color: #000000;
+    background-color: #ffffff;
+}
+button:focus,
+entry:focus {
+    background-color:#555555;
+}
+spinbutton {
+    border: 1px solid rgba(1,1,1,0);
+    font-size: 0.9em;
+    border-radius: 0px;
+    padding: 0px;
+    margin: 0px;
+}
+spinbutton:hover {
+    border: 1px solid #555555;
+    background-color: #ffffff;
+}
+checkbutton:hover, radiobutton:hover {
+    border: 1px solid #aaaaaa;
+}
+.button-cp {
+    border: 1px solid rgba(1,1,1,0);
+    border-radius: 0px;
+    padding: 0px;
+    margin: 0px;
+}
+tooltip {
+    font-size: 0.8em;
+}
+.dnd-icon {
+  border: 1px solid #000000;
+}
+
+.banner-fill {
+  background-image: linear-gradient(to right, #007aff, #2fedde);
+  padding: 0.25em 0;
+}
+.banner-text {
+  color: #EEE;
+  text-shadow: 0px 0px 8px rgba(17, 17, 17, 0.75);
+  font-size: 2.5em;
+}
+messagedialog {
+  border: 1px solid #888888;
+}
+messagedialog > box {
+  margin: 2px;
+  margin-top: 16px;
+}
+.w-entervalue {
+}
+.w-renamenode {
+}
+.w-warning {
+    background-color: #616124;
+}
+.w-error {
+    background-color: #42050A;
+}
+.w-info {
+}
+.w-confirm {
+}
+
diff --git a/res/themes/asbru-dark/asbru_buttonbar_hide.png b/res/themes/asbru-dark/asbru_buttonbar_hide.png
new file mode 100644
index 00000000..d37d036d
Binary files /dev/null and b/res/themes/asbru-dark/asbru_buttonbar_hide.png differ
diff --git a/res/themes/asbru-dark/asbru_buttonbar_show.png b/res/themes/asbru-dark/asbru_buttonbar_show.png
new file mode 100644
index 00000000..37ba5786
Binary files /dev/null and b/res/themes/asbru-dark/asbru_buttonbar_show.png differ
diff --git a/res/themes/asbru-dark/asbru_chain.png b/res/themes/asbru-dark/asbru_chain.png
new file mode 100644
index 00000000..9ed1d733
Binary files /dev/null and b/res/themes/asbru-dark/asbru_chain.png differ
diff --git a/res/themes/asbru-dark/asbru_cluster_auto.png b/res/themes/asbru-dark/asbru_cluster_auto.png
new file mode 100644
index 00000000..be755ca9
Binary files /dev/null and b/res/themes/asbru-dark/asbru_cluster_auto.png differ
diff --git a/res/themes/asbru-dark/asbru_cluster_connection.svg b/res/themes/asbru-dark/asbru_cluster_connection.svg
new file mode 100644
index 00000000..a294bac1
--- /dev/null
+++ b/res/themes/asbru-dark/asbru_cluster_connection.svg
@@ -0,0 +1,44 @@
+<?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"
+   id="Layer_1_1_"
+   version="1.1"
+   viewBox="0 0 16 16"
+   xml:space="preserve"
+   sodipodi:docname="asbru_cluster_connection.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   width="16"
+   height="16"><metadata
+     id="metadata9"><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="defs7" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview5"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="-14.508475"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1_1_" /><path
+     d="m 13.266949,4.4830516 c 0.966876,0 1.75,-0.7831245 1.75,-1.7500001 0,-0.9668745 -0.783124,-1.75 -1.75,-1.75 -0.966875,0 -1.75,0.7831255 -1.75,1.75 0,0.49175 0.203876,0.9345001 0.530251,1.2521256 l -1.380751,2.4158748 c -0.28175,-0.10325 -0.581875,-0.168 -0.8995004,-0.168 -0.7,0 -1.3326254,0.27825 -1.8033754,0.725374 L 4.3839488,4.2739261 c 0.084875,-0.2056245 0.133,-0.4296245 0.133,-0.6658745 0,-0.9668747 -0.783125,-1.7500001 -1.7499998,-1.7500001 -0.9668749,0 -1.7499999,0.7831254 -1.7499999,1.7500001 0,0.9668745 0.783125,1.7500003 1.7499999,1.7500003 0.4129999,0 0.7874999,-0.1487505 1.0867499,-0.3876258 l 3.5892497,2.6923758 c -0.1863754,0.359624 -0.301,0.762124 -0.301,1.19525 0,0.273874 0.054249,0.5337499 0.1321246,0.7822499 L 3.5194489,11.658925 C 3.2901989,11.54955 3.037324,11.48305 2.766949,11.48305 c -0.9668749,0 -1.7499999,0.783124 -1.7499999,1.75 0,0.966875 0.783125,1.75 1.7499999,1.75 0.9668748,0 1.7499998,-0.783125 1.7499998,-1.75 0,-0.355249 -0.1076249,-0.685125 -0.2896249,-0.961625 l 3.4413747,-1.850624 c 0.4786246,0.641374 1.2363746,1.062249 2.09825,1.062249 0.4357514,0 0.8408764,-0.116375 1.2031254,-0.3045 l 0.854875,1.064875 c -0.193375,0.281749 -0.308,0.622125 -0.308,0.989625 0,0.966875 0.783125,1.75 1.75,1.75 0.966876,0 1.75,-0.783125 1.75,-1.75 0,-0.966876 -0.783124,-1.75 -1.75,-1.75 -0.280875,0 -0.5425,0.07263 -0.777875,0.189875 l -0.817249,-1.0185 c 0.443624,-0.469875 0.720124,-1.0989991 0.720124,-1.7963731 0,-0.81725 -0.3815,-1.53825 -0.966875,-2.0195 l 1.385125,-2.4237503 c 0.146126,0.040245 0.2975,0.068245 0.45675,0.068245 z"
+     id="path2"
+     style="fill:#aaccff;stroke:#0044aa;stroke-width:1.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     inkscape:connector-curvature="0" /></svg>
\ No newline at end of file
diff --git a/res/themes/asbru-dark/asbru_cluster_manager.svg b/res/themes/asbru-dark/asbru_cluster_manager.svg
new file mode 100644
index 00000000..5e975921
--- /dev/null
+++ b/res/themes/asbru-dark/asbru_cluster_manager.svg
@@ -0,0 +1,44 @@
+<?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"
+   id="Layer_1_1_"
+   version="1.1"
+   viewBox="0 0 32 32"
+   xml:space="preserve"
+   sodipodi:docname="asbru_cluster_manager.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   width="32"
+   height="32"><metadata
+     id="metadata9"><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="defs7" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview5"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1_1_" /><path
+     d="m 27.266949,8.4830534 c 2.071877,0 3.75,-1.6781241 3.75,-3.7500002 0,-2.0718741 -1.678123,-3.75000018 -3.75,-3.75000018 -2.071875,0 -3.75,1.67812608 -3.75,3.75000018 0,1.05375 0.436877,2.0025 1.136252,2.6831261 l -2.958752,5.1768747 c -0.60375,-0.22125 -1.246875,-0.36 -1.927501,-0.36 -1.5,0 -2.855626,0.59625 -3.864376,1.554373 L 8.2319484,8.0349273 c 0.1818761,-0.440624 0.285,-0.9206241 0.285,-1.4268741 0,-2.0718741 -1.6781249,-3.7500001 -3.7499995,-3.7500001 -2.0718749,0 -3.7499998,1.678126 -3.7499998,3.7500001 0,2.0718741 1.6781249,3.7500008 3.7499998,3.7500008 0.8849997,0 1.6874998,-0.318751 2.3287498,-0.8306267 l 7.6912493,5.7693767 c -0.399376,0.770623 -0.645,1.633123 -0.645,2.56125 0,0.586873 0.116248,1.14375 0.283124,1.67625 L 6.3794487,23.859926 C 5.8881986,23.62555 5.3463238,23.48305 4.7669489,23.48305 c -2.0718749,0 -3.7499998,1.678124 -3.7499998,3.75 0,2.071876 1.6781249,3.75 3.7499998,3.75 2.0718746,0 3.7499995,-1.678124 3.7499995,-3.75 0,-0.761248 -0.2306248,-1.468124 -0.6206248,-2.060624 l 7.3743744,-3.965624 c 1.025624,1.374374 2.649374,2.276248 4.49625,2.276248 0.933753,0 1.801877,-0.249374 2.578126,-0.6525 l 1.831875,2.281876 c -0.414375,0.603748 -0.66,1.333124 -0.66,2.120624 0,2.071876 1.678125,3.75 3.75,3.75 2.071877,0 3.75,-1.678124 3.75,-3.75 0,-2.071876 -1.678123,-3.75 -3.75,-3.75 -0.601875,0 -1.1625,0.15564 -1.666875,0.406876 l -1.751248,-2.1825 c 0.950623,-1.006876 1.543123,-2.354999 1.543123,-3.849372 0,-1.75125 -0.8175,-3.29625 -2.071875,-4.3275 l 2.968125,-5.1937507 c 0.313127,0.08624 0.6375,0.14624 0.97875,0.14624 z"
+     id="path2"
+     style="fill:#aaccff;stroke:#0044aa;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     inkscape:connector-curvature="0" /></svg>
\ No newline at end of file
diff --git a/res/themes/asbru-dark/asbru_cluster_manager2.png b/res/themes/asbru-dark/asbru_cluster_manager2.png
new file mode 100644
index 00000000..ace22f21
Binary files /dev/null and b/res/themes/asbru-dark/asbru_cluster_manager2.png differ
diff --git a/res/themes/asbru-dark/asbru_cluster_manager_off.svg b/res/themes/asbru-dark/asbru_cluster_manager_off.svg
new file mode 100644
index 00000000..aa41909b
--- /dev/null
+++ b/res/themes/asbru-dark/asbru_cluster_manager_off.svg
@@ -0,0 +1,44 @@
+<?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"
+   id="Layer_1_1_"
+   version="1.1"
+   viewBox="0 0 16 16"
+   xml:space="preserve"
+   sodipodi:docname="asbru_cluster_manager_off.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   width="16"
+   height="16"><metadata
+     id="metadata9"><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="defs7" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview5"
+     showgrid="false"
+     inkscape:zoom="52.125"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1_1_" /><path
+     d="m 13.266949,4.4830516 c 0.966876,0 1.75,-0.7831245 1.75,-1.7500001 0,-0.9668745 -0.783124,-1.75 -1.75,-1.75 -0.966875,0 -1.75,0.7831255 -1.75,1.75 0,0.49175 0.203876,0.9345001 0.530251,1.2521256 l -1.380751,2.4158748 c -0.28175,-0.10325 -0.581875,-0.168 -0.8995004,-0.168 -0.7,0 -1.3326254,0.27825 -1.8033754,0.725374 L 4.3839488,4.2739261 c 0.084875,-0.2056245 0.133,-0.4296245 0.133,-0.6658745 0,-0.9668747 -0.783125,-1.7500001 -1.7499998,-1.7500001 -0.9668749,0 -1.7499999,0.7831254 -1.7499999,1.7500001 0,0.9668745 0.783125,1.7500003 1.7499999,1.7500003 0.4129999,0 0.7874999,-0.1487505 1.0867499,-0.3876258 l 3.5892497,2.6923758 c -0.1863754,0.359624 -0.301,0.762124 -0.301,1.19525 0,0.273874 0.054249,0.5337499 0.1321246,0.7822499 L 3.5194489,11.658925 C 3.2901989,11.54955 3.037324,11.48305 2.766949,11.48305 c -0.9668749,0 -1.7499999,0.783124 -1.7499999,1.75 0,0.966875 0.783125,1.75 1.7499999,1.75 0.9668748,0 1.7499998,-0.783125 1.7499998,-1.75 0,-0.355249 -0.1076249,-0.685125 -0.2896249,-0.961625 l 3.4413747,-1.850624 c 0.4786246,0.641374 1.2363746,1.062249 2.09825,1.062249 0.4357514,0 0.8408764,-0.116375 1.2031254,-0.3045 l 0.854875,1.064875 c -0.193375,0.281749 -0.308,0.622125 -0.308,0.989625 0,0.966875 0.783125,1.75 1.75,1.75 0.966876,0 1.75,-0.783125 1.75,-1.75 0,-0.966876 -0.783124,-1.75 -1.75,-1.75 -0.280875,0 -0.5425,0.07263 -0.777875,0.189875 l -0.817249,-1.0185 c 0.443624,-0.469875 0.720124,-1.0989991 0.720124,-1.7963731 0,-0.81725 -0.3815,-1.53825 -0.966875,-2.0195 l 1.385125,-2.4237503 c 0.146126,0.040245 0.2975,0.068245 0.45675,0.068245 z"
+     id="path2"
+     style="fill:#ff8080;stroke:#aa0000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     inkscape:connector-curvature="0" /></svg>
\ No newline at end of file
diff --git a/res/themes/asbru-dark/asbru_drag_terminal32x32.png b/res/themes/asbru-dark/asbru_drag_terminal32x32.png
new file mode 100644
index 00000000..e134fb07
Binary files /dev/null and b/res/themes/asbru-dark/asbru_drag_terminal32x32.png differ
diff --git a/res/themes/asbru-dark/asbru_favourite_off.svg b/res/themes/asbru-dark/asbru_favourite_off.svg
new file mode 100644
index 00000000..cd554050
--- /dev/null
+++ b/res/themes/asbru-dark/asbru_favourite_off.svg
@@ -0,0 +1,56 @@
+<?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"
+   enable-background="new 0 0 64 64"
+   height="32"
+   version="1.1"
+   viewBox="0 0 32 32"
+   width="32"
+   xml:space="preserve"
+   id="svg20"
+   sodipodi:docname="asbru_favourite_off.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
+     id="metadata26"><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="defs24" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1810"
+     inkscape:window-height="905"
+     id="namedview22"
+     showgrid="false"
+     inkscape:zoom="14.389266"
+     inkscape:cx="5.4418896"
+     inkscape:cy="8.3395498"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg20" /><g
+     id="g844"><circle
+       r="14.735541"
+       style="fill:#e9ddaf;stroke:#ffd42a;stroke-width:2.4000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="circle2"
+       cy="15.983025"
+       cx="16.071079" /><g
+       transform="matrix(0.5196023,0,0,0.5196023,-0.55619493,-0.64424733)"
+       id="g14"
+       style="fill:#ff9955;stroke-width:1.92454886"><path
+         style="fill:#ff9955;stroke-width:1.92454886"
+         inkscape:connector-curvature="0"
+         id="path12"
+         d="m 52.872,26.063 c -0.31,-0.951 -1.133,-1.645 -2.121,-1.79 L 39.424,22.628 34.357,12.365 C 33.913,11.466 33.001,10.898 32,10.898 c -1.001,0 -1.913,0.568 -2.357,1.467 L 24.579,22.628 13.25,24.273 c -0.991,0.145 -1.813,0.838 -2.121,1.79 -0.31,0.951 -0.053,1.995 0.665,2.694 l 8.197,7.99 -1.934,11.283 c -0.168,0.986 0.237,1.982 1.046,2.57 0.455,0.334 0.996,0.502 1.543,0.502 0.418,0 0.838,-0.1 1.222,-0.302 L 32,45.473 42.132,50.8 c 0.384,0.202 0.804,0.302 1.222,0.302 0.544,0 1.088,-0.168 1.545,-0.502 0.809,-0.589 1.214,-1.585 1.046,-2.57 l -1.935,-11.284 8.197,-7.99 c 0.715,-0.696 0.973,-1.742 0.665,-2.693 z" /></g></g><g
+     id="Layer_2"
+     transform="translate(0,-32)" /></svg>
\ No newline at end of file
diff --git a/res/themes/asbru-dark/asbru_favourite_on.svg b/res/themes/asbru-dark/asbru_favourite_on.svg
new file mode 100644
index 00000000..739a25ea
--- /dev/null
+++ b/res/themes/asbru-dark/asbru_favourite_on.svg
@@ -0,0 +1,58 @@
+<?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"
+   enable-background="new 0 0 64 64"
+   height="16"
+   version="1.1"
+   viewBox="0 0 16 16"
+   width="16"
+   xml:space="preserve"
+   id="svg20"
+   sodipodi:docname="asbru_favourite_on.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
+     id="metadata26"><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="defs24" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1810"
+     inkscape:window-height="905"
+     id="namedview22"
+     showgrid="false"
+     inkscape:zoom="14.389266"
+     inkscape:cx="6.393277"
+     inkscape:cy="0"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg20" /><g
+     id="g835"
+     transform="matrix(1.2333333,0,0,1.2333333,-2.0189156,-1.8317346)"
+     style="stroke-width:0.81081086"><circle
+       style="fill:#ffe680;stroke:#ffd42a;stroke-width:0.81081086;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="circle2"
+       r="6"
+       cy="8.0389948"
+       cx="8.0999956" /><g
+       transform="matrix(0.20113637,0,0,0.20113637,1.6636317,1.6026312)"
+       id="g14"
+       style="fill:#ff7f2a;stroke-width:4.03114986"><path
+         style="fill:#ff7f2a;stroke-width:4.03114986"
+         inkscape:connector-curvature="0"
+         id="path12"
+         d="m 52.872,26.063 c -0.31,-0.951 -1.133,-1.645 -2.121,-1.79 L 39.424,22.628 34.357,12.365 C 33.913,11.466 33.001,10.898 32,10.898 c -1.001,0 -1.913,0.568 -2.357,1.467 L 24.579,22.628 13.25,24.273 c -0.991,0.145 -1.813,0.838 -2.121,1.79 -0.31,0.951 -0.053,1.995 0.665,2.694 l 8.197,7.99 -1.934,11.283 c -0.168,0.986 0.237,1.982 1.046,2.57 0.455,0.334 0.996,0.502 1.543,0.502 0.418,0 0.838,-0.1 1.222,-0.302 L 32,45.473 42.132,50.8 c 0.384,0.202 0.804,0.302 1.222,0.302 0.544,0 1.088,-0.168 1.545,-0.502 0.809,-0.589 1.214,-1.585 1.046,-2.57 l -1.935,-11.284 8.197,-7.99 c 0.715,-0.696 0.973,-1.742 0.665,-2.693 z" /></g></g><g
+     id="Layer_2"
+     transform="translate(0,-48)" /></svg>
\ No newline at end of file
diff --git a/res/themes/asbru-dark/asbru_group.svg b/res/themes/asbru-dark/asbru_group.svg
new file mode 100644
index 00000000..eb71c256
--- /dev/null
+++ b/res/themes/asbru-dark/asbru_group.svg
@@ -0,0 +1,82 @@
+<?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"
+   enable-background="new 0 0 200 200"
+   height="16"
+   id="Layer_1"
+   version="1.1"
+   viewBox="0 0 16 16"
+   width="16"
+   xml:space="preserve"
+   sodipodi:docname="asbru_group.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
+     id="metadata9"><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="defs7" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview5"
+     showgrid="false"
+     inkscape:zoom="22.366364"
+     inkscape:cx="5.3448441"
+     inkscape:cy="8.4745763"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1" /><circle
+     style="opacity:1;fill:#ff6600;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:7.55905533;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+     id="path812"
+     cx="8.0119495"
+     cy="7.9880486"
+     r="8" /><circle
+     style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:7.55905533;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+     id="path814"
+     cx="7.2757797"
+     cy="13.73174"
+     r="2"
+     inkscape:transform-center-x="33.979596"
+     inkscape:transform-center-y="-19.851237" /><circle
+     style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:7.55905533;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+     id="path814-7"
+     cx="12.222208"
+     cy="5.5214815"
+     r="2"
+     inkscape:transform-center-x="33.979596"
+     inkscape:transform-center-y="-19.851237" /><circle
+     style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:7.55905533;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+     id="path814-0"
+     cx="5.1580291"
+     cy="3.3306911"
+     inkscape:transform-center-x="33.979596"
+     inkscape:transform-center-y="-19.851237"
+     r="2" /><path
+     style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 0.08941999,6.9238712 6.2123724,13.092495 5.2400835,13.046114 C 3.0123979,12.459303 1.4904345,8.7391172 0.08941999,6.9238712 Z"
+     id="path837"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccc" /><path
+     style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 1.1374018,12.156337 11.113137,6.2071141 10.92858,6.8666442 C 9.1487554,9.7125141 3.9046135,11.042187 1.1374018,12.156337 Z"
+     id="path837-4"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccc" /><path
+     style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 12.300309,14.704657 5.2707209,3.8823307 6.6186331,4.492337 c 2.4471893,2.0184944 4.2314849,7.159638 5.6816739,10.212326 z"
+     id="path837-8"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccc" /></svg>
\ No newline at end of file
diff --git a/res/themes/asbru-dark/asbru_group_add_16x16.svg b/res/themes/asbru-dark/asbru_group_add_16x16.svg
new file mode 100644
index 00000000..642027e3
--- /dev/null
+++ b/res/themes/asbru-dark/asbru_group_add_16x16.svg
@@ -0,0 +1,107 @@
+<?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"
+   height="32"
+   version="1.1"
+   viewBox="0 0 32 32"
+   width="32"
+   id="svg9"
+   sodipodi:docname="asbru_group_add_16x16.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata13">
+    <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>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview11"
+     showgrid="false"
+     inkscape:zoom="26.0625"
+     inkscape:cx="16"
+     inkscape:cy="16"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg9" />
+  <defs
+     id="defs4">
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path839"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+  </defs>
+  <g
+     id="g838"
+     transform="matrix(2,0,0,2,0,-31.999999)"
+     style="stroke-width:0.5">
+    <g
+       transform="matrix(1,0,0,1.3333333,0,13.333333)"
+       style="fill:#ffcc00;fill-rule:evenodd;stroke:none;stroke-width:0.5"
+       id="Icons with numbers">
+      <g
+         style="fill:#ffcc00;stroke-width:0.5"
+         transform="translate(-240)"
+         id="Group">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ffcc00;stroke-width:0.5"
+           id="Rectangle 136"
+           d="m 241.00087,4 h 13.99826 C 255.55537,4 256,4.4456547 256,4.9953976 V 13.004602 C 256,13.544336 255.55189,14 254.99913,14 H 241.00087 C 240.44463,14 240,13.554345 240,13.004602 V 4.9953976 C 240,4.4556644 240.44811,4 241.00087,4 Z M 243,2 h 4 l 1,1 h -6 z m 0,0" />
+      </g>
+    </g>
+    <g
+       style="stroke:#008000;stroke-width:0.40967742;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+       transform="matrix(0.73228346,0,0,0.73228346,5.9786627,22.093771)"
+       id="g837">
+      <rect
+         style="opacity:1;fill:#008000;fill-opacity:1;stroke:#008000;stroke-width:0.40967742;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+         id="rect818"
+         width="9.7458029"
+         height="2.2254195"
+         x="3.1270988"
+         y="6.88729" />
+      <rect
+         style="opacity:1;fill:#008000;fill-opacity:1;stroke:#008000;stroke-width:0.40967742;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+         id="rect818-0"
+         width="9.7458029"
+         height="2.2254195"
+         x="3.1270983"
+         y="-9.11271"
+         transform="rotate(90)" />
+    </g>
+  </g>
+</svg>
diff --git a/res/themes/asbru-dark/asbru_group_closed_16x16.svg b/res/themes/asbru-dark/asbru_group_closed_16x16.svg
new file mode 100644
index 00000000..3f961d36
--- /dev/null
+++ b/res/themes/asbru-dark/asbru_group_closed_16x16.svg
@@ -0,0 +1,66 @@
+<?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"
+   height="16"
+   version="1.1"
+   viewBox="0 0 16 16"
+   width="16"
+   id="svg9"
+   sodipodi:docname="asbru_group_closed_16x16.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata13">
+    <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>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview11"
+     showgrid="false"
+     inkscape:zoom="52.125"
+     inkscape:cx="-4.7002398"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg9" />
+  <defs
+     id="defs4" />
+  <g
+     id="Icons with numbers"
+     style="fill:#ffcc00;fill-rule:evenodd;stroke:none;stroke-width:1"
+     transform="matrix(1,0,0,1.3333332,0,-2.6666669)">
+    <g
+       id="Group"
+       transform="translate(-240)"
+       style="fill:#ffcc00;stroke-width:1">
+      <path
+         d="m 241.00087,4 h 13.99826 C 255.55537,4 256,4.4456547 256,4.9953976 V 13.004602 C 256,13.544336 255.55189,14 254.99913,14 H 241.00087 C 240.44463,14 240,13.554345 240,13.004602 V 4.9953976 C 240,4.4556644 240.44811,4 241.00087,4 Z M 243,2 h 4 l 1,1 h -6 z m 0,0"
+         id="Rectangle 136"
+         style="fill:#ffcc00;stroke-width:1"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>
diff --git a/res/themes/asbru-dark/asbru_group_open_16x16.svg b/res/themes/asbru-dark/asbru_group_open_16x16.svg
new file mode 100644
index 00000000..729b1bcb
--- /dev/null
+++ b/res/themes/asbru-dark/asbru_group_open_16x16.svg
@@ -0,0 +1,76 @@
+<?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"
+   height="16"
+   id="Capa_1"
+   version="1.1"
+   viewBox="0 0 16 16"
+   width="16"
+   xml:space="preserve"
+   sodipodi:docname="asbru_group_open_16x16.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
+     id="metadata41"><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="defs39" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview37"
+     showgrid="false"
+     inkscape:zoom="52.125"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Capa_1"
+     scale-x="1.3"
+     showguides="false" /><path
+     inkscape:connector-curvature="0"
+     style="fill:#ed6912;fill-opacity:1;stroke-width:0.17888558"
+     id="path2"
+     d="M 15.256018,5.0000002 H 0.74399844 c -0.736641,0 -0.77344105,0.4482 -0.73344099,0.9958 L 0.67087834,15.004 c 0.04,0.5478 0.14384019,0.995999 0.87936116,0.995999 H 14.449617 c 0.750081,0 0.839041,-0.448199 0.879042,-0.995799 l 0.66032,-9.0081998 c 0.04016,-0.5478 0.0035,-0.996 -0.732961,-0.996 z m -0.53264,-2.1999999 c -0.0888,-0.4399999 -0.524001,-0.8 -0.967523,-0.8 H 8.3043287 c -0.4433607,0 -1.0632015,-0.3176 -1.3771219,-0.7056 L 6.4505662,0.70580042 C 6.1364857,0.3176004 5.5168049,3.9333338e-7 5.0734442,3.9333338e-7 H 2.4688007 C 2.0254402,3.9333338e-7 1.6225596,0.4472003 1.5737595,0.99400042 L 1.3399993,3.6000003 H 14.884658 Z" /><g
+     id="g6"
+     transform="translate(0,-64)" /><g
+     id="g8"
+     transform="translate(0,-64)" /><g
+     id="g10"
+     transform="translate(0,-64)" /><g
+     id="g12"
+     transform="translate(0,-64)" /><g
+     id="g14"
+     transform="translate(0,-64)" /><g
+     id="g16"
+     transform="translate(0,-64)" /><g
+     id="g18"
+     transform="translate(0,-64)" /><g
+     id="g20"
+     transform="translate(0,-64)" /><g
+     id="g22"
+     transform="translate(0,-64)" /><g
+     id="g24"
+     transform="translate(0,-64)" /><g
+     id="g26"
+     transform="translate(0,-64)" /><g
+     id="g28"
+     transform="translate(0,-64)" /><g
+     id="g30"
+     transform="translate(0,-64)" /><g
+     id="g32"
+     transform="translate(0,-64)" /><g
+     id="g34"
+     transform="translate(0,-64)" /></svg>
\ No newline at end of file
diff --git a/res/themes/asbru-dark/asbru_history.svg b/res/themes/asbru-dark/asbru_history.svg
new file mode 100644
index 00000000..c00957ed
--- /dev/null
+++ b/res/themes/asbru-dark/asbru_history.svg
@@ -0,0 +1,64 @@
+<?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"
+   height="32"
+   id="clock"
+   viewBox="0 0 32 32"
+   width="32"
+   version="1.1"
+   sodipodi:docname="asbru_history.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata9">
+    <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="defs7" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview5"
+     showgrid="false"
+     inkscape:zoom="26.0625"
+     inkscape:cx="16"
+     inkscape:cy="16"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="clock" />
+  <ellipse
+     style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:7.09063911;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+     id="path812"
+     cx="15.894855"
+     cy="15.875745"
+     rx="12.344953"
+     ry="12.402431" />
+  <path
+     d="M 16,0 C 7.163444,0 0,7.163444 0,16 0,24.836556 7.163444,32 16,32 24.836556,32 32,24.836556 32,16 32,7.163444 24.836556,0 16,0 m 0,4 C 22.627417,4 28,9.372583 28,16 28,22.627417 22.627417,28 16,28 9.372583,28 4,22.627417 4,16 4,9.372583 9.372583,4 16,4 m -2,2 0.613909,10.981415 7.846523,4.289568 0.446643,-0.775779 L 16.35012,16.016187 14.776979,5.8848921 Z"
+     id="path2"
+     style="fill:#2c5aa0"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="csssccssscccccccc" />
+</svg>
diff --git a/res/themes/asbru-dark/asbru_keepass.png b/res/themes/asbru-dark/asbru_keepass.png
new file mode 100644
index 00000000..e41f8b33
Binary files /dev/null and b/res/themes/asbru-dark/asbru_keepass.png differ
diff --git a/res/themes/asbru-dark/asbru_method_3270.jpg b/res/themes/asbru-dark/asbru_method_3270.jpg
new file mode 100644
index 00000000..cca081bd
Binary files /dev/null and b/res/themes/asbru-dark/asbru_method_3270.jpg differ
diff --git a/res/themes/asbru-dark/asbru_method_cadaver.png b/res/themes/asbru-dark/asbru_method_cadaver.png
new file mode 100644
index 00000000..373bddf3
Binary files /dev/null and b/res/themes/asbru-dark/asbru_method_cadaver.png differ
diff --git a/res/themes/asbru-dark/asbru_method_cu.jpg b/res/themes/asbru-dark/asbru_method_cu.jpg
new file mode 100644
index 00000000..e7959f61
Binary files /dev/null and b/res/themes/asbru-dark/asbru_method_cu.jpg differ
diff --git a/res/themes/asbru-dark/asbru_method_ftp.svg b/res/themes/asbru-dark/asbru_method_ftp.svg
new file mode 100644
index 00000000..04db778c
--- /dev/null
+++ b/res/themes/asbru-dark/asbru_method_ftp.svg
@@ -0,0 +1,45 @@
+<?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"
+   enable-background="new 0 0 200 200"
+   height="32"
+   id="Layer_1"
+   version="1.1"
+   viewBox="0 0 32 32"
+   width="32"
+   xml:space="preserve"
+   sodipodi:docname="asbru_method_ftp.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
+     id="metadata9"><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="defs7" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview5"
+     showgrid="false"
+     inkscape:zoom="29.203762"
+     inkscape:cx="16.056412"
+     inkscape:cy="16.180629"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1" /><path
+     d="M 31.55641,8.3513739 V 13.71682 c -0.20336,0.858595 -0.653945,1.647139 -1.319515,2.286746 -0.9362,0.898425 -2.18395,1.39359 -3.511525,1.39359 h -8.347061 v -1.633501 c 0,-0.690286 -0.564975,-1.255037 -1.255345,-1.255037 h -2.133265 c -0.69006,0 -1.25488,0.564906 -1.25488,1.255037 v 1.633501 H 5.3872988 c -1.327575,0 -2.5750151,-0.495165 -3.5115251,-1.39359 C 1.2095837,15.364889 0.75977365,14.575725 0.55641364,13.71744 V 8.3513739 c 0,-1.156624 0.94705006,-2.1035585 2.10397006,-2.1035585 H 29.45275 c 1.156765,0 2.10366,0.9469345 2.10366,2.1035585 z M 17.123119,20.285539 c 0.110515,0 0.20274,-0.09237 0.20274,-0.202716 v -1.63381 -1.051857 -1.633501 c 0,-0.110346 -0.09223,-0.203335 -0.20274,-0.203335 h -2.13342 c -0.11005,0 -0.20336,0.09299 -0.20336,0.203335 v 1.633501 1.051857 1.63381 c 0,0.110347 0.09331,0.202716 0.20336,0.202716 z M 30.96586,16.762198 c -1.13398,1.087503 -2.63903,1.68697 -4.24049,1.68697 h -8.347061 v 1.63381 c 0,0.689356 -0.564975,1.254572 -1.255345,1.254572 h -2.133265 c -0.69006,0 -1.25488,-0.565061 -1.25488,-1.254572 v -1.63381 H 5.3872988 c -1.60115,0 -3.1065101,-0.599467 -4.2403351,-1.68697 C 0.93151365,16.555299 0.73435365,16.33569 0.55641364,16.105233 v 11.389406 c 0,1.157554 0.94705006,2.103714 2.10397006,2.103714 H 29.45275 c 1.156765,0 2.10366,-0.94616 2.10366,-2.103714 V 16.105233 c -0.17825,0.230457 -0.374635,0.450066 -0.59055,0.656965 z M 20.907289,2.6567484 C 20.496229,2.2457385 19.957604,2.0403885 19.419444,2.0403885 h -6.72545 c -0.53847,0 -1.077405,0.20535 -1.488155,0.6163599 -0.41044,0.4106999 -0.61597,0.9491042 -0.61597,1.4873536 v 1.0518567 h 1.787925 V 4.144102 c 0,-0.059668 0.01628,-0.1469221 0.093,-0.2231728 0.07595,-0.076251 0.16306,-0.092834 0.2232,-0.092834 h 6.725605 c 0.05921,0 0.14663,0.016583 0.222735,0.092834 0.07657,0.076251 0.09285,0.163505 0.09285,0.2231728 v 1.0518567 h 1.787925 V 4.144102 c -1.6e-4,-0.5382494 -0.20538,-1.0764987 -0.61582,-1.4873536 z"
+     id="path2"
+     inkscape:connector-curvature="0"
+     style="fill:#aa0000;stroke:#ffffff;stroke-width:1;stroke-opacity:1" /></svg>
\ No newline at end of file
diff --git a/res/themes/asbru-dark/asbru_method_generic.svg b/res/themes/asbru-dark/asbru_method_generic.svg
new file mode 100644
index 00000000..4f91a4f0
--- /dev/null
+++ b/res/themes/asbru-dark/asbru_method_generic.svg
@@ -0,0 +1,66 @@
+<?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"
+   height="32"
+   version="1.1"
+   viewBox="0 0 32 32"
+   width="32"
+   id="svg9"
+   sodipodi:docname="asbru_method_generic.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata13">
+    <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>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview11"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="-14.440678"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg9" />
+  <defs
+     id="defs4" />
+  <g
+     id="Icons with numbers"
+     style="fill:#00aad4;fill-rule:evenodd;stroke:none;stroke-width:0.5"
+     transform="scale(2)">
+    <g
+       id="Group"
+       transform="translate(-48,-432)"
+       style="fill:#00aad4;stroke-width:0.5">
+      <path
+         d="M 54.879684,443.0591 V 445 h 2.351085 v -1.9409 z M 56,448 c -4.418278,0 -8,-3.58172 -8,-8 0,-4.41828 3.581722,-8 8,-8 4.418278,0 8,3.58172 8,8 0,4.41828 -3.581722,8 -8,8 z m -2.42998,-12.48959 c -0.983569,0.5328 -1.506903,1.4372 -1.57002,2.71323 h 2.280079 c 0,-0.37162 0.127546,-0.72979 0.382643,-1.07455 0.255097,-0.34475 0.687702,-0.51712 1.29783,-0.51712 0.620648,0 1.047994,0.13991 1.282052,0.41974 0.234057,0.27983 0.351084,0.58988 0.351084,0.93016 0,0.2955 -0.105193,0.56637 -0.315582,0.81262 l -0.457593,0.39624 -0.575937,0.38281 c -0.56805,0.37609 -0.920447,0.70853 -1.057199,0.99731 -0.136753,0.28879 -0.220907,0.81151 -0.252466,1.56817 h 2.130178 c 0.0053,-0.35818 0.03945,-0.62234 0.102564,-0.79248 0.09994,-0.26864 0.302431,-0.50369 0.607495,-0.70517 l 0.560158,-0.36938 c 0.56805,-0.37609 0.952004,-0.68502 1.151874,-0.92679 C 59.829062,438.94672 60,438.45646 60,437.87441 60,436.92522 59.606842,436.20887 58.820513,435.72532 58.034184,435.24177 57.046686,435 55.857988,435 c -0.904672,0 -1.667321,0.17014 -2.287968,0.51041 z m 0,0"
+         id="Oval 318"
+         inkscape:connector-curvature="0"
+         style="stroke-width:0.5;fill:#00aad4" />
+    </g>
+  </g>
+</svg>
diff --git a/res/themes/asbru-dark/asbru_method_mosh.svg b/res/themes/asbru-dark/asbru_method_mosh.svg
new file mode 100644
index 00000000..47d4adda
--- /dev/null
+++ b/res/themes/asbru-dark/asbru_method_mosh.svg
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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="32mm"
+   height="32mm"
+   viewBox="0 0 32 32"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="asbru_method_mosh.svg">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="6.8957031"
+     inkscape:cx="60.472441"
+     inkscape:cy="60.472441"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5">
+    <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>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-265)">
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+       id="rect815"
+       width="28.201439"
+       height="19.529974"
+       x="1.8992805"
+       y="271.02399" />
+    <rect
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+       id="rect815-2"
+       width="16.767389"
+       height="2.9838984"
+       x="7.5203829"
+       y="276.35336" />
+    <g
+       id="g906"
+       transform="matrix(0.85488233,0,0,0.62461017,2.2473141,107.31378)"
+       style="stroke-width:1.36849201">
+      <rect
+         y="285.91129"
+         x="13.582733"
+         height="1.3045554"
+         width="4.8345346"
+         id="rect815-2-1"
+         style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:2.73698401;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" />
+      <rect
+         y="286.17984"
+         x="21.520235"
+         height="1.0359701"
+         width="4.8345346"
+         id="rect815-2-1-7"
+         style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:2.73698401;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" />
+      <rect
+         y="285.87289"
+         x="5.6452365"
+         height="1.3429247"
+         width="4.8345346"
+         id="rect815-2-1-8"
+         style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:2.73698401;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" />
+    </g>
+  </g>
+</svg>
diff --git a/res/themes/asbru-dark/asbru_method_rdesktop.svg b/res/themes/asbru-dark/asbru_method_rdesktop.svg
new file mode 100644
index 00000000..f9890639
--- /dev/null
+++ b/res/themes/asbru-dark/asbru_method_rdesktop.svg
@@ -0,0 +1,57 @@
+<?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"
+   enable-background="new 0 0 24 24"
+   height="24px"
+   id="Layer_1"
+   version="1.1"
+   viewBox="0 0 24 24"
+   width="24px"
+   xml:space="preserve"
+   sodipodi:docname="asbru_method_rdesktop.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
+     id="metadata17"><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="defs15" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview13"
+     showgrid="false"
+     inkscape:zoom="9.8333333"
+     inkscape:cx="-8.5932204"
+     inkscape:cy="12"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1" /><path
+     inkscape:connector-curvature="0"
+     id="path2"
+     d="M 6.5367687,11.808543 C 5.1178185,11.926788 3.8171144,12.281526 2.9893935,12.518018 2.8711478,12.636264 2.6346561,12.636264 2.3981644,12.754509 L 0.26973949,19.84926 C 1.6886895,19.376276 2.8711478,19.139785 4.0536061,19.139785 c 2.0101792,0 3.4291291,0.709475 4.6115875,1.418949 C 9.2564227,18.548556 10.438882,14.646443 10.911865,13.109247 10.675374,12.991001 10.438882,12.872756 10.202389,12.754509 9.0199309,12.045035 7.7192269,11.690297 6.5367687,11.808543 Z"
+     style="fill:#0000ff;stroke-width:1" /><path
+     inkscape:connector-curvature="0"
+     id="path4"
+     d="m 12.204756,13.794915 -2.114926,7.16725 c 1.057463,0.587479 2.937398,1.409951 4.347348,1.409951 1.292455,0 2.819902,-0.352487 4.58234,-1.057463 l 1.99743,-6.814762 c -1.292454,0.352487 -2.584909,0.587479 -3.877364,0.587479 -2.114926,0 -3.877365,-0.704975 -4.934828,-1.292455 z"
+     style="fill:#ffcc00;stroke-width:0.99999994" /><path
+     inkscape:connector-curvature="0"
+     id="path6"
+     d="M 11.019269,11.297448 C 11.50085,9.8527042 12.223221,7.3244018 12.825198,5.3980766 L 13.306779,3.8329374 C 12.704802,3.4717513 11.621245,2.99017 10.778477,2.7493793 10.176501,2.628984 9.5745247,2.5085886 8.8521525,2.5085886 c -1.3243489,0 -2.6486976,0.361186 -4.2138369,0.9631627 L 2.591595,10.695472 C 4.036339,10.21389 5.3606875,9.9730991 6.5646409,9.9730991 c 1.9263254,0 3.3710682,0.6019779 4.4546281,1.3243489 z"
+     style="fill:#d40000;stroke-width:1" /><path
+     inkscape:connector-curvature="0"
+     id="path8"
+     d="m 19.819889,5.6515686 c -2.290056,0 -3.977465,-0.7231753 -5.062228,-1.4463508 l -2.169526,7.4728142 c 2.772173,1.687409 5.905931,1.807938 9.160222,0.361587 l 2.169525,-7.1112257 c -1.44635,0.6026461 -2.772173,0.7231753 -4.097993,0.7231753 z"
+     style="fill:#008000;stroke-width:0.99999988" /></svg>
\ No newline at end of file
diff --git a/res/themes/asbru-dark/asbru_method_remote-tty.jpg b/res/themes/asbru-dark/asbru_method_remote-tty.jpg
new file mode 100644
index 00000000..e7959f61
Binary files /dev/null and b/res/themes/asbru-dark/asbru_method_remote-tty.jpg differ
diff --git a/res/themes/asbru-dark/asbru_method_sftp.svg b/res/themes/asbru-dark/asbru_method_sftp.svg
new file mode 100644
index 00000000..c0628b84
--- /dev/null
+++ b/res/themes/asbru-dark/asbru_method_sftp.svg
@@ -0,0 +1,45 @@
+<?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"
+   enable-background="new 0 0 200 200"
+   height="32"
+   id="Layer_1"
+   version="1.1"
+   viewBox="0 0 32 32"
+   width="32"
+   xml:space="preserve"
+   sodipodi:docname="asbru_method_sftp.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
+     id="metadata9"><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="defs7" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview5"
+     showgrid="false"
+     inkscape:zoom="26.0625"
+     inkscape:cx="3.2997602"
+     inkscape:cy="16"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1" /><path
+     d="m 31.498797,7.6600216 v 5.3654454 c -0.20336,0.858595 -0.653945,1.647139 -1.319515,2.286746 -0.9362,0.898426 -2.18395,1.39359 -3.511525,1.39359 h -8.34706 v -1.633501 c 0,-0.690285 -0.564975,-1.255036 -1.255345,-1.255036 h -2.133265 c -0.69006,0 -1.25488,0.564906 -1.25488,1.255036 v 1.633501 H 5.3296859 c -1.327575,0 -2.575015,-0.495164 -3.511525,-1.39359 -0.66619,-0.638677 -1.116,-1.427841 -1.31936,-2.286126 V 7.6600216 c 0,-1.1566239 0.94705,-2.1035584 2.10397,-2.1035584 H 29.395137 c 1.156765,0 2.10366,0.9469345 2.10366,2.1035584 z M 17.065507,19.594186 c 0.110515,0 0.20274,-0.09237 0.20274,-0.202715 V 17.75766 16.705803 15.072302 c 0,-0.110346 -0.09222,-0.203335 -0.20274,-0.203335 h -2.13342 c -0.11005,0 -0.20336,0.09299 -0.20336,0.203335 v 1.633501 1.051857 1.633811 c 0,0.110346 0.09331,0.202715 0.20336,0.202715 z m 13.84274,-3.52334 c -1.13398,1.087502 -2.63903,1.686969 -4.24049,1.686969 h -8.34706 v 1.633811 c 0,0.689356 -0.564975,1.254572 -1.255345,1.254572 h -2.133265 c -0.69006,0 -1.25488,-0.565062 -1.25488,-1.254572 V 17.757815 H 5.3296859 c -1.60115,0 -3.10651,-0.599467 -4.240335,-1.686969 -0.21545,-0.2069 -0.41261,-0.426508 -0.59055,-0.656965 v 11.389406 c 0,1.157553 0.94705,2.103713 2.10397,2.103713 H 29.395137 c 1.156765,0 2.10366,-0.94616 2.10366,-2.103713 V 15.413881 c -0.17825,0.230457 -0.374635,0.450065 -0.59055,0.656965 z M 20.849677,1.9653962 C 20.438617,1.5543863 19.899992,1.3490364 19.361832,1.3490364 h -6.72545 c -0.53847,0 -1.077405,0.2053499 -1.488155,0.6163598 -0.41044,0.4106999 -0.61597,0.9491042 -0.61597,1.4873536 v 1.0518567 h 1.787925 V 3.4527498 c 0,-0.059668 0.01628,-0.1469221 0.093,-0.2231728 0.07595,-0.076251 0.16306,-0.092834 0.2232,-0.092834 h 6.725605 c 0.05921,0 0.14663,0.016583 0.222735,0.092834 0.07657,0.076251 0.09285,0.163505 0.09285,0.2231728 v 1.0518567 h 1.787925 V 3.4527498 c -1.6e-4,-0.5382494 -0.20538,-1.0764987 -0.61582,-1.4873536 z"
+     id="path2"
+     inkscape:connector-curvature="0"
+     style="fill:#447821;stroke:#ffffff;stroke-width:0.99999994;stroke-opacity:1" /></svg>
\ No newline at end of file
diff --git a/res/themes/asbru-dark/asbru_method_ssh.svg b/res/themes/asbru-dark/asbru_method_ssh.svg
new file mode 100644
index 00000000..ed344d54
--- /dev/null
+++ b/res/themes/asbru-dark/asbru_method_ssh.svg
@@ -0,0 +1,67 @@
+<?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"
+   height="32px"
+   version="1.1"
+   viewBox="0 0 32 32"
+   width="32px"
+   id="svg11"
+   sodipodi:docname="asbru_method_ssh.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata15">
+    <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>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview13"
+     showgrid="false"
+     inkscape:zoom="20.270834"
+     inkscape:cx="16.091127"
+     inkscape:cy="20.614595"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg11" />
+  <desc
+     id="desc4" />
+  <defs
+     id="defs6" />
+  <g
+     id="Page-1"
+     style="fill:#217821;fill-rule:evenodd;stroke:none;stroke-width:0.84375"
+     transform="matrix(1.1851852,0,0,1.1851852,-3.5555558,-3.5555558)">
+    <g
+       id="icon-114-lock"
+       style="fill:#217821;stroke-width:0.84375">
+      <path
+         d="m 16,21.914647 v 2.594348 C 16,24.780169 16.231934,25 16.5,25 16.776142,25 17,24.772119 17,24.508995 V 21.914647 C 17.582596,21.708729 18,21.153109 18,20.5 18,19.671573 17.328427,19 16.5,19 15.671573,19 15,19.671573 15,20.5 c 0,0.653109 0.417404,1.208729 1,1.414647 z M 9,14.000013 V 10.499235 C 9,6.3567048 12.357864,3 16.5,3 20.633707,3 24,6.3575219 24,10.499235 v 3.500778 c 1.659147,0.0047 3,1.350304 3,3.009465 v 9.981044 C 27,28.663369 25.65292,30 23.991212,30 H 9.008788 C 7.3455902,30 6,28.652611 6,26.990522 V 17.009478 C 6,15.339581 7.3423335,14.004715 9,14.000013 Z M 12,14 V 10.500854 C 12,8.0092478 14.014719,6 16.5,6 18.980224,6 21,8.0151008 21,10.500854 V 14 Z"
+         id="lock"
+         style="fill:#217821;stroke-width:0.84375"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>
diff --git a/res/themes/asbru-dark/asbru_method_telnet.svg b/res/themes/asbru-dark/asbru_method_telnet.svg
new file mode 100644
index 00000000..9b8bd059
--- /dev/null
+++ b/res/themes/asbru-dark/asbru_method_telnet.svg
@@ -0,0 +1,67 @@
+<?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"
+   height="32px"
+   version="1.1"
+   viewBox="0 0 32 32"
+   width="32px"
+   id="svg11"
+   sodipodi:docname="asbru_method_telnet.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata15">
+    <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>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview13"
+     showgrid="false"
+     inkscape:zoom="26.0625"
+     inkscape:cx="16"
+     inkscape:cy="16"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg11" />
+  <desc
+     id="desc4" />
+  <defs
+     id="defs6" />
+  <g
+     id="Page-1"
+     style="fill:#d40000;fill-rule:evenodd;stroke:none;stroke-width:0.96875012"
+     transform="matrix(1.0322581,0,0,1.0322581,-0.5161296,-1.0322586)">
+    <g
+       id="icon-115-lock-open"
+       style="fill:#d40000;stroke-width:0.96875012">
+      <path
+         d="m 20,23.914647 v 2.594348 C 20,26.780169 20.231934,27 20.5,27 20.776142,27 21,26.772119 21,26.508995 V 23.914647 C 21.582596,23.708729 22,23.153109 22,22.5 22,21.671573 21.328427,21 20.5,21 19.671573,21 19,21.671573 19,22.5 c 0,0.653109 0.417404,1.208729 1,1.414647 z M 13,8.4999175 C 13,6.0146817 10.980224,4 8.5,4 6.0147186,4 4,6.0168811 4,8.4999175 V 10 12.499167 C 4,13.321455 3.3284271,14 2.5,14 1.6657972,14 1,13.328054 1,12.499167 V 10 8.499235 C 1,4.3567048 4.3578644,1 8.5,1 12.633707,1 16,4.3575219 16,8.499235 V 16 H 27.991212 C 29.65441,16 31,17.347389 31,19.009478 v 9.981044 C 31,30.663369 29.65292,32 27.991212,32 H 13.008788 C 11.34559,32 10,30.652611 10,28.990522 v -9.981044 c 0,-1.669897 1.342334,-3.004763 3,-3.009466 z"
+         id="lock-open"
+         style="fill:#d40000;stroke-width:0.96875012"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>
diff --git a/res/themes/asbru-dark/asbru_method_vncviewer.svg b/res/themes/asbru-dark/asbru_method_vncviewer.svg
new file mode 100644
index 00000000..de6acfd3
--- /dev/null
+++ b/res/themes/asbru-dark/asbru_method_vncviewer.svg
@@ -0,0 +1,88 @@
+<?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"
+   enable-background="new 0 0 75 61"
+   height="16"
+   id="Layer_1"
+   version="1.1"
+   viewBox="0 0 16 16"
+   width="16"
+   xml:space="preserve"
+   sodipodi:docname="asbru_method_vncviewer.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
+     id="metadata9"><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="defs7" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview5"
+     showgrid="false"
+     showguides="false"
+     inkscape:zoom="19.17937"
+     inkscape:cx="13.737479"
+     inkscape:cy="14.479008"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1" /><text
+     xml:space="preserve"
+     style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.35899734px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#008000;fill-opacity:1;stroke:none;stroke-width:0.32043648px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     x="0.22531466"
+     y="11.772177"
+     id="text17"
+     transform="scale(0.78181461,1.2790756)"><tspan
+       sodipodi:role="line"
+       id="tspan15"
+       x="0.22531466"
+       y="11.772177"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.35899734px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#008000;stroke-width:0.32043648px">V</tspan></text>
+<text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     x="11.36525"
+     y="4.6609974"
+     id="text21"><tspan
+       sodipodi:role="line"
+       id="tspan19"
+       x="11.36525"
+       y="40.05162"></tspan></text>
+<text
+     xml:space="preserve"
+     style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:10.58827019px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#0000ff;fill-opacity:1;stroke:none;stroke-width:0.20747451px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     x="8.708106"
+     y="7.6002789"
+     id="text25"
+     transform="scale(1.0010631,0.99893803)"><tspan
+       sodipodi:role="line"
+       id="tspan23"
+       x="8.708106"
+       y="7.6002789"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:10.58827019px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#0000ff;stroke-width:0.20747451px">n</tspan></text>
+<text
+     xml:space="preserve"
+     style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:12.49081612px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#d40000;fill-opacity:1;stroke:none;stroke-width:0.24945076px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     x="8.8415861"
+     y="15.172903"
+     id="text29"
+     transform="scale(0.99763601,1.0023696)"><tspan
+       sodipodi:role="line"
+       id="tspan27"
+       x="8.8415861"
+       y="15.172903"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:12.49081612px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#d40000;stroke-width:0.24945076px">c</tspan></text>
+</svg>
\ No newline at end of file
diff --git a/res/themes/asbru-dark/asbru_node_add_16x16.svg b/res/themes/asbru-dark/asbru_node_add_16x16.svg
new file mode 100644
index 00000000..eb1a749d
--- /dev/null
+++ b/res/themes/asbru-dark/asbru_node_add_16x16.svg
@@ -0,0 +1,75 @@
+<?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"
+   id="Layer_1_1_"
+   version="1.1"
+   viewBox="0 0 32 32"
+   xml:space="preserve"
+   sodipodi:docname="asbru_node_add_16x16.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   width="32"
+   height="32"><metadata
+     id="metadata9"><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="defs7" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview5"
+     showgrid="false"
+     inkscape:zoom="26.0625"
+     inkscape:cx="16"
+     inkscape:cy="16"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1_1_" /><path
+     d="M 7.3188612,17.259575 H 23.863547 c 3.547916,0 6.434043,-2.725788 6.434043,-6.076596 0,-3.3508084 -2.886127,-6.0765963 -6.434043,-6.0765963 H 8.2380101 c 0,-1.9184671 -1.6452765,-3.4723392 -3.6765958,-3.4723392 -2.031319,0 -3.67659552,1.5538721 -3.67659552,3.4723392 0,1.9184691 1.64527652,3.4723412 3.67659552,3.4723412 1.3566638,0 2.529498,-0.7031494 3.1673873,-1.7361706 H 23.863547 c 2.533176,0 4.595744,1.9479822 4.595744,4.3404257 0,2.392443 -2.062568,4.340425 -4.595744,4.340425 H 7.3188612 c -3.5479149,0 -6.43404242,2.725788 -6.43404242,6.076591 0,3.35081 2.88612752,6.076594 6.43404242,6.076594 H 23.453606 c 0.636053,1.033025 1.808887,1.736172 3.167389,1.736172 2.031318,0 3.676595,-1.553872 3.676595,-3.472339 0,-1.918469 -1.645277,-3.472343 -3.676595,-3.472343 -2.031319,0 -3.676596,1.553874 -3.676596,3.472343 H 7.3188612 c -2.5331744,0 -4.5957446,-1.947986 -4.5957446,-4.340427 0,-2.392442 2.0625702,-4.34042 4.5957446,-4.34042 z"
+     id="path2"
+     style="fill:#ffcc00;stroke:#ffcc00;stroke-width:0.60000002;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1"
+     inkscape:connector-curvature="0" /><circle
+     style="opacity:0;fill:#ff0000;fill-opacity:1;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none"
+     id="path829"
+     cx="-9.3279467"
+     cy="-9.8042545"
+     r="0" /><circle
+     style="opacity:1;fill:#ff0000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+     id="path835"
+     cx="5.7869463"
+     cy="5.9914875"
+     r="5.7191491" /><circle
+     style="opacity:1;fill:#ffcc00;fill-opacity:1;stroke:#808080;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+     id="path835-6"
+     cx="26.348646"
+     cy="26.280851"
+     r="5.7191491" /><g
+     id="g837"
+     transform="matrix(1.9373429,0,0,1.9373429,6.0036167,6.197711)"
+     style="fill:#225500;stroke:#225500;stroke-width:0.30970252;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"><rect
+       y="6.88729"
+       x="3.1270988"
+       height="2.2254195"
+       width="9.7458029"
+       id="rect818"
+       style="opacity:1;fill:#225500;fill-opacity:1;stroke:#225500;stroke-width:0.30970252;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" /><rect
+       transform="rotate(90)"
+       y="-9.11271"
+       x="3.1270983"
+       height="2.2254195"
+       width="9.7458029"
+       id="rect818-0"
+       style="opacity:1;fill:#225500;fill-opacity:1;stroke:#225500;stroke-width:0.30970252;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" /></g></svg>
\ No newline at end of file
diff --git a/res/themes/asbru-dark/asbru_prompt.png b/res/themes/asbru-dark/asbru_prompt.png
new file mode 100644
index 00000000..7ba70cb5
Binary files /dev/null and b/res/themes/asbru-dark/asbru_prompt.png differ
diff --git a/res/themes/asbru-dark/asbru_protected.png b/res/themes/asbru-dark/asbru_protected.png
new file mode 100644
index 00000000..09866ad9
Binary files /dev/null and b/res/themes/asbru-dark/asbru_protected.png differ
diff --git a/res/themes/asbru-dark/asbru_quick_connect.svg b/res/themes/asbru-dark/asbru_quick_connect.svg
new file mode 100644
index 00000000..385f397b
--- /dev/null
+++ b/res/themes/asbru-dark/asbru_quick_connect.svg
@@ -0,0 +1,44 @@
+<?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"
+   height="32"
+   id="Layer_1"
+   version="1.1"
+   viewBox="0 0 32 32"
+   width="32"
+   xml:space="preserve"
+   sodipodi:docname="asbru_quick_connect.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
+     id="metadata9"><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="defs7" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview5"
+     showgrid="false"
+     inkscape:zoom="7.8954133"
+     inkscape:cx="-29.032781"
+     inkscape:cy="-3.2542373"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1" /><path
+     d="M 20.214619,-0.08375616 6.9062849,18.582909 H 14.889617 L 12.431284,31.916243 25.739618,13.249576 h -7.983332 z"
+     id="path2"
+     inkscape:connector-curvature="0"
+     style="stroke-width:1;fill:#00aad4" /></svg>
\ No newline at end of file
diff --git a/res/themes/asbru-dark/asbru_script.png b/res/themes/asbru-dark/asbru_script.png
new file mode 100644
index 00000000..a8f5a36c
Binary files /dev/null and b/res/themes/asbru-dark/asbru_script.png differ
diff --git a/res/themes/asbru-dark/asbru_shell.svg b/res/themes/asbru-dark/asbru_shell.svg
new file mode 100644
index 00000000..5f203639
--- /dev/null
+++ b/res/themes/asbru-dark/asbru_shell.svg
@@ -0,0 +1,63 @@
+<?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"
+   height="512"
+   width="512"
+   version="1.1"
+   id="svg4"
+   sodipodi:docname="asbru_shell.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata10">
+    <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="defs8" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="1.1649148"
+     inkscape:cx="282.0339"
+     inkscape:cy="271.18644"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4" />
+  <rect
+     style="opacity:1;fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:7.55905581;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+     id="rect817"
+     width="343.40387"
+     height="266.97235"
+     x="65.240822"
+     y="81.925621" />
+  <path
+     d="M 475.287,0.3623481 H 36.42986 c -20.199999,0 -36.5714281,19.0934309 -36.5714281,42.6519929 V 469.53405 c 0,23.55856 16.3714291,42.65199 36.5714281,42.65199 H 475.287 c 20.2,0 36.57143,-19.09343 36.57143,-42.65199 V 43.014341 C 511.85843,19.455779 495.487,0.3623481 475.287,0.3623481 Z M 73.001289,298.9261 146.14414,213.62212 73.001289,128.31819 109.57272,85.666302 219.287,213.62212 109.57272,341.57809 Z M 405.06058,343.29495 219.287,341.57809 V 298.9261 l 184.91515,0 z"
+     id="path2"
+     inkscape:connector-curvature="0"
+     style="fill:#4d4d4d;stroke-width:1"
+     sodipodi:nodetypes="ssssssssscccccccccccc" />
+</svg>
diff --git a/res/themes/asbru-dark/asbru_tab.png b/res/themes/asbru-dark/asbru_tab.png
new file mode 100644
index 00000000..3354871e
Binary files /dev/null and b/res/themes/asbru-dark/asbru_tab.png differ
diff --git a/res/themes/asbru-dark/asbru_treelist.svg b/res/themes/asbru-dark/asbru_treelist.svg
new file mode 100644
index 00000000..4bd8554f
--- /dev/null
+++ b/res/themes/asbru-dark/asbru_treelist.svg
@@ -0,0 +1,86 @@
+<?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"
+   height="16"
+   viewBox="0 0 16 16"
+   width="16"
+   version="1.1"
+   id="svg4"
+   sodipodi:docname="asbru_treelist.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata10">
+    <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="defs8" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1687"
+     inkscape:window-height="978"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="52.311231"
+     inkscape:cx="8.077014"
+     inkscape:cy="7.609346"
+     inkscape:window-x="194"
+     inkscape:window-y="51"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg4" />
+  <rect
+     style="opacity:1;fill:#008000;fill-opacity:1;stroke:#008000;stroke-width:1.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+     id="rect817"
+     width="8.7747412"
+     height="2.3712707"
+     x="6.4718328"
+     y="2.984359" />
+  <rect
+     style="opacity:1;fill:#ffcc00;fill-opacity:1;stroke:#ffcc00;stroke-width:1.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+     id="rect817-8"
+     width="3.6917095"
+     height="2.3712707"
+     x="0.73416901"
+     y="3.0152664" />
+  <rect
+     style="opacity:1;fill:#008000;fill-opacity:1;stroke:#008000;stroke-width:1.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+     id="rect817-6"
+     width="6.8878584"
+     height="2.3712707"
+     x="8.493495"
+     y="7.2050185" />
+  <rect
+     style="opacity:1;fill:#d45500;fill-opacity:1;stroke:#d45500;stroke-width:1.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+     id="rect817-8-2"
+     width="3.6917095"
+     height="2.3712707"
+     x="3.0061305"
+     y="7.2359362" />
+  <rect
+     style="opacity:1;fill:#008000;fill-opacity:1;stroke:#008000;stroke-width:1.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+     id="rect817-6-9"
+     width="6.8878584"
+     height="2.3712707"
+     x="8.4583416"
+     y="11.588383" />
+</svg>
diff --git a/res/themes/asbru-dark/asbru_unprotected.png b/res/themes/asbru-dark/asbru_unprotected.png
new file mode 100644
index 00000000..91370324
Binary files /dev/null and b/res/themes/asbru-dark/asbru_unprotected.png differ
diff --git a/res/themes/asbru-dark/asbru_wol.svg b/res/themes/asbru-dark/asbru_wol.svg
new file mode 100644
index 00000000..5e14540d
--- /dev/null
+++ b/res/themes/asbru-dark/asbru_wol.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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="32"
+   viewBox="0 0 32 32"
+   width="32"
+   version="1.1"
+   id="svg6"
+   sodipodi:docname="asbru_wol.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata12">
+    <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="defs10">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient872">
+      <stop
+         style="stop-color:#00aa00;stop-opacity:1;"
+         offset="0"
+         id="stop868" />
+      <stop
+         style="stop-color:#00aa00;stop-opacity:0;"
+         offset="1"
+         id="stop870" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient872"
+       id="radialGradient874"
+       cx="16.398134"
+       cy="25.057543"
+       fx="16.398134"
+       fy="25.057543"
+       r="6.693624"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(8.8460339,0.19906688)" />
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1499"
+     inkscape:window-height="865"
+     id="namedview8"
+     showgrid="false"
+     inkscape:zoom="20.09375"
+     inkscape:cx="16"
+     inkscape:cy="16"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg6" />
+  <path
+     d="M 0,-16 H 48 V 32 H 0 Z"
+     id="path2"
+     inkscape:connector-curvature="0"
+     style="fill:none" />
+  <path
+     d="M 9.1857824,2.43527 7.1532259,0.75247158 0.01288136,9.3512252 7.1532259,17.956594 9.1857824,16.273796 3.4444703,9.3512252 Z M 8.1695042,10.671067 H 10.809187 V 8.0313833 H 8.1695042 Z M 21.367922,8.0313833 h -2.639683 v 2.6396837 h 2.639683 z m -7.919051,2.6396837 h 2.639684 V 8.0313833 h -2.639684 z m 8.93533,-9.9251946 -2.032557,1.6827984 5.741312,6.9225544 -5.741312,6.9159708 2.032557,1.682798 7.140344,-8.5987688 z"
+     id="path4"
+     inkscape:connector-curvature="0"
+     style="stroke-width:1" />
+  <circle
+     style="opacity:1;fill:url(#radialGradient874);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:7.55905533;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+     id="path822"
+     cx="25.244165"
+     cy="25.256609"
+     r="6.693624" />
+</svg>
diff --git a/res/themes/asbru-dark/gtk-delete.svg b/res/themes/asbru-dark/gtk-delete.svg
new file mode 100644
index 00000000..d2bedaef
--- /dev/null
+++ b/res/themes/asbru-dark/gtk-delete.svg
@@ -0,0 +1,44 @@
+<?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"
+   id="Layer_1_1_"
+   version="1.1"
+   viewBox="0 0 32 32"
+   xml:space="preserve"
+   sodipodi:docname="gtk-delete.svg"
+   width="32"
+   height="32"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
+     id="metadata9"><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="defs7" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview5"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="-13.355932"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1_1_" /><path
+     d="M 16,0 C 14.896,0 14,0.896 14,2 H 0 v 4 h 2 v 22 c 0,2.21 1.79,4 4,4 h 20 c 2.21,0 4,-1.79 4,-4 V 6 h 2 V 2 H 18 C 18,0.896 17.104,0 16,0 Z M 8,28 H 6 V 10 h 2 z m 6,0 H 12 V 10 h 2 z m 6,0 H 18 V 10 h 2 z m 6,0 H 24 V 10 h 2 z"
+     id="path2"
+     inkscape:connector-curvature="0"
+     style="stroke-width:1;fill:#aa0000" /></svg>
\ No newline at end of file
diff --git a/res/themes/asbru-dark/gtk-edit.svg b/res/themes/asbru-dark/gtk-edit.svg
new file mode 100644
index 00000000..da911158
--- /dev/null
+++ b/res/themes/asbru-dark/gtk-edit.svg
@@ -0,0 +1,67 @@
+<?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"
+   height="32px"
+   version="1.1"
+   viewBox="0 0 32 32"
+   width="32px"
+   id="svg11"
+   sodipodi:docname="gtk-edit.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata15">
+    <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>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview13"
+     showgrid="false"
+     inkscape:zoom="26.0625"
+     inkscape:cx="-9.4772182"
+     inkscape:cy="16"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg11" />
+  <desc
+     id="desc4" />
+  <defs
+     id="defs6" />
+  <g
+     id="Page-1"
+     style="fill:#0088aa;fill-rule:evenodd;stroke:none;stroke-width:0.84906781;fill-opacity:1"
+     transform="matrix(1.1777622,0,0,1.1777622,-3.3807443,-3.2989684)">
+    <g
+       id="icon-136-document-edit"
+       style="fill:#0088aa;stroke-width:0.84906781;fill-opacity:1">
+      <path
+         d="M 26.443228,12.150335 15.157013,23.449906 v 0 L 12.551447,20.84434 23.843538,9.5506451 Z M 27.149916,11.44281 28.879095,9.7115841 C 29.269069,9.3211489 29.266195,8.6865042 28.8743,8.295685 L 27.694487,7.11911 C 27.301865,6.7275656 26.669258,6.7245247 26.277913,7.1159253 L 24.550595,8.8434882 Z M 11.903706,21.610813 11.26416,24.72351 14.399065,24.106171 Z M 22,18 V 28.002578 C 22,29.109075 21.105724,30 20.002578,30 H 4.9974219 C 3.8909254,30 3,29.101288 3,27.99267 V 5.0073299 C 3,3.8983383 3.8992496,3 5.0085302,3 H 15 V 9.0018986 C 15,10.113294 15.898081,11 17.005919,11 H 21 l 4.580107,-4.5801067 c 0.792674,-0.7926743 2.051284,-0.7885027 2.830143,-0.00964 l 1.1795,1.1794992 c 0.776438,0.7764385 0.774542,2.0459582 -0.0096,2.8301435 z M 16,3 V 8.9970707 C 16,9.5509732 16.450975,10 16.990778,10 H 22 Z"
+         id="document-edit"
+         style="fill:#0088aa;stroke-width:0.84906781;fill-opacity:1"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>
diff --git a/res/themes/asbru-dark/gtk-find.svg b/res/themes/asbru-dark/gtk-find.svg
new file mode 100644
index 00000000..1f78c535
--- /dev/null
+++ b/res/themes/asbru-dark/gtk-find.svg
@@ -0,0 +1,55 @@
+<?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"
+   height="32"
+   width="32"
+   version="1.1"
+   id="svg4"
+   sodipodi:docname="gtk-find.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata10">
+    <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="defs8" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="12.95122"
+     inkscape:cx="-8.6346506"
+     inkscape:cy="10"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4" />
+  <path
+     d="m 30.961667,26.87326 -7.697992,-7.697992 c 1.098901,-1.794154 1.765169,-3.884732 1.765169,-6.145262 0,-6.5517821 -5.31482,-11.8656452 -11.865646,-11.8656452 -6.5517834,0 -11.8656461,5.3138631 -11.8656461,11.8656452 0,6.550826 5.3138627,11.865646 11.8656461,11.865646 2.26053,0 4.351108,-0.666268 6.145262,-1.761307 l 7.697992,7.69413 c 0.540752,0.540753 1.436855,0.53689 1.977607,0 l 1.977608,-1.977608 c 0.540753,-0.540752 0.540753,-1.436855 0,-1.977607 z M 13.163198,20.940437 c -4.3685044,0 -7.9104308,-3.541927 -7.9104308,-7.910431 0,-4.3685035 3.5419264,-7.9104298 7.9104308,-7.9104298 4.368504,0 7.910431,3.5419263 7.910431,7.9104298 0,4.368504 -3.541927,7.910431 -7.910431,7.910431 z"
+     id="path2"
+     inkscape:connector-curvature="0"
+     style="stroke-width:1;fill:#0088aa" />
+</svg>
diff --git a/res/themes/asbru-dark/gtk-spell-check.svg b/res/themes/asbru-dark/gtk-spell-check.svg
new file mode 100644
index 00000000..b9a6f146
--- /dev/null
+++ b/res/themes/asbru-dark/gtk-spell-check.svg
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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="32"
+   height="32"
+   viewBox="0 0 8.4666659 8.4666659"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="gtk-spell-check.svg">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="17.497415"
+     inkscape:cx="-0.34209718"
+     inkscape:cy="20.846388"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5">
+    <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>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-288.53334)">
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:3.52777767px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#0088aa;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+       x="0.30242562"
+       y="292.20654"
+       id="text817"><tspan
+         sodipodi:role="line"
+         id="tspan815"
+         x="0.30242562"
+         y="292.20654"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:3.52777767px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.26458332px;fill:#0088aa;">ABC</tspan></text>
+    <g
+       id="g848"
+       style="fill:#447821;stroke:none;stroke-width:0.81602418"
+       transform="matrix(1.2254539,0,0,1.2254539,-0.77539418,-67.044897)">
+      <rect
+         transform="rotate(45)"
+         y="206.14658"
+         x="208.99654"
+         height="0.83167046"
+         width="2.8730433"
+         id="rect819"
+         style="opacity:1;fill:#447821;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.63204837;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" />
+      <rect
+         transform="rotate(-45)"
+         inkscape:transform-center-y="4.8319891"
+         inkscape:transform-center-x="4.1049014"
+         y="211.03792"
+         x="-206.97824"
+         height="0.83167046"
+         width="4.4305353"
+         id="rect819-3"
+         style="opacity:1;fill:#447821;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.63204837;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" />
+    </g>
+  </g>
+</svg>
diff --git a/res/themes/default/asbru-cluster.svg b/res/themes/default/asbru-cluster.svg
new file mode 100644
index 00000000..d178ae40
--- /dev/null
+++ b/res/themes/default/asbru-cluster.svg
@@ -0,0 +1,885 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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"
+   id="svg3327"
+   sodipodi:docname="asbru-cluster.svg"
+   viewBox="0 0 50 49.999999"
+   version="1.1"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   width="50"
+   height="50">
+  <defs
+     id="defs165" />
+  <sodipodi:namedview
+     id="base"
+     bordercolor="#666666"
+     inkscape:pageshadow="2"
+     inkscape:window-y="28"
+     fit-margin-left="0"
+     pagecolor="#ffffff"
+     fit-margin-top="0"
+     inkscape:window-maximized="1"
+     inkscape:zoom="3.959798"
+     inkscape:window-x="0"
+     inkscape:window-height="1412"
+     showgrid="false"
+     borderopacity="1.0"
+     inkscape:current-layer="layer1"
+     inkscape:cx="48.181346"
+     inkscape:cy="18.904047"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="2560"
+     inkscape:pageopacity="0.0"
+     inkscape:document-units="px" />
+  <g
+     id="layer1"
+     inkscape:label="レイヤー 1"
+     inkscape:groupmode="layer"
+     transform="translate(-112.53,-481.26001)">
+    <g
+       id="g5204"
+       transform="matrix(0.78017703,0,0,0.78017703,90.885763,444.84324)">
+      <path
+         id="rect5126"
+         style="color:#000000;fill:#4d4d4d;fill-rule:evenodd;stroke:#cccccc;stroke-width:0.20812"
+         inkscape:connector-curvature="0"
+         d="m 33,52.362 h 54.145 v 11 H 33 Z" />
+      <path
+         id="rect5128"
+         style="color:#000000;fill:#afdde9;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 38,54.362 h 18 v 2 H 38 Z" />
+      <path
+         id="path5130"
+         style="color:#000000;fill:#008080;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(0.0625,2.9375)" />
+      <path
+         id="path5132"
+         style="color:#000000;fill:#afdde9;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 79,55.362 c 0,0.55228 -0.44772,1 -1,1 -0.55228,0 -1,-0.44772 -1,-1 0,-0.55228 0.44772,-1 1,-1 0.55228,0 1,0.44772 1,1 z"
+         transform="translate(4)" />
+      <path
+         id="path5134"
+         style="color:#000000;fill:#008080;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(21.062,2.9375)" />
+      <path
+         id="path5136"
+         style="color:#000000;fill:#008080;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(19.062,2.9375)" />
+      <path
+         id="path5138"
+         style="color:#000000;fill:#008080;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(17.062,2.9375)" />
+      <g
+         id="g5140"
+         style="stroke:#1a1a1a;stroke-width:0.1">
+        <path
+           id="path5142"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="M 37.047,60.425 H 83.094"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5144"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 38.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5146"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 40.062,60.425 v 1.9579" />
+        <path
+           id="path5148"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 42.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5150"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 44.062,60.425 v 1.9579" />
+        <path
+           id="path5152"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 46.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5154"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 48.062,60.425 v 1.9579" />
+        <path
+           id="path5156"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 50.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5158"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 62.062,60.425 v 1.9579" />
+        <path
+           id="path5160"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 52.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5162"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 68.062,60.425 v 1.9579" />
+        <path
+           id="path5164"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 66.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5166"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 64.062,60.425 v 1.9579" />
+        <path
+           id="path5168"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 60.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5170"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 58.062,60.425 v 1.9579" />
+        <path
+           id="path5172"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 54.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5174"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 56.062,60.425 v 1.9579" />
+        <path
+           id="path5176"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 70.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5178"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 72.062,60.425 v 1.9579" />
+        <path
+           id="path5180"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 74.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5182"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 76.062,60.425 v 1.9579" />
+        <path
+           id="path5184"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 78.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5186"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 80.062,60.425 v 1.9579" />
+        <path
+           id="path5188"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 82.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+      </g>
+      <path
+         id="rect5192"
+         style="color:#000000;fill:#4d4d4d;fill-rule:evenodd;stroke:#cccccc;stroke-width:0.050956"
+         inkscape:connector-curvature="0"
+         d="m 87.255,52.362 h 3.2457 v 11 h -3.246 z" />
+      <path
+         id="path5194"
+         style="color:#000000;fill:#1a1a1a;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(31.28,0.42989)" />
+      <path
+         id="path5196"
+         style="color:#000000;fill:#1a1a1a;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(31.28,9.5901)" />
+      <path
+         id="rect5198"
+         style="color:#000000;fill:#4d4d4d;fill-rule:evenodd;stroke:#cccccc;stroke-width:0.050956"
+         inkscape:connector-curvature="0"
+         d="m 29.618,52.362 h 3.2457 v 11 h -3.246 z" />
+      <path
+         id="path5200"
+         style="color:#000000;fill:#1a1a1a;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(-26.357,0.42989)" />
+      <path
+         id="path5202"
+         style="color:#000000;fill:#1a1a1a;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(-26.357,9.5901)" />
+    </g>
+    <g
+       id="g5204-2"
+       transform="matrix(0.78017703,0,0,0.78017703,90.885763,456.10555)">
+      <path
+         id="rect5126-0"
+         style="color:#000000;fill:#4d4d4d;fill-rule:evenodd;stroke:#cccccc;stroke-width:0.20812"
+         inkscape:connector-curvature="0"
+         d="m 33,52.362 h 54.145 v 11 H 33 Z" />
+      <path
+         id="rect5128-0"
+         style="color:#000000;fill:#afdde9;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 38,54.362 h 18 v 2 H 38 Z" />
+      <path
+         id="path5130-9"
+         style="color:#000000;fill:#008080;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(0.0625,2.9375)" />
+      <path
+         id="path5132-4"
+         style="color:#000000;fill:#afdde9;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 79,55.362 c 0,0.55228 -0.44772,1 -1,1 -0.55228,0 -1,-0.44772 -1,-1 0,-0.55228 0.44772,-1 1,-1 0.55228,0 1,0.44772 1,1 z"
+         transform="translate(4)" />
+      <path
+         id="path5134-5"
+         style="color:#000000;fill:#008080;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(21.062,2.9375)" />
+      <path
+         id="path5136-6"
+         style="color:#000000;fill:#008080;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(19.062,2.9375)" />
+      <path
+         id="path5138-7"
+         style="color:#000000;fill:#008080;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(17.062,2.9375)" />
+      <g
+         id="g5140-6"
+         style="stroke:#1a1a1a;stroke-width:0.1">
+        <path
+           id="path5142-6"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="M 37.047,60.425 H 83.094"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5144-6"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 38.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5146-1"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 40.062,60.425 v 1.9579" />
+        <path
+           id="path5148-1"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 42.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5150-7"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 44.062,60.425 v 1.9579" />
+        <path
+           id="path5152-4"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 46.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5154-8"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 48.062,60.425 v 1.9579" />
+        <path
+           id="path5156-8"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 50.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5158-5"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 62.062,60.425 v 1.9579" />
+        <path
+           id="path5160-3"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 52.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5162-8"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 68.062,60.425 v 1.9579" />
+        <path
+           id="path5164-0"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 66.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5166-4"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 64.062,60.425 v 1.9579" />
+        <path
+           id="path5168-4"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 60.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5170-9"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 58.062,60.425 v 1.9579" />
+        <path
+           id="path5172-5"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 54.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5174-3"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 56.062,60.425 v 1.9579" />
+        <path
+           id="path5176-3"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 70.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5178-8"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 72.062,60.425 v 1.9579" />
+        <path
+           id="path5180-7"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 74.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5182-8"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 76.062,60.425 v 1.9579" />
+        <path
+           id="path5184-7"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 78.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5186-5"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 80.062,60.425 v 1.9579" />
+        <path
+           id="path5188-5"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 82.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+      </g>
+      <path
+         id="rect5192-4"
+         style="color:#000000;fill:#4d4d4d;fill-rule:evenodd;stroke:#cccccc;stroke-width:0.050956"
+         inkscape:connector-curvature="0"
+         d="m 87.255,52.362 h 3.2457 v 11 h -3.246 z" />
+      <path
+         id="path5194-4"
+         style="color:#000000;fill:#1a1a1a;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(31.28,0.42989)" />
+      <path
+         id="path5196-2"
+         style="color:#000000;fill:#1a1a1a;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(31.28,9.5901)" />
+      <path
+         id="rect5198-4"
+         style="color:#000000;fill:#4d4d4d;fill-rule:evenodd;stroke:#cccccc;stroke-width:0.050956"
+         inkscape:connector-curvature="0"
+         d="m 29.618,52.362 h 3.2457 v 11 h -3.246 z" />
+      <path
+         id="path5200-3"
+         style="color:#000000;fill:#1a1a1a;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(-26.357,0.42989)" />
+      <path
+         id="path5202-8"
+         style="color:#000000;fill:#1a1a1a;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(-26.357,9.5901)" />
+    </g>
+    <g
+       id="g5204-1"
+       transform="matrix(0.78017703,0,0,0.78017703,90.885763,467.36785)">
+      <path
+         id="rect5126-4"
+         style="color:#000000;fill:#4d4d4d;fill-rule:evenodd;stroke:#cccccc;stroke-width:0.20812"
+         inkscape:connector-curvature="0"
+         d="m 33,52.362 h 54.145 v 11 H 33 Z" />
+      <path
+         id="rect5128-8"
+         style="color:#000000;fill:#afdde9;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 38,54.362 h 18 v 2 H 38 Z" />
+      <path
+         id="path5130-0"
+         style="color:#000000;fill:#008080;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(0.0625,2.9375)" />
+      <path
+         id="path5132-1"
+         style="color:#000000;fill:#afdde9;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 79,55.362 c 0,0.55228 -0.44772,1 -1,1 -0.55228,0 -1,-0.44772 -1,-1 0,-0.55228 0.44772,-1 1,-1 0.55228,0 1,0.44772 1,1 z"
+         transform="translate(4)" />
+      <path
+         id="path5134-6"
+         style="color:#000000;fill:#008080;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(21.062,2.9375)" />
+      <path
+         id="path5136-2"
+         style="color:#000000;fill:#008080;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(19.062,2.9375)" />
+      <path
+         id="path5138-5"
+         style="color:#000000;fill:#008080;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(17.062,2.9375)" />
+      <g
+         id="g5140-1"
+         style="stroke:#1a1a1a;stroke-width:0.1">
+        <path
+           id="path5142-4"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="M 37.047,60.425 H 83.094"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5144-7"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 38.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5146-8"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 40.062,60.425 v 1.9579" />
+        <path
+           id="path5148-5"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 42.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5150-6"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 44.062,60.425 v 1.9579" />
+        <path
+           id="path5152-6"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 46.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5154-2"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 48.062,60.425 v 1.9579" />
+        <path
+           id="path5156-85"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 50.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5158-0"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 62.062,60.425 v 1.9579" />
+        <path
+           id="path5160-8"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 52.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5162-3"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 68.062,60.425 v 1.9579" />
+        <path
+           id="path5164-8"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 66.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5166-40"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 64.062,60.425 v 1.9579" />
+        <path
+           id="path5168-9"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 60.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5170-2"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 58.062,60.425 v 1.9579" />
+        <path
+           id="path5172-54"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 54.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5174-9"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 56.062,60.425 v 1.9579" />
+        <path
+           id="path5176-4"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 70.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5178-81"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 72.062,60.425 v 1.9579" />
+        <path
+           id="path5180-3"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 74.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5182-9"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 76.062,60.425 v 1.9579" />
+        <path
+           id="path5184-1"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 78.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5186-2"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 80.062,60.425 v 1.9579" />
+        <path
+           id="path5188-1"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 82.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+      </g>
+      <path
+         id="rect5192-1"
+         style="color:#000000;fill:#4d4d4d;fill-rule:evenodd;stroke:#cccccc;stroke-width:0.050956"
+         inkscape:connector-curvature="0"
+         d="m 87.255,52.362 h 3.2457 v 11 h -3.246 z" />
+      <path
+         id="path5194-7"
+         style="color:#000000;fill:#1a1a1a;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(31.28,0.42989)" />
+      <path
+         id="path5196-0"
+         style="color:#000000;fill:#1a1a1a;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(31.28,9.5901)" />
+      <path
+         id="rect5198-5"
+         style="color:#000000;fill:#4d4d4d;fill-rule:evenodd;stroke:#cccccc;stroke-width:0.050956"
+         inkscape:connector-curvature="0"
+         d="m 29.618,52.362 h 3.2457 v 11 h -3.246 z" />
+      <path
+         id="path5200-7"
+         style="color:#000000;fill:#1a1a1a;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(-26.357,0.42989)" />
+      <path
+         id="path5202-5"
+         style="color:#000000;fill:#1a1a1a;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(-26.357,9.5901)" />
+    </g>
+    <g
+       id="g5204-2-1"
+       transform="matrix(0.78017703,0,0,0.78017703,90.885763,478.63184)">
+      <path
+         id="rect5126-0-2"
+         style="color:#000000;fill:#4d4d4d;fill-rule:evenodd;stroke:#cccccc;stroke-width:0.20812"
+         inkscape:connector-curvature="0"
+         d="m 33,52.362 h 54.145 v 11 H 33 Z" />
+      <path
+         id="rect5128-0-4"
+         style="color:#000000;fill:#afdde9;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 38,54.362 h 18 v 2 H 38 Z" />
+      <path
+         id="path5130-9-3"
+         style="color:#000000;fill:#008080;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(0.0625,2.9375)" />
+      <path
+         id="path5132-4-7"
+         style="color:#000000;fill:#afdde9;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 79,55.362 c 0,0.55228 -0.44772,1 -1,1 -0.55228,0 -1,-0.44772 -1,-1 0,-0.55228 0.44772,-1 1,-1 0.55228,0 1,0.44772 1,1 z"
+         transform="translate(4)" />
+      <path
+         id="path5134-5-9"
+         style="color:#000000;fill:#008080;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(21.062,2.9375)" />
+      <path
+         id="path5136-6-8"
+         style="color:#000000;fill:#008080;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(19.062,2.9375)" />
+      <path
+         id="path5138-7-1"
+         style="color:#000000;fill:#008080;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(17.062,2.9375)" />
+      <g
+         id="g5140-6-3"
+         style="stroke:#1a1a1a;stroke-width:0.1">
+        <path
+           id="path5142-6-4"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="M 37.047,60.425 H 83.094"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5144-6-3"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 38.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5146-1-6"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 40.062,60.425 v 1.9579" />
+        <path
+           id="path5148-1-1"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 42.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5150-7-8"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 44.062,60.425 v 1.9579" />
+        <path
+           id="path5152-4-7"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 46.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5154-8-0"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 48.062,60.425 v 1.9579" />
+        <path
+           id="path5156-8-3"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 50.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5158-5-1"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 62.062,60.425 v 1.9579" />
+        <path
+           id="path5160-3-0"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 52.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5162-8-9"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 68.062,60.425 v 1.9579" />
+        <path
+           id="path5164-0-5"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 66.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5166-4-4"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 64.062,60.425 v 1.9579" />
+        <path
+           id="path5168-4-8"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 60.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5170-9-5"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 58.062,60.425 v 1.9579" />
+        <path
+           id="path5172-5-5"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 54.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5174-3-1"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 56.062,60.425 v 1.9579" />
+        <path
+           id="path5176-3-4"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 70.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5178-8-4"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 72.062,60.425 v 1.9579" />
+        <path
+           id="path5180-7-0"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 74.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5182-8-5"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 76.062,60.425 v 1.9579" />
+        <path
+           id="path5184-7-8"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 78.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5186-5-3"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 80.062,60.425 v 1.9579" />
+        <path
+           id="path5188-5-8"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 82.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+      </g>
+      <path
+         id="rect5192-4-8"
+         style="color:#000000;fill:#4d4d4d;fill-rule:evenodd;stroke:#cccccc;stroke-width:0.050956"
+         inkscape:connector-curvature="0"
+         d="m 87.255,52.362 h 3.2457 v 11 h -3.246 z" />
+      <path
+         id="path5194-4-1"
+         style="color:#000000;fill:#1a1a1a;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(31.28,0.42989)" />
+      <path
+         id="path5196-2-6"
+         style="color:#000000;fill:#1a1a1a;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(31.28,9.5901)" />
+      <path
+         id="rect5198-4-0"
+         style="color:#000000;fill:#4d4d4d;fill-rule:evenodd;stroke:#cccccc;stroke-width:0.050956"
+         inkscape:connector-curvature="0"
+         d="m 29.618,52.362 h 3.2457 v 11 h -3.246 z" />
+      <path
+         id="path5200-3-1"
+         style="color:#000000;fill:#1a1a1a;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(-26.357,0.42989)" />
+      <path
+         id="path5202-8-8"
+         style="color:#000000;fill:#1a1a1a;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(-26.357,9.5901)" />
+    </g>
+  </g>
+  <metadata
+     id="metadata162">
+    <rdf:RDF>
+      <cc:Work>
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+        <dc:publisher>
+          <cc:Agent
+             rdf:about="http://openclipart.org/">
+            <dc:title>Openclipart</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:title></dc:title>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+</svg>
diff --git a/res/themes/default/asbru-edit.svg b/res/themes/default/asbru-edit.svg
new file mode 100644
index 00000000..5b112806
--- /dev/null
+++ b/res/themes/default/asbru-edit.svg
@@ -0,0 +1,587 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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="50"
+   height="50"
+   viewBox="0 0 50 50"
+   version="1.1"
+   id="svg3519"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="asbru-edit.svg">
+  <defs
+     id="defs3513">
+    <linearGradient
+       id="linearGradient24875"
+       y2="367.54999"
+       gradientUnits="userSpaceOnUse"
+       x2="379.88"
+       gradientTransform="matrix(0.7071,0.7071,-0.7071,0.7071,362.27,-93.062)"
+       y1="367.54999"
+       x1="368.17001"
+       inkscape:collect="always">
+      <stop
+         id="stop8086"
+         style="stop-color:#3F3F3F"
+         offset="0" />
+      <stop
+         id="stop8088"
+         style="stop-color:#FFFFFF"
+         offset=".3315" />
+      <stop
+         id="stop8090"
+         style="stop-color:#FFFFFF"
+         offset=".5281" />
+      <stop
+         id="stop8092"
+         style="stop-color:#333333"
+         offset=".6854" />
+      <stop
+         id="stop8094"
+         style="stop-color:#A4A4A4"
+         offset=".8427" />
+      <stop
+         id="stop8096"
+         style="stop-color:#9A9A9A"
+         offset=".8705" />
+      <stop
+         id="stop8098"
+         style="stop-color:#7D7D7D"
+         offset=".9192" />
+      <stop
+         id="stop8100"
+         style="stop-color:#4E4E4E"
+         offset=".9826" />
+      <stop
+         id="stop8102"
+         style="stop-color:#3F3F3F"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient24877"
+       y2="408.34"
+       gradientUnits="userSpaceOnUse"
+       x2="379.88"
+       gradientTransform="matrix(0.7071,0.7071,-0.7071,0.7071,362.27,-93.062)"
+       y1="408.34"
+       x1="368.17001"
+       inkscape:collect="always">
+      <stop
+         id="stop8107"
+         style="stop-color:#E4BD96"
+         offset="0" />
+      <stop
+         id="stop8109"
+         style="stop-color:#D59658"
+         offset=".2303" />
+      <stop
+         id="stop8111"
+         style="stop-color:#E4BD96"
+         offset=".5" />
+      <stop
+         id="stop8113"
+         style="stop-color:#D59658"
+         offset=".7753" />
+      <stop
+         id="stop8115"
+         style="stop-color:#E4BD96"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient24879"
+       y2="413.64001"
+       gradientUnits="userSpaceOnUse"
+       x2="376.51001"
+       gradientTransform="matrix(0.7071,0.7071,-0.7071,0.7071,362.27,-93.062)"
+       y1="414.03"
+       x1="372.07001"
+       inkscape:collect="always">
+      <stop
+         id="stop8120"
+         style="stop-color:#191919"
+         offset="0" />
+      <stop
+         id="stop8122"
+         style="stop-color:#666666"
+         offset=".3708" />
+      <stop
+         id="stop8124"
+         style="stop-color:#565656"
+         offset=".3921" />
+      <stop
+         id="stop8126"
+         style="stop-color:#3B3B3B"
+         offset=".4356" />
+      <stop
+         id="stop8128"
+         style="stop-color:#252525"
+         offset=".4857" />
+      <stop
+         id="stop8130"
+         style="stop-color:#161616"
+         offset=".5443" />
+      <stop
+         id="stop8132"
+         style="stop-color:#0D0D0D"
+         offset=".6166" />
+      <stop
+         id="stop8134"
+         style="stop-color:#060606"
+         offset=".7181" />
+      <stop
+         id="stop8136"
+         style="stop-color:#000000"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient24881"
+       y2="404.66"
+       gradientUnits="userSpaceOnUse"
+       x2="374.17001"
+       gradientTransform="matrix(0.7071,0.7071,-0.7071,0.7071,362.27,-93.062)"
+       y1="370.19"
+       x1="374.17001"
+       inkscape:collect="always">
+      <stop
+         id="stop8143"
+         style="stop-color:#FFFF00"
+         offset="0" />
+      <stop
+         id="stop8145"
+         style="stop-color:#FFEC00"
+         offset=".1047" />
+      <stop
+         id="stop8147"
+         style="stop-color:#FFD800"
+         offset=".2571" />
+      <stop
+         id="stop8149"
+         style="stop-color:#FFCA00"
+         offset=".4309" />
+      <stop
+         id="stop8151"
+         style="stop-color:#FFC200"
+         offset=".6427" />
+      <stop
+         id="stop8153"
+         style="stop-color:#FFBF00"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient24883"
+       y2="370.19"
+       gradientUnits="userSpaceOnUse"
+       x2="378.12"
+       gradientTransform="matrix(0.7071,0.7071,-0.7071,0.7071,362.27,-93.062)"
+       y1="402.64999"
+       x1="378.12"
+       inkscape:collect="always">
+      <stop
+         id="stop8158"
+         style="stop-color:#FFBF00"
+         offset="0" />
+      <stop
+         id="stop8160"
+         style="stop-color:#F2B407"
+         offset=".0202" />
+      <stop
+         id="stop8162"
+         style="stop-color:#BC8712"
+         offset=".128" />
+      <stop
+         id="stop8164"
+         style="stop-color:#946818"
+         offset=".2457" />
+      <stop
+         id="stop8166"
+         style="stop-color:#78531A"
+         offset=".3747" />
+      <stop
+         id="stop8168"
+         style="stop-color:#67461B"
+         offset=".521" />
+      <stop
+         id="stop8170"
+         style="stop-color:#5D3F1B"
+         offset=".6993" />
+      <stop
+         id="stop8172"
+         style="stop-color:#5A3D1B"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient24885"
+       y2="370.19"
+       gradientUnits="userSpaceOnUse"
+       x2="369.95999"
+       gradientTransform="matrix(0.7071,0.7071,-0.7071,0.7071,362.27,-93.062)"
+       y1="402.23001"
+       x1="369.95999"
+       inkscape:collect="always">
+      <stop
+         id="stop8177"
+         style="stop-color:#FFBF00"
+         offset="0" />
+      <stop
+         id="stop8179"
+         style="stop-color:#F2B407"
+         offset=".0202" />
+      <stop
+         id="stop8181"
+         style="stop-color:#BC8712"
+         offset=".128" />
+      <stop
+         id="stop8183"
+         style="stop-color:#946818"
+         offset=".2457" />
+      <stop
+         id="stop8185"
+         style="stop-color:#78531A"
+         offset=".3747" />
+      <stop
+         id="stop8187"
+         style="stop-color:#67461B"
+         offset=".521" />
+      <stop
+         id="stop8189"
+         style="stop-color:#5D3F1B"
+         offset=".6993" />
+      <stop
+         id="stop8191"
+         style="stop-color:#5A3D1B"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient24887"
+       y2="385.26999"
+       gradientUnits="userSpaceOnUse"
+       x2="511.01999"
+       gradientTransform="matrix(-0.6676,-0.0135,0.0308,-1.5277,669.76,1053.2)"
+       y1="385.26999"
+       x1="504.91"
+       inkscape:collect="always">
+      <stop
+         id="stop8230"
+         style="stop-color:#FFFFFF"
+         offset="0" />
+      <stop
+         id="stop8232"
+         style="stop-color:#070606"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient24889"
+       y2="281.03"
+       gradientUnits="userSpaceOnUse"
+       x2="382.51001"
+       gradientTransform="matrix(0.6676,0.0135,-0.0308,1.5277,101.91,23.36)"
+       y1="281.03"
+       x1="376.39001"
+       inkscape:collect="always">
+      <stop
+         id="stop8237"
+         style="stop-color:#FFFFFF"
+         offset="0" />
+      <stop
+         id="stop8239"
+         style="stop-color:#070606"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient24891"
+       y2="348.26001"
+       gradientUnits="userSpaceOnUse"
+       x2="421.85001"
+       gradientTransform="matrix(0.0268,0.6979,1.5269,-0.0586,-202.31,183.83)"
+       y1="348.26001"
+       x1="415.73999"
+       inkscape:collect="always">
+      <stop
+         id="stop8246"
+         style="stop-color:#FFFFFF"
+         offset="0" />
+      <stop
+         id="stop8248"
+         style="stop-color:#070606"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient24893"
+       y2="317.95001"
+       gradientUnits="userSpaceOnUse"
+       x2="472.57001"
+       gradientTransform="matrix(-0.0268,-0.6979,-1.5269,0.0586,838.57,760.49)"
+       y1="317.95001"
+       x1="466.45999"
+       inkscape:collect="always">
+      <stop
+         id="stop8253"
+         style="stop-color:#FFFFFF"
+         offset="0" />
+      <stop
+         id="stop8255"
+         style="stop-color:#070606"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient24895"
+       y2="359.76999"
+       gradientUnits="userSpaceOnUse"
+       x2="373.92999"
+       gradientTransform="matrix(0.7071,0.7071,-0.7071,0.7071,362.27,-93.062)"
+       y1="357.67999"
+       x1="373.92999"
+       inkscape:collect="always">
+      <stop
+         id="stop8262"
+         style="stop-color:#FFFFFF"
+         offset="0" />
+      <stop
+         id="stop8264"
+         style="stop-color:#FAFAFA"
+         offset=".1075" />
+      <stop
+         id="stop8266"
+         style="stop-color:#ECECEC"
+         offset=".2312" />
+      <stop
+         id="stop8268"
+         style="stop-color:#D5D5D5"
+         offset=".363" />
+      <stop
+         id="stop8270"
+         style="stop-color:#B5B5B5"
+         offset=".5005" />
+      <stop
+         id="stop8272"
+         style="stop-color:#8B8B8B"
+         offset=".6425" />
+      <stop
+         id="stop8274"
+         style="stop-color:#585858"
+         offset=".7882" />
+      <stop
+         id="stop8276"
+         style="stop-color:#1D1D1D"
+         offset=".9342" />
+      <stop
+         id="stop8278"
+         style="stop-color:#000000"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient24897"
+       y2="373.48001"
+       gradientUnits="userSpaceOnUse"
+       x2="439.42001"
+       gradientTransform="matrix(0.7208,0.7218,-2.8534,2.8493,1118.2,-943.64)"
+       y1="373.48001"
+       x1="433.31"
+       inkscape:collect="always">
+      <stop
+         id="stop8285"
+         style="stop-color:#FFFFFF"
+         offset="0" />
+      <stop
+         id="stop8287"
+         style="stop-color:#070606"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient24899"
+       y2="293.31"
+       gradientUnits="userSpaceOnUse"
+       x2="453.57001"
+       gradientTransform="matrix(-0.7208,-0.7218,2.8534,-2.8493,-149.55,1592)"
+       y1="293.31"
+       x1="447.45999"
+       inkscape:collect="always">
+      <stop
+         id="stop8292"
+         style="stop-color:#FFFFFF"
+         offset="0" />
+      <stop
+         id="stop8294"
+         style="stop-color:#070606"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient24901"
+       y2="377.45999"
+       gradientUnits="userSpaceOnUse"
+       x2="523"
+       gradientTransform="matrix(-0.7208,-0.7218,2.8534,-2.8493,-335.13,1877.4)"
+       y1="377.45999"
+       x1="516.89001"
+       inkscape:collect="always">
+      <stop
+         id="stop8301"
+         style="stop-color:#FFFFFF"
+         offset="0" />
+      <stop
+         id="stop8303"
+         style="stop-color:#070606"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient24903"
+       y2="289.32999"
+       gradientUnits="userSpaceOnUse"
+       x2="369.98999"
+       gradientTransform="matrix(0.7208,0.7218,-2.8534,2.8493,932.61,-658.29)"
+       y1="289.32999"
+       x1="363.88"
+       inkscape:collect="always">
+      <stop
+         id="stop8308"
+         style="stop-color:#FFFFFF"
+         offset="0" />
+      <stop
+         id="stop8310"
+         style="stop-color:#070606"
+         offset="1" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.919596"
+     inkscape:cx="-18.556451"
+     inkscape:cy="-10.736188"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="2560"
+     inkscape:window-height="1412"
+     inkscape:window-x="0"
+     inkscape:window-y="28"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata3516">
+    <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 />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-283.77083)">
+    <path
+       d="m 48.529996,293.99022 c 2.319869,-2.32778 -5.779876,-10.61854 -8.200694,-8.20069 -2.035823,2.03384 -4.956442,4.95545 -4.956442,4.95545 l 8.200695,8.19971 c 9.89e-4,0 2.837483,-2.83749 4.956441,-4.95447 z"
+       inkscape:connector-curvature="0"
+       style="fill:#bf0000;stroke-width:0.98970485"
+       id="path8083" />
+    <polygon
+       points="368.49,437.95 373.5,432.94 365.22,424.66 360.2,429.67 "
+       style="fill:url(#linearGradient24875)"
+       id="polygon8104"
+       transform="matrix(0.98970484,0,0,0.98970484,-324.11367,-131.50368)" />
+    <polygon
+       points="331.55,466.54 340.29,449.59 348.57,457.87 "
+       style="fill:url(#linearGradient24877)"
+       id="polygon8117"
+       transform="matrix(0.98970484,0,0,0.98970484,-324.11367,-131.50368)" />
+    <polygon
+       points="331.55,466.54 338.04,463.23 334.88,460.07 "
+       style="fill:url(#linearGradient24879)"
+       id="polygon8138"
+       transform="matrix(0.98970484,0,0,0.98970484,-324.11367,-131.50368)" />
+    <g
+       id="g8140"
+       transform="matrix(0.98970484,0,0,0.98970484,-324.11367,-131.50368)">
+      <polygon
+         points="365.1,433.29 363.33,431.52 351.78,443.07 341.51,453.35 341.14,453.48 340.75,453.87 340.73,457.66 344.46,457.64 344.81,456.65 355.08,446.37 366.63,434.82 "
+         style="fill:url(#linearGradient24881)"
+         id="polygon8155" />
+      <polyline
+         points="343.72 457.81 348.57 457.87 358.85 447.59 369.12 437.31 366.63 434.82 355.08 446.37 343.68 457.77"
+         style="fill:url(#linearGradient24883)"
+         id="polyline8174" />
+      <polyline
+         points="341.51 453.35 351.78 443.07 363.33 431.52 360.85 429.03 350.57 439.31 340.29 449.59 340.72 454.22"
+         style="fill:url(#linearGradient24885)"
+         id="polyline8193" />
+    </g>
+    <g
+       style="opacity:0.6"
+       id="g8227"
+       transform="matrix(0.98970484,0,0,0.98970484,-324.11367,-131.50368)">
+      <polygon
+         points="340.72,457.64 340.72,457.68 344.54,457.98 344.56,457.55 "
+         style="fill:url(#linearGradient24887)"
+         id="polygon8234" />
+      <polygon
+         points="348.37,457.79 344.54,457.55 344.52,457.98 348.37,457.88 "
+         style="fill:url(#linearGradient24889)"
+         id="polygon8241" />
+    </g>
+    <g
+       style="opacity:0.3"
+       id="g8243"
+       transform="matrix(0.98970484,0,0,0.98970484,-324.11367,-131.50368)">
+      <polygon
+         points="340.8,457.56 340.75,457.57 340.37,453.57 340.8,453.55 "
+         style="fill:url(#linearGradient24891)"
+         id="polygon8250" />
+      <polygon
+         points="340.49,449.57 340.8,453.57 340.37,453.59 340.4,449.58 "
+         style="fill:url(#linearGradient24893)"
+         id="polygon8257" />
+    </g>
+    <g
+       style="opacity:0.4"
+       id="g8259"
+       transform="matrix(0.98970484,0,0,0.98970484,-324.11367,-131.50368)">
+      <path
+         d="m 368.81,421.68 c 0.497,1.194 2.282,2.853 3.47,4.036 1.199,1.201 2.859,3.009 4.062,3.513 0.33,-1.042 -1.069,-3.456 -2.579,-4.968 -1.506,-1.503 -3.908,-2.901 -4.953,-2.581 z"
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient24895)"
+         id="path8280" />
+    </g>
+    <g
+       style="opacity:0.6"
+       id="g8282"
+       transform="matrix(0.98970484,0,0,0.98970484,-324.11367,-131.50368)">
+      <polygon
+         points="369,437.4 369.09,437.31 365.12,432.99 364.56,433.56 "
+         style="fill:url(#linearGradient24897)"
+         id="polygon8289" />
+      <polygon
+         points="360.74,429.13 364.58,433.58 365.15,433.02 360.9,428.97 "
+         style="fill:url(#linearGradient24899)"
+         id="polygon8296" />
+    </g>
+    <g
+       style="opacity:0.6"
+       id="g8298"
+       transform="matrix(0.98970484,0,0,0.98970484,-324.11367,-131.50368)">
+      <polygon
+         points="365.19,424.64 365.1,424.72 369.06,429.05 369.62,428.48 "
+         style="fill:url(#linearGradient24901)"
+         id="polygon8305" />
+      <polygon
+         points="373.44,432.91 369.61,428.46 369.04,429.02 373.28,433.08 "
+         style="fill:url(#linearGradient24903)"
+         id="polygon8312" />
+    </g>
+  </g>
+</svg>
diff --git a/res/themes/default/asbru-help.svg b/res/themes/default/asbru-help.svg
new file mode 100644
index 00000000..85ea9f47
--- /dev/null
+++ b/res/themes/default/asbru-help.svg
@@ -0,0 +1,66 @@
+<?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"
+   height="32"
+   version="1.1"
+   viewBox="0 0 32 32"
+   width="32"
+   id="svg9"
+   sodipodi:docname="asbru-help.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata13">
+    <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>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview11"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="-13.355932"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg9" />
+  <defs
+     id="defs4" />
+  <g
+     id="Icons with numbers"
+     style="fill:#808080;fill-rule:evenodd;stroke:none;stroke-width:0.5"
+     transform="scale(2)">
+    <g
+       id="Group"
+       transform="translate(-48,-432)"
+       style="fill:#808080;stroke-width:0.5">
+      <path
+         d="M 54.879684,443.0591 V 445 h 2.351085 v -1.9409 z M 56,448 c -4.418278,0 -8,-3.58172 -8,-8 0,-4.41828 3.581722,-8 8,-8 4.418278,0 8,3.58172 8,8 0,4.41828 -3.581722,8 -8,8 z m -2.42998,-12.48959 c -0.983569,0.5328 -1.506903,1.4372 -1.57002,2.71323 h 2.280079 c 0,-0.37162 0.127546,-0.72979 0.382643,-1.07455 0.255097,-0.34475 0.687702,-0.51712 1.29783,-0.51712 0.620648,0 1.047994,0.13991 1.282052,0.41974 0.234057,0.27983 0.351084,0.58988 0.351084,0.93016 0,0.2955 -0.105193,0.56637 -0.315582,0.81262 l -0.457593,0.39624 -0.575937,0.38281 c -0.56805,0.37609 -0.920447,0.70853 -1.057199,0.99731 -0.136753,0.28879 -0.220907,0.81151 -0.252466,1.56817 h 2.130178 c 0.0053,-0.35818 0.03945,-0.62234 0.102564,-0.79248 0.09994,-0.26864 0.302431,-0.50369 0.607495,-0.70517 l 0.560158,-0.36938 c 0.56805,-0.37609 0.952004,-0.68502 1.151874,-0.92679 C 59.829062,438.94672 60,438.45646 60,437.87441 60,436.92522 59.606842,436.20887 58.820513,435.72532 58.034184,435.24177 57.046686,435 55.857988,435 c -0.904672,0 -1.667321,0.17014 -2.287968,0.51041 z m 0,0"
+         id="Oval 318"
+         inkscape:connector-curvature="0"
+         style="stroke-width:0.5;fill:#808080" />
+    </g>
+  </g>
+</svg>
diff --git a/res/themes/default/asbru-preferences.svg b/res/themes/default/asbru-preferences.svg
new file mode 100644
index 00000000..16253cbf
--- /dev/null
+++ b/res/themes/default/asbru-preferences.svg
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--part of the rodentia icon theme by sixsixfive released under CC0 (https://creativecommons.org/publicdomain/zero/1.0/) on openclipart-->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 48 48">
+ <defs id="0">
+  <linearGradient id="F">
+   <stop id="b" stop-color="#555753"/>
+   <stop id="c" offset="1" stop-color="#eeeeec"/>
+  </linearGradient>
+  <linearGradient id="G">
+   <stop id="d" stop-color="#fff" stop-opacity="0.8"/>
+   <stop id="e" offset="1" stop-color="#fff" stop-opacity="0"/>
+  </linearGradient>
+  <linearGradient id="H">
+   <stop id="f" stop-color="#2e3436"/>
+   <stop id="g" offset="1" stop-color="#555753"/>
+  </linearGradient>
+  <linearGradient id="I">
+   <stop id="h" stop-color="#eeeeec"/>
+   <stop id="i" offset="1" stop-color="#d3d7cf"/>
+  </linearGradient>
+  <linearGradient id="J">
+   <stop id="j" stop-color="#d3d7cf"/>
+   <stop id="k" offset="1" stop-color="#babdb6"/>
+  </linearGradient>
+  <linearGradient id="K">
+   <stop id="l" stop-color="#2e3436"/>
+   <stop id="m" offset="1" stop-color="#2e3436" stop-opacity="0"/>
+  </linearGradient>
+  <radialGradient cx="24.708" cy="42.11" r="22.16" id="L" xlink:href="#K" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.09589041,0,38.073311)"/>
+  <linearGradient y1="9.03" x2="0" y2="38.969" id="M" xlink:href="#J" gradientUnits="userSpaceOnUse"/>
+  <linearGradient y1="8.979" x2="0" y2="39.02" id="N" xlink:href="#G" gradientUnits="userSpaceOnUse"/>
+  <linearGradient y1="36.22" x2="0" y2="11.781" id="O" xlink:href="#J" gradientUnits="userSpaceOnUse"/>
+  <linearGradient x1="12.28" x2="16.719" id="P" xlink:href="#H" gradientUnits="userSpaceOnUse"/>
+  <linearGradient x1="21.78" x2="26.22" id="Q" xlink:href="#H" gradientUnits="userSpaceOnUse"/>
+  <linearGradient x1="31.18" x2="35.619" id="R" xlink:href="#H" gradientUnits="userSpaceOnUse"/>
+  <linearGradient y1="35.19" x2="0" y2="12.813" id="S" xlink:href="#G" gradientUnits="userSpaceOnUse"/>
+  <linearGradient y1="20.16" x2="0" y2="23.594" id="T" xlink:href="#I" gradientUnits="userSpaceOnUse"/>
+  <linearGradient y1="14.515" x2="0" y2="33.485" id="U" xlink:href="#F" gradientUnits="userSpaceOnUse"/>
+ </defs>
+ <path d="m 46.866049,42.111389 a 22.158171,2.1247561 0 1 1 -44.3163416,0 22.158171,2.1247561 0 1 1 44.3163416,0 z" transform="matrix(1.0493151,0,0,-1.4518947,-1.9263496,100.27038)" id="1" opacity="0.8" fill="url(#L)"/>
+ <path d="m 5.21875,7.9375 c -1.108,0 -2,0.892 -2,2 l 0,28.125 c 0,1.108 0.892,2 2,2 l 37.5625,0 c 1.108,0 2,-0.892 2,-2 l 0,-28.125 c 0,-1.108 -0.892,-2 -2,-2 l -37.5625,0 z" id="2" fill="#555753"/>
+ <path d="m 5.21875,9.03125 c -0.5241331,0 -0.90625,0.3821169 -0.90625,0.90625 l 0,28.125 c 0,0.524133 0.3821169,0.90625 0.90625,0.90625 l 37.5625,0 c 0.524133,0 0.90625,-0.382117 0.90625,-0.90625 l 0,-28.125 c 0,-0.5241331 -0.382117,-0.90625 -0.90625,-0.90625 l -37.5625,0 z" id="3" fill="url(#M)"/>
+ <path d="m 5.21875,9.5 c -0.2768191,0 -0.4375,0.1606809 -0.4375,0.4375 l 0,28.125 c 0,0.276819 0.1606809,0.4375 0.4375,0.4375 l 37.5625,0 c 0.276819,0 0.4375,-0.160681 0.4375,-0.4375 l 0,-28.125 C 43.21875,9.6606809 43.058069,9.5 42.78125,9.5 l -37.5625,0 z" id="4" opacity="0.8" fill="none" stroke="url(#N)" stroke-linejoin="round" stroke-linecap="round" stroke-width="1.042"/>
+ <path d="m 7.5625,12.28125 0,23.4375 32.875,0 0,-23.4375 -32.875,0 z" id="5" fill="url(#O)" stroke="#888a85"/>
+ <g id="6" stroke="url(#U)">
+  <rect width="4.439" height="18" x="21.78" y="15" id="V" fill="url(#Q)" stroke-linejoin="round" stroke-linecap="square" stroke-width="0.97" rx="2.1"/>
+  <rect width="4.439" height="18" x="12.28" y="15" id="W" fill="url(#P)" stroke-linejoin="round" stroke-linecap="square" stroke-width="0.97" rx="2.1"/>
+  <rect width="4.439" height="18" x="31.18" y="15" id="X" fill="url(#R)" stroke-linejoin="round" stroke-linecap="square" stroke-width="0.97" rx="2.1"/>
+ </g>
+ <g id="7">
+  <rect width="8.698" height="5.125" x="10.151" y="19.802" id="Y" fill="#2e3436" rx="1"/>
+  <rect width="8.698" height="5.125" x="19.651" y="25.862" id="Z" fill="#2e3436" rx="1"/>
+  <rect width="8.698" height="5.125" x="29.05" y="19.802" id="a" fill="#2e3436" rx="1"/>
+ </g>
+ <rect width="8.698" height="5.125" x="10.151" y="19.302" id="8" fill="#888a85" rx="1"/>
+ <path d="M 11.15625,20.15625 C 11.052832,20.15625 11,20.209082 11,20.3125 l 0,3.125 c 0,0.103418 0.05283,0.15625 0.15625,0.15625 l 6.6875,0 C 17.947168,23.59375 18,23.54092 18,23.4375 l 0,-3.125 c 0,-0.103417 -0.05283,-0.15625 -0.15625,-0.15625 l -6.6875,0 z" id="9" fill="url(#T)"/>
+ <rect width="8.698" height="5.125" x="19.651" y="25.363" id="A" fill="#888a85" rx="1"/>
+ <path d="M 11.15625,20.15625 C 11.052832,20.15625 11,20.209082 11,20.3125 l 0,3.125 c 0,0.103418 0.05283,0.15625 0.15625,0.15625 l 6.6875,0 C 17.947168,23.59375 18,23.54092 18,23.4375 l 0,-3.125 c 0,-0.103417 -0.05283,-0.15625 -0.15625,-0.15625 l -6.6875,0 z" transform="translate(9.5002949,6.0606237)" id="B" fill="url(#T)"/>
+ <rect width="8.698" height="5.125" x="29.05" y="19.302" id="C" fill="#888a85" rx="1"/>
+ <path d="M 11.15625,20.15625 C 11.052832,20.15625 11,20.209082 11,20.3125 l 0,3.125 c 0,0.103418 0.05283,0.15625 0.15625,0.15625 l 6.6875,0 C 17.947168,23.59375 18,23.54092 18,23.4375 l 0,-3.125 c 0,-0.103417 -0.05283,-0.15625 -0.15625,-0.15625 l -6.6875,0 z" transform="translate(18.900005,-4.6484992e-8)" id="D" fill="url(#T)"/>
+ <path d="m 8.59375,13.3125 0,21.375 30.8125,0 0,-21.375 -30.8125,0 z" id="E" opacity="0.8" fill="none" stroke="url(#S)"/>
+</svg>
diff --git a/res/themes/default/asbru-scripts-manager.svg b/res/themes/default/asbru-scripts-manager.svg
new file mode 100644
index 00000000..58777325
--- /dev/null
+++ b/res/themes/default/asbru-scripts-manager.svg
@@ -0,0 +1,53 @@
+<?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"
+   height="50"
+   version="1.1"
+   viewBox="0 0 50 50"
+   width="50"
+   xml:space="preserve"
+   id="svg8"
+   sodipodi:docname="asbru-scripts-manager.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
+     id="metadata14"><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="defs12" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview10"
+     showgrid="false"
+     inkscape:zoom="4.7459491"
+     inkscape:cx="44.474576"
+     inkscape:cy="35.79661"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg8" /><rect
+     style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:7.55905533;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+     id="rect816"
+     width="37.294964"
+     height="46.987442"
+     x="5.9805918"
+     y="0.37190047" /><path
+     d="M 43.435991,2.9002577 H 40.690016 9.2413148 V 47.869591 50.129734 H 43.435991 Z M 28.627135,30.691088 c -0.587239,-0.587109 -1.397342,-0.95174 -2.288162,-0.95174 -0.895317,0 -1.705421,0.364631 -2.288674,0.95174 -0.58724,0.583384 -0.947757,1.393487 -0.947757,2.288677 0,0.891203 0.360388,1.70118 0.947757,2.288675 0.583253,0.583256 1.393357,0.947885 2.288674,0.947885 0.89082,0 1.700923,-0.364629 2.288162,-0.947885 0.58724,-0.587367 0.948142,-1.397472 0.948142,-2.288675 0,-0.89519 -0.360902,-1.705293 -0.948142,-2.288677 z m -2.288162,-1.944226 c 1.16651,0 2.227755,0.474008 2.993261,1.239643 0.765505,0.765506 1.239641,1.822766 1.239641,2.99326 0,1.166508 -0.474007,2.227881 -1.239641,2.993388 -0.765378,0.765506 -1.826751,1.239513 -2.993261,1.239513 -1.170879,0 -2.227755,-0.474007 -2.993645,-1.239513 -0.765505,-0.765507 -1.239511,-1.82688 -1.239511,-2.993388 0,-1.170494 0.474006,-2.227754 1.239511,-2.99326 0.76589,-0.765635 1.822639,-1.239643 2.993645,-1.239643 z M 15.665467,33.70864 v -1.887416 l 2.884013,-0.433521 0.109247,-0.46578 0.138038,-0.461669 -2.280579,-1.814799 1.158412,-2.005016 2.713971,1.065229 0.328001,-0.348308 0.352677,-0.328129 -1.069471,-2.713842 2.005018,-1.158412 1.818654,2.280322 0.457812,-0.13778 0.465524,-0.109249 0.433521,-2.884012 h 2.31708 l 0.433522,2.884012 0.465394,0.109249 0.457941,0.13778 1.818654,-2.280322 2.005018,1.158412 -1.069471,2.713842 0.352806,0.328129 0.323887,0.348308 2.718085,-1.065229 1.158413,2.005016 -2.284694,1.814799 0.142024,0.461669 0.109247,0.46578 2.884011,0.433521 v 2.316825 l -2.884011,0.433263 -0.109247,0.461925 -0.142024,0.461796 2.284694,1.814541 -1.158413,2.009259 -2.718085,-1.069341 -0.323887,0.348307 -0.352806,0.327999 1.069471,2.713972 -2.005018,1.15854 -1.818654,-2.28045 -0.457941,0.137652 -0.465394,0.113361 -0.433522,2.884012 h -2.31708 L 24.746784,40.76476 24.28126,40.655384 23.823448,40.517731 22.004794,42.798183 19.999776,41.639642 21.069247,38.925671 20.720554,38.59767 c -0.113231,-0.109377 -0.222737,-0.22685 -0.327872,-0.348308 l -2.718084,1.069343 -1.158412,-2.009259 2.280579,-1.814541 -0.138038,-0.461797 -0.109247,-0.461925 -2.884013,-0.433264 z m 0.996339,-0.728875 v 0.299723 l 2.750603,0.413213 0.0563,0.364504 c 0.0365,0.247284 0.08933,0.490201 0.150247,0.720905 0.06439,0.247158 0.141637,0.482234 0.230963,0.704842 l 0.129427,0.340211 -2.17493,1.733568 0.30358,0.522461 2.588144,-1.016646 0.230961,0.283401 c 0.146136,0.182508 0.312192,0.368743 0.494444,0.54701 0.174023,0.178267 0.360388,0.344323 0.550736,0.498171 l 0.283659,0.230833 -1.016647,2.5884 0.522334,0.299726 1.733954,-2.171203 0.340082,0.129811 c 0.218752,0.08496 0.457812,0.161945 0.700472,0.226722 0.247155,0.0649 0.486214,0.117474 0.725404,0.153976 l 0.360389,0.05668 0.417326,2.750346 h 0.603561 l 0.413086,-2.750346 0.36039,-0.05668 c 0.247284,-0.04049 0.490329,-0.08907 0.721291,-0.153976 0.250757,-0.06478 0.485702,-0.141765 0.708568,-0.226722 l 0.340083,-0.129811 1.729842,2.171203 0.522332,-0.299726 -1.016775,-2.592384 0.283787,-0.226849 c 0.186235,-0.153848 0.372471,-0.319904 0.550737,-0.498171 0.182251,-0.182379 0.348693,-0.364502 0.494314,-0.54701 l 0.230963,-0.283401 2.588272,1.016646 0.303581,-0.522461 -2.17506,-1.733568 0.129426,-0.340211 c 0.08521,-0.226849 0.166443,-0.461926 0.230963,-0.704842 0.06092,-0.230704 0.113746,-0.473748 0.150249,-0.720905 l 0.05642,-0.364504 2.750473,-0.413213 v -0.603432 l -2.750473,-0.413214 -0.05642,-0.360518 c -0.0365,-0.251142 -0.08933,-0.490072 -0.150249,-0.725147 -0.06452,-0.243046 -0.145749,-0.477864 -0.230963,-0.704713 l -0.129426,-0.34021 2.17506,-1.729586 -0.303581,-0.526573 -2.588272,1.020631 -0.230963,-0.287514 C 31.604844,28.426961 31.438402,28.24458 31.256151,28.062329 31.077885,27.884063 30.891649,27.718135 30.705414,27.564161 l -0.283787,-0.22685 1.016775,-2.588401 -0.522332,-0.303709 -1.729842,2.171073 -0.340083,-0.129682 c -0.222736,-0.08496 -0.457811,-0.161944 -0.708568,-0.226851 -0.230962,-0.06066 -0.474007,-0.11336 -0.721291,-0.153717 l -0.36039,-0.0527 -0.413086,-2.750344 h -0.603561 l -0.417326,2.746361 -0.360389,0.05668 c -0.23906,0.03637 -0.47812,0.08907 -0.725404,0.153717 -0.24266,0.06491 -0.48172,0.141894 -0.700472,0.226851 l -0.340082,0.133668 -1.733954,-2.175059 -0.522334,0.303709 1.016647,2.588401 -0.283659,0.22685 c -0.190348,0.153974 -0.376713,0.324016 -0.550736,0.498168 -0.182252,0.182251 -0.348179,0.364632 -0.494444,0.546883 l -0.230961,0.287514 -2.588144,-1.020631 -0.30358,0.526573 2.17493,1.729586 -0.129427,0.34021 c -0.08933,0.222737 -0.166443,0.457684 -0.230963,0.704713 -0.06092,0.230962 -0.113746,0.474005 -0.150247,0.721035 l -0.0563,0.364502 -2.750603,0.413214 z M 12.817828,6.8456444 c -0.275176,0 -0.498041,-0.2228652 -0.498041,-0.4943144 0,-0.2754326 0.222865,-0.498169 0.498041,-0.498169 h 9.369089 c 0.27556,0 0.498426,0.2227364 0.498426,0.498169 0,0.2713203 -0.222866,0.4943144 -0.498426,0.4943144 z m 0,3.0986535 c -0.275176,0 -0.498041,-0.222867 -0.498041,-0.4983 0,-0.27556 0.222865,-0.498169 0.498041,-0.498169 h 9.369089 c 0.27556,0 0.498426,0.222609 0.498426,0.498169 0,0.275433 -0.222866,0.4983 -0.498426,0.4983 z m 0,3.3375811 c -0.275176,0 -0.498041,-0.222736 -0.498041,-0.498169 0,-0.27132 0.222865,-0.498299 0.498041,-0.498299 h 26.555559 c 0.275691,0 0.498427,0.226979 0.498427,0.498299 0,0.275433 -0.222736,0.498169 -0.498427,0.498169 z m 0,3.341825 c -0.275176,0 -0.498041,-0.222865 -0.498041,-0.498299 0,-0.27556 0.222865,-0.498298 0.498041,-0.498298 h 26.555559 c 0.275691,0 0.498427,0.222738 0.498427,0.498298 0,0.275434 -0.222736,0.498299 -0.498427,0.498299 z m 0,3.337583 c -0.275176,0 -0.498041,-0.222736 -0.498041,-0.494185 0,-0.275561 0.222865,-0.498169 0.498041,-0.498169 h 26.555559 c 0.275691,0 0.498427,0.222608 0.498427,0.498169 0,0.27132 -0.222736,0.494185 -0.498427,0.494185 z M 8.7428888,1.9037899 H 40.179379 V 0.12973433 H 37.676321 5.9805918 V 45.265126 47.359341 h 2.264384 V 2.4020878 c 0,-0.2755615 0.222737,-0.4982979 0.497913,-0.4982979 z"
+     style="clip-rule:evenodd;fill-rule:evenodd;stroke-width:1"
+     id="path2"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccccccscscscscscscscscscccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccsccccccccccccccccccccccccccccccccsssssssssssssssssssssssssssssssssssscccccccss" /><g
+     id="Layer_1"
+     transform="translate(0,-462)" /></svg>
\ No newline at end of file
diff --git a/res/themes/default/asbru-wol.svg b/res/themes/default/asbru-wol.svg
new file mode 100644
index 00000000..071ad8c3
--- /dev/null
+++ b/res/themes/default/asbru-wol.svg
@@ -0,0 +1,270 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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"
+   id="svg3389"
+   sodipodi:docname="asbru-wol.svg"
+   viewBox="0 0 50 50"
+   version="1.1"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   width="50"
+   height="50">
+  <defs
+     id="defs3391">
+    <filter
+       id="filter18963-0"
+       width="1.122"
+       y="-2.1965001"
+       x="-0.061012998"
+       height="5.3929"
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         id="feGaussianBlur18965-9"
+         stdDeviation="3.889576"
+         inkscape:collect="always" />
+    </filter>
+    <linearGradient
+       id="linearGradient3534"
+       y2="1186.4"
+       gradientUnits="userSpaceOnUse"
+       y1="1113.2"
+       gradientTransform="matrix(0.4426619,0,0,0.4380449,-698.43282,-277.88632)"
+       x2="1627.3"
+       x1="1577"
+       inkscape:collect="always">
+      <stop
+         id="stop18945-8"
+         style="stop-color:#ffffff"
+         offset="0" />
+      <stop
+         id="stop18947-2"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <filter
+       id="filter22422-4"
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         id="feGaussianBlur22424-5"
+         stdDeviation="1.2317302"
+         inkscape:collect="always" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     bordercolor="#666666"
+     inkscape:pageshadow="2"
+     inkscape:window-y="28"
+     pagecolor="#ffffff"
+     inkscape:window-height="1412"
+     inkscape:window-maximized="1"
+     inkscape:zoom="15.839192"
+     inkscape:window-x="0"
+     showgrid="false"
+     borderopacity="1.0"
+     inkscape:current-layer="layer4"
+     inkscape:cx="48.633059"
+     inkscape:cy="18.175828"
+     inkscape:window-width="2560"
+     inkscape:pageopacity="0.0"
+     inkscape:document-units="px" />
+  <g
+     id="layer5"
+     inkscape:label="background"
+     inkscape:groupmode="layer"
+     transform="translate(0,-220)">
+    <rect
+       id="rect17756"
+       style="fill:#333333;stroke-width:0.18394427"
+       ry="6.839232"
+       height="42.779919"
+       width="43.030083"
+       y="220.75952"
+       x="1.3548651" />
+  </g>
+  <g
+     id="layer2"
+     inkscape:label="shadow"
+     inkscape:groupmode="layer"
+     transform="translate(0,-220)">
+    <ellipse
+       id="path18953"
+       style="fill:#000000;filter:url(#filter18963-0)"
+       transform="matrix(0.25662065,0,0,0.31141765,-422.33246,-423.69894)"
+       cx="1732.25"
+       cy="2215.875"
+       rx="76.5"
+       ry="2.125" />
+    <path
+       id="rect17756-0"
+       sodipodi:nodetypes="ccccccc"
+       style="fill:url(#linearGradient3534);stroke-width:0.18394427"
+       d="m 8.758788,221.43317 h 28.835103 c 2.957272,0.13552 4.239916,1.46697 4.239916,1.46697 -21.273155,15.17173 -33.628692,27.95218 -36.9470465,39.28499 0,0 -2.9053997,-3.22289 -2.9053997,-5.51152 v -28.53528 c -0.2630219,-3.71512 2.6876097,-6.99135 6.7766902,-6.70606 z"
+       inkscape:connector-curvature="0" />
+    <g
+       id="g16145-0-1-0"
+       style="fill:none;stroke:#ffffff;stroke-width:1.57270002;filter:url(#filter22422-4)"
+       transform="matrix(0.26451186,0,0,0.26298512,117.77759,404.6941)">
+      <path
+         id="rect15862-1-3-9"
+         style="fill:none;stroke:#ffffff;stroke-width:1.57270002"
+         d="m -397.75,-670.05 c -6.2826,0 -11.358,5.0754 -11.358,11.358 v 16.04 c 0,6.2826 5.0754,11.358 11.358,11.358 h 3.6415 v 8.9304 h -18.641 v 8.5836 h 50.287 v 8.9737 h -4.3785 c -6.2826,0 -11.315,5.0321 -11.315,11.315 v 16.083 c 0,6.2826 5.0321,11.315 11.315,11.315 h 16.083 c 6.2826,0 11.315,-5.0321 11.315,-11.315 v -16.083 c 0,-6.2826 -5.0321,-11.315 -11.315,-11.315 h -4.3785 v -8.9737 h 50.287 v -8.5836 h -19.335 v -8.9304 h 4.3351 c 6.2826,0 11.358,-5.0754 11.358,-11.358 v -16.04 c 0,-6.2826 -5.0754,-11.358 -11.358,-11.358 h -16.04 c -6.2826,0 -11.358,5.0754 -11.358,11.358 v 16.04 c 0,6.2826 5.0754,11.358 11.358,11.358 h 4.3351 v 8.9304 h -55.186 v -8.9304 h 5.0288 c 6.2826,0 11.358,-5.0754 11.358,-11.358 v -16.04 c 0,-6.2826 -5.0754,-11.358 -11.358,-11.358 h -16.04 z m 1.9942,6.7194 c 0.24998,-0.0252 0.52346,0 0.78033,0 h 10.491 c 4.1097,0 7.4131,3.3034 7.4131,7.4131 v 10.491 c 0,4.1097 -3.3034,7.4131 -7.4131,7.4131 h -10.491 c -4.1097,0 -7.4131,-3.3034 -7.4131,-7.4131 v -10.491 c 0,-3.8528 2.883,-7.0345 6.6327,-7.4131 z m 61.862,0 c 0.24998,-0.0252 0.52346,0 0.78032,0 h 10.491 c 4.1097,0 7.4131,3.3034 7.4131,7.4131 v 10.491 c 0,4.1097 -3.3034,7.4131 -7.4131,7.4131 h -10.491 c -4.1097,0 -7.4131,-3.3034 -7.4131,-7.4131 v -10.491 c 0,-3.8528 2.883,-7.0345 6.6328,-7.4131 z m -30.172,65.2 h 10.534 c 4.1097,0 7.4131,3.3034 7.4131,7.4131 v 10.534 c 0,4.1097 -3.3034,7.4131 -7.4131,7.4131 h -10.534 c -4.1097,0 -7.4131,-3.3034 -7.4131,-7.4131 v -10.534 c 0,-4.1097 3.3034,-7.4131 7.4131,-7.4131 z"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+  <g
+     id="layer3"
+     inkscape:label="border"
+     inkscape:groupmode="layer"
+     transform="translate(0,-220)">
+    <rect
+       id="rect17756-2"
+       style="fill:none;stroke:#131312;stroke-width:1.36161077"
+       ry="6.839232"
+       height="42.779919"
+       width="43.030083"
+       y="220.75952"
+       x="1.3252683" />
+  </g>
+  <g
+     id="layer4"
+     inkscape:label="Symbol"
+     inkscape:groupmode="layer"
+     transform="translate(0,-220)">
+    <g
+       id="g16145-0-1"
+       style="fill:#ffffff;stroke:#ffffff"
+       transform="matrix(0.26451186,0,0,0.26298512,117.77759,404.6941)">
+      <path
+         id="rect15862-1-3"
+         style="fill:#ffffff;stroke:#ffffff"
+         d="m -397.75,-670.05 c -6.2826,0 -11.358,5.0754 -11.358,11.358 v 16.04 c 0,6.2826 5.0754,11.358 11.358,11.358 h 3.6415 v 8.9304 h -18.641 v 8.5836 h 50.287 v 8.9737 h -4.3785 c -6.2826,0 -11.315,5.0321 -11.315,11.315 v 16.083 c 0,6.2826 5.0321,11.315 11.315,11.315 h 16.083 c 6.2826,0 11.315,-5.0321 11.315,-11.315 v -16.083 c 0,-6.2826 -5.0321,-11.315 -11.315,-11.315 h -4.3785 v -8.9737 h 50.287 v -8.5836 h -19.335 v -8.9304 h 4.3351 c 6.2826,0 11.358,-5.0754 11.358,-11.358 v -16.04 c 0,-6.2826 -5.0754,-11.358 -11.358,-11.358 h -16.04 c -6.2826,0 -11.358,5.0754 -11.358,11.358 v 16.04 c 0,6.2826 5.0754,11.358 11.358,11.358 h 4.3351 v 8.9304 h -55.186 v -8.9304 h 5.0288 c 6.2826,0 11.358,-5.0754 11.358,-11.358 v -16.04 c 0,-6.2826 -5.0754,-11.358 -11.358,-11.358 h -16.04 z m 1.9942,6.7194 c 0.24998,-0.0252 0.52346,0 0.78033,0 h 10.491 c 4.1097,0 7.4131,3.3034 7.4131,7.4131 v 10.491 c 0,4.1097 -3.3034,7.4131 -7.4131,7.4131 h -10.491 c -4.1097,0 -7.4131,-3.3034 -7.4131,-7.4131 v -10.491 c 0,-3.8528 2.883,-7.0345 6.6327,-7.4131 z m 61.862,0 c 0.24998,-0.0252 0.52346,0 0.78032,0 h 10.491 c 4.1097,0 7.4131,3.3034 7.4131,7.4131 v 10.491 c 0,4.1097 -3.3034,7.4131 -7.4131,7.4131 h -10.491 c -4.1097,0 -7.4131,-3.3034 -7.4131,-7.4131 v -10.491 c 0,-3.8528 2.883,-7.0345 6.6328,-7.4131 z m -30.172,65.2 h 10.534 c 4.1097,0 7.4131,3.3034 7.4131,7.4131 v 10.534 c 0,4.1097 -3.3034,7.4131 -7.4131,7.4131 h -10.534 c -4.1097,0 -7.4131,-3.3034 -7.4131,-7.4131 v -10.534 c 0,-4.1097 3.3034,-7.4131 7.4131,-7.4131 z"
+         inkscape:connector-curvature="0" />
+    </g>
+    <path
+       style="opacity:1;fill:#e97c25;fill-opacity:1;stroke:none;stroke-width:0.28574833;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 40.904729,250.07888 a 8.6210739,8.6210739 0 0 0 -8.62117,8.62119 8.6210739,8.6210739 0 0 0 8.62117,8.62078 8.6210739,8.6210739 0 0 0 8.621179,-8.62078 8.6210739,8.6210739 0 0 0 -8.621179,-8.62119 z m 0,0.54745 a 8.0736426,8.0736426 0 0 1 8.073781,8.07374 8.0736426,8.0736426 0 0 1 -8.073781,8.07332 8.0736426,8.0736426 0 0 1 -8.073771,-8.07332 8.0736426,8.0736426 0 0 1 8.073771,-8.07374 z"
+       id="circle4885"
+       inkscape:connector-curvature="0" />
+    <circle
+       style="opacity:1;fill:#f0cd6b;fill-opacity:1;stroke:none;stroke-width:0.28574833;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4871"
+       cx="40.904816"
+       cy="258.69995"
+       r="7.7909422" />
+    <g
+       id="g4922"
+       transform="matrix(0.04927315,-0.02324474,0.02324474,0.04927315,-134.83749,175.53715)"
+       style="fill:#6bb9f0;fill-opacity:1">
+      <path
+         sodipodi:nodetypes="cccc"
+         inkscape:connector-curvature="0"
+         id="path4924"
+         d="m 2260.9487,2542.5095 c -26.4294,0.018 -49.0929,18.8694 -53.9239,44.8535 39.3037,5.5876 74.2239,3.8691 107.8536,0 -4.8314,-25.9863 -27.4981,-44.8382 -53.9297,-44.8535 z"
+         style="opacity:1;fill:#f0cd6b;fill-opacity:1;stroke:none;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <rect
+         ry="6.109827"
+         y="2525.1899"
+         x="2254.8418"
+         height="14.116755"
+         width="12.219654"
+         id="rect4926"
+         style="opacity:1;fill:#6bb9f0;fill-opacity:1;stroke:none;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+    <path
+       style="opacity:1;fill:#f0cd6b;fill-opacity:1;stroke:none;stroke-width:0.28574833;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 35.638978,265.89867 -0.692816,1.60024 c -0.173973,0.40193 -0.126929,0.84445 0.21514,1.04632 0.342041,0.20186 0.761415,0.0366 1.019693,-0.31745 l 1.032713,-1.41559 a 8.6210739,8.6210739 0 0 1 -1.57473,-0.91352 z"
+       id="rect4934"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4944"
+       d="m 46.351968,265.89867 0.692816,1.60024 c 0.173973,0.40193 0.126929,0.84445 -0.21513,1.04632 -0.342051,0.20186 -0.761415,0.0366 -1.019693,-0.31745 l -1.032723,-1.41559 a 8.6210739,8.6210739 0 0 0 1.57473,-0.91352 z"
+       style="opacity:1;fill:#f0cd6b;fill-opacity:1;stroke:none;stroke-width:0.28574833;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <g
+       style="fill:#f0cd6b;fill-opacity:1"
+       transform="matrix(-0.04927315,-0.02324474,-0.02324474,0.04927315,216.92785,175.53715)"
+       id="g4946">
+      <path
+         style="opacity:1;fill:#f0cd6b;fill-opacity:1;stroke:none;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 2260.9487,2542.5095 c -26.4294,0.018 -49.0929,18.8694 -53.9239,44.8535 39.3037,5.5876 74.2239,3.8691 107.8536,0 -4.8314,-25.9863 -27.4981,-44.8382 -53.9297,-44.8535 z"
+         id="path4948"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccc" />
+      <rect
+         style="opacity:1;fill:#f0cd6b;fill-opacity:1;stroke:none;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect4950"
+         width="12.219654"
+         height="14.116755"
+         x="2254.8418"
+         y="2525.1899"
+         ry="6.109827" />
+    </g>
+    <path
+       style="fill:#22313f;fill-opacity:1;stroke:none;stroke-width:0.09524944"
+       d="m 40.868458,251.69703 -0.603262,0.88378 h 0.335021 v 5.82692 0.56397 0.006 h 0.55739 v -0.006 h 4.252354 v 0.31393 l 0.887725,-0.60327 -0.887944,-0.60329 v 0.33527 h -4.252135 v -0.007 -5.82691 h 0.313923 z"
+       id="path5011-3"
+       inkscape:connector-curvature="0"
+       inkscape:transform-center-x="-30.047941"
+       inkscape:transform-center-y="-30.612244"
+       sodipodi:nodetypes="cccccccccccccccccc" />
+  </g>
+  <metadata
+     id="metadata23">
+    <rdf:RDF>
+      <cc:Work>
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+        <dc:publisher>
+          <cc:Agent
+             rdf:about="http://openclipart.org/">
+            <dc:title>Openclipart</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:title></dc:title>
+        <dc:date>2010-07-19T07:43:30</dc:date>
+        <dc:description>glossy-shadow - community button in darkgrey</dc:description>
+        <dc:source>https://openclipart.org/detail/73717/community-button-by-laser_engravers</dc:source>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>laser_engravers</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>black</rdf:li>
+            <rdf:li>button</rdf:li>
+            <rdf:li>community</rdf:li>
+            <rdf:li>effect</rdf:li>
+            <rdf:li>glossy</rdf:li>
+            <rdf:li>grey</rdf:li>
+            <rdf:li>icon</rdf:li>
+            <rdf:li>network</rdf:li>
+            <rdf:li>shadow</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+</svg>
diff --git a/res/themes/default/asbru.css b/res/themes/default/asbru.css
new file mode 100644
index 00000000..26ed4bcb
--- /dev/null
+++ b/res/themes/default/asbru.css
@@ -0,0 +1,78 @@
+button {
+    border: 1px solid #dddddd;
+    margin: 1px;
+}
+radiobutton, checkbutton {
+    border: 1px solid rgba(1,1,1,0);
+    margin: 1px;
+}
+button:hover {
+    border: 1px solid #555555;
+    color: #000000;
+    background-color: #ffffff;
+}
+button:focus,
+entry:focus {
+    color: #000000;
+    background-color:#FFEBBB;
+}
+spinbutton {
+    color: #000000;
+    font-size: 0.9em;
+    border: 1px solid #dddddd;
+    background-color: #dddddd;
+    border-radius: 0px;
+    padding: 0px;
+    margin: 0px;
+}
+spinbutton:hover {
+    border: 1px solid #555555;
+    background-color: #ffffff;
+}
+checkbutton:hover, radiobutton:hover {
+    border: 1px solid #555555;
+}
+.button-cp {
+    border: 1px solid rgba(1,1,1,0);
+    border-radius: 0px;
+    padding: 0px;
+    margin: 0px;
+}
+tooltip {
+    font-size: 0.8em;
+}
+.dnd-icon {
+  border: 1px solid #000000;
+}
+
+.banner-fill {
+  background-image: linear-gradient(to right, #007aff, #2fedde);
+  padding: 0.25em 0;
+}
+.banner-text {
+  color: #EEE;
+  text-shadow: 0px 0px 8px rgba(17, 17, 17, 0.75);
+  font-size: 2.5em;
+}
+messagedialog {
+  border: 1px solid #888888;
+}
+messagedialog > box {
+  margin: 2px;
+  margin-top: 16px;
+}
+.w-entervalue {
+}
+.w-renamenode {
+}
+.w-warning {
+    background-color: #F6F877;
+}
+.w-error {
+    background-color: #FFFFEB;
+}
+.w-info {
+}
+.w-confirm {
+}
+
diff --git a/res/themes/default/asbru_buttonbar_hide.png b/res/themes/default/asbru_buttonbar_hide.png
new file mode 100644
index 00000000..d37d036d
Binary files /dev/null and b/res/themes/default/asbru_buttonbar_hide.png differ
diff --git a/res/themes/default/asbru_buttonbar_show.png b/res/themes/default/asbru_buttonbar_show.png
new file mode 100644
index 00000000..37ba5786
Binary files /dev/null and b/res/themes/default/asbru_buttonbar_show.png differ
diff --git a/res/themes/default/asbru_chain.png b/res/themes/default/asbru_chain.png
new file mode 100644
index 00000000..9ed1d733
Binary files /dev/null and b/res/themes/default/asbru_chain.png differ
diff --git a/res/themes/default/asbru_cluster_auto.png b/res/themes/default/asbru_cluster_auto.png
new file mode 100644
index 00000000..be755ca9
Binary files /dev/null and b/res/themes/default/asbru_cluster_auto.png differ
diff --git a/res/themes/default/asbru_cluster_connection.svg b/res/themes/default/asbru_cluster_connection.svg
new file mode 100644
index 00000000..731b700c
--- /dev/null
+++ b/res/themes/default/asbru_cluster_connection.svg
@@ -0,0 +1,44 @@
+<?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"
+   id="Layer_1_1_"
+   version="1.1"
+   viewBox="0 0 16 16"
+   xml:space="preserve"
+   sodipodi:docname="asbru_cluster_connection.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   width="16"
+   height="16"><metadata
+     id="metadata9"><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="defs7" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview5"
+     showgrid="false"
+     inkscape:zoom="26.0625"
+     inkscape:cx="3.2613909"
+     inkscape:cy="16"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1_1_" /><path
+     d="m 13.266949,4.4830516 c 0.966876,0 1.75,-0.7831245 1.75,-1.7500001 0,-0.9668745 -0.783124,-1.75 -1.75,-1.75 -0.966875,0 -1.75,0.7831255 -1.75,1.75 0,0.49175 0.203876,0.9345001 0.530251,1.2521256 l -1.380751,2.4158748 c -0.28175,-0.10325 -0.581875,-0.168 -0.8995004,-0.168 -0.7,0 -1.3326254,0.27825 -1.8033754,0.725374 L 4.3839488,4.2739261 c 0.084875,-0.2056245 0.133,-0.4296245 0.133,-0.6658745 0,-0.9668747 -0.783125,-1.7500001 -1.7499998,-1.7500001 -0.9668749,0 -1.7499999,0.7831254 -1.7499999,1.7500001 0,0.9668745 0.783125,1.7500003 1.7499999,1.7500003 0.4129999,0 0.7874999,-0.1487505 1.0867499,-0.3876258 l 3.5892497,2.6923758 c -0.1863754,0.359624 -0.301,0.762124 -0.301,1.19525 0,0.273874 0.054249,0.5337499 0.1321246,0.7822499 L 3.5194489,11.658925 C 3.2901989,11.54955 3.037324,11.48305 2.766949,11.48305 c -0.9668749,0 -1.7499999,0.783124 -1.7499999,1.75 0,0.966875 0.783125,1.75 1.7499999,1.75 0.9668748,0 1.7499998,-0.783125 1.7499998,-1.75 0,-0.355249 -0.1076249,-0.685125 -0.2896249,-0.961625 l 3.4413747,-1.850624 c 0.4786246,0.641374 1.2363746,1.062249 2.09825,1.062249 0.4357514,0 0.8408764,-0.116375 1.2031254,-0.3045 l 0.854875,1.064875 c -0.193375,0.281749 -0.308,0.622125 -0.308,0.989625 0,0.966875 0.783125,1.75 1.75,1.75 0.966876,0 1.75,-0.783125 1.75,-1.75 0,-0.966876 -0.783124,-1.75 -1.75,-1.75 -0.280875,0 -0.5425,0.07263 -0.777875,0.189875 l -0.817249,-1.0185 c 0.443624,-0.469875 0.720124,-1.0989991 0.720124,-1.7963731 0,-0.81725 -0.3815,-1.53825 -0.966875,-2.0195 l 1.385125,-2.4237503 c 0.146126,0.040245 0.2975,0.068245 0.45675,0.068245 z"
+     id="path2"
+     style="fill:#b3b3b3;stroke:#1a1a1a;stroke-width:1.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     inkscape:connector-curvature="0" /></svg>
\ No newline at end of file
diff --git a/res/themes/default/asbru_cluster_manager.svg b/res/themes/default/asbru_cluster_manager.svg
new file mode 100644
index 00000000..f3958732
--- /dev/null
+++ b/res/themes/default/asbru_cluster_manager.svg
@@ -0,0 +1,44 @@
+<?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"
+   id="Layer_1_1_"
+   version="1.1"
+   viewBox="0 0 32 32"
+   xml:space="preserve"
+   sodipodi:docname="asbru_cluster_manager.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   width="32"
+   height="32"><metadata
+     id="metadata9"><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="defs7" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview5"
+     showgrid="false"
+     inkscape:zoom="26.0625"
+     inkscape:cx="16"
+     inkscape:cy="16"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1_1_" /><path
+     d="m 27.266949,8.4830534 c 2.071877,0 3.75,-1.6781241 3.75,-3.7500002 0,-2.0718741 -1.678123,-3.75000018 -3.75,-3.75000018 -2.071875,0 -3.75,1.67812608 -3.75,3.75000018 0,1.05375 0.436877,2.0025 1.136252,2.6831261 l -2.958752,5.1768747 c -0.60375,-0.22125 -1.246875,-0.36 -1.927501,-0.36 -1.5,0 -2.855626,0.59625 -3.864376,1.554373 L 8.2319484,8.0349273 c 0.1818761,-0.440624 0.285,-0.9206241 0.285,-1.4268741 0,-2.0718741 -1.6781249,-3.7500001 -3.7499995,-3.7500001 -2.0718749,0 -3.7499998,1.678126 -3.7499998,3.7500001 0,2.0718741 1.6781249,3.7500008 3.7499998,3.7500008 0.8849997,0 1.6874998,-0.318751 2.3287498,-0.8306267 l 7.6912493,5.7693767 c -0.399376,0.770623 -0.645,1.633123 -0.645,2.56125 0,0.586873 0.116248,1.14375 0.283124,1.67625 L 6.3794487,23.859926 C 5.8881986,23.62555 5.3463238,23.48305 4.7669489,23.48305 c -2.0718749,0 -3.7499998,1.678124 -3.7499998,3.75 0,2.071876 1.6781249,3.75 3.7499998,3.75 2.0718746,0 3.7499995,-1.678124 3.7499995,-3.75 0,-0.761248 -0.2306248,-1.468124 -0.6206248,-2.060624 l 7.3743744,-3.965624 c 1.025624,1.374374 2.649374,2.276248 4.49625,2.276248 0.933753,0 1.801877,-0.249374 2.578126,-0.6525 l 1.831875,2.281876 c -0.414375,0.603748 -0.66,1.333124 -0.66,2.120624 0,2.071876 1.678125,3.75 3.75,3.75 2.071877,0 3.75,-1.678124 3.75,-3.75 0,-2.071876 -1.678123,-3.75 -3.75,-3.75 -0.601875,0 -1.1625,0.15564 -1.666875,0.406876 l -1.751248,-2.1825 c 0.950623,-1.006876 1.543123,-2.354999 1.543123,-3.849372 0,-1.75125 -0.8175,-3.29625 -2.071875,-4.3275 l 2.968125,-5.1937507 c 0.313127,0.08624 0.6375,0.14624 0.97875,0.14624 z"
+     id="path2"
+     style="fill:#b3b3b3;stroke:#1a1a1a;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     inkscape:connector-curvature="0" /></svg>
\ No newline at end of file
diff --git a/res/themes/default/asbru_cluster_manager2.png b/res/themes/default/asbru_cluster_manager2.png
new file mode 100644
index 00000000..ace22f21
Binary files /dev/null and b/res/themes/default/asbru_cluster_manager2.png differ
diff --git a/res/themes/default/asbru_cluster_manager_off.svg b/res/themes/default/asbru_cluster_manager_off.svg
new file mode 100644
index 00000000..7e149c2f
--- /dev/null
+++ b/res/themes/default/asbru_cluster_manager_off.svg
@@ -0,0 +1,44 @@
+<?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"
+   id="Layer_1_1_"
+   version="1.1"
+   viewBox="0 0 16 16"
+   xml:space="preserve"
+   sodipodi:docname="asbru_cluster_manager_off.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   width="16"
+   height="16"><metadata
+     id="metadata9"><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="defs7" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview5"
+     showgrid="false"
+     inkscape:zoom="52.125"
+     inkscape:cx="8.3864337"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1_1_" /><path
+     d="m 13.266949,4.4830516 c 0.966876,0 1.75,-0.7831245 1.75,-1.7500001 0,-0.9668745 -0.783124,-1.75 -1.75,-1.75 -0.966875,0 -1.75,0.7831255 -1.75,1.75 0,0.49175 0.203876,0.9345001 0.530251,1.2521256 l -1.380751,2.4158748 c -0.28175,-0.10325 -0.581875,-0.168 -0.8995004,-0.168 -0.7,0 -1.3326254,0.27825 -1.8033754,0.725374 L 4.3839488,4.2739261 c 0.084875,-0.2056245 0.133,-0.4296245 0.133,-0.6658745 0,-0.9668747 -0.783125,-1.7500001 -1.7499998,-1.7500001 -0.9668749,0 -1.7499999,0.7831254 -1.7499999,1.7500001 0,0.9668745 0.783125,1.7500003 1.7499999,1.7500003 0.4129999,0 0.7874999,-0.1487505 1.0867499,-0.3876258 l 3.5892497,2.6923758 c -0.1863754,0.359624 -0.301,0.762124 -0.301,1.19525 0,0.273874 0.054249,0.5337499 0.1321246,0.7822499 L 3.5194489,11.658925 C 3.2901989,11.54955 3.037324,11.48305 2.766949,11.48305 c -0.9668749,0 -1.7499999,0.783124 -1.7499999,1.75 0,0.966875 0.783125,1.75 1.7499999,1.75 0.9668748,0 1.7499998,-0.783125 1.7499998,-1.75 0,-0.355249 -0.1076249,-0.685125 -0.2896249,-0.961625 l 3.4413747,-1.850624 c 0.4786246,0.641374 1.2363746,1.062249 2.09825,1.062249 0.4357514,0 0.8408764,-0.116375 1.2031254,-0.3045 l 0.854875,1.064875 c -0.193375,0.281749 -0.308,0.622125 -0.308,0.989625 0,0.966875 0.783125,1.75 1.75,1.75 0.966876,0 1.75,-0.783125 1.75,-1.75 0,-0.966876 -0.783124,-1.75 -1.75,-1.75 -0.280875,0 -0.5425,0.07263 -0.777875,0.189875 l -0.817249,-1.0185 c 0.443624,-0.469875 0.720124,-1.0989991 0.720124,-1.7963731 0,-0.81725 -0.3815,-1.53825 -0.966875,-2.0195 l 1.385125,-2.4237503 c 0.146126,0.040245 0.2975,0.068245 0.45675,0.068245 z"
+     id="path2"
+     style="fill:#1a1a1a;stroke:#cccccc;stroke-width:1.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     inkscape:connector-curvature="0" /></svg>
\ No newline at end of file
diff --git a/res/themes/default/asbru_drag_terminal32x32.png b/res/themes/default/asbru_drag_terminal32x32.png
new file mode 100644
index 00000000..e134fb07
Binary files /dev/null and b/res/themes/default/asbru_drag_terminal32x32.png differ
diff --git a/res/themes/default/asbru_favourite_off.svg b/res/themes/default/asbru_favourite_off.svg
new file mode 100644
index 00000000..3e0ee544
--- /dev/null
+++ b/res/themes/default/asbru_favourite_off.svg
@@ -0,0 +1,55 @@
+<?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"
+   enable-background="new 0 0 64 64"
+   height="32"
+   version="1.1"
+   viewBox="0 0 32 32"
+   width="32"
+   xml:space="preserve"
+   id="svg20"
+   sodipodi:docname="asbru_favourite_off.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
+     id="metadata26"><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="defs24" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1810"
+     inkscape:window-height="905"
+     id="namedview22"
+     showgrid="false"
+     inkscape:zoom="22.4375"
+     inkscape:cx="1.2479109"
+     inkscape:cy="16"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg20" /><circle
+     cx="16.071079"
+     cy="15.983025"
+     id="circle2"
+     style="fill:#b3b3b3;stroke:#999999;stroke-width:2.4000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     r="14.735541" /><g
+     style="fill:#e6e6e6;stroke-width:1.92454886"
+     id="g14"
+     transform="matrix(0.5196023,0,0,0.5196023,-0.55619493,-0.64424733)"><path
+       d="m 52.872,26.063 c -0.31,-0.951 -1.133,-1.645 -2.121,-1.79 L 39.424,22.628 34.357,12.365 C 33.913,11.466 33.001,10.898 32,10.898 c -1.001,0 -1.913,0.568 -2.357,1.467 L 24.579,22.628 13.25,24.273 c -0.991,0.145 -1.813,0.838 -2.121,1.79 -0.31,0.951 -0.053,1.995 0.665,2.694 l 8.197,7.99 -1.934,11.283 c -0.168,0.986 0.237,1.982 1.046,2.57 0.455,0.334 0.996,0.502 1.543,0.502 0.418,0 0.838,-0.1 1.222,-0.302 L 32,45.473 42.132,50.8 c 0.384,0.202 0.804,0.302 1.222,0.302 0.544,0 1.088,-0.168 1.545,-0.502 0.809,-0.589 1.214,-1.585 1.046,-2.57 l -1.935,-11.284 8.197,-7.99 c 0.715,-0.696 0.973,-1.742 0.665,-2.693 z"
+       id="path12"
+       inkscape:connector-curvature="0"
+       style="fill:#e6e6e6;stroke-width:1.92454886" /></g><g
+     id="Layer_2"
+     transform="translate(0,-32)" /></svg>
\ No newline at end of file
diff --git a/res/themes/default/asbru_favourite_on.svg b/res/themes/default/asbru_favourite_on.svg
new file mode 100644
index 00000000..7452a8bb
--- /dev/null
+++ b/res/themes/default/asbru_favourite_on.svg
@@ -0,0 +1,55 @@
+<?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"
+   enable-background="new 0 0 64 64"
+   height="16"
+   version="1.1"
+   viewBox="0 0 16 16"
+   width="16"
+   xml:space="preserve"
+   id="svg20"
+   sodipodi:docname="asbru_favourite_on.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
+     id="metadata26"><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="defs24" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1810"
+     inkscape:window-height="905"
+     id="namedview22"
+     showgrid="false"
+     inkscape:zoom="44.875"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg20" /><circle
+     cx="7.9710789"
+     cy="8.083025"
+     r="7.3999996"
+     id="circle2"
+     style="fill:#999999;stroke:#1a1a1a;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><g
+     style="fill:#ffffff;stroke-width:4.03114986"
+     id="g14"
+     transform="matrix(0.24806818,0,0,0.24806818,0.03289677,0.14484383)"><path
+       d="m 52.872,26.063 c -0.31,-0.951 -1.133,-1.645 -2.121,-1.79 L 39.424,22.628 34.357,12.365 C 33.913,11.466 33.001,10.898 32,10.898 c -1.001,0 -1.913,0.568 -2.357,1.467 L 24.579,22.628 13.25,24.273 c -0.991,0.145 -1.813,0.838 -2.121,1.79 -0.31,0.951 -0.053,1.995 0.665,2.694 l 8.197,7.99 -1.934,11.283 c -0.168,0.986 0.237,1.982 1.046,2.57 0.455,0.334 0.996,0.502 1.543,0.502 0.418,0 0.838,-0.1 1.222,-0.302 L 32,45.473 42.132,50.8 c 0.384,0.202 0.804,0.302 1.222,0.302 0.544,0 1.088,-0.168 1.545,-0.502 0.809,-0.589 1.214,-1.585 1.046,-2.57 l -1.935,-11.284 8.197,-7.99 c 0.715,-0.696 0.973,-1.742 0.665,-2.693 z"
+       id="path12"
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff;stroke-width:4.03114986" /></g><g
+     id="Layer_2"
+     transform="translate(0,-48)" /></svg>
\ No newline at end of file
diff --git a/res/themes/default/asbru_group.svg b/res/themes/default/asbru_group.svg
new file mode 100644
index 00000000..eb71c256
--- /dev/null
+++ b/res/themes/default/asbru_group.svg
@@ -0,0 +1,82 @@
+<?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"
+   enable-background="new 0 0 200 200"
+   height="16"
+   id="Layer_1"
+   version="1.1"
+   viewBox="0 0 16 16"
+   width="16"
+   xml:space="preserve"
+   sodipodi:docname="asbru_group.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
+     id="metadata9"><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="defs7" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview5"
+     showgrid="false"
+     inkscape:zoom="22.366364"
+     inkscape:cx="5.3448441"
+     inkscape:cy="8.4745763"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1" /><circle
+     style="opacity:1;fill:#ff6600;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:7.55905533;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+     id="path812"
+     cx="8.0119495"
+     cy="7.9880486"
+     r="8" /><circle
+     style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:7.55905533;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+     id="path814"
+     cx="7.2757797"
+     cy="13.73174"
+     r="2"
+     inkscape:transform-center-x="33.979596"
+     inkscape:transform-center-y="-19.851237" /><circle
+     style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:7.55905533;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+     id="path814-7"
+     cx="12.222208"
+     cy="5.5214815"
+     r="2"
+     inkscape:transform-center-x="33.979596"
+     inkscape:transform-center-y="-19.851237" /><circle
+     style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:7.55905533;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+     id="path814-0"
+     cx="5.1580291"
+     cy="3.3306911"
+     inkscape:transform-center-x="33.979596"
+     inkscape:transform-center-y="-19.851237"
+     r="2" /><path
+     style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 0.08941999,6.9238712 6.2123724,13.092495 5.2400835,13.046114 C 3.0123979,12.459303 1.4904345,8.7391172 0.08941999,6.9238712 Z"
+     id="path837"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccc" /><path
+     style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 1.1374018,12.156337 11.113137,6.2071141 10.92858,6.8666442 C 9.1487554,9.7125141 3.9046135,11.042187 1.1374018,12.156337 Z"
+     id="path837-4"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccc" /><path
+     style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 12.300309,14.704657 5.2707209,3.8823307 6.6186331,4.492337 c 2.4471893,2.0184944 4.2314849,7.159638 5.6816739,10.212326 z"
+     id="path837-8"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccc" /></svg>
\ No newline at end of file
diff --git a/res/themes/default/asbru_group_add_16x16.svg b/res/themes/default/asbru_group_add_16x16.svg
new file mode 100644
index 00000000..6b3ee8e2
--- /dev/null
+++ b/res/themes/default/asbru_group_add_16x16.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"
+   height="32"
+   version="1.1"
+   viewBox="0 0 32 32"
+   width="32"
+   id="svg9"
+   sodipodi:docname="asbru_group_add_16x16.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata13">
+    <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>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview11"
+     showgrid="false"
+     inkscape:zoom="26.0625"
+     inkscape:cx="3.2997602"
+     inkscape:cy="16"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg9" />
+  <defs
+     id="defs4">
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path839"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+  </defs>
+  <g
+     id="Icons with numbers"
+     style="fill:#999999;fill-rule:evenodd;stroke:none;stroke-width:0.5"
+     transform="matrix(2,0,0,2.6666666,0,-5.333333)">
+    <g
+       id="Group"
+       transform="translate(-240)"
+       style="fill:#999999;stroke-width:0.5">
+      <path
+         d="m 241.00087,4 h 13.99826 C 255.55537,4 256,4.4456547 256,4.9953976 V 13.004602 C 256,13.544336 255.55189,14 254.99913,14 H 241.00087 C 240.44463,14 240,13.554345 240,13.004602 V 4.9953976 C 240,4.4556644 240.44811,4 241.00087,4 Z M 243,2 h 4 l 1,1 h -6 z m 0,0"
+         id="Rectangle 136"
+         style="fill:#999999;stroke-width:0.5"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+  <g
+     id="g837"
+     transform="matrix(1.4645669,0,0,1.4645669,11.957325,12.187543)"
+     style="fill:#333333;stroke:#333333;stroke-width:0.40967742;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers">
+    <rect
+       y="6.88729"
+       x="3.1270988"
+       height="2.2254195"
+       width="9.7458029"
+       id="rect818"
+       style="opacity:1;fill:#333333;fill-opacity:1;stroke:#333333;stroke-width:0.40967742;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" />
+    <rect
+       transform="rotate(90)"
+       y="-9.11271"
+       x="3.1270983"
+       height="2.2254195"
+       width="9.7458029"
+       id="rect818-0"
+       style="opacity:1;fill:#333333;fill-opacity:1;stroke:#333333;stroke-width:0.40967742;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" />
+  </g>
+</svg>
diff --git a/res/themes/default/asbru_group_closed_16x16.svg b/res/themes/default/asbru_group_closed_16x16.svg
new file mode 100644
index 00000000..3f961d36
--- /dev/null
+++ b/res/themes/default/asbru_group_closed_16x16.svg
@@ -0,0 +1,66 @@
+<?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"
+   height="16"
+   version="1.1"
+   viewBox="0 0 16 16"
+   width="16"
+   id="svg9"
+   sodipodi:docname="asbru_group_closed_16x16.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata13">
+    <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>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview11"
+     showgrid="false"
+     inkscape:zoom="52.125"
+     inkscape:cx="-4.7002398"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg9" />
+  <defs
+     id="defs4" />
+  <g
+     id="Icons with numbers"
+     style="fill:#ffcc00;fill-rule:evenodd;stroke:none;stroke-width:1"
+     transform="matrix(1,0,0,1.3333332,0,-2.6666669)">
+    <g
+       id="Group"
+       transform="translate(-240)"
+       style="fill:#ffcc00;stroke-width:1">
+      <path
+         d="m 241.00087,4 h 13.99826 C 255.55537,4 256,4.4456547 256,4.9953976 V 13.004602 C 256,13.544336 255.55189,14 254.99913,14 H 241.00087 C 240.44463,14 240,13.554345 240,13.004602 V 4.9953976 C 240,4.4556644 240.44811,4 241.00087,4 Z M 243,2 h 4 l 1,1 h -6 z m 0,0"
+         id="Rectangle 136"
+         style="fill:#ffcc00;stroke-width:1"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>
diff --git a/res/themes/default/asbru_group_open_16x16.svg b/res/themes/default/asbru_group_open_16x16.svg
new file mode 100644
index 00000000..729b1bcb
--- /dev/null
+++ b/res/themes/default/asbru_group_open_16x16.svg
@@ -0,0 +1,76 @@
+<?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"
+   height="16"
+   id="Capa_1"
+   version="1.1"
+   viewBox="0 0 16 16"
+   width="16"
+   xml:space="preserve"
+   sodipodi:docname="asbru_group_open_16x16.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
+     id="metadata41"><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="defs39" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview37"
+     showgrid="false"
+     inkscape:zoom="52.125"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Capa_1"
+     scale-x="1.3"
+     showguides="false" /><path
+     inkscape:connector-curvature="0"
+     style="fill:#ed6912;fill-opacity:1;stroke-width:0.17888558"
+     id="path2"
+     d="M 15.256018,5.0000002 H 0.74399844 c -0.736641,0 -0.77344105,0.4482 -0.73344099,0.9958 L 0.67087834,15.004 c 0.04,0.5478 0.14384019,0.995999 0.87936116,0.995999 H 14.449617 c 0.750081,0 0.839041,-0.448199 0.879042,-0.995799 l 0.66032,-9.0081998 c 0.04016,-0.5478 0.0035,-0.996 -0.732961,-0.996 z m -0.53264,-2.1999999 c -0.0888,-0.4399999 -0.524001,-0.8 -0.967523,-0.8 H 8.3043287 c -0.4433607,0 -1.0632015,-0.3176 -1.3771219,-0.7056 L 6.4505662,0.70580042 C 6.1364857,0.3176004 5.5168049,3.9333338e-7 5.0734442,3.9333338e-7 H 2.4688007 C 2.0254402,3.9333338e-7 1.6225596,0.4472003 1.5737595,0.99400042 L 1.3399993,3.6000003 H 14.884658 Z" /><g
+     id="g6"
+     transform="translate(0,-64)" /><g
+     id="g8"
+     transform="translate(0,-64)" /><g
+     id="g10"
+     transform="translate(0,-64)" /><g
+     id="g12"
+     transform="translate(0,-64)" /><g
+     id="g14"
+     transform="translate(0,-64)" /><g
+     id="g16"
+     transform="translate(0,-64)" /><g
+     id="g18"
+     transform="translate(0,-64)" /><g
+     id="g20"
+     transform="translate(0,-64)" /><g
+     id="g22"
+     transform="translate(0,-64)" /><g
+     id="g24"
+     transform="translate(0,-64)" /><g
+     id="g26"
+     transform="translate(0,-64)" /><g
+     id="g28"
+     transform="translate(0,-64)" /><g
+     id="g30"
+     transform="translate(0,-64)" /><g
+     id="g32"
+     transform="translate(0,-64)" /><g
+     id="g34"
+     transform="translate(0,-64)" /></svg>
\ No newline at end of file
diff --git a/res/themes/default/asbru_history.svg b/res/themes/default/asbru_history.svg
new file mode 100644
index 00000000..efd565e2
--- /dev/null
+++ b/res/themes/default/asbru_history.svg
@@ -0,0 +1,64 @@
+<?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"
+   height="32"
+   id="clock"
+   viewBox="0 0 32 32"
+   width="32"
+   version="1.1"
+   sodipodi:docname="asbru_history.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata9">
+    <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="defs7" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview5"
+     showgrid="false"
+     inkscape:zoom="26.0625"
+     inkscape:cx="3.2613909"
+     inkscape:cy="16"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="clock" />
+  <ellipse
+     style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:7.09063911;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+     id="path812"
+     cx="15.894855"
+     cy="15.875745"
+     rx="12.344953"
+     ry="12.402431" />
+  <path
+     d="M 16,0 C 7.163444,0 0,7.163444 0,16 0,24.836556 7.163444,32 16,32 24.836556,32 32,24.836556 32,16 32,7.163444 24.836556,0 16,0 m 0,4 C 22.627417,4 28,9.372583 28,16 28,22.627417 22.627417,28 16,28 9.372583,28 4,22.627417 4,16 4,9.372583 9.372583,4 16,4 m -2,2 0.613909,10.981415 7.846523,4.289568 0.446643,-0.775779 L 16.35012,16.016187 14.776979,5.8848921 Z"
+     id="path2"
+     style="fill:#333333"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="csssccssscccccccc" />
+</svg>
diff --git a/res/themes/default/asbru_keepass.png b/res/themes/default/asbru_keepass.png
new file mode 100644
index 00000000..e41f8b33
Binary files /dev/null and b/res/themes/default/asbru_keepass.png differ
diff --git a/res/themes/default/asbru_method_3270.jpg b/res/themes/default/asbru_method_3270.jpg
new file mode 100644
index 00000000..cca081bd
Binary files /dev/null and b/res/themes/default/asbru_method_3270.jpg differ
diff --git a/res/themes/default/asbru_method_cadaver.png b/res/themes/default/asbru_method_cadaver.png
new file mode 100644
index 00000000..373bddf3
Binary files /dev/null and b/res/themes/default/asbru_method_cadaver.png differ
diff --git a/res/themes/default/asbru_method_cu.jpg b/res/themes/default/asbru_method_cu.jpg
new file mode 100644
index 00000000..e7959f61
Binary files /dev/null and b/res/themes/default/asbru_method_cu.jpg differ
diff --git a/res/themes/default/asbru_method_ftp.svg b/res/themes/default/asbru_method_ftp.svg
new file mode 100644
index 00000000..04db778c
--- /dev/null
+++ b/res/themes/default/asbru_method_ftp.svg
@@ -0,0 +1,45 @@
+<?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"
+   enable-background="new 0 0 200 200"
+   height="32"
+   id="Layer_1"
+   version="1.1"
+   viewBox="0 0 32 32"
+   width="32"
+   xml:space="preserve"
+   sodipodi:docname="asbru_method_ftp.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
+     id="metadata9"><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="defs7" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview5"
+     showgrid="false"
+     inkscape:zoom="29.203762"
+     inkscape:cx="16.056412"
+     inkscape:cy="16.180629"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1" /><path
+     d="M 31.55641,8.3513739 V 13.71682 c -0.20336,0.858595 -0.653945,1.647139 -1.319515,2.286746 -0.9362,0.898425 -2.18395,1.39359 -3.511525,1.39359 h -8.347061 v -1.633501 c 0,-0.690286 -0.564975,-1.255037 -1.255345,-1.255037 h -2.133265 c -0.69006,0 -1.25488,0.564906 -1.25488,1.255037 v 1.633501 H 5.3872988 c -1.327575,0 -2.5750151,-0.495165 -3.5115251,-1.39359 C 1.2095837,15.364889 0.75977365,14.575725 0.55641364,13.71744 V 8.3513739 c 0,-1.156624 0.94705006,-2.1035585 2.10397006,-2.1035585 H 29.45275 c 1.156765,0 2.10366,0.9469345 2.10366,2.1035585 z M 17.123119,20.285539 c 0.110515,0 0.20274,-0.09237 0.20274,-0.202716 v -1.63381 -1.051857 -1.633501 c 0,-0.110346 -0.09223,-0.203335 -0.20274,-0.203335 h -2.13342 c -0.11005,0 -0.20336,0.09299 -0.20336,0.203335 v 1.633501 1.051857 1.63381 c 0,0.110347 0.09331,0.202716 0.20336,0.202716 z M 30.96586,16.762198 c -1.13398,1.087503 -2.63903,1.68697 -4.24049,1.68697 h -8.347061 v 1.63381 c 0,0.689356 -0.564975,1.254572 -1.255345,1.254572 h -2.133265 c -0.69006,0 -1.25488,-0.565061 -1.25488,-1.254572 v -1.63381 H 5.3872988 c -1.60115,0 -3.1065101,-0.599467 -4.2403351,-1.68697 C 0.93151365,16.555299 0.73435365,16.33569 0.55641364,16.105233 v 11.389406 c 0,1.157554 0.94705006,2.103714 2.10397006,2.103714 H 29.45275 c 1.156765,0 2.10366,-0.94616 2.10366,-2.103714 V 16.105233 c -0.17825,0.230457 -0.374635,0.450066 -0.59055,0.656965 z M 20.907289,2.6567484 C 20.496229,2.2457385 19.957604,2.0403885 19.419444,2.0403885 h -6.72545 c -0.53847,0 -1.077405,0.20535 -1.488155,0.6163599 -0.41044,0.4106999 -0.61597,0.9491042 -0.61597,1.4873536 v 1.0518567 h 1.787925 V 4.144102 c 0,-0.059668 0.01628,-0.1469221 0.093,-0.2231728 0.07595,-0.076251 0.16306,-0.092834 0.2232,-0.092834 h 6.725605 c 0.05921,0 0.14663,0.016583 0.222735,0.092834 0.07657,0.076251 0.09285,0.163505 0.09285,0.2231728 v 1.0518567 h 1.787925 V 4.144102 c -1.6e-4,-0.5382494 -0.20538,-1.0764987 -0.61582,-1.4873536 z"
+     id="path2"
+     inkscape:connector-curvature="0"
+     style="fill:#aa0000;stroke:#ffffff;stroke-width:1;stroke-opacity:1" /></svg>
\ No newline at end of file
diff --git a/res/themes/default/asbru_method_generic.svg b/res/themes/default/asbru_method_generic.svg
new file mode 100644
index 00000000..4f91a4f0
--- /dev/null
+++ b/res/themes/default/asbru_method_generic.svg
@@ -0,0 +1,66 @@
+<?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"
+   height="32"
+   version="1.1"
+   viewBox="0 0 32 32"
+   width="32"
+   id="svg9"
+   sodipodi:docname="asbru_method_generic.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata13">
+    <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>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview11"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="-14.440678"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg9" />
+  <defs
+     id="defs4" />
+  <g
+     id="Icons with numbers"
+     style="fill:#00aad4;fill-rule:evenodd;stroke:none;stroke-width:0.5"
+     transform="scale(2)">
+    <g
+       id="Group"
+       transform="translate(-48,-432)"
+       style="fill:#00aad4;stroke-width:0.5">
+      <path
+         d="M 54.879684,443.0591 V 445 h 2.351085 v -1.9409 z M 56,448 c -4.418278,0 -8,-3.58172 -8,-8 0,-4.41828 3.581722,-8 8,-8 4.418278,0 8,3.58172 8,8 0,4.41828 -3.581722,8 -8,8 z m -2.42998,-12.48959 c -0.983569,0.5328 -1.506903,1.4372 -1.57002,2.71323 h 2.280079 c 0,-0.37162 0.127546,-0.72979 0.382643,-1.07455 0.255097,-0.34475 0.687702,-0.51712 1.29783,-0.51712 0.620648,0 1.047994,0.13991 1.282052,0.41974 0.234057,0.27983 0.351084,0.58988 0.351084,0.93016 0,0.2955 -0.105193,0.56637 -0.315582,0.81262 l -0.457593,0.39624 -0.575937,0.38281 c -0.56805,0.37609 -0.920447,0.70853 -1.057199,0.99731 -0.136753,0.28879 -0.220907,0.81151 -0.252466,1.56817 h 2.130178 c 0.0053,-0.35818 0.03945,-0.62234 0.102564,-0.79248 0.09994,-0.26864 0.302431,-0.50369 0.607495,-0.70517 l 0.560158,-0.36938 c 0.56805,-0.37609 0.952004,-0.68502 1.151874,-0.92679 C 59.829062,438.94672 60,438.45646 60,437.87441 60,436.92522 59.606842,436.20887 58.820513,435.72532 58.034184,435.24177 57.046686,435 55.857988,435 c -0.904672,0 -1.667321,0.17014 -2.287968,0.51041 z m 0,0"
+         id="Oval 318"
+         inkscape:connector-curvature="0"
+         style="stroke-width:0.5;fill:#00aad4" />
+    </g>
+  </g>
+</svg>
diff --git a/res/themes/default/asbru_method_mosh.svg b/res/themes/default/asbru_method_mosh.svg
new file mode 100644
index 00000000..47d4adda
--- /dev/null
+++ b/res/themes/default/asbru_method_mosh.svg
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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="32mm"
+   height="32mm"
+   viewBox="0 0 32 32"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="asbru_method_mosh.svg">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="6.8957031"
+     inkscape:cx="60.472441"
+     inkscape:cy="60.472441"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5">
+    <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>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-265)">
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+       id="rect815"
+       width="28.201439"
+       height="19.529974"
+       x="1.8992805"
+       y="271.02399" />
+    <rect
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+       id="rect815-2"
+       width="16.767389"
+       height="2.9838984"
+       x="7.5203829"
+       y="276.35336" />
+    <g
+       id="g906"
+       transform="matrix(0.85488233,0,0,0.62461017,2.2473141,107.31378)"
+       style="stroke-width:1.36849201">
+      <rect
+         y="285.91129"
+         x="13.582733"
+         height="1.3045554"
+         width="4.8345346"
+         id="rect815-2-1"
+         style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:2.73698401;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" />
+      <rect
+         y="286.17984"
+         x="21.520235"
+         height="1.0359701"
+         width="4.8345346"
+         id="rect815-2-1-7"
+         style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:2.73698401;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" />
+      <rect
+         y="285.87289"
+         x="5.6452365"
+         height="1.3429247"
+         width="4.8345346"
+         id="rect815-2-1-8"
+         style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:2.73698401;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" />
+    </g>
+  </g>
+</svg>
diff --git a/res/themes/default/asbru_method_rdesktop.svg b/res/themes/default/asbru_method_rdesktop.svg
new file mode 100644
index 00000000..f9890639
--- /dev/null
+++ b/res/themes/default/asbru_method_rdesktop.svg
@@ -0,0 +1,57 @@
+<?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"
+   enable-background="new 0 0 24 24"
+   height="24px"
+   id="Layer_1"
+   version="1.1"
+   viewBox="0 0 24 24"
+   width="24px"
+   xml:space="preserve"
+   sodipodi:docname="asbru_method_rdesktop.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
+     id="metadata17"><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="defs15" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview13"
+     showgrid="false"
+     inkscape:zoom="9.8333333"
+     inkscape:cx="-8.5932204"
+     inkscape:cy="12"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1" /><path
+     inkscape:connector-curvature="0"
+     id="path2"
+     d="M 6.5367687,11.808543 C 5.1178185,11.926788 3.8171144,12.281526 2.9893935,12.518018 2.8711478,12.636264 2.6346561,12.636264 2.3981644,12.754509 L 0.26973949,19.84926 C 1.6886895,19.376276 2.8711478,19.139785 4.0536061,19.139785 c 2.0101792,0 3.4291291,0.709475 4.6115875,1.418949 C 9.2564227,18.548556 10.438882,14.646443 10.911865,13.109247 10.675374,12.991001 10.438882,12.872756 10.202389,12.754509 9.0199309,12.045035 7.7192269,11.690297 6.5367687,11.808543 Z"
+     style="fill:#0000ff;stroke-width:1" /><path
+     inkscape:connector-curvature="0"
+     id="path4"
+     d="m 12.204756,13.794915 -2.114926,7.16725 c 1.057463,0.587479 2.937398,1.409951 4.347348,1.409951 1.292455,0 2.819902,-0.352487 4.58234,-1.057463 l 1.99743,-6.814762 c -1.292454,0.352487 -2.584909,0.587479 -3.877364,0.587479 -2.114926,0 -3.877365,-0.704975 -4.934828,-1.292455 z"
+     style="fill:#ffcc00;stroke-width:0.99999994" /><path
+     inkscape:connector-curvature="0"
+     id="path6"
+     d="M 11.019269,11.297448 C 11.50085,9.8527042 12.223221,7.3244018 12.825198,5.3980766 L 13.306779,3.8329374 C 12.704802,3.4717513 11.621245,2.99017 10.778477,2.7493793 10.176501,2.628984 9.5745247,2.5085886 8.8521525,2.5085886 c -1.3243489,0 -2.6486976,0.361186 -4.2138369,0.9631627 L 2.591595,10.695472 C 4.036339,10.21389 5.3606875,9.9730991 6.5646409,9.9730991 c 1.9263254,0 3.3710682,0.6019779 4.4546281,1.3243489 z"
+     style="fill:#d40000;stroke-width:1" /><path
+     inkscape:connector-curvature="0"
+     id="path8"
+     d="m 19.819889,5.6515686 c -2.290056,0 -3.977465,-0.7231753 -5.062228,-1.4463508 l -2.169526,7.4728142 c 2.772173,1.687409 5.905931,1.807938 9.160222,0.361587 l 2.169525,-7.1112257 c -1.44635,0.6026461 -2.772173,0.7231753 -4.097993,0.7231753 z"
+     style="fill:#008000;stroke-width:0.99999988" /></svg>
\ No newline at end of file
diff --git a/res/themes/default/asbru_method_remote-tty.jpg b/res/themes/default/asbru_method_remote-tty.jpg
new file mode 100644
index 00000000..e7959f61
Binary files /dev/null and b/res/themes/default/asbru_method_remote-tty.jpg differ
diff --git a/res/themes/default/asbru_method_sftp.svg b/res/themes/default/asbru_method_sftp.svg
new file mode 100644
index 00000000..c0628b84
--- /dev/null
+++ b/res/themes/default/asbru_method_sftp.svg
@@ -0,0 +1,45 @@
+<?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"
+   enable-background="new 0 0 200 200"
+   height="32"
+   id="Layer_1"
+   version="1.1"
+   viewBox="0 0 32 32"
+   width="32"
+   xml:space="preserve"
+   sodipodi:docname="asbru_method_sftp.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
+     id="metadata9"><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="defs7" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview5"
+     showgrid="false"
+     inkscape:zoom="26.0625"
+     inkscape:cx="3.2997602"
+     inkscape:cy="16"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1" /><path
+     d="m 31.498797,7.6600216 v 5.3654454 c -0.20336,0.858595 -0.653945,1.647139 -1.319515,2.286746 -0.9362,0.898426 -2.18395,1.39359 -3.511525,1.39359 h -8.34706 v -1.633501 c 0,-0.690285 -0.564975,-1.255036 -1.255345,-1.255036 h -2.133265 c -0.69006,0 -1.25488,0.564906 -1.25488,1.255036 v 1.633501 H 5.3296859 c -1.327575,0 -2.575015,-0.495164 -3.511525,-1.39359 -0.66619,-0.638677 -1.116,-1.427841 -1.31936,-2.286126 V 7.6600216 c 0,-1.1566239 0.94705,-2.1035584 2.10397,-2.1035584 H 29.395137 c 1.156765,0 2.10366,0.9469345 2.10366,2.1035584 z M 17.065507,19.594186 c 0.110515,0 0.20274,-0.09237 0.20274,-0.202715 V 17.75766 16.705803 15.072302 c 0,-0.110346 -0.09222,-0.203335 -0.20274,-0.203335 h -2.13342 c -0.11005,0 -0.20336,0.09299 -0.20336,0.203335 v 1.633501 1.051857 1.633811 c 0,0.110346 0.09331,0.202715 0.20336,0.202715 z m 13.84274,-3.52334 c -1.13398,1.087502 -2.63903,1.686969 -4.24049,1.686969 h -8.34706 v 1.633811 c 0,0.689356 -0.564975,1.254572 -1.255345,1.254572 h -2.133265 c -0.69006,0 -1.25488,-0.565062 -1.25488,-1.254572 V 17.757815 H 5.3296859 c -1.60115,0 -3.10651,-0.599467 -4.240335,-1.686969 -0.21545,-0.2069 -0.41261,-0.426508 -0.59055,-0.656965 v 11.389406 c 0,1.157553 0.94705,2.103713 2.10397,2.103713 H 29.395137 c 1.156765,0 2.10366,-0.94616 2.10366,-2.103713 V 15.413881 c -0.17825,0.230457 -0.374635,0.450065 -0.59055,0.656965 z M 20.849677,1.9653962 C 20.438617,1.5543863 19.899992,1.3490364 19.361832,1.3490364 h -6.72545 c -0.53847,0 -1.077405,0.2053499 -1.488155,0.6163598 -0.41044,0.4106999 -0.61597,0.9491042 -0.61597,1.4873536 v 1.0518567 h 1.787925 V 3.4527498 c 0,-0.059668 0.01628,-0.1469221 0.093,-0.2231728 0.07595,-0.076251 0.16306,-0.092834 0.2232,-0.092834 h 6.725605 c 0.05921,0 0.14663,0.016583 0.222735,0.092834 0.07657,0.076251 0.09285,0.163505 0.09285,0.2231728 v 1.0518567 h 1.787925 V 3.4527498 c -1.6e-4,-0.5382494 -0.20538,-1.0764987 -0.61582,-1.4873536 z"
+     id="path2"
+     inkscape:connector-curvature="0"
+     style="fill:#447821;stroke:#ffffff;stroke-width:0.99999994;stroke-opacity:1" /></svg>
\ No newline at end of file
diff --git a/res/themes/default/asbru_method_ssh.svg b/res/themes/default/asbru_method_ssh.svg
new file mode 100644
index 00000000..ed344d54
--- /dev/null
+++ b/res/themes/default/asbru_method_ssh.svg
@@ -0,0 +1,67 @@
+<?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"
+   height="32px"
+   version="1.1"
+   viewBox="0 0 32 32"
+   width="32px"
+   id="svg11"
+   sodipodi:docname="asbru_method_ssh.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata15">
+    <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>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview13"
+     showgrid="false"
+     inkscape:zoom="20.270834"
+     inkscape:cx="16.091127"
+     inkscape:cy="20.614595"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg11" />
+  <desc
+     id="desc4" />
+  <defs
+     id="defs6" />
+  <g
+     id="Page-1"
+     style="fill:#217821;fill-rule:evenodd;stroke:none;stroke-width:0.84375"
+     transform="matrix(1.1851852,0,0,1.1851852,-3.5555558,-3.5555558)">
+    <g
+       id="icon-114-lock"
+       style="fill:#217821;stroke-width:0.84375">
+      <path
+         d="m 16,21.914647 v 2.594348 C 16,24.780169 16.231934,25 16.5,25 16.776142,25 17,24.772119 17,24.508995 V 21.914647 C 17.582596,21.708729 18,21.153109 18,20.5 18,19.671573 17.328427,19 16.5,19 15.671573,19 15,19.671573 15,20.5 c 0,0.653109 0.417404,1.208729 1,1.414647 z M 9,14.000013 V 10.499235 C 9,6.3567048 12.357864,3 16.5,3 20.633707,3 24,6.3575219 24,10.499235 v 3.500778 c 1.659147,0.0047 3,1.350304 3,3.009465 v 9.981044 C 27,28.663369 25.65292,30 23.991212,30 H 9.008788 C 7.3455902,30 6,28.652611 6,26.990522 V 17.009478 C 6,15.339581 7.3423335,14.004715 9,14.000013 Z M 12,14 V 10.500854 C 12,8.0092478 14.014719,6 16.5,6 18.980224,6 21,8.0151008 21,10.500854 V 14 Z"
+         id="lock"
+         style="fill:#217821;stroke-width:0.84375"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>
diff --git a/res/themes/default/asbru_method_telnet.svg b/res/themes/default/asbru_method_telnet.svg
new file mode 100644
index 00000000..9b8bd059
--- /dev/null
+++ b/res/themes/default/asbru_method_telnet.svg
@@ -0,0 +1,67 @@
+<?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"
+   height="32px"
+   version="1.1"
+   viewBox="0 0 32 32"
+   width="32px"
+   id="svg11"
+   sodipodi:docname="asbru_method_telnet.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata15">
+    <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>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview13"
+     showgrid="false"
+     inkscape:zoom="26.0625"
+     inkscape:cx="16"
+     inkscape:cy="16"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg11" />
+  <desc
+     id="desc4" />
+  <defs
+     id="defs6" />
+  <g
+     id="Page-1"
+     style="fill:#d40000;fill-rule:evenodd;stroke:none;stroke-width:0.96875012"
+     transform="matrix(1.0322581,0,0,1.0322581,-0.5161296,-1.0322586)">
+    <g
+       id="icon-115-lock-open"
+       style="fill:#d40000;stroke-width:0.96875012">
+      <path
+         d="m 20,23.914647 v 2.594348 C 20,26.780169 20.231934,27 20.5,27 20.776142,27 21,26.772119 21,26.508995 V 23.914647 C 21.582596,23.708729 22,23.153109 22,22.5 22,21.671573 21.328427,21 20.5,21 19.671573,21 19,21.671573 19,22.5 c 0,0.653109 0.417404,1.208729 1,1.414647 z M 13,8.4999175 C 13,6.0146817 10.980224,4 8.5,4 6.0147186,4 4,6.0168811 4,8.4999175 V 10 12.499167 C 4,13.321455 3.3284271,14 2.5,14 1.6657972,14 1,13.328054 1,12.499167 V 10 8.499235 C 1,4.3567048 4.3578644,1 8.5,1 12.633707,1 16,4.3575219 16,8.499235 V 16 H 27.991212 C 29.65441,16 31,17.347389 31,19.009478 v 9.981044 C 31,30.663369 29.65292,32 27.991212,32 H 13.008788 C 11.34559,32 10,30.652611 10,28.990522 v -9.981044 c 0,-1.669897 1.342334,-3.004763 3,-3.009466 z"
+         id="lock-open"
+         style="fill:#d40000;stroke-width:0.96875012"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>
diff --git a/res/themes/default/asbru_method_vncviewer.svg b/res/themes/default/asbru_method_vncviewer.svg
new file mode 100644
index 00000000..de6acfd3
--- /dev/null
+++ b/res/themes/default/asbru_method_vncviewer.svg
@@ -0,0 +1,88 @@
+<?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"
+   enable-background="new 0 0 75 61"
+   height="16"
+   id="Layer_1"
+   version="1.1"
+   viewBox="0 0 16 16"
+   width="16"
+   xml:space="preserve"
+   sodipodi:docname="asbru_method_vncviewer.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
+     id="metadata9"><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="defs7" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview5"
+     showgrid="false"
+     showguides="false"
+     inkscape:zoom="19.17937"
+     inkscape:cx="13.737479"
+     inkscape:cy="14.479008"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1" /><text
+     xml:space="preserve"
+     style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.35899734px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#008000;fill-opacity:1;stroke:none;stroke-width:0.32043648px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     x="0.22531466"
+     y="11.772177"
+     id="text17"
+     transform="scale(0.78181461,1.2790756)"><tspan
+       sodipodi:role="line"
+       id="tspan15"
+       x="0.22531466"
+       y="11.772177"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.35899734px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#008000;stroke-width:0.32043648px">V</tspan></text>
+<text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     x="11.36525"
+     y="4.6609974"
+     id="text21"><tspan
+       sodipodi:role="line"
+       id="tspan19"
+       x="11.36525"
+       y="40.05162"></tspan></text>
+<text
+     xml:space="preserve"
+     style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:10.58827019px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#0000ff;fill-opacity:1;stroke:none;stroke-width:0.20747451px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     x="8.708106"
+     y="7.6002789"
+     id="text25"
+     transform="scale(1.0010631,0.99893803)"><tspan
+       sodipodi:role="line"
+       id="tspan23"
+       x="8.708106"
+       y="7.6002789"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:10.58827019px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#0000ff;stroke-width:0.20747451px">n</tspan></text>
+<text
+     xml:space="preserve"
+     style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:12.49081612px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#d40000;fill-opacity:1;stroke:none;stroke-width:0.24945076px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     x="8.8415861"
+     y="15.172903"
+     id="text29"
+     transform="scale(0.99763601,1.0023696)"><tspan
+       sodipodi:role="line"
+       id="tspan27"
+       x="8.8415861"
+       y="15.172903"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:12.49081612px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#d40000;stroke-width:0.24945076px">c</tspan></text>
+</svg>
\ No newline at end of file
diff --git a/res/themes/default/asbru_node_add_16x16.svg b/res/themes/default/asbru_node_add_16x16.svg
new file mode 100644
index 00000000..65dc41eb
--- /dev/null
+++ b/res/themes/default/asbru_node_add_16x16.svg
@@ -0,0 +1,75 @@
+<?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"
+   id="Layer_1_1_"
+   version="1.1"
+   viewBox="0 0 32 32"
+   xml:space="preserve"
+   sodipodi:docname="asbru_node_add_16x16.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   width="32"
+   height="32"><metadata
+     id="metadata9"><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="defs7" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview5"
+     showgrid="false"
+     inkscape:zoom="26.0625"
+     inkscape:cx="16"
+     inkscape:cy="16"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1_1_" /><path
+     d="M 7.3188612,17.259575 H 23.863547 c 3.547916,0 6.434043,-2.725788 6.434043,-6.076596 0,-3.3508084 -2.886127,-6.0765963 -6.434043,-6.0765963 H 8.2380101 c 0,-1.9184671 -1.6452765,-3.4723392 -3.6765958,-3.4723392 -2.031319,0 -3.67659552,1.5538721 -3.67659552,3.4723392 0,1.9184691 1.64527652,3.4723412 3.67659552,3.4723412 1.3566638,0 2.529498,-0.7031494 3.1673873,-1.7361706 H 23.863547 c 2.533176,0 4.595744,1.9479822 4.595744,4.3404257 0,2.392443 -2.062568,4.340425 -4.595744,4.340425 H 7.3188612 c -3.5479149,0 -6.43404242,2.725788 -6.43404242,6.076591 0,3.35081 2.88612752,6.076594 6.43404242,6.076594 H 23.453606 c 0.636053,1.033025 1.808887,1.736172 3.167389,1.736172 2.031318,0 3.676595,-1.553872 3.676595,-3.472339 0,-1.918469 -1.645277,-3.472343 -3.676595,-3.472343 -2.031319,0 -3.676596,1.553874 -3.676596,3.472343 H 7.3188612 c -2.5331744,0 -4.5957446,-1.947986 -4.5957446,-4.340427 0,-2.392442 2.0625702,-4.34042 4.5957446,-4.34042 z"
+     id="path2"
+     style="fill:#999999;stroke:#999999;stroke-width:0.60000002;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1"
+     inkscape:connector-curvature="0" /><circle
+     style="opacity:0;fill:#ff0000;fill-opacity:1;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none"
+     id="path829"
+     cx="-9.3279467"
+     cy="-9.8042545"
+     r="0" /><circle
+     style="opacity:1;fill:#333333;fill-opacity:1;stroke:#333333;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+     id="path835"
+     cx="5.7869463"
+     cy="5.9914875"
+     r="5.7191491" /><circle
+     style="opacity:1;fill:#cccccc;fill-opacity:1;stroke:#808080;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+     id="path835-6"
+     cx="26.348646"
+     cy="26.280851"
+     r="5.7191491" /><g
+     id="g837"
+     transform="matrix(1.9373429,0,0,1.9373429,6.0036167,6.197711)"
+     style="fill:#000000;stroke:#000000;stroke-width:0.30970252;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"><rect
+       y="6.88729"
+       x="3.1270988"
+       height="2.2254195"
+       width="9.7458029"
+       id="rect818"
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.30970252;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" /><rect
+       transform="rotate(90)"
+       y="-9.11271"
+       x="3.1270983"
+       height="2.2254195"
+       width="9.7458029"
+       id="rect818-0"
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.30970252;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" /></g></svg>
\ No newline at end of file
diff --git a/res/themes/default/asbru_prompt.png b/res/themes/default/asbru_prompt.png
new file mode 100644
index 00000000..7ba70cb5
Binary files /dev/null and b/res/themes/default/asbru_prompt.png differ
diff --git a/res/themes/default/asbru_protected.png b/res/themes/default/asbru_protected.png
new file mode 100644
index 00000000..09866ad9
Binary files /dev/null and b/res/themes/default/asbru_protected.png differ
diff --git a/res/themes/default/asbru_quick_connect.svg b/res/themes/default/asbru_quick_connect.svg
new file mode 100644
index 00000000..d2bad228
--- /dev/null
+++ b/res/themes/default/asbru_quick_connect.svg
@@ -0,0 +1,44 @@
+<?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"
+   height="32"
+   id="Layer_1"
+   version="1.1"
+   viewBox="0 0 32 32"
+   width="32"
+   xml:space="preserve"
+   sodipodi:docname="asbru_quick_connect.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
+     id="metadata9"><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="defs7" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview5"
+     showgrid="false"
+     inkscape:zoom="7.8954133"
+     inkscape:cx="13.016949"
+     inkscape:cy="-3.2542373"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1" /><path
+     d="M 20.214619,-0.08375616 6.9062849,18.582909 H 14.889617 L 12.431284,31.916243 25.739618,13.249576 h -7.983332 z"
+     id="path2"
+     inkscape:connector-curvature="0"
+     style="stroke-width:1" /></svg>
\ No newline at end of file
diff --git a/res/themes/default/asbru_script.png b/res/themes/default/asbru_script.png
new file mode 100644
index 00000000..ce122ed1
Binary files /dev/null and b/res/themes/default/asbru_script.png differ
diff --git a/res/themes/default/asbru_shell.svg b/res/themes/default/asbru_shell.svg
new file mode 100644
index 00000000..a1f1c2bc
--- /dev/null
+++ b/res/themes/default/asbru_shell.svg
@@ -0,0 +1,56 @@
+<?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"
+   height="512"
+   width="512"
+   version="1.1"
+   id="svg4"
+   sodipodi:docname="asbru_shell.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata10">
+    <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="defs8" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="1.1649148"
+     inkscape:cx="-2.9654836"
+     inkscape:cy="271.18644"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4" />
+  <path
+     d="M 475.287,0.3623481 H 36.42986 c -20.199999,0 -36.5714281,19.0934309 -36.5714281,42.6519929 V 469.53405 c 0,23.55856 16.3714291,42.65199 36.5714281,42.65199 H 475.287 c 20.2,0 36.57143,-19.09343 36.57143,-42.65199 V 43.014341 C 511.85843,19.455779 495.487,0.3623481 475.287,0.3623481 Z M 73.001289,298.9261 146.14414,213.62212 73.001289,128.31819 109.57272,85.666302 219.287,213.62212 109.57272,341.57809 Z M 405.06058,343.29495 219.287,341.57809 V 298.9261 l 184.91515,0 z"
+     id="path2"
+     inkscape:connector-curvature="0"
+     style="fill:#4d4d4d;stroke-width:1"
+     sodipodi:nodetypes="ssssssssscccccccccccc" />
+</svg>
diff --git a/res/themes/default/asbru_tab.png b/res/themes/default/asbru_tab.png
new file mode 100644
index 00000000..3354871e
Binary files /dev/null and b/res/themes/default/asbru_tab.png differ
diff --git a/res/themes/default/asbru_treelist.svg b/res/themes/default/asbru_treelist.svg
new file mode 100644
index 00000000..bdb339eb
--- /dev/null
+++ b/res/themes/default/asbru_treelist.svg
@@ -0,0 +1,86 @@
+<?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"
+   height="16"
+   viewBox="0 0 16 16"
+   width="16"
+   version="1.1"
+   id="svg4"
+   sodipodi:docname="asbru_treelist.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata10">
+    <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="defs8" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1687"
+     inkscape:window-height="978"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="49.4375"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:window-x="194"
+     inkscape:window-y="51"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg4" />
+  <rect
+     style="opacity:1;fill:#666666;fill-opacity:1;stroke:#666666;stroke-width:1.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+     id="rect817"
+     width="8.7747412"
+     height="2.3712707"
+     x="6.4718328"
+     y="2.984359" />
+  <rect
+     style="opacity:1;fill:#e6e6e6;fill-opacity:1;stroke:#e6e6e6;stroke-width:1.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+     id="rect817-8"
+     width="3.6917095"
+     height="2.3712707"
+     x="0.73416901"
+     y="3.0152664" />
+  <rect
+     style="opacity:1;fill:#666666;fill-opacity:1;stroke:#666666;stroke-width:1.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+     id="rect817-6"
+     width="6.8878584"
+     height="2.3712707"
+     x="8.493495"
+     y="7.2050185" />
+  <rect
+     style="opacity:1;fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:1.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+     id="rect817-8-2"
+     width="3.6917095"
+     height="2.3712707"
+     x="3.0061305"
+     y="7.2359362" />
+  <rect
+     style="opacity:1;fill:#666666;fill-opacity:1;stroke:#666666;stroke-width:1.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+     id="rect817-6-9"
+     width="6.8878584"
+     height="2.3712707"
+     x="8.4583416"
+     y="11.588383" />
+</svg>
diff --git a/res/themes/default/asbru_unprotected.png b/res/themes/default/asbru_unprotected.png
new file mode 100644
index 00000000..91370324
Binary files /dev/null and b/res/themes/default/asbru_unprotected.png differ
diff --git a/res/themes/default/asbru_wol.svg b/res/themes/default/asbru_wol.svg
new file mode 100644
index 00000000..5e14540d
--- /dev/null
+++ b/res/themes/default/asbru_wol.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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="32"
+   viewBox="0 0 32 32"
+   width="32"
+   version="1.1"
+   id="svg6"
+   sodipodi:docname="asbru_wol.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata12">
+    <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="defs10">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient872">
+      <stop
+         style="stop-color:#00aa00;stop-opacity:1;"
+         offset="0"
+         id="stop868" />
+      <stop
+         style="stop-color:#00aa00;stop-opacity:0;"
+         offset="1"
+         id="stop870" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient872"
+       id="radialGradient874"
+       cx="16.398134"
+       cy="25.057543"
+       fx="16.398134"
+       fy="25.057543"
+       r="6.693624"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(8.8460339,0.19906688)" />
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1499"
+     inkscape:window-height="865"
+     id="namedview8"
+     showgrid="false"
+     inkscape:zoom="20.09375"
+     inkscape:cx="16"
+     inkscape:cy="16"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg6" />
+  <path
+     d="M 0,-16 H 48 V 32 H 0 Z"
+     id="path2"
+     inkscape:connector-curvature="0"
+     style="fill:none" />
+  <path
+     d="M 9.1857824,2.43527 7.1532259,0.75247158 0.01288136,9.3512252 7.1532259,17.956594 9.1857824,16.273796 3.4444703,9.3512252 Z M 8.1695042,10.671067 H 10.809187 V 8.0313833 H 8.1695042 Z M 21.367922,8.0313833 h -2.639683 v 2.6396837 h 2.639683 z m -7.919051,2.6396837 h 2.639684 V 8.0313833 h -2.639684 z m 8.93533,-9.9251946 -2.032557,1.6827984 5.741312,6.9225544 -5.741312,6.9159708 2.032557,1.682798 7.140344,-8.5987688 z"
+     id="path4"
+     inkscape:connector-curvature="0"
+     style="stroke-width:1" />
+  <circle
+     style="opacity:1;fill:url(#radialGradient874);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:7.55905533;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+     id="path822"
+     cx="25.244165"
+     cy="25.256609"
+     r="6.693624" />
+</svg>
diff --git a/res/themes/default/gtk-delete.svg b/res/themes/default/gtk-delete.svg
new file mode 100644
index 00000000..142592b9
--- /dev/null
+++ b/res/themes/default/gtk-delete.svg
@@ -0,0 +1,44 @@
+<?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"
+   id="Layer_1_1_"
+   version="1.1"
+   viewBox="0 0 32 32"
+   xml:space="preserve"
+   sodipodi:docname="gtk-delete.svg"
+   width="32"
+   height="32"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
+     id="metadata9"><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="defs7" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview5"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1_1_" /><path
+     d="M 16,0 C 14.896,0 14,0.896 14,2 H 0 v 4 h 2 v 22 c 0,2.21 1.79,4 4,4 h 20 c 2.21,0 4,-1.79 4,-4 V 6 h 2 V 2 H 18 C 18,0.896 17.104,0 16,0 Z M 8,28 H 6 V 10 h 2 z m 6,0 H 12 V 10 h 2 z m 6,0 H 18 V 10 h 2 z m 6,0 H 24 V 10 h 2 z"
+     id="path2"
+     inkscape:connector-curvature="0"
+     style="stroke-width:1" /></svg>
\ No newline at end of file
diff --git a/res/themes/default/gtk-edit.svg b/res/themes/default/gtk-edit.svg
new file mode 100644
index 00000000..2598385f
--- /dev/null
+++ b/res/themes/default/gtk-edit.svg
@@ -0,0 +1,67 @@
+<?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"
+   height="32px"
+   version="1.1"
+   viewBox="0 0 32 32"
+   width="32px"
+   id="svg11"
+   sodipodi:docname="gtk-edit.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata15">
+    <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>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview13"
+     showgrid="false"
+     inkscape:zoom="7.375"
+     inkscape:cx="-28.881356"
+     inkscape:cy="16"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg11" />
+  <desc
+     id="desc4" />
+  <defs
+     id="defs6" />
+  <g
+     id="Page-1"
+     style="fill:#1a1a1a;fill-rule:evenodd;stroke:none;stroke-width:0.84906781"
+     transform="matrix(1.1777622,0,0,1.1777622,-3.3807443,-3.2989684)">
+    <g
+       id="icon-136-document-edit"
+       style="fill:#1a1a1a;stroke-width:0.84906781">
+      <path
+         d="M 26.443228,12.150335 15.157013,23.449906 v 0 L 12.551447,20.84434 23.843538,9.5506451 Z M 27.149916,11.44281 28.879095,9.7115841 C 29.269069,9.3211489 29.266195,8.6865042 28.8743,8.295685 L 27.694487,7.11911 C 27.301865,6.7275656 26.669258,6.7245247 26.277913,7.1159253 L 24.550595,8.8434882 Z M 11.903706,21.610813 11.26416,24.72351 14.399065,24.106171 Z M 22,18 V 28.002578 C 22,29.109075 21.105724,30 20.002578,30 H 4.9974219 C 3.8909254,30 3,29.101288 3,27.99267 V 5.0073299 C 3,3.8983383 3.8992496,3 5.0085302,3 H 15 V 9.0018986 C 15,10.113294 15.898081,11 17.005919,11 H 21 l 4.580107,-4.5801067 c 0.792674,-0.7926743 2.051284,-0.7885027 2.830143,-0.00964 l 1.1795,1.1794992 c 0.776438,0.7764385 0.774542,2.0459582 -0.0096,2.8301435 z M 16,3 V 8.9970707 C 16,9.5509732 16.450975,10 16.990778,10 H 22 Z"
+         id="document-edit"
+         style="fill:#1a1a1a;stroke-width:0.84906781"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>
diff --git a/res/themes/default/gtk-find.svg b/res/themes/default/gtk-find.svg
new file mode 100644
index 00000000..7b399734
--- /dev/null
+++ b/res/themes/default/gtk-find.svg
@@ -0,0 +1,55 @@
+<?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"
+   height="32"
+   width="32"
+   version="1.1"
+   id="svg4"
+   sodipodi:docname="gtk-find.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata10">
+    <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="defs8" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="12.95122"
+     inkscape:cx="17"
+     inkscape:cy="10"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4" />
+  <path
+     d="m 30.961667,26.87326 -7.697992,-7.697992 c 1.098901,-1.794154 1.765169,-3.884732 1.765169,-6.145262 0,-6.5517821 -5.31482,-11.8656452 -11.865646,-11.8656452 -6.5517834,0 -11.8656461,5.3138631 -11.8656461,11.8656452 0,6.550826 5.3138627,11.865646 11.8656461,11.865646 2.26053,0 4.351108,-0.666268 6.145262,-1.761307 l 7.697992,7.69413 c 0.540752,0.540753 1.436855,0.53689 1.977607,0 l 1.977608,-1.977608 c 0.540753,-0.540752 0.540753,-1.436855 0,-1.977607 z M 13.163198,20.940437 c -4.3685044,0 -7.9104308,-3.541927 -7.9104308,-7.910431 0,-4.3685035 3.5419264,-7.9104298 7.9104308,-7.9104298 4.368504,0 7.910431,3.5419263 7.910431,7.9104298 0,4.368504 -3.541927,7.910431 -7.910431,7.910431 z"
+     id="path2"
+     inkscape:connector-curvature="0"
+     style="stroke-width:1" />
+</svg>
diff --git a/res/themes/default/gtk-spell-check.svg b/res/themes/default/gtk-spell-check.svg
new file mode 100644
index 00000000..136583ef
--- /dev/null
+++ b/res/themes/default/gtk-spell-check.svg
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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="32"
+   height="32"
+   viewBox="0 0 8.4666659 8.4666659"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="gtk-spell-check.svg">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="17.497415"
+     inkscape:cx="18.889315"
+     inkscape:cy="20.846388"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5">
+    <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>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-288.53334)">
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:3.52777767px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="0.30242562"
+       y="292.20654"
+       id="text817"><tspan
+         sodipodi:role="line"
+         id="tspan815"
+         x="0.30242562"
+         y="292.20654"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:3.52777767px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.26458332px">ABC</tspan></text>
+    <g
+       id="g848"
+       style="fill:#999999;stroke:none;stroke-width:0.81602418"
+       transform="matrix(1.2254539,0,0,1.2254539,-0.77539418,-67.044897)">
+      <rect
+         transform="rotate(45)"
+         y="206.14658"
+         x="208.99654"
+         height="0.83167046"
+         width="2.8730433"
+         id="rect819"
+         style="opacity:1;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.63204837;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" />
+      <rect
+         transform="rotate(-45)"
+         inkscape:transform-center-y="4.8319891"
+         inkscape:transform-center-x="4.1049014"
+         y="211.03792"
+         x="-206.97824"
+         height="0.83167046"
+         width="4.4305353"
+         id="rect819-3"
+         style="opacity:1;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.63204837;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" />
+    </g>
+  </g>
+</svg>
diff --git a/res/themes/system/asbru-cluster.svg b/res/themes/system/asbru-cluster.svg
new file mode 100644
index 00000000..d178ae40
--- /dev/null
+++ b/res/themes/system/asbru-cluster.svg
@@ -0,0 +1,885 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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"
+   id="svg3327"
+   sodipodi:docname="asbru-cluster.svg"
+   viewBox="0 0 50 49.999999"
+   version="1.1"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   width="50"
+   height="50">
+  <defs
+     id="defs165" />
+  <sodipodi:namedview
+     id="base"
+     bordercolor="#666666"
+     inkscape:pageshadow="2"
+     inkscape:window-y="28"
+     fit-margin-left="0"
+     pagecolor="#ffffff"
+     fit-margin-top="0"
+     inkscape:window-maximized="1"
+     inkscape:zoom="3.959798"
+     inkscape:window-x="0"
+     inkscape:window-height="1412"
+     showgrid="false"
+     borderopacity="1.0"
+     inkscape:current-layer="layer1"
+     inkscape:cx="48.181346"
+     inkscape:cy="18.904047"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="2560"
+     inkscape:pageopacity="0.0"
+     inkscape:document-units="px" />
+  <g
+     id="layer1"
+     inkscape:label="レイヤー 1"
+     inkscape:groupmode="layer"
+     transform="translate(-112.53,-481.26001)">
+    <g
+       id="g5204"
+       transform="matrix(0.78017703,0,0,0.78017703,90.885763,444.84324)">
+      <path
+         id="rect5126"
+         style="color:#000000;fill:#4d4d4d;fill-rule:evenodd;stroke:#cccccc;stroke-width:0.20812"
+         inkscape:connector-curvature="0"
+         d="m 33,52.362 h 54.145 v 11 H 33 Z" />
+      <path
+         id="rect5128"
+         style="color:#000000;fill:#afdde9;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 38,54.362 h 18 v 2 H 38 Z" />
+      <path
+         id="path5130"
+         style="color:#000000;fill:#008080;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(0.0625,2.9375)" />
+      <path
+         id="path5132"
+         style="color:#000000;fill:#afdde9;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 79,55.362 c 0,0.55228 -0.44772,1 -1,1 -0.55228,0 -1,-0.44772 -1,-1 0,-0.55228 0.44772,-1 1,-1 0.55228,0 1,0.44772 1,1 z"
+         transform="translate(4)" />
+      <path
+         id="path5134"
+         style="color:#000000;fill:#008080;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(21.062,2.9375)" />
+      <path
+         id="path5136"
+         style="color:#000000;fill:#008080;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(19.062,2.9375)" />
+      <path
+         id="path5138"
+         style="color:#000000;fill:#008080;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(17.062,2.9375)" />
+      <g
+         id="g5140"
+         style="stroke:#1a1a1a;stroke-width:0.1">
+        <path
+           id="path5142"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="M 37.047,60.425 H 83.094"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5144"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 38.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5146"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 40.062,60.425 v 1.9579" />
+        <path
+           id="path5148"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 42.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5150"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 44.062,60.425 v 1.9579" />
+        <path
+           id="path5152"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 46.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5154"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 48.062,60.425 v 1.9579" />
+        <path
+           id="path5156"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 50.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5158"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 62.062,60.425 v 1.9579" />
+        <path
+           id="path5160"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 52.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5162"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 68.062,60.425 v 1.9579" />
+        <path
+           id="path5164"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 66.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5166"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 64.062,60.425 v 1.9579" />
+        <path
+           id="path5168"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 60.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5170"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 58.062,60.425 v 1.9579" />
+        <path
+           id="path5172"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 54.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5174"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 56.062,60.425 v 1.9579" />
+        <path
+           id="path5176"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 70.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5178"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 72.062,60.425 v 1.9579" />
+        <path
+           id="path5180"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 74.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5182"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 76.062,60.425 v 1.9579" />
+        <path
+           id="path5184"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 78.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5186"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 80.062,60.425 v 1.9579" />
+        <path
+           id="path5188"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 82.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+      </g>
+      <path
+         id="rect5192"
+         style="color:#000000;fill:#4d4d4d;fill-rule:evenodd;stroke:#cccccc;stroke-width:0.050956"
+         inkscape:connector-curvature="0"
+         d="m 87.255,52.362 h 3.2457 v 11 h -3.246 z" />
+      <path
+         id="path5194"
+         style="color:#000000;fill:#1a1a1a;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(31.28,0.42989)" />
+      <path
+         id="path5196"
+         style="color:#000000;fill:#1a1a1a;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(31.28,9.5901)" />
+      <path
+         id="rect5198"
+         style="color:#000000;fill:#4d4d4d;fill-rule:evenodd;stroke:#cccccc;stroke-width:0.050956"
+         inkscape:connector-curvature="0"
+         d="m 29.618,52.362 h 3.2457 v 11 h -3.246 z" />
+      <path
+         id="path5200"
+         style="color:#000000;fill:#1a1a1a;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(-26.357,0.42989)" />
+      <path
+         id="path5202"
+         style="color:#000000;fill:#1a1a1a;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(-26.357,9.5901)" />
+    </g>
+    <g
+       id="g5204-2"
+       transform="matrix(0.78017703,0,0,0.78017703,90.885763,456.10555)">
+      <path
+         id="rect5126-0"
+         style="color:#000000;fill:#4d4d4d;fill-rule:evenodd;stroke:#cccccc;stroke-width:0.20812"
+         inkscape:connector-curvature="0"
+         d="m 33,52.362 h 54.145 v 11 H 33 Z" />
+      <path
+         id="rect5128-0"
+         style="color:#000000;fill:#afdde9;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 38,54.362 h 18 v 2 H 38 Z" />
+      <path
+         id="path5130-9"
+         style="color:#000000;fill:#008080;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(0.0625,2.9375)" />
+      <path
+         id="path5132-4"
+         style="color:#000000;fill:#afdde9;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 79,55.362 c 0,0.55228 -0.44772,1 -1,1 -0.55228,0 -1,-0.44772 -1,-1 0,-0.55228 0.44772,-1 1,-1 0.55228,0 1,0.44772 1,1 z"
+         transform="translate(4)" />
+      <path
+         id="path5134-5"
+         style="color:#000000;fill:#008080;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(21.062,2.9375)" />
+      <path
+         id="path5136-6"
+         style="color:#000000;fill:#008080;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(19.062,2.9375)" />
+      <path
+         id="path5138-7"
+         style="color:#000000;fill:#008080;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(17.062,2.9375)" />
+      <g
+         id="g5140-6"
+         style="stroke:#1a1a1a;stroke-width:0.1">
+        <path
+           id="path5142-6"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="M 37.047,60.425 H 83.094"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5144-6"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 38.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5146-1"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 40.062,60.425 v 1.9579" />
+        <path
+           id="path5148-1"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 42.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5150-7"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 44.062,60.425 v 1.9579" />
+        <path
+           id="path5152-4"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 46.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5154-8"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 48.062,60.425 v 1.9579" />
+        <path
+           id="path5156-8"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 50.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5158-5"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 62.062,60.425 v 1.9579" />
+        <path
+           id="path5160-3"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 52.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5162-8"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 68.062,60.425 v 1.9579" />
+        <path
+           id="path5164-0"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 66.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5166-4"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 64.062,60.425 v 1.9579" />
+        <path
+           id="path5168-4"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 60.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5170-9"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 58.062,60.425 v 1.9579" />
+        <path
+           id="path5172-5"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 54.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5174-3"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 56.062,60.425 v 1.9579" />
+        <path
+           id="path5176-3"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 70.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5178-8"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 72.062,60.425 v 1.9579" />
+        <path
+           id="path5180-7"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 74.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5182-8"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 76.062,60.425 v 1.9579" />
+        <path
+           id="path5184-7"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 78.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5186-5"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 80.062,60.425 v 1.9579" />
+        <path
+           id="path5188-5"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 82.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+      </g>
+      <path
+         id="rect5192-4"
+         style="color:#000000;fill:#4d4d4d;fill-rule:evenodd;stroke:#cccccc;stroke-width:0.050956"
+         inkscape:connector-curvature="0"
+         d="m 87.255,52.362 h 3.2457 v 11 h -3.246 z" />
+      <path
+         id="path5194-4"
+         style="color:#000000;fill:#1a1a1a;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(31.28,0.42989)" />
+      <path
+         id="path5196-2"
+         style="color:#000000;fill:#1a1a1a;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(31.28,9.5901)" />
+      <path
+         id="rect5198-4"
+         style="color:#000000;fill:#4d4d4d;fill-rule:evenodd;stroke:#cccccc;stroke-width:0.050956"
+         inkscape:connector-curvature="0"
+         d="m 29.618,52.362 h 3.2457 v 11 h -3.246 z" />
+      <path
+         id="path5200-3"
+         style="color:#000000;fill:#1a1a1a;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(-26.357,0.42989)" />
+      <path
+         id="path5202-8"
+         style="color:#000000;fill:#1a1a1a;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(-26.357,9.5901)" />
+    </g>
+    <g
+       id="g5204-1"
+       transform="matrix(0.78017703,0,0,0.78017703,90.885763,467.36785)">
+      <path
+         id="rect5126-4"
+         style="color:#000000;fill:#4d4d4d;fill-rule:evenodd;stroke:#cccccc;stroke-width:0.20812"
+         inkscape:connector-curvature="0"
+         d="m 33,52.362 h 54.145 v 11 H 33 Z" />
+      <path
+         id="rect5128-8"
+         style="color:#000000;fill:#afdde9;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 38,54.362 h 18 v 2 H 38 Z" />
+      <path
+         id="path5130-0"
+         style="color:#000000;fill:#008080;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(0.0625,2.9375)" />
+      <path
+         id="path5132-1"
+         style="color:#000000;fill:#afdde9;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 79,55.362 c 0,0.55228 -0.44772,1 -1,1 -0.55228,0 -1,-0.44772 -1,-1 0,-0.55228 0.44772,-1 1,-1 0.55228,0 1,0.44772 1,1 z"
+         transform="translate(4)" />
+      <path
+         id="path5134-6"
+         style="color:#000000;fill:#008080;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(21.062,2.9375)" />
+      <path
+         id="path5136-2"
+         style="color:#000000;fill:#008080;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(19.062,2.9375)" />
+      <path
+         id="path5138-5"
+         style="color:#000000;fill:#008080;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(17.062,2.9375)" />
+      <g
+         id="g5140-1"
+         style="stroke:#1a1a1a;stroke-width:0.1">
+        <path
+           id="path5142-4"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="M 37.047,60.425 H 83.094"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5144-7"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 38.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5146-8"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 40.062,60.425 v 1.9579" />
+        <path
+           id="path5148-5"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 42.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5150-6"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 44.062,60.425 v 1.9579" />
+        <path
+           id="path5152-6"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 46.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5154-2"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 48.062,60.425 v 1.9579" />
+        <path
+           id="path5156-85"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 50.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5158-0"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 62.062,60.425 v 1.9579" />
+        <path
+           id="path5160-8"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 52.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5162-3"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 68.062,60.425 v 1.9579" />
+        <path
+           id="path5164-8"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 66.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5166-40"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 64.062,60.425 v 1.9579" />
+        <path
+           id="path5168-9"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 60.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5170-2"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 58.062,60.425 v 1.9579" />
+        <path
+           id="path5172-54"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 54.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5174-9"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 56.062,60.425 v 1.9579" />
+        <path
+           id="path5176-4"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 70.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5178-81"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 72.062,60.425 v 1.9579" />
+        <path
+           id="path5180-3"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 74.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5182-9"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 76.062,60.425 v 1.9579" />
+        <path
+           id="path5184-1"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 78.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5186-2"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 80.062,60.425 v 1.9579" />
+        <path
+           id="path5188-1"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 82.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+      </g>
+      <path
+         id="rect5192-1"
+         style="color:#000000;fill:#4d4d4d;fill-rule:evenodd;stroke:#cccccc;stroke-width:0.050956"
+         inkscape:connector-curvature="0"
+         d="m 87.255,52.362 h 3.2457 v 11 h -3.246 z" />
+      <path
+         id="path5194-7"
+         style="color:#000000;fill:#1a1a1a;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(31.28,0.42989)" />
+      <path
+         id="path5196-0"
+         style="color:#000000;fill:#1a1a1a;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(31.28,9.5901)" />
+      <path
+         id="rect5198-5"
+         style="color:#000000;fill:#4d4d4d;fill-rule:evenodd;stroke:#cccccc;stroke-width:0.050956"
+         inkscape:connector-curvature="0"
+         d="m 29.618,52.362 h 3.2457 v 11 h -3.246 z" />
+      <path
+         id="path5200-7"
+         style="color:#000000;fill:#1a1a1a;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(-26.357,0.42989)" />
+      <path
+         id="path5202-5"
+         style="color:#000000;fill:#1a1a1a;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(-26.357,9.5901)" />
+    </g>
+    <g
+       id="g5204-2-1"
+       transform="matrix(0.78017703,0,0,0.78017703,90.885763,478.63184)">
+      <path
+         id="rect5126-0-2"
+         style="color:#000000;fill:#4d4d4d;fill-rule:evenodd;stroke:#cccccc;stroke-width:0.20812"
+         inkscape:connector-curvature="0"
+         d="m 33,52.362 h 54.145 v 11 H 33 Z" />
+      <path
+         id="rect5128-0-4"
+         style="color:#000000;fill:#afdde9;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 38,54.362 h 18 v 2 H 38 Z" />
+      <path
+         id="path5130-9-3"
+         style="color:#000000;fill:#008080;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(0.0625,2.9375)" />
+      <path
+         id="path5132-4-7"
+         style="color:#000000;fill:#afdde9;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 79,55.362 c 0,0.55228 -0.44772,1 -1,1 -0.55228,0 -1,-0.44772 -1,-1 0,-0.55228 0.44772,-1 1,-1 0.55228,0 1,0.44772 1,1 z"
+         transform="translate(4)" />
+      <path
+         id="path5134-5-9"
+         style="color:#000000;fill:#008080;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(21.062,2.9375)" />
+      <path
+         id="path5136-6-8"
+         style="color:#000000;fill:#008080;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(19.062,2.9375)" />
+      <path
+         id="path5138-7-1"
+         style="color:#000000;fill:#008080;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(17.062,2.9375)" />
+      <g
+         id="g5140-6-3"
+         style="stroke:#1a1a1a;stroke-width:0.1">
+        <path
+           id="path5142-6-4"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="M 37.047,60.425 H 83.094"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5144-6-3"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 38.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5146-1-6"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 40.062,60.425 v 1.9579" />
+        <path
+           id="path5148-1-1"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 42.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5150-7-8"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 44.062,60.425 v 1.9579" />
+        <path
+           id="path5152-4-7"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 46.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5154-8-0"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 48.062,60.425 v 1.9579" />
+        <path
+           id="path5156-8-3"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 50.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5158-5-1"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 62.062,60.425 v 1.9579" />
+        <path
+           id="path5160-3-0"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 52.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5162-8-9"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 68.062,60.425 v 1.9579" />
+        <path
+           id="path5164-0-5"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 66.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5166-4-4"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 64.062,60.425 v 1.9579" />
+        <path
+           id="path5168-4-8"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 60.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5170-9-5"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 58.062,60.425 v 1.9579" />
+        <path
+           id="path5172-5-5"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 54.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5174-3-1"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 56.062,60.425 v 1.9579" />
+        <path
+           id="path5176-3-4"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 70.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5178-8-4"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 72.062,60.425 v 1.9579" />
+        <path
+           id="path5180-7-0"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 74.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5182-8-5"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 76.062,60.425 v 1.9579" />
+        <path
+           id="path5184-7-8"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 78.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path5186-5-3"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           inkscape:connector-curvature="0"
+           d="m 80.062,60.425 v 1.9579" />
+        <path
+           id="path5188-5-8"
+           style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:round"
+           d="m 82.062,60.425 v 1.9579"
+           inkscape:connector-curvature="0" />
+      </g>
+      <path
+         id="rect5192-4-8"
+         style="color:#000000;fill:#4d4d4d;fill-rule:evenodd;stroke:#cccccc;stroke-width:0.050956"
+         inkscape:connector-curvature="0"
+         d="m 87.255,52.362 h 3.2457 v 11 h -3.246 z" />
+      <path
+         id="path5194-4-1"
+         style="color:#000000;fill:#1a1a1a;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(31.28,0.42989)" />
+      <path
+         id="path5196-2-6"
+         style="color:#000000;fill:#1a1a1a;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(31.28,9.5901)" />
+      <path
+         id="rect5198-4-0"
+         style="color:#000000;fill:#4d4d4d;fill-rule:evenodd;stroke:#cccccc;stroke-width:0.050956"
+         inkscape:connector-curvature="0"
+         d="m 29.618,52.362 h 3.2457 v 11 h -3.246 z" />
+      <path
+         id="path5200-3-1"
+         style="color:#000000;fill:#1a1a1a;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(-26.357,0.42989)" />
+      <path
+         id="path5202-8-8"
+         style="color:#000000;fill:#1a1a1a;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:square"
+         inkscape:connector-curvature="0"
+         d="m 58,52.862 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z"
+         transform="translate(-26.357,9.5901)" />
+    </g>
+  </g>
+  <metadata
+     id="metadata162">
+    <rdf:RDF>
+      <cc:Work>
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+        <dc:publisher>
+          <cc:Agent
+             rdf:about="http://openclipart.org/">
+            <dc:title>Openclipart</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:title></dc:title>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+</svg>
diff --git a/res/themes/system/asbru-edit.svg b/res/themes/system/asbru-edit.svg
new file mode 100644
index 00000000..5b112806
--- /dev/null
+++ b/res/themes/system/asbru-edit.svg
@@ -0,0 +1,587 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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="50"
+   height="50"
+   viewBox="0 0 50 50"
+   version="1.1"
+   id="svg3519"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="asbru-edit.svg">
+  <defs
+     id="defs3513">
+    <linearGradient
+       id="linearGradient24875"
+       y2="367.54999"
+       gradientUnits="userSpaceOnUse"
+       x2="379.88"
+       gradientTransform="matrix(0.7071,0.7071,-0.7071,0.7071,362.27,-93.062)"
+       y1="367.54999"
+       x1="368.17001"
+       inkscape:collect="always">
+      <stop
+         id="stop8086"
+         style="stop-color:#3F3F3F"
+         offset="0" />
+      <stop
+         id="stop8088"
+         style="stop-color:#FFFFFF"
+         offset=".3315" />
+      <stop
+         id="stop8090"
+         style="stop-color:#FFFFFF"
+         offset=".5281" />
+      <stop
+         id="stop8092"
+         style="stop-color:#333333"
+         offset=".6854" />
+      <stop
+         id="stop8094"
+         style="stop-color:#A4A4A4"
+         offset=".8427" />
+      <stop
+         id="stop8096"
+         style="stop-color:#9A9A9A"
+         offset=".8705" />
+      <stop
+         id="stop8098"
+         style="stop-color:#7D7D7D"
+         offset=".9192" />
+      <stop
+         id="stop8100"
+         style="stop-color:#4E4E4E"
+         offset=".9826" />
+      <stop
+         id="stop8102"
+         style="stop-color:#3F3F3F"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient24877"
+       y2="408.34"
+       gradientUnits="userSpaceOnUse"
+       x2="379.88"
+       gradientTransform="matrix(0.7071,0.7071,-0.7071,0.7071,362.27,-93.062)"
+       y1="408.34"
+       x1="368.17001"
+       inkscape:collect="always">
+      <stop
+         id="stop8107"
+         style="stop-color:#E4BD96"
+         offset="0" />
+      <stop
+         id="stop8109"
+         style="stop-color:#D59658"
+         offset=".2303" />
+      <stop
+         id="stop8111"
+         style="stop-color:#E4BD96"
+         offset=".5" />
+      <stop
+         id="stop8113"
+         style="stop-color:#D59658"
+         offset=".7753" />
+      <stop
+         id="stop8115"
+         style="stop-color:#E4BD96"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient24879"
+       y2="413.64001"
+       gradientUnits="userSpaceOnUse"
+       x2="376.51001"
+       gradientTransform="matrix(0.7071,0.7071,-0.7071,0.7071,362.27,-93.062)"
+       y1="414.03"
+       x1="372.07001"
+       inkscape:collect="always">
+      <stop
+         id="stop8120"
+         style="stop-color:#191919"
+         offset="0" />
+      <stop
+         id="stop8122"
+         style="stop-color:#666666"
+         offset=".3708" />
+      <stop
+         id="stop8124"
+         style="stop-color:#565656"
+         offset=".3921" />
+      <stop
+         id="stop8126"
+         style="stop-color:#3B3B3B"
+         offset=".4356" />
+      <stop
+         id="stop8128"
+         style="stop-color:#252525"
+         offset=".4857" />
+      <stop
+         id="stop8130"
+         style="stop-color:#161616"
+         offset=".5443" />
+      <stop
+         id="stop8132"
+         style="stop-color:#0D0D0D"
+         offset=".6166" />
+      <stop
+         id="stop8134"
+         style="stop-color:#060606"
+         offset=".7181" />
+      <stop
+         id="stop8136"
+         style="stop-color:#000000"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient24881"
+       y2="404.66"
+       gradientUnits="userSpaceOnUse"
+       x2="374.17001"
+       gradientTransform="matrix(0.7071,0.7071,-0.7071,0.7071,362.27,-93.062)"
+       y1="370.19"
+       x1="374.17001"
+       inkscape:collect="always">
+      <stop
+         id="stop8143"
+         style="stop-color:#FFFF00"
+         offset="0" />
+      <stop
+         id="stop8145"
+         style="stop-color:#FFEC00"
+         offset=".1047" />
+      <stop
+         id="stop8147"
+         style="stop-color:#FFD800"
+         offset=".2571" />
+      <stop
+         id="stop8149"
+         style="stop-color:#FFCA00"
+         offset=".4309" />
+      <stop
+         id="stop8151"
+         style="stop-color:#FFC200"
+         offset=".6427" />
+      <stop
+         id="stop8153"
+         style="stop-color:#FFBF00"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient24883"
+       y2="370.19"
+       gradientUnits="userSpaceOnUse"
+       x2="378.12"
+       gradientTransform="matrix(0.7071,0.7071,-0.7071,0.7071,362.27,-93.062)"
+       y1="402.64999"
+       x1="378.12"
+       inkscape:collect="always">
+      <stop
+         id="stop8158"
+         style="stop-color:#FFBF00"
+         offset="0" />
+      <stop
+         id="stop8160"
+         style="stop-color:#F2B407"
+         offset=".0202" />
+      <stop
+         id="stop8162"
+         style="stop-color:#BC8712"
+         offset=".128" />
+      <stop
+         id="stop8164"
+         style="stop-color:#946818"
+         offset=".2457" />
+      <stop
+         id="stop8166"
+         style="stop-color:#78531A"
+         offset=".3747" />
+      <stop
+         id="stop8168"
+         style="stop-color:#67461B"
+         offset=".521" />
+      <stop
+         id="stop8170"
+         style="stop-color:#5D3F1B"
+         offset=".6993" />
+      <stop
+         id="stop8172"
+         style="stop-color:#5A3D1B"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient24885"
+       y2="370.19"
+       gradientUnits="userSpaceOnUse"
+       x2="369.95999"
+       gradientTransform="matrix(0.7071,0.7071,-0.7071,0.7071,362.27,-93.062)"
+       y1="402.23001"
+       x1="369.95999"
+       inkscape:collect="always">
+      <stop
+         id="stop8177"
+         style="stop-color:#FFBF00"
+         offset="0" />
+      <stop
+         id="stop8179"
+         style="stop-color:#F2B407"
+         offset=".0202" />
+      <stop
+         id="stop8181"
+         style="stop-color:#BC8712"
+         offset=".128" />
+      <stop
+         id="stop8183"
+         style="stop-color:#946818"
+         offset=".2457" />
+      <stop
+         id="stop8185"
+         style="stop-color:#78531A"
+         offset=".3747" />
+      <stop
+         id="stop8187"
+         style="stop-color:#67461B"
+         offset=".521" />
+      <stop
+         id="stop8189"
+         style="stop-color:#5D3F1B"
+         offset=".6993" />
+      <stop
+         id="stop8191"
+         style="stop-color:#5A3D1B"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient24887"
+       y2="385.26999"
+       gradientUnits="userSpaceOnUse"
+       x2="511.01999"
+       gradientTransform="matrix(-0.6676,-0.0135,0.0308,-1.5277,669.76,1053.2)"
+       y1="385.26999"
+       x1="504.91"
+       inkscape:collect="always">
+      <stop
+         id="stop8230"
+         style="stop-color:#FFFFFF"
+         offset="0" />
+      <stop
+         id="stop8232"
+         style="stop-color:#070606"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient24889"
+       y2="281.03"
+       gradientUnits="userSpaceOnUse"
+       x2="382.51001"
+       gradientTransform="matrix(0.6676,0.0135,-0.0308,1.5277,101.91,23.36)"
+       y1="281.03"
+       x1="376.39001"
+       inkscape:collect="always">
+      <stop
+         id="stop8237"
+         style="stop-color:#FFFFFF"
+         offset="0" />
+      <stop
+         id="stop8239"
+         style="stop-color:#070606"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient24891"
+       y2="348.26001"
+       gradientUnits="userSpaceOnUse"
+       x2="421.85001"
+       gradientTransform="matrix(0.0268,0.6979,1.5269,-0.0586,-202.31,183.83)"
+       y1="348.26001"
+       x1="415.73999"
+       inkscape:collect="always">
+      <stop
+         id="stop8246"
+         style="stop-color:#FFFFFF"
+         offset="0" />
+      <stop
+         id="stop8248"
+         style="stop-color:#070606"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient24893"
+       y2="317.95001"
+       gradientUnits="userSpaceOnUse"
+       x2="472.57001"
+       gradientTransform="matrix(-0.0268,-0.6979,-1.5269,0.0586,838.57,760.49)"
+       y1="317.95001"
+       x1="466.45999"
+       inkscape:collect="always">
+      <stop
+         id="stop8253"
+         style="stop-color:#FFFFFF"
+         offset="0" />
+      <stop
+         id="stop8255"
+         style="stop-color:#070606"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient24895"
+       y2="359.76999"
+       gradientUnits="userSpaceOnUse"
+       x2="373.92999"
+       gradientTransform="matrix(0.7071,0.7071,-0.7071,0.7071,362.27,-93.062)"
+       y1="357.67999"
+       x1="373.92999"
+       inkscape:collect="always">
+      <stop
+         id="stop8262"
+         style="stop-color:#FFFFFF"
+         offset="0" />
+      <stop
+         id="stop8264"
+         style="stop-color:#FAFAFA"
+         offset=".1075" />
+      <stop
+         id="stop8266"
+         style="stop-color:#ECECEC"
+         offset=".2312" />
+      <stop
+         id="stop8268"
+         style="stop-color:#D5D5D5"
+         offset=".363" />
+      <stop
+         id="stop8270"
+         style="stop-color:#B5B5B5"
+         offset=".5005" />
+      <stop
+         id="stop8272"
+         style="stop-color:#8B8B8B"
+         offset=".6425" />
+      <stop
+         id="stop8274"
+         style="stop-color:#585858"
+         offset=".7882" />
+      <stop
+         id="stop8276"
+         style="stop-color:#1D1D1D"
+         offset=".9342" />
+      <stop
+         id="stop8278"
+         style="stop-color:#000000"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient24897"
+       y2="373.48001"
+       gradientUnits="userSpaceOnUse"
+       x2="439.42001"
+       gradientTransform="matrix(0.7208,0.7218,-2.8534,2.8493,1118.2,-943.64)"
+       y1="373.48001"
+       x1="433.31"
+       inkscape:collect="always">
+      <stop
+         id="stop8285"
+         style="stop-color:#FFFFFF"
+         offset="0" />
+      <stop
+         id="stop8287"
+         style="stop-color:#070606"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient24899"
+       y2="293.31"
+       gradientUnits="userSpaceOnUse"
+       x2="453.57001"
+       gradientTransform="matrix(-0.7208,-0.7218,2.8534,-2.8493,-149.55,1592)"
+       y1="293.31"
+       x1="447.45999"
+       inkscape:collect="always">
+      <stop
+         id="stop8292"
+         style="stop-color:#FFFFFF"
+         offset="0" />
+      <stop
+         id="stop8294"
+         style="stop-color:#070606"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient24901"
+       y2="377.45999"
+       gradientUnits="userSpaceOnUse"
+       x2="523"
+       gradientTransform="matrix(-0.7208,-0.7218,2.8534,-2.8493,-335.13,1877.4)"
+       y1="377.45999"
+       x1="516.89001"
+       inkscape:collect="always">
+      <stop
+         id="stop8301"
+         style="stop-color:#FFFFFF"
+         offset="0" />
+      <stop
+         id="stop8303"
+         style="stop-color:#070606"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient24903"
+       y2="289.32999"
+       gradientUnits="userSpaceOnUse"
+       x2="369.98999"
+       gradientTransform="matrix(0.7208,0.7218,-2.8534,2.8493,932.61,-658.29)"
+       y1="289.32999"
+       x1="363.88"
+       inkscape:collect="always">
+      <stop
+         id="stop8308"
+         style="stop-color:#FFFFFF"
+         offset="0" />
+      <stop
+         id="stop8310"
+         style="stop-color:#070606"
+         offset="1" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.919596"
+     inkscape:cx="-18.556451"
+     inkscape:cy="-10.736188"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="2560"
+     inkscape:window-height="1412"
+     inkscape:window-x="0"
+     inkscape:window-y="28"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata3516">
+    <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 />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-283.77083)">
+    <path
+       d="m 48.529996,293.99022 c 2.319869,-2.32778 -5.779876,-10.61854 -8.200694,-8.20069 -2.035823,2.03384 -4.956442,4.95545 -4.956442,4.95545 l 8.200695,8.19971 c 9.89e-4,0 2.837483,-2.83749 4.956441,-4.95447 z"
+       inkscape:connector-curvature="0"
+       style="fill:#bf0000;stroke-width:0.98970485"
+       id="path8083" />
+    <polygon
+       points="368.49,437.95 373.5,432.94 365.22,424.66 360.2,429.67 "
+       style="fill:url(#linearGradient24875)"
+       id="polygon8104"
+       transform="matrix(0.98970484,0,0,0.98970484,-324.11367,-131.50368)" />
+    <polygon
+       points="331.55,466.54 340.29,449.59 348.57,457.87 "
+       style="fill:url(#linearGradient24877)"
+       id="polygon8117"
+       transform="matrix(0.98970484,0,0,0.98970484,-324.11367,-131.50368)" />
+    <polygon
+       points="331.55,466.54 338.04,463.23 334.88,460.07 "
+       style="fill:url(#linearGradient24879)"
+       id="polygon8138"
+       transform="matrix(0.98970484,0,0,0.98970484,-324.11367,-131.50368)" />
+    <g
+       id="g8140"
+       transform="matrix(0.98970484,0,0,0.98970484,-324.11367,-131.50368)">
+      <polygon
+         points="365.1,433.29 363.33,431.52 351.78,443.07 341.51,453.35 341.14,453.48 340.75,453.87 340.73,457.66 344.46,457.64 344.81,456.65 355.08,446.37 366.63,434.82 "
+         style="fill:url(#linearGradient24881)"
+         id="polygon8155" />
+      <polyline
+         points="343.72 457.81 348.57 457.87 358.85 447.59 369.12 437.31 366.63 434.82 355.08 446.37 343.68 457.77"
+         style="fill:url(#linearGradient24883)"
+         id="polyline8174" />
+      <polyline
+         points="341.51 453.35 351.78 443.07 363.33 431.52 360.85 429.03 350.57 439.31 340.29 449.59 340.72 454.22"
+         style="fill:url(#linearGradient24885)"
+         id="polyline8193" />
+    </g>
+    <g
+       style="opacity:0.6"
+       id="g8227"
+       transform="matrix(0.98970484,0,0,0.98970484,-324.11367,-131.50368)">
+      <polygon
+         points="340.72,457.64 340.72,457.68 344.54,457.98 344.56,457.55 "
+         style="fill:url(#linearGradient24887)"
+         id="polygon8234" />
+      <polygon
+         points="348.37,457.79 344.54,457.55 344.52,457.98 348.37,457.88 "
+         style="fill:url(#linearGradient24889)"
+         id="polygon8241" />
+    </g>
+    <g
+       style="opacity:0.3"
+       id="g8243"
+       transform="matrix(0.98970484,0,0,0.98970484,-324.11367,-131.50368)">
+      <polygon
+         points="340.8,457.56 340.75,457.57 340.37,453.57 340.8,453.55 "
+         style="fill:url(#linearGradient24891)"
+         id="polygon8250" />
+      <polygon
+         points="340.49,449.57 340.8,453.57 340.37,453.59 340.4,449.58 "
+         style="fill:url(#linearGradient24893)"
+         id="polygon8257" />
+    </g>
+    <g
+       style="opacity:0.4"
+       id="g8259"
+       transform="matrix(0.98970484,0,0,0.98970484,-324.11367,-131.50368)">
+      <path
+         d="m 368.81,421.68 c 0.497,1.194 2.282,2.853 3.47,4.036 1.199,1.201 2.859,3.009 4.062,3.513 0.33,-1.042 -1.069,-3.456 -2.579,-4.968 -1.506,-1.503 -3.908,-2.901 -4.953,-2.581 z"
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient24895)"
+         id="path8280" />
+    </g>
+    <g
+       style="opacity:0.6"
+       id="g8282"
+       transform="matrix(0.98970484,0,0,0.98970484,-324.11367,-131.50368)">
+      <polygon
+         points="369,437.4 369.09,437.31 365.12,432.99 364.56,433.56 "
+         style="fill:url(#linearGradient24897)"
+         id="polygon8289" />
+      <polygon
+         points="360.74,429.13 364.58,433.58 365.15,433.02 360.9,428.97 "
+         style="fill:url(#linearGradient24899)"
+         id="polygon8296" />
+    </g>
+    <g
+       style="opacity:0.6"
+       id="g8298"
+       transform="matrix(0.98970484,0,0,0.98970484,-324.11367,-131.50368)">
+      <polygon
+         points="365.19,424.64 365.1,424.72 369.06,429.05 369.62,428.48 "
+         style="fill:url(#linearGradient24901)"
+         id="polygon8305" />
+      <polygon
+         points="373.44,432.91 369.61,428.46 369.04,429.02 373.28,433.08 "
+         style="fill:url(#linearGradient24903)"
+         id="polygon8312" />
+    </g>
+  </g>
+</svg>
diff --git a/res/themes/system/asbru-help.svg b/res/themes/system/asbru-help.svg
new file mode 100644
index 00000000..85ea9f47
--- /dev/null
+++ b/res/themes/system/asbru-help.svg
@@ -0,0 +1,66 @@
+<?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"
+   height="32"
+   version="1.1"
+   viewBox="0 0 32 32"
+   width="32"
+   id="svg9"
+   sodipodi:docname="asbru-help.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata13">
+    <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>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview11"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="-13.355932"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg9" />
+  <defs
+     id="defs4" />
+  <g
+     id="Icons with numbers"
+     style="fill:#808080;fill-rule:evenodd;stroke:none;stroke-width:0.5"
+     transform="scale(2)">
+    <g
+       id="Group"
+       transform="translate(-48,-432)"
+       style="fill:#808080;stroke-width:0.5">
+      <path
+         d="M 54.879684,443.0591 V 445 h 2.351085 v -1.9409 z M 56,448 c -4.418278,0 -8,-3.58172 -8,-8 0,-4.41828 3.581722,-8 8,-8 4.418278,0 8,3.58172 8,8 0,4.41828 -3.581722,8 -8,8 z m -2.42998,-12.48959 c -0.983569,0.5328 -1.506903,1.4372 -1.57002,2.71323 h 2.280079 c 0,-0.37162 0.127546,-0.72979 0.382643,-1.07455 0.255097,-0.34475 0.687702,-0.51712 1.29783,-0.51712 0.620648,0 1.047994,0.13991 1.282052,0.41974 0.234057,0.27983 0.351084,0.58988 0.351084,0.93016 0,0.2955 -0.105193,0.56637 -0.315582,0.81262 l -0.457593,0.39624 -0.575937,0.38281 c -0.56805,0.37609 -0.920447,0.70853 -1.057199,0.99731 -0.136753,0.28879 -0.220907,0.81151 -0.252466,1.56817 h 2.130178 c 0.0053,-0.35818 0.03945,-0.62234 0.102564,-0.79248 0.09994,-0.26864 0.302431,-0.50369 0.607495,-0.70517 l 0.560158,-0.36938 c 0.56805,-0.37609 0.952004,-0.68502 1.151874,-0.92679 C 59.829062,438.94672 60,438.45646 60,437.87441 60,436.92522 59.606842,436.20887 58.820513,435.72532 58.034184,435.24177 57.046686,435 55.857988,435 c -0.904672,0 -1.667321,0.17014 -2.287968,0.51041 z m 0,0"
+         id="Oval 318"
+         inkscape:connector-curvature="0"
+         style="stroke-width:0.5;fill:#808080" />
+    </g>
+  </g>
+</svg>
diff --git a/res/themes/system/asbru-preferences.svg b/res/themes/system/asbru-preferences.svg
new file mode 100644
index 00000000..16253cbf
--- /dev/null
+++ b/res/themes/system/asbru-preferences.svg
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--part of the rodentia icon theme by sixsixfive released under CC0 (https://creativecommons.org/publicdomain/zero/1.0/) on openclipart-->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 48 48">
+ <defs id="0">
+  <linearGradient id="F">
+   <stop id="b" stop-color="#555753"/>
+   <stop id="c" offset="1" stop-color="#eeeeec"/>
+  </linearGradient>
+  <linearGradient id="G">
+   <stop id="d" stop-color="#fff" stop-opacity="0.8"/>
+   <stop id="e" offset="1" stop-color="#fff" stop-opacity="0"/>
+  </linearGradient>
+  <linearGradient id="H">
+   <stop id="f" stop-color="#2e3436"/>
+   <stop id="g" offset="1" stop-color="#555753"/>
+  </linearGradient>
+  <linearGradient id="I">
+   <stop id="h" stop-color="#eeeeec"/>
+   <stop id="i" offset="1" stop-color="#d3d7cf"/>
+  </linearGradient>
+  <linearGradient id="J">
+   <stop id="j" stop-color="#d3d7cf"/>
+   <stop id="k" offset="1" stop-color="#babdb6"/>
+  </linearGradient>
+  <linearGradient id="K">
+   <stop id="l" stop-color="#2e3436"/>
+   <stop id="m" offset="1" stop-color="#2e3436" stop-opacity="0"/>
+  </linearGradient>
+  <radialGradient cx="24.708" cy="42.11" r="22.16" id="L" xlink:href="#K" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.09589041,0,38.073311)"/>
+  <linearGradient y1="9.03" x2="0" y2="38.969" id="M" xlink:href="#J" gradientUnits="userSpaceOnUse"/>
+  <linearGradient y1="8.979" x2="0" y2="39.02" id="N" xlink:href="#G" gradientUnits="userSpaceOnUse"/>
+  <linearGradient y1="36.22" x2="0" y2="11.781" id="O" xlink:href="#J" gradientUnits="userSpaceOnUse"/>
+  <linearGradient x1="12.28" x2="16.719" id="P" xlink:href="#H" gradientUnits="userSpaceOnUse"/>
+  <linearGradient x1="21.78" x2="26.22" id="Q" xlink:href="#H" gradientUnits="userSpaceOnUse"/>
+  <linearGradient x1="31.18" x2="35.619" id="R" xlink:href="#H" gradientUnits="userSpaceOnUse"/>
+  <linearGradient y1="35.19" x2="0" y2="12.813" id="S" xlink:href="#G" gradientUnits="userSpaceOnUse"/>
+  <linearGradient y1="20.16" x2="0" y2="23.594" id="T" xlink:href="#I" gradientUnits="userSpaceOnUse"/>
+  <linearGradient y1="14.515" x2="0" y2="33.485" id="U" xlink:href="#F" gradientUnits="userSpaceOnUse"/>
+ </defs>
+ <path d="m 46.866049,42.111389 a 22.158171,2.1247561 0 1 1 -44.3163416,0 22.158171,2.1247561 0 1 1 44.3163416,0 z" transform="matrix(1.0493151,0,0,-1.4518947,-1.9263496,100.27038)" id="1" opacity="0.8" fill="url(#L)"/>
+ <path d="m 5.21875,7.9375 c -1.108,0 -2,0.892 -2,2 l 0,28.125 c 0,1.108 0.892,2 2,2 l 37.5625,0 c 1.108,0 2,-0.892 2,-2 l 0,-28.125 c 0,-1.108 -0.892,-2 -2,-2 l -37.5625,0 z" id="2" fill="#555753"/>
+ <path d="m 5.21875,9.03125 c -0.5241331,0 -0.90625,0.3821169 -0.90625,0.90625 l 0,28.125 c 0,0.524133 0.3821169,0.90625 0.90625,0.90625 l 37.5625,0 c 0.524133,0 0.90625,-0.382117 0.90625,-0.90625 l 0,-28.125 c 0,-0.5241331 -0.382117,-0.90625 -0.90625,-0.90625 l -37.5625,0 z" id="3" fill="url(#M)"/>
+ <path d="m 5.21875,9.5 c -0.2768191,0 -0.4375,0.1606809 -0.4375,0.4375 l 0,28.125 c 0,0.276819 0.1606809,0.4375 0.4375,0.4375 l 37.5625,0 c 0.276819,0 0.4375,-0.160681 0.4375,-0.4375 l 0,-28.125 C 43.21875,9.6606809 43.058069,9.5 42.78125,9.5 l -37.5625,0 z" id="4" opacity="0.8" fill="none" stroke="url(#N)" stroke-linejoin="round" stroke-linecap="round" stroke-width="1.042"/>
+ <path d="m 7.5625,12.28125 0,23.4375 32.875,0 0,-23.4375 -32.875,0 z" id="5" fill="url(#O)" stroke="#888a85"/>
+ <g id="6" stroke="url(#U)">
+  <rect width="4.439" height="18" x="21.78" y="15" id="V" fill="url(#Q)" stroke-linejoin="round" stroke-linecap="square" stroke-width="0.97" rx="2.1"/>
+  <rect width="4.439" height="18" x="12.28" y="15" id="W" fill="url(#P)" stroke-linejoin="round" stroke-linecap="square" stroke-width="0.97" rx="2.1"/>
+  <rect width="4.439" height="18" x="31.18" y="15" id="X" fill="url(#R)" stroke-linejoin="round" stroke-linecap="square" stroke-width="0.97" rx="2.1"/>
+ </g>
+ <g id="7">
+  <rect width="8.698" height="5.125" x="10.151" y="19.802" id="Y" fill="#2e3436" rx="1"/>
+  <rect width="8.698" height="5.125" x="19.651" y="25.862" id="Z" fill="#2e3436" rx="1"/>
+  <rect width="8.698" height="5.125" x="29.05" y="19.802" id="a" fill="#2e3436" rx="1"/>
+ </g>
+ <rect width="8.698" height="5.125" x="10.151" y="19.302" id="8" fill="#888a85" rx="1"/>
+ <path d="M 11.15625,20.15625 C 11.052832,20.15625 11,20.209082 11,20.3125 l 0,3.125 c 0,0.103418 0.05283,0.15625 0.15625,0.15625 l 6.6875,0 C 17.947168,23.59375 18,23.54092 18,23.4375 l 0,-3.125 c 0,-0.103417 -0.05283,-0.15625 -0.15625,-0.15625 l -6.6875,0 z" id="9" fill="url(#T)"/>
+ <rect width="8.698" height="5.125" x="19.651" y="25.363" id="A" fill="#888a85" rx="1"/>
+ <path d="M 11.15625,20.15625 C 11.052832,20.15625 11,20.209082 11,20.3125 l 0,3.125 c 0,0.103418 0.05283,0.15625 0.15625,0.15625 l 6.6875,0 C 17.947168,23.59375 18,23.54092 18,23.4375 l 0,-3.125 c 0,-0.103417 -0.05283,-0.15625 -0.15625,-0.15625 l -6.6875,0 z" transform="translate(9.5002949,6.0606237)" id="B" fill="url(#T)"/>
+ <rect width="8.698" height="5.125" x="29.05" y="19.302" id="C" fill="#888a85" rx="1"/>
+ <path d="M 11.15625,20.15625 C 11.052832,20.15625 11,20.209082 11,20.3125 l 0,3.125 c 0,0.103418 0.05283,0.15625 0.15625,0.15625 l 6.6875,0 C 17.947168,23.59375 18,23.54092 18,23.4375 l 0,-3.125 c 0,-0.103417 -0.05283,-0.15625 -0.15625,-0.15625 l -6.6875,0 z" transform="translate(18.900005,-4.6484992e-8)" id="D" fill="url(#T)"/>
+ <path d="m 8.59375,13.3125 0,21.375 30.8125,0 0,-21.375 -30.8125,0 z" id="E" opacity="0.8" fill="none" stroke="url(#S)"/>
+</svg>
diff --git a/res/themes/system/asbru-scripts-manager.svg b/res/themes/system/asbru-scripts-manager.svg
new file mode 100644
index 00000000..58777325
--- /dev/null
+++ b/res/themes/system/asbru-scripts-manager.svg
@@ -0,0 +1,53 @@
+<?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"
+   height="50"
+   version="1.1"
+   viewBox="0 0 50 50"
+   width="50"
+   xml:space="preserve"
+   id="svg8"
+   sodipodi:docname="asbru-scripts-manager.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
+     id="metadata14"><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="defs12" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview10"
+     showgrid="false"
+     inkscape:zoom="4.7459491"
+     inkscape:cx="44.474576"
+     inkscape:cy="35.79661"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg8" /><rect
+     style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:7.55905533;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+     id="rect816"
+     width="37.294964"
+     height="46.987442"
+     x="5.9805918"
+     y="0.37190047" /><path
+     d="M 43.435991,2.9002577 H 40.690016 9.2413148 V 47.869591 50.129734 H 43.435991 Z M 28.627135,30.691088 c -0.587239,-0.587109 -1.397342,-0.95174 -2.288162,-0.95174 -0.895317,0 -1.705421,0.364631 -2.288674,0.95174 -0.58724,0.583384 -0.947757,1.393487 -0.947757,2.288677 0,0.891203 0.360388,1.70118 0.947757,2.288675 0.583253,0.583256 1.393357,0.947885 2.288674,0.947885 0.89082,0 1.700923,-0.364629 2.288162,-0.947885 0.58724,-0.587367 0.948142,-1.397472 0.948142,-2.288675 0,-0.89519 -0.360902,-1.705293 -0.948142,-2.288677 z m -2.288162,-1.944226 c 1.16651,0 2.227755,0.474008 2.993261,1.239643 0.765505,0.765506 1.239641,1.822766 1.239641,2.99326 0,1.166508 -0.474007,2.227881 -1.239641,2.993388 -0.765378,0.765506 -1.826751,1.239513 -2.993261,1.239513 -1.170879,0 -2.227755,-0.474007 -2.993645,-1.239513 -0.765505,-0.765507 -1.239511,-1.82688 -1.239511,-2.993388 0,-1.170494 0.474006,-2.227754 1.239511,-2.99326 0.76589,-0.765635 1.822639,-1.239643 2.993645,-1.239643 z M 15.665467,33.70864 v -1.887416 l 2.884013,-0.433521 0.109247,-0.46578 0.138038,-0.461669 -2.280579,-1.814799 1.158412,-2.005016 2.713971,1.065229 0.328001,-0.348308 0.352677,-0.328129 -1.069471,-2.713842 2.005018,-1.158412 1.818654,2.280322 0.457812,-0.13778 0.465524,-0.109249 0.433521,-2.884012 h 2.31708 l 0.433522,2.884012 0.465394,0.109249 0.457941,0.13778 1.818654,-2.280322 2.005018,1.158412 -1.069471,2.713842 0.352806,0.328129 0.323887,0.348308 2.718085,-1.065229 1.158413,2.005016 -2.284694,1.814799 0.142024,0.461669 0.109247,0.46578 2.884011,0.433521 v 2.316825 l -2.884011,0.433263 -0.109247,0.461925 -0.142024,0.461796 2.284694,1.814541 -1.158413,2.009259 -2.718085,-1.069341 -0.323887,0.348307 -0.352806,0.327999 1.069471,2.713972 -2.005018,1.15854 -1.818654,-2.28045 -0.457941,0.137652 -0.465394,0.113361 -0.433522,2.884012 h -2.31708 L 24.746784,40.76476 24.28126,40.655384 23.823448,40.517731 22.004794,42.798183 19.999776,41.639642 21.069247,38.925671 20.720554,38.59767 c -0.113231,-0.109377 -0.222737,-0.22685 -0.327872,-0.348308 l -2.718084,1.069343 -1.158412,-2.009259 2.280579,-1.814541 -0.138038,-0.461797 -0.109247,-0.461925 -2.884013,-0.433264 z m 0.996339,-0.728875 v 0.299723 l 2.750603,0.413213 0.0563,0.364504 c 0.0365,0.247284 0.08933,0.490201 0.150247,0.720905 0.06439,0.247158 0.141637,0.482234 0.230963,0.704842 l 0.129427,0.340211 -2.17493,1.733568 0.30358,0.522461 2.588144,-1.016646 0.230961,0.283401 c 0.146136,0.182508 0.312192,0.368743 0.494444,0.54701 0.174023,0.178267 0.360388,0.344323 0.550736,0.498171 l 0.283659,0.230833 -1.016647,2.5884 0.522334,0.299726 1.733954,-2.171203 0.340082,0.129811 c 0.218752,0.08496 0.457812,0.161945 0.700472,0.226722 0.247155,0.0649 0.486214,0.117474 0.725404,0.153976 l 0.360389,0.05668 0.417326,2.750346 h 0.603561 l 0.413086,-2.750346 0.36039,-0.05668 c 0.247284,-0.04049 0.490329,-0.08907 0.721291,-0.153976 0.250757,-0.06478 0.485702,-0.141765 0.708568,-0.226722 l 0.340083,-0.129811 1.729842,2.171203 0.522332,-0.299726 -1.016775,-2.592384 0.283787,-0.226849 c 0.186235,-0.153848 0.372471,-0.319904 0.550737,-0.498171 0.182251,-0.182379 0.348693,-0.364502 0.494314,-0.54701 l 0.230963,-0.283401 2.588272,1.016646 0.303581,-0.522461 -2.17506,-1.733568 0.129426,-0.340211 c 0.08521,-0.226849 0.166443,-0.461926 0.230963,-0.704842 0.06092,-0.230704 0.113746,-0.473748 0.150249,-0.720905 l 0.05642,-0.364504 2.750473,-0.413213 v -0.603432 l -2.750473,-0.413214 -0.05642,-0.360518 c -0.0365,-0.251142 -0.08933,-0.490072 -0.150249,-0.725147 -0.06452,-0.243046 -0.145749,-0.477864 -0.230963,-0.704713 l -0.129426,-0.34021 2.17506,-1.729586 -0.303581,-0.526573 -2.588272,1.020631 -0.230963,-0.287514 C 31.604844,28.426961 31.438402,28.24458 31.256151,28.062329 31.077885,27.884063 30.891649,27.718135 30.705414,27.564161 l -0.283787,-0.22685 1.016775,-2.588401 -0.522332,-0.303709 -1.729842,2.171073 -0.340083,-0.129682 c -0.222736,-0.08496 -0.457811,-0.161944 -0.708568,-0.226851 -0.230962,-0.06066 -0.474007,-0.11336 -0.721291,-0.153717 l -0.36039,-0.0527 -0.413086,-2.750344 h -0.603561 l -0.417326,2.746361 -0.360389,0.05668 c -0.23906,0.03637 -0.47812,0.08907 -0.725404,0.153717 -0.24266,0.06491 -0.48172,0.141894 -0.700472,0.226851 l -0.340082,0.133668 -1.733954,-2.175059 -0.522334,0.303709 1.016647,2.588401 -0.283659,0.22685 c -0.190348,0.153974 -0.376713,0.324016 -0.550736,0.498168 -0.182252,0.182251 -0.348179,0.364632 -0.494444,0.546883 l -0.230961,0.287514 -2.588144,-1.020631 -0.30358,0.526573 2.17493,1.729586 -0.129427,0.34021 c -0.08933,0.222737 -0.166443,0.457684 -0.230963,0.704713 -0.06092,0.230962 -0.113746,0.474005 -0.150247,0.721035 l -0.0563,0.364502 -2.750603,0.413214 z M 12.817828,6.8456444 c -0.275176,0 -0.498041,-0.2228652 -0.498041,-0.4943144 0,-0.2754326 0.222865,-0.498169 0.498041,-0.498169 h 9.369089 c 0.27556,0 0.498426,0.2227364 0.498426,0.498169 0,0.2713203 -0.222866,0.4943144 -0.498426,0.4943144 z m 0,3.0986535 c -0.275176,0 -0.498041,-0.222867 -0.498041,-0.4983 0,-0.27556 0.222865,-0.498169 0.498041,-0.498169 h 9.369089 c 0.27556,0 0.498426,0.222609 0.498426,0.498169 0,0.275433 -0.222866,0.4983 -0.498426,0.4983 z m 0,3.3375811 c -0.275176,0 -0.498041,-0.222736 -0.498041,-0.498169 0,-0.27132 0.222865,-0.498299 0.498041,-0.498299 h 26.555559 c 0.275691,0 0.498427,0.226979 0.498427,0.498299 0,0.275433 -0.222736,0.498169 -0.498427,0.498169 z m 0,3.341825 c -0.275176,0 -0.498041,-0.222865 -0.498041,-0.498299 0,-0.27556 0.222865,-0.498298 0.498041,-0.498298 h 26.555559 c 0.275691,0 0.498427,0.222738 0.498427,0.498298 0,0.275434 -0.222736,0.498299 -0.498427,0.498299 z m 0,3.337583 c -0.275176,0 -0.498041,-0.222736 -0.498041,-0.494185 0,-0.275561 0.222865,-0.498169 0.498041,-0.498169 h 26.555559 c 0.275691,0 0.498427,0.222608 0.498427,0.498169 0,0.27132 -0.222736,0.494185 -0.498427,0.494185 z M 8.7428888,1.9037899 H 40.179379 V 0.12973433 H 37.676321 5.9805918 V 45.265126 47.359341 h 2.264384 V 2.4020878 c 0,-0.2755615 0.222737,-0.4982979 0.497913,-0.4982979 z"
+     style="clip-rule:evenodd;fill-rule:evenodd;stroke-width:1"
+     id="path2"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccccccscscscscscscscscscccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccsccccccccccccccccccccccccccccccccsssssssssssssssssssssssssssssssssssscccccccss" /><g
+     id="Layer_1"
+     transform="translate(0,-462)" /></svg>
\ No newline at end of file
diff --git a/res/themes/system/asbru-wol.svg b/res/themes/system/asbru-wol.svg
new file mode 100644
index 00000000..071ad8c3
--- /dev/null
+++ b/res/themes/system/asbru-wol.svg
@@ -0,0 +1,270 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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"
+   id="svg3389"
+   sodipodi:docname="asbru-wol.svg"
+   viewBox="0 0 50 50"
+   version="1.1"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   width="50"
+   height="50">
+  <defs
+     id="defs3391">
+    <filter
+       id="filter18963-0"
+       width="1.122"
+       y="-2.1965001"
+       x="-0.061012998"
+       height="5.3929"
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         id="feGaussianBlur18965-9"
+         stdDeviation="3.889576"
+         inkscape:collect="always" />
+    </filter>
+    <linearGradient
+       id="linearGradient3534"
+       y2="1186.4"
+       gradientUnits="userSpaceOnUse"
+       y1="1113.2"
+       gradientTransform="matrix(0.4426619,0,0,0.4380449,-698.43282,-277.88632)"
+       x2="1627.3"
+       x1="1577"
+       inkscape:collect="always">
+      <stop
+         id="stop18945-8"
+         style="stop-color:#ffffff"
+         offset="0" />
+      <stop
+         id="stop18947-2"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <filter
+       id="filter22422-4"
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         id="feGaussianBlur22424-5"
+         stdDeviation="1.2317302"
+         inkscape:collect="always" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     bordercolor="#666666"
+     inkscape:pageshadow="2"
+     inkscape:window-y="28"
+     pagecolor="#ffffff"
+     inkscape:window-height="1412"
+     inkscape:window-maximized="1"
+     inkscape:zoom="15.839192"
+     inkscape:window-x="0"
+     showgrid="false"
+     borderopacity="1.0"
+     inkscape:current-layer="layer4"
+     inkscape:cx="48.633059"
+     inkscape:cy="18.175828"
+     inkscape:window-width="2560"
+     inkscape:pageopacity="0.0"
+     inkscape:document-units="px" />
+  <g
+     id="layer5"
+     inkscape:label="background"
+     inkscape:groupmode="layer"
+     transform="translate(0,-220)">
+    <rect
+       id="rect17756"
+       style="fill:#333333;stroke-width:0.18394427"
+       ry="6.839232"
+       height="42.779919"
+       width="43.030083"
+       y="220.75952"
+       x="1.3548651" />
+  </g>
+  <g
+     id="layer2"
+     inkscape:label="shadow"
+     inkscape:groupmode="layer"
+     transform="translate(0,-220)">
+    <ellipse
+       id="path18953"
+       style="fill:#000000;filter:url(#filter18963-0)"
+       transform="matrix(0.25662065,0,0,0.31141765,-422.33246,-423.69894)"
+       cx="1732.25"
+       cy="2215.875"
+       rx="76.5"
+       ry="2.125" />
+    <path
+       id="rect17756-0"
+       sodipodi:nodetypes="ccccccc"
+       style="fill:url(#linearGradient3534);stroke-width:0.18394427"
+       d="m 8.758788,221.43317 h 28.835103 c 2.957272,0.13552 4.239916,1.46697 4.239916,1.46697 -21.273155,15.17173 -33.628692,27.95218 -36.9470465,39.28499 0,0 -2.9053997,-3.22289 -2.9053997,-5.51152 v -28.53528 c -0.2630219,-3.71512 2.6876097,-6.99135 6.7766902,-6.70606 z"
+       inkscape:connector-curvature="0" />
+    <g
+       id="g16145-0-1-0"
+       style="fill:none;stroke:#ffffff;stroke-width:1.57270002;filter:url(#filter22422-4)"
+       transform="matrix(0.26451186,0,0,0.26298512,117.77759,404.6941)">
+      <path
+         id="rect15862-1-3-9"
+         style="fill:none;stroke:#ffffff;stroke-width:1.57270002"
+         d="m -397.75,-670.05 c -6.2826,0 -11.358,5.0754 -11.358,11.358 v 16.04 c 0,6.2826 5.0754,11.358 11.358,11.358 h 3.6415 v 8.9304 h -18.641 v 8.5836 h 50.287 v 8.9737 h -4.3785 c -6.2826,0 -11.315,5.0321 -11.315,11.315 v 16.083 c 0,6.2826 5.0321,11.315 11.315,11.315 h 16.083 c 6.2826,0 11.315,-5.0321 11.315,-11.315 v -16.083 c 0,-6.2826 -5.0321,-11.315 -11.315,-11.315 h -4.3785 v -8.9737 h 50.287 v -8.5836 h -19.335 v -8.9304 h 4.3351 c 6.2826,0 11.358,-5.0754 11.358,-11.358 v -16.04 c 0,-6.2826 -5.0754,-11.358 -11.358,-11.358 h -16.04 c -6.2826,0 -11.358,5.0754 -11.358,11.358 v 16.04 c 0,6.2826 5.0754,11.358 11.358,11.358 h 4.3351 v 8.9304 h -55.186 v -8.9304 h 5.0288 c 6.2826,0 11.358,-5.0754 11.358,-11.358 v -16.04 c 0,-6.2826 -5.0754,-11.358 -11.358,-11.358 h -16.04 z m 1.9942,6.7194 c 0.24998,-0.0252 0.52346,0 0.78033,0 h 10.491 c 4.1097,0 7.4131,3.3034 7.4131,7.4131 v 10.491 c 0,4.1097 -3.3034,7.4131 -7.4131,7.4131 h -10.491 c -4.1097,0 -7.4131,-3.3034 -7.4131,-7.4131 v -10.491 c 0,-3.8528 2.883,-7.0345 6.6327,-7.4131 z m 61.862,0 c 0.24998,-0.0252 0.52346,0 0.78032,0 h 10.491 c 4.1097,0 7.4131,3.3034 7.4131,7.4131 v 10.491 c 0,4.1097 -3.3034,7.4131 -7.4131,7.4131 h -10.491 c -4.1097,0 -7.4131,-3.3034 -7.4131,-7.4131 v -10.491 c 0,-3.8528 2.883,-7.0345 6.6328,-7.4131 z m -30.172,65.2 h 10.534 c 4.1097,0 7.4131,3.3034 7.4131,7.4131 v 10.534 c 0,4.1097 -3.3034,7.4131 -7.4131,7.4131 h -10.534 c -4.1097,0 -7.4131,-3.3034 -7.4131,-7.4131 v -10.534 c 0,-4.1097 3.3034,-7.4131 7.4131,-7.4131 z"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+  <g
+     id="layer3"
+     inkscape:label="border"
+     inkscape:groupmode="layer"
+     transform="translate(0,-220)">
+    <rect
+       id="rect17756-2"
+       style="fill:none;stroke:#131312;stroke-width:1.36161077"
+       ry="6.839232"
+       height="42.779919"
+       width="43.030083"
+       y="220.75952"
+       x="1.3252683" />
+  </g>
+  <g
+     id="layer4"
+     inkscape:label="Symbol"
+     inkscape:groupmode="layer"
+     transform="translate(0,-220)">
+    <g
+       id="g16145-0-1"
+       style="fill:#ffffff;stroke:#ffffff"
+       transform="matrix(0.26451186,0,0,0.26298512,117.77759,404.6941)">
+      <path
+         id="rect15862-1-3"
+         style="fill:#ffffff;stroke:#ffffff"
+         d="m -397.75,-670.05 c -6.2826,0 -11.358,5.0754 -11.358,11.358 v 16.04 c 0,6.2826 5.0754,11.358 11.358,11.358 h 3.6415 v 8.9304 h -18.641 v 8.5836 h 50.287 v 8.9737 h -4.3785 c -6.2826,0 -11.315,5.0321 -11.315,11.315 v 16.083 c 0,6.2826 5.0321,11.315 11.315,11.315 h 16.083 c 6.2826,0 11.315,-5.0321 11.315,-11.315 v -16.083 c 0,-6.2826 -5.0321,-11.315 -11.315,-11.315 h -4.3785 v -8.9737 h 50.287 v -8.5836 h -19.335 v -8.9304 h 4.3351 c 6.2826,0 11.358,-5.0754 11.358,-11.358 v -16.04 c 0,-6.2826 -5.0754,-11.358 -11.358,-11.358 h -16.04 c -6.2826,0 -11.358,5.0754 -11.358,11.358 v 16.04 c 0,6.2826 5.0754,11.358 11.358,11.358 h 4.3351 v 8.9304 h -55.186 v -8.9304 h 5.0288 c 6.2826,0 11.358,-5.0754 11.358,-11.358 v -16.04 c 0,-6.2826 -5.0754,-11.358 -11.358,-11.358 h -16.04 z m 1.9942,6.7194 c 0.24998,-0.0252 0.52346,0 0.78033,0 h 10.491 c 4.1097,0 7.4131,3.3034 7.4131,7.4131 v 10.491 c 0,4.1097 -3.3034,7.4131 -7.4131,7.4131 h -10.491 c -4.1097,0 -7.4131,-3.3034 -7.4131,-7.4131 v -10.491 c 0,-3.8528 2.883,-7.0345 6.6327,-7.4131 z m 61.862,0 c 0.24998,-0.0252 0.52346,0 0.78032,0 h 10.491 c 4.1097,0 7.4131,3.3034 7.4131,7.4131 v 10.491 c 0,4.1097 -3.3034,7.4131 -7.4131,7.4131 h -10.491 c -4.1097,0 -7.4131,-3.3034 -7.4131,-7.4131 v -10.491 c 0,-3.8528 2.883,-7.0345 6.6328,-7.4131 z m -30.172,65.2 h 10.534 c 4.1097,0 7.4131,3.3034 7.4131,7.4131 v 10.534 c 0,4.1097 -3.3034,7.4131 -7.4131,7.4131 h -10.534 c -4.1097,0 -7.4131,-3.3034 -7.4131,-7.4131 v -10.534 c 0,-4.1097 3.3034,-7.4131 7.4131,-7.4131 z"
+         inkscape:connector-curvature="0" />
+    </g>
+    <path
+       style="opacity:1;fill:#e97c25;fill-opacity:1;stroke:none;stroke-width:0.28574833;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 40.904729,250.07888 a 8.6210739,8.6210739 0 0 0 -8.62117,8.62119 8.6210739,8.6210739 0 0 0 8.62117,8.62078 8.6210739,8.6210739 0 0 0 8.621179,-8.62078 8.6210739,8.6210739 0 0 0 -8.621179,-8.62119 z m 0,0.54745 a 8.0736426,8.0736426 0 0 1 8.073781,8.07374 8.0736426,8.0736426 0 0 1 -8.073781,8.07332 8.0736426,8.0736426 0 0 1 -8.073771,-8.07332 8.0736426,8.0736426 0 0 1 8.073771,-8.07374 z"
+       id="circle4885"
+       inkscape:connector-curvature="0" />
+    <circle
+       style="opacity:1;fill:#f0cd6b;fill-opacity:1;stroke:none;stroke-width:0.28574833;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4871"
+       cx="40.904816"
+       cy="258.69995"
+       r="7.7909422" />
+    <g
+       id="g4922"
+       transform="matrix(0.04927315,-0.02324474,0.02324474,0.04927315,-134.83749,175.53715)"
+       style="fill:#6bb9f0;fill-opacity:1">
+      <path
+         sodipodi:nodetypes="cccc"
+         inkscape:connector-curvature="0"
+         id="path4924"
+         d="m 2260.9487,2542.5095 c -26.4294,0.018 -49.0929,18.8694 -53.9239,44.8535 39.3037,5.5876 74.2239,3.8691 107.8536,0 -4.8314,-25.9863 -27.4981,-44.8382 -53.9297,-44.8535 z"
+         style="opacity:1;fill:#f0cd6b;fill-opacity:1;stroke:none;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <rect
+         ry="6.109827"
+         y="2525.1899"
+         x="2254.8418"
+         height="14.116755"
+         width="12.219654"
+         id="rect4926"
+         style="opacity:1;fill:#6bb9f0;fill-opacity:1;stroke:none;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+    <path
+       style="opacity:1;fill:#f0cd6b;fill-opacity:1;stroke:none;stroke-width:0.28574833;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 35.638978,265.89867 -0.692816,1.60024 c -0.173973,0.40193 -0.126929,0.84445 0.21514,1.04632 0.342041,0.20186 0.761415,0.0366 1.019693,-0.31745 l 1.032713,-1.41559 a 8.6210739,8.6210739 0 0 1 -1.57473,-0.91352 z"
+       id="rect4934"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4944"
+       d="m 46.351968,265.89867 0.692816,1.60024 c 0.173973,0.40193 0.126929,0.84445 -0.21513,1.04632 -0.342051,0.20186 -0.761415,0.0366 -1.019693,-0.31745 l -1.032723,-1.41559 a 8.6210739,8.6210739 0 0 0 1.57473,-0.91352 z"
+       style="opacity:1;fill:#f0cd6b;fill-opacity:1;stroke:none;stroke-width:0.28574833;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <g
+       style="fill:#f0cd6b;fill-opacity:1"
+       transform="matrix(-0.04927315,-0.02324474,-0.02324474,0.04927315,216.92785,175.53715)"
+       id="g4946">
+      <path
+         style="opacity:1;fill:#f0cd6b;fill-opacity:1;stroke:none;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 2260.9487,2542.5095 c -26.4294,0.018 -49.0929,18.8694 -53.9239,44.8535 39.3037,5.5876 74.2239,3.8691 107.8536,0 -4.8314,-25.9863 -27.4981,-44.8382 -53.9297,-44.8535 z"
+         id="path4948"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccc" />
+      <rect
+         style="opacity:1;fill:#f0cd6b;fill-opacity:1;stroke:none;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect4950"
+         width="12.219654"
+         height="14.116755"
+         x="2254.8418"
+         y="2525.1899"
+         ry="6.109827" />
+    </g>
+    <path
+       style="fill:#22313f;fill-opacity:1;stroke:none;stroke-width:0.09524944"
+       d="m 40.868458,251.69703 -0.603262,0.88378 h 0.335021 v 5.82692 0.56397 0.006 h 0.55739 v -0.006 h 4.252354 v 0.31393 l 0.887725,-0.60327 -0.887944,-0.60329 v 0.33527 h -4.252135 v -0.007 -5.82691 h 0.313923 z"
+       id="path5011-3"
+       inkscape:connector-curvature="0"
+       inkscape:transform-center-x="-30.047941"
+       inkscape:transform-center-y="-30.612244"
+       sodipodi:nodetypes="cccccccccccccccccc" />
+  </g>
+  <metadata
+     id="metadata23">
+    <rdf:RDF>
+      <cc:Work>
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+        <dc:publisher>
+          <cc:Agent
+             rdf:about="http://openclipart.org/">
+            <dc:title>Openclipart</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:title></dc:title>
+        <dc:date>2010-07-19T07:43:30</dc:date>
+        <dc:description>glossy-shadow - community button in darkgrey</dc:description>
+        <dc:source>https://openclipart.org/detail/73717/community-button-by-laser_engravers</dc:source>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>laser_engravers</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>black</rdf:li>
+            <rdf:li>button</rdf:li>
+            <rdf:li>community</rdf:li>
+            <rdf:li>effect</rdf:li>
+            <rdf:li>glossy</rdf:li>
+            <rdf:li>grey</rdf:li>
+            <rdf:li>icon</rdf:li>
+            <rdf:li>network</rdf:li>
+            <rdf:li>shadow</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+</svg>
diff --git a/res/themes/system/asbru.css b/res/themes/system/asbru.css
new file mode 100644
index 00000000..7aa98ba5
--- /dev/null
+++ b/res/themes/system/asbru.css
@@ -0,0 +1,39 @@
+button {
+    margin: 1px;
+}
+radiobutton, checkbutton {
+    margin: 1px;
+}
+spinbutton {
+    font-size: 0.9em;
+}
+.button-cp {
+}
+tooltip {
+    font-size: 0.8em;
+}
+.dnd-icon {
+}
+
+.banner-fill {
+  background-image: linear-gradient(to right, #007aff, #2fedde);
+  padding: 0.25em 0;
+}
+.banner-text {
+  color: #EEE;
+  text-shadow: 0px 0px 8px rgba(17, 17, 17, 0.75);
+  font-size: 2.5em;
+}
+.w-entervalue {
+}
+.w-renamenode {
+}
+.w-warning {
+}
+.w-error {
+}
+.w-confirm {
+}
+.w-info {
+}
+
diff --git a/res/themes/system/asbru_buttonbar_hide.png b/res/themes/system/asbru_buttonbar_hide.png
new file mode 100644
index 00000000..d37d036d
Binary files /dev/null and b/res/themes/system/asbru_buttonbar_hide.png differ
diff --git a/res/themes/system/asbru_buttonbar_show.png b/res/themes/system/asbru_buttonbar_show.png
new file mode 100644
index 00000000..37ba5786
Binary files /dev/null and b/res/themes/system/asbru_buttonbar_show.png differ
diff --git a/res/themes/system/asbru_chain.png b/res/themes/system/asbru_chain.png
new file mode 100644
index 00000000..9ed1d733
Binary files /dev/null and b/res/themes/system/asbru_chain.png differ
diff --git a/res/themes/system/asbru_cluster_auto.png b/res/themes/system/asbru_cluster_auto.png
new file mode 100644
index 00000000..be755ca9
Binary files /dev/null and b/res/themes/system/asbru_cluster_auto.png differ
diff --git a/res/themes/system/asbru_cluster_connection.svg b/res/themes/system/asbru_cluster_connection.svg
new file mode 100644
index 00000000..731b700c
--- /dev/null
+++ b/res/themes/system/asbru_cluster_connection.svg
@@ -0,0 +1,44 @@
+<?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"
+   id="Layer_1_1_"
+   version="1.1"
+   viewBox="0 0 16 16"
+   xml:space="preserve"
+   sodipodi:docname="asbru_cluster_connection.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   width="16"
+   height="16"><metadata
+     id="metadata9"><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="defs7" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview5"
+     showgrid="false"
+     inkscape:zoom="26.0625"
+     inkscape:cx="3.2613909"
+     inkscape:cy="16"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1_1_" /><path
+     d="m 13.266949,4.4830516 c 0.966876,0 1.75,-0.7831245 1.75,-1.7500001 0,-0.9668745 -0.783124,-1.75 -1.75,-1.75 -0.966875,0 -1.75,0.7831255 -1.75,1.75 0,0.49175 0.203876,0.9345001 0.530251,1.2521256 l -1.380751,2.4158748 c -0.28175,-0.10325 -0.581875,-0.168 -0.8995004,-0.168 -0.7,0 -1.3326254,0.27825 -1.8033754,0.725374 L 4.3839488,4.2739261 c 0.084875,-0.2056245 0.133,-0.4296245 0.133,-0.6658745 0,-0.9668747 -0.783125,-1.7500001 -1.7499998,-1.7500001 -0.9668749,0 -1.7499999,0.7831254 -1.7499999,1.7500001 0,0.9668745 0.783125,1.7500003 1.7499999,1.7500003 0.4129999,0 0.7874999,-0.1487505 1.0867499,-0.3876258 l 3.5892497,2.6923758 c -0.1863754,0.359624 -0.301,0.762124 -0.301,1.19525 0,0.273874 0.054249,0.5337499 0.1321246,0.7822499 L 3.5194489,11.658925 C 3.2901989,11.54955 3.037324,11.48305 2.766949,11.48305 c -0.9668749,0 -1.7499999,0.783124 -1.7499999,1.75 0,0.966875 0.783125,1.75 1.7499999,1.75 0.9668748,0 1.7499998,-0.783125 1.7499998,-1.75 0,-0.355249 -0.1076249,-0.685125 -0.2896249,-0.961625 l 3.4413747,-1.850624 c 0.4786246,0.641374 1.2363746,1.062249 2.09825,1.062249 0.4357514,0 0.8408764,-0.116375 1.2031254,-0.3045 l 0.854875,1.064875 c -0.193375,0.281749 -0.308,0.622125 -0.308,0.989625 0,0.966875 0.783125,1.75 1.75,1.75 0.966876,0 1.75,-0.783125 1.75,-1.75 0,-0.966876 -0.783124,-1.75 -1.75,-1.75 -0.280875,0 -0.5425,0.07263 -0.777875,0.189875 l -0.817249,-1.0185 c 0.443624,-0.469875 0.720124,-1.0989991 0.720124,-1.7963731 0,-0.81725 -0.3815,-1.53825 -0.966875,-2.0195 l 1.385125,-2.4237503 c 0.146126,0.040245 0.2975,0.068245 0.45675,0.068245 z"
+     id="path2"
+     style="fill:#b3b3b3;stroke:#1a1a1a;stroke-width:1.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     inkscape:connector-curvature="0" /></svg>
\ No newline at end of file
diff --git a/res/themes/system/asbru_cluster_manager.svg b/res/themes/system/asbru_cluster_manager.svg
new file mode 100644
index 00000000..f3958732
--- /dev/null
+++ b/res/themes/system/asbru_cluster_manager.svg
@@ -0,0 +1,44 @@
+<?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"
+   id="Layer_1_1_"
+   version="1.1"
+   viewBox="0 0 32 32"
+   xml:space="preserve"
+   sodipodi:docname="asbru_cluster_manager.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   width="32"
+   height="32"><metadata
+     id="metadata9"><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="defs7" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview5"
+     showgrid="false"
+     inkscape:zoom="26.0625"
+     inkscape:cx="16"
+     inkscape:cy="16"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1_1_" /><path
+     d="m 27.266949,8.4830534 c 2.071877,0 3.75,-1.6781241 3.75,-3.7500002 0,-2.0718741 -1.678123,-3.75000018 -3.75,-3.75000018 -2.071875,0 -3.75,1.67812608 -3.75,3.75000018 0,1.05375 0.436877,2.0025 1.136252,2.6831261 l -2.958752,5.1768747 c -0.60375,-0.22125 -1.246875,-0.36 -1.927501,-0.36 -1.5,0 -2.855626,0.59625 -3.864376,1.554373 L 8.2319484,8.0349273 c 0.1818761,-0.440624 0.285,-0.9206241 0.285,-1.4268741 0,-2.0718741 -1.6781249,-3.7500001 -3.7499995,-3.7500001 -2.0718749,0 -3.7499998,1.678126 -3.7499998,3.7500001 0,2.0718741 1.6781249,3.7500008 3.7499998,3.7500008 0.8849997,0 1.6874998,-0.318751 2.3287498,-0.8306267 l 7.6912493,5.7693767 c -0.399376,0.770623 -0.645,1.633123 -0.645,2.56125 0,0.586873 0.116248,1.14375 0.283124,1.67625 L 6.3794487,23.859926 C 5.8881986,23.62555 5.3463238,23.48305 4.7669489,23.48305 c -2.0718749,0 -3.7499998,1.678124 -3.7499998,3.75 0,2.071876 1.6781249,3.75 3.7499998,3.75 2.0718746,0 3.7499995,-1.678124 3.7499995,-3.75 0,-0.761248 -0.2306248,-1.468124 -0.6206248,-2.060624 l 7.3743744,-3.965624 c 1.025624,1.374374 2.649374,2.276248 4.49625,2.276248 0.933753,0 1.801877,-0.249374 2.578126,-0.6525 l 1.831875,2.281876 c -0.414375,0.603748 -0.66,1.333124 -0.66,2.120624 0,2.071876 1.678125,3.75 3.75,3.75 2.071877,0 3.75,-1.678124 3.75,-3.75 0,-2.071876 -1.678123,-3.75 -3.75,-3.75 -0.601875,0 -1.1625,0.15564 -1.666875,0.406876 l -1.751248,-2.1825 c 0.950623,-1.006876 1.543123,-2.354999 1.543123,-3.849372 0,-1.75125 -0.8175,-3.29625 -2.071875,-4.3275 l 2.968125,-5.1937507 c 0.313127,0.08624 0.6375,0.14624 0.97875,0.14624 z"
+     id="path2"
+     style="fill:#b3b3b3;stroke:#1a1a1a;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     inkscape:connector-curvature="0" /></svg>
\ No newline at end of file
diff --git a/res/themes/system/asbru_cluster_manager2.png b/res/themes/system/asbru_cluster_manager2.png
new file mode 100644
index 00000000..ace22f21
Binary files /dev/null and b/res/themes/system/asbru_cluster_manager2.png differ
diff --git a/res/themes/system/asbru_cluster_manager_off.svg b/res/themes/system/asbru_cluster_manager_off.svg
new file mode 100644
index 00000000..7e149c2f
--- /dev/null
+++ b/res/themes/system/asbru_cluster_manager_off.svg
@@ -0,0 +1,44 @@
+<?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"
+   id="Layer_1_1_"
+   version="1.1"
+   viewBox="0 0 16 16"
+   xml:space="preserve"
+   sodipodi:docname="asbru_cluster_manager_off.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   width="16"
+   height="16"><metadata
+     id="metadata9"><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="defs7" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview5"
+     showgrid="false"
+     inkscape:zoom="52.125"
+     inkscape:cx="8.3864337"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1_1_" /><path
+     d="m 13.266949,4.4830516 c 0.966876,0 1.75,-0.7831245 1.75,-1.7500001 0,-0.9668745 -0.783124,-1.75 -1.75,-1.75 -0.966875,0 -1.75,0.7831255 -1.75,1.75 0,0.49175 0.203876,0.9345001 0.530251,1.2521256 l -1.380751,2.4158748 c -0.28175,-0.10325 -0.581875,-0.168 -0.8995004,-0.168 -0.7,0 -1.3326254,0.27825 -1.8033754,0.725374 L 4.3839488,4.2739261 c 0.084875,-0.2056245 0.133,-0.4296245 0.133,-0.6658745 0,-0.9668747 -0.783125,-1.7500001 -1.7499998,-1.7500001 -0.9668749,0 -1.7499999,0.7831254 -1.7499999,1.7500001 0,0.9668745 0.783125,1.7500003 1.7499999,1.7500003 0.4129999,0 0.7874999,-0.1487505 1.0867499,-0.3876258 l 3.5892497,2.6923758 c -0.1863754,0.359624 -0.301,0.762124 -0.301,1.19525 0,0.273874 0.054249,0.5337499 0.1321246,0.7822499 L 3.5194489,11.658925 C 3.2901989,11.54955 3.037324,11.48305 2.766949,11.48305 c -0.9668749,0 -1.7499999,0.783124 -1.7499999,1.75 0,0.966875 0.783125,1.75 1.7499999,1.75 0.9668748,0 1.7499998,-0.783125 1.7499998,-1.75 0,-0.355249 -0.1076249,-0.685125 -0.2896249,-0.961625 l 3.4413747,-1.850624 c 0.4786246,0.641374 1.2363746,1.062249 2.09825,1.062249 0.4357514,0 0.8408764,-0.116375 1.2031254,-0.3045 l 0.854875,1.064875 c -0.193375,0.281749 -0.308,0.622125 -0.308,0.989625 0,0.966875 0.783125,1.75 1.75,1.75 0.966876,0 1.75,-0.783125 1.75,-1.75 0,-0.966876 -0.783124,-1.75 -1.75,-1.75 -0.280875,0 -0.5425,0.07263 -0.777875,0.189875 l -0.817249,-1.0185 c 0.443624,-0.469875 0.720124,-1.0989991 0.720124,-1.7963731 0,-0.81725 -0.3815,-1.53825 -0.966875,-2.0195 l 1.385125,-2.4237503 c 0.146126,0.040245 0.2975,0.068245 0.45675,0.068245 z"
+     id="path2"
+     style="fill:#1a1a1a;stroke:#cccccc;stroke-width:1.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     inkscape:connector-curvature="0" /></svg>
\ No newline at end of file
diff --git a/res/themes/system/asbru_drag_terminal32x32.png b/res/themes/system/asbru_drag_terminal32x32.png
new file mode 100644
index 00000000..e134fb07
Binary files /dev/null and b/res/themes/system/asbru_drag_terminal32x32.png differ
diff --git a/res/themes/system/asbru_favourite_off.svg b/res/themes/system/asbru_favourite_off.svg
new file mode 100644
index 00000000..3e0ee544
--- /dev/null
+++ b/res/themes/system/asbru_favourite_off.svg
@@ -0,0 +1,55 @@
+<?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"
+   enable-background="new 0 0 64 64"
+   height="32"
+   version="1.1"
+   viewBox="0 0 32 32"
+   width="32"
+   xml:space="preserve"
+   id="svg20"
+   sodipodi:docname="asbru_favourite_off.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
+     id="metadata26"><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="defs24" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1810"
+     inkscape:window-height="905"
+     id="namedview22"
+     showgrid="false"
+     inkscape:zoom="22.4375"
+     inkscape:cx="1.2479109"
+     inkscape:cy="16"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg20" /><circle
+     cx="16.071079"
+     cy="15.983025"
+     id="circle2"
+     style="fill:#b3b3b3;stroke:#999999;stroke-width:2.4000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     r="14.735541" /><g
+     style="fill:#e6e6e6;stroke-width:1.92454886"
+     id="g14"
+     transform="matrix(0.5196023,0,0,0.5196023,-0.55619493,-0.64424733)"><path
+       d="m 52.872,26.063 c -0.31,-0.951 -1.133,-1.645 -2.121,-1.79 L 39.424,22.628 34.357,12.365 C 33.913,11.466 33.001,10.898 32,10.898 c -1.001,0 -1.913,0.568 -2.357,1.467 L 24.579,22.628 13.25,24.273 c -0.991,0.145 -1.813,0.838 -2.121,1.79 -0.31,0.951 -0.053,1.995 0.665,2.694 l 8.197,7.99 -1.934,11.283 c -0.168,0.986 0.237,1.982 1.046,2.57 0.455,0.334 0.996,0.502 1.543,0.502 0.418,0 0.838,-0.1 1.222,-0.302 L 32,45.473 42.132,50.8 c 0.384,0.202 0.804,0.302 1.222,0.302 0.544,0 1.088,-0.168 1.545,-0.502 0.809,-0.589 1.214,-1.585 1.046,-2.57 l -1.935,-11.284 8.197,-7.99 c 0.715,-0.696 0.973,-1.742 0.665,-2.693 z"
+       id="path12"
+       inkscape:connector-curvature="0"
+       style="fill:#e6e6e6;stroke-width:1.92454886" /></g><g
+     id="Layer_2"
+     transform="translate(0,-32)" /></svg>
\ No newline at end of file
diff --git a/res/themes/system/asbru_favourite_on.svg b/res/themes/system/asbru_favourite_on.svg
new file mode 100644
index 00000000..7452a8bb
--- /dev/null
+++ b/res/themes/system/asbru_favourite_on.svg
@@ -0,0 +1,55 @@
+<?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"
+   enable-background="new 0 0 64 64"
+   height="16"
+   version="1.1"
+   viewBox="0 0 16 16"
+   width="16"
+   xml:space="preserve"
+   id="svg20"
+   sodipodi:docname="asbru_favourite_on.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
+     id="metadata26"><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="defs24" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1810"
+     inkscape:window-height="905"
+     id="namedview22"
+     showgrid="false"
+     inkscape:zoom="44.875"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg20" /><circle
+     cx="7.9710789"
+     cy="8.083025"
+     r="7.3999996"
+     id="circle2"
+     style="fill:#999999;stroke:#1a1a1a;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><g
+     style="fill:#ffffff;stroke-width:4.03114986"
+     id="g14"
+     transform="matrix(0.24806818,0,0,0.24806818,0.03289677,0.14484383)"><path
+       d="m 52.872,26.063 c -0.31,-0.951 -1.133,-1.645 -2.121,-1.79 L 39.424,22.628 34.357,12.365 C 33.913,11.466 33.001,10.898 32,10.898 c -1.001,0 -1.913,0.568 -2.357,1.467 L 24.579,22.628 13.25,24.273 c -0.991,0.145 -1.813,0.838 -2.121,1.79 -0.31,0.951 -0.053,1.995 0.665,2.694 l 8.197,7.99 -1.934,11.283 c -0.168,0.986 0.237,1.982 1.046,2.57 0.455,0.334 0.996,0.502 1.543,0.502 0.418,0 0.838,-0.1 1.222,-0.302 L 32,45.473 42.132,50.8 c 0.384,0.202 0.804,0.302 1.222,0.302 0.544,0 1.088,-0.168 1.545,-0.502 0.809,-0.589 1.214,-1.585 1.046,-2.57 l -1.935,-11.284 8.197,-7.99 c 0.715,-0.696 0.973,-1.742 0.665,-2.693 z"
+       id="path12"
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff;stroke-width:4.03114986" /></g><g
+     id="Layer_2"
+     transform="translate(0,-48)" /></svg>
\ No newline at end of file
diff --git a/res/themes/system/asbru_group.svg b/res/themes/system/asbru_group.svg
new file mode 100644
index 00000000..eb71c256
--- /dev/null
+++ b/res/themes/system/asbru_group.svg
@@ -0,0 +1,82 @@
+<?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"
+   enable-background="new 0 0 200 200"
+   height="16"
+   id="Layer_1"
+   version="1.1"
+   viewBox="0 0 16 16"
+   width="16"
+   xml:space="preserve"
+   sodipodi:docname="asbru_group.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
+     id="metadata9"><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="defs7" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview5"
+     showgrid="false"
+     inkscape:zoom="22.366364"
+     inkscape:cx="5.3448441"
+     inkscape:cy="8.4745763"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1" /><circle
+     style="opacity:1;fill:#ff6600;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:7.55905533;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+     id="path812"
+     cx="8.0119495"
+     cy="7.9880486"
+     r="8" /><circle
+     style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:7.55905533;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+     id="path814"
+     cx="7.2757797"
+     cy="13.73174"
+     r="2"
+     inkscape:transform-center-x="33.979596"
+     inkscape:transform-center-y="-19.851237" /><circle
+     style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:7.55905533;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+     id="path814-7"
+     cx="12.222208"
+     cy="5.5214815"
+     r="2"
+     inkscape:transform-center-x="33.979596"
+     inkscape:transform-center-y="-19.851237" /><circle
+     style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:7.55905533;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+     id="path814-0"
+     cx="5.1580291"
+     cy="3.3306911"
+     inkscape:transform-center-x="33.979596"
+     inkscape:transform-center-y="-19.851237"
+     r="2" /><path
+     style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 0.08941999,6.9238712 6.2123724,13.092495 5.2400835,13.046114 C 3.0123979,12.459303 1.4904345,8.7391172 0.08941999,6.9238712 Z"
+     id="path837"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccc" /><path
+     style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 1.1374018,12.156337 11.113137,6.2071141 10.92858,6.8666442 C 9.1487554,9.7125141 3.9046135,11.042187 1.1374018,12.156337 Z"
+     id="path837-4"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccc" /><path
+     style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 12.300309,14.704657 5.2707209,3.8823307 6.6186331,4.492337 c 2.4471893,2.0184944 4.2314849,7.159638 5.6816739,10.212326 z"
+     id="path837-8"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccc" /></svg>
\ No newline at end of file
diff --git a/res/themes/system/asbru_group_add_16x16.svg b/res/themes/system/asbru_group_add_16x16.svg
new file mode 100644
index 00000000..6b3ee8e2
--- /dev/null
+++ b/res/themes/system/asbru_group_add_16x16.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"
+   height="32"
+   version="1.1"
+   viewBox="0 0 32 32"
+   width="32"
+   id="svg9"
+   sodipodi:docname="asbru_group_add_16x16.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata13">
+    <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>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview11"
+     showgrid="false"
+     inkscape:zoom="26.0625"
+     inkscape:cx="3.2997602"
+     inkscape:cy="16"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg9" />
+  <defs
+     id="defs4">
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path839"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+  </defs>
+  <g
+     id="Icons with numbers"
+     style="fill:#999999;fill-rule:evenodd;stroke:none;stroke-width:0.5"
+     transform="matrix(2,0,0,2.6666666,0,-5.333333)">
+    <g
+       id="Group"
+       transform="translate(-240)"
+       style="fill:#999999;stroke-width:0.5">
+      <path
+         d="m 241.00087,4 h 13.99826 C 255.55537,4 256,4.4456547 256,4.9953976 V 13.004602 C 256,13.544336 255.55189,14 254.99913,14 H 241.00087 C 240.44463,14 240,13.554345 240,13.004602 V 4.9953976 C 240,4.4556644 240.44811,4 241.00087,4 Z M 243,2 h 4 l 1,1 h -6 z m 0,0"
+         id="Rectangle 136"
+         style="fill:#999999;stroke-width:0.5"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+  <g
+     id="g837"
+     transform="matrix(1.4645669,0,0,1.4645669,11.957325,12.187543)"
+     style="fill:#333333;stroke:#333333;stroke-width:0.40967742;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers">
+    <rect
+       y="6.88729"
+       x="3.1270988"
+       height="2.2254195"
+       width="9.7458029"
+       id="rect818"
+       style="opacity:1;fill:#333333;fill-opacity:1;stroke:#333333;stroke-width:0.40967742;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" />
+    <rect
+       transform="rotate(90)"
+       y="-9.11271"
+       x="3.1270983"
+       height="2.2254195"
+       width="9.7458029"
+       id="rect818-0"
+       style="opacity:1;fill:#333333;fill-opacity:1;stroke:#333333;stroke-width:0.40967742;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" />
+  </g>
+</svg>
diff --git a/res/themes/system/asbru_group_closed_16x16.svg b/res/themes/system/asbru_group_closed_16x16.svg
new file mode 100644
index 00000000..3f961d36
--- /dev/null
+++ b/res/themes/system/asbru_group_closed_16x16.svg
@@ -0,0 +1,66 @@
+<?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"
+   height="16"
+   version="1.1"
+   viewBox="0 0 16 16"
+   width="16"
+   id="svg9"
+   sodipodi:docname="asbru_group_closed_16x16.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata13">
+    <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>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview11"
+     showgrid="false"
+     inkscape:zoom="52.125"
+     inkscape:cx="-4.7002398"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg9" />
+  <defs
+     id="defs4" />
+  <g
+     id="Icons with numbers"
+     style="fill:#ffcc00;fill-rule:evenodd;stroke:none;stroke-width:1"
+     transform="matrix(1,0,0,1.3333332,0,-2.6666669)">
+    <g
+       id="Group"
+       transform="translate(-240)"
+       style="fill:#ffcc00;stroke-width:1">
+      <path
+         d="m 241.00087,4 h 13.99826 C 255.55537,4 256,4.4456547 256,4.9953976 V 13.004602 C 256,13.544336 255.55189,14 254.99913,14 H 241.00087 C 240.44463,14 240,13.554345 240,13.004602 V 4.9953976 C 240,4.4556644 240.44811,4 241.00087,4 Z M 243,2 h 4 l 1,1 h -6 z m 0,0"
+         id="Rectangle 136"
+         style="fill:#ffcc00;stroke-width:1"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>
diff --git a/res/themes/system/asbru_group_open_16x16.svg b/res/themes/system/asbru_group_open_16x16.svg
new file mode 100644
index 00000000..729b1bcb
--- /dev/null
+++ b/res/themes/system/asbru_group_open_16x16.svg
@@ -0,0 +1,76 @@
+<?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"
+   height="16"
+   id="Capa_1"
+   version="1.1"
+   viewBox="0 0 16 16"
+   width="16"
+   xml:space="preserve"
+   sodipodi:docname="asbru_group_open_16x16.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
+     id="metadata41"><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="defs39" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview37"
+     showgrid="false"
+     inkscape:zoom="52.125"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Capa_1"
+     scale-x="1.3"
+     showguides="false" /><path
+     inkscape:connector-curvature="0"
+     style="fill:#ed6912;fill-opacity:1;stroke-width:0.17888558"
+     id="path2"
+     d="M 15.256018,5.0000002 H 0.74399844 c -0.736641,0 -0.77344105,0.4482 -0.73344099,0.9958 L 0.67087834,15.004 c 0.04,0.5478 0.14384019,0.995999 0.87936116,0.995999 H 14.449617 c 0.750081,0 0.839041,-0.448199 0.879042,-0.995799 l 0.66032,-9.0081998 c 0.04016,-0.5478 0.0035,-0.996 -0.732961,-0.996 z m -0.53264,-2.1999999 c -0.0888,-0.4399999 -0.524001,-0.8 -0.967523,-0.8 H 8.3043287 c -0.4433607,0 -1.0632015,-0.3176 -1.3771219,-0.7056 L 6.4505662,0.70580042 C 6.1364857,0.3176004 5.5168049,3.9333338e-7 5.0734442,3.9333338e-7 H 2.4688007 C 2.0254402,3.9333338e-7 1.6225596,0.4472003 1.5737595,0.99400042 L 1.3399993,3.6000003 H 14.884658 Z" /><g
+     id="g6"
+     transform="translate(0,-64)" /><g
+     id="g8"
+     transform="translate(0,-64)" /><g
+     id="g10"
+     transform="translate(0,-64)" /><g
+     id="g12"
+     transform="translate(0,-64)" /><g
+     id="g14"
+     transform="translate(0,-64)" /><g
+     id="g16"
+     transform="translate(0,-64)" /><g
+     id="g18"
+     transform="translate(0,-64)" /><g
+     id="g20"
+     transform="translate(0,-64)" /><g
+     id="g22"
+     transform="translate(0,-64)" /><g
+     id="g24"
+     transform="translate(0,-64)" /><g
+     id="g26"
+     transform="translate(0,-64)" /><g
+     id="g28"
+     transform="translate(0,-64)" /><g
+     id="g30"
+     transform="translate(0,-64)" /><g
+     id="g32"
+     transform="translate(0,-64)" /><g
+     id="g34"
+     transform="translate(0,-64)" /></svg>
\ No newline at end of file
diff --git a/res/themes/system/asbru_history.svg b/res/themes/system/asbru_history.svg
new file mode 100644
index 00000000..efd565e2
--- /dev/null
+++ b/res/themes/system/asbru_history.svg
@@ -0,0 +1,64 @@
+<?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"
+   height="32"
+   id="clock"
+   viewBox="0 0 32 32"
+   width="32"
+   version="1.1"
+   sodipodi:docname="asbru_history.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata9">
+    <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="defs7" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview5"
+     showgrid="false"
+     inkscape:zoom="26.0625"
+     inkscape:cx="3.2613909"
+     inkscape:cy="16"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="clock" />
+  <ellipse
+     style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:7.09063911;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+     id="path812"
+     cx="15.894855"
+     cy="15.875745"
+     rx="12.344953"
+     ry="12.402431" />
+  <path
+     d="M 16,0 C 7.163444,0 0,7.163444 0,16 0,24.836556 7.163444,32 16,32 24.836556,32 32,24.836556 32,16 32,7.163444 24.836556,0 16,0 m 0,4 C 22.627417,4 28,9.372583 28,16 28,22.627417 22.627417,28 16,28 9.372583,28 4,22.627417 4,16 4,9.372583 9.372583,4 16,4 m -2,2 0.613909,10.981415 7.846523,4.289568 0.446643,-0.775779 L 16.35012,16.016187 14.776979,5.8848921 Z"
+     id="path2"
+     style="fill:#333333"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="csssccssscccccccc" />
+</svg>
diff --git a/res/themes/system/asbru_keepass.png b/res/themes/system/asbru_keepass.png
new file mode 100644
index 00000000..e41f8b33
Binary files /dev/null and b/res/themes/system/asbru_keepass.png differ
diff --git a/res/themes/system/asbru_method_3270.jpg b/res/themes/system/asbru_method_3270.jpg
new file mode 100644
index 00000000..cca081bd
Binary files /dev/null and b/res/themes/system/asbru_method_3270.jpg differ
diff --git a/res/themes/system/asbru_method_cadaver.png b/res/themes/system/asbru_method_cadaver.png
new file mode 100644
index 00000000..373bddf3
Binary files /dev/null and b/res/themes/system/asbru_method_cadaver.png differ
diff --git a/res/themes/system/asbru_method_cu.jpg b/res/themes/system/asbru_method_cu.jpg
new file mode 100644
index 00000000..e7959f61
Binary files /dev/null and b/res/themes/system/asbru_method_cu.jpg differ
diff --git a/res/themes/system/asbru_method_ftp.svg b/res/themes/system/asbru_method_ftp.svg
new file mode 100644
index 00000000..04db778c
--- /dev/null
+++ b/res/themes/system/asbru_method_ftp.svg
@@ -0,0 +1,45 @@
+<?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"
+   enable-background="new 0 0 200 200"
+   height="32"
+   id="Layer_1"
+   version="1.1"
+   viewBox="0 0 32 32"
+   width="32"
+   xml:space="preserve"
+   sodipodi:docname="asbru_method_ftp.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
+     id="metadata9"><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="defs7" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview5"
+     showgrid="false"
+     inkscape:zoom="29.203762"
+     inkscape:cx="16.056412"
+     inkscape:cy="16.180629"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1" /><path
+     d="M 31.55641,8.3513739 V 13.71682 c -0.20336,0.858595 -0.653945,1.647139 -1.319515,2.286746 -0.9362,0.898425 -2.18395,1.39359 -3.511525,1.39359 h -8.347061 v -1.633501 c 0,-0.690286 -0.564975,-1.255037 -1.255345,-1.255037 h -2.133265 c -0.69006,0 -1.25488,0.564906 -1.25488,1.255037 v 1.633501 H 5.3872988 c -1.327575,0 -2.5750151,-0.495165 -3.5115251,-1.39359 C 1.2095837,15.364889 0.75977365,14.575725 0.55641364,13.71744 V 8.3513739 c 0,-1.156624 0.94705006,-2.1035585 2.10397006,-2.1035585 H 29.45275 c 1.156765,0 2.10366,0.9469345 2.10366,2.1035585 z M 17.123119,20.285539 c 0.110515,0 0.20274,-0.09237 0.20274,-0.202716 v -1.63381 -1.051857 -1.633501 c 0,-0.110346 -0.09223,-0.203335 -0.20274,-0.203335 h -2.13342 c -0.11005,0 -0.20336,0.09299 -0.20336,0.203335 v 1.633501 1.051857 1.63381 c 0,0.110347 0.09331,0.202716 0.20336,0.202716 z M 30.96586,16.762198 c -1.13398,1.087503 -2.63903,1.68697 -4.24049,1.68697 h -8.347061 v 1.63381 c 0,0.689356 -0.564975,1.254572 -1.255345,1.254572 h -2.133265 c -0.69006,0 -1.25488,-0.565061 -1.25488,-1.254572 v -1.63381 H 5.3872988 c -1.60115,0 -3.1065101,-0.599467 -4.2403351,-1.68697 C 0.93151365,16.555299 0.73435365,16.33569 0.55641364,16.105233 v 11.389406 c 0,1.157554 0.94705006,2.103714 2.10397006,2.103714 H 29.45275 c 1.156765,0 2.10366,-0.94616 2.10366,-2.103714 V 16.105233 c -0.17825,0.230457 -0.374635,0.450066 -0.59055,0.656965 z M 20.907289,2.6567484 C 20.496229,2.2457385 19.957604,2.0403885 19.419444,2.0403885 h -6.72545 c -0.53847,0 -1.077405,0.20535 -1.488155,0.6163599 -0.41044,0.4106999 -0.61597,0.9491042 -0.61597,1.4873536 v 1.0518567 h 1.787925 V 4.144102 c 0,-0.059668 0.01628,-0.1469221 0.093,-0.2231728 0.07595,-0.076251 0.16306,-0.092834 0.2232,-0.092834 h 6.725605 c 0.05921,0 0.14663,0.016583 0.222735,0.092834 0.07657,0.076251 0.09285,0.163505 0.09285,0.2231728 v 1.0518567 h 1.787925 V 4.144102 c -1.6e-4,-0.5382494 -0.20538,-1.0764987 -0.61582,-1.4873536 z"
+     id="path2"
+     inkscape:connector-curvature="0"
+     style="fill:#aa0000;stroke:#ffffff;stroke-width:1;stroke-opacity:1" /></svg>
\ No newline at end of file
diff --git a/res/themes/system/asbru_method_generic.svg b/res/themes/system/asbru_method_generic.svg
new file mode 100644
index 00000000..4f91a4f0
--- /dev/null
+++ b/res/themes/system/asbru_method_generic.svg
@@ -0,0 +1,66 @@
+<?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"
+   height="32"
+   version="1.1"
+   viewBox="0 0 32 32"
+   width="32"
+   id="svg9"
+   sodipodi:docname="asbru_method_generic.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata13">
+    <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>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview11"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="-14.440678"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg9" />
+  <defs
+     id="defs4" />
+  <g
+     id="Icons with numbers"
+     style="fill:#00aad4;fill-rule:evenodd;stroke:none;stroke-width:0.5"
+     transform="scale(2)">
+    <g
+       id="Group"
+       transform="translate(-48,-432)"
+       style="fill:#00aad4;stroke-width:0.5">
+      <path
+         d="M 54.879684,443.0591 V 445 h 2.351085 v -1.9409 z M 56,448 c -4.418278,0 -8,-3.58172 -8,-8 0,-4.41828 3.581722,-8 8,-8 4.418278,0 8,3.58172 8,8 0,4.41828 -3.581722,8 -8,8 z m -2.42998,-12.48959 c -0.983569,0.5328 -1.506903,1.4372 -1.57002,2.71323 h 2.280079 c 0,-0.37162 0.127546,-0.72979 0.382643,-1.07455 0.255097,-0.34475 0.687702,-0.51712 1.29783,-0.51712 0.620648,0 1.047994,0.13991 1.282052,0.41974 0.234057,0.27983 0.351084,0.58988 0.351084,0.93016 0,0.2955 -0.105193,0.56637 -0.315582,0.81262 l -0.457593,0.39624 -0.575937,0.38281 c -0.56805,0.37609 -0.920447,0.70853 -1.057199,0.99731 -0.136753,0.28879 -0.220907,0.81151 -0.252466,1.56817 h 2.130178 c 0.0053,-0.35818 0.03945,-0.62234 0.102564,-0.79248 0.09994,-0.26864 0.302431,-0.50369 0.607495,-0.70517 l 0.560158,-0.36938 c 0.56805,-0.37609 0.952004,-0.68502 1.151874,-0.92679 C 59.829062,438.94672 60,438.45646 60,437.87441 60,436.92522 59.606842,436.20887 58.820513,435.72532 58.034184,435.24177 57.046686,435 55.857988,435 c -0.904672,0 -1.667321,0.17014 -2.287968,0.51041 z m 0,0"
+         id="Oval 318"
+         inkscape:connector-curvature="0"
+         style="stroke-width:0.5;fill:#00aad4" />
+    </g>
+  </g>
+</svg>
diff --git a/res/themes/system/asbru_method_mosh.svg b/res/themes/system/asbru_method_mosh.svg
new file mode 100644
index 00000000..47d4adda
--- /dev/null
+++ b/res/themes/system/asbru_method_mosh.svg
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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="32mm"
+   height="32mm"
+   viewBox="0 0 32 32"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="asbru_method_mosh.svg">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="6.8957031"
+     inkscape:cx="60.472441"
+     inkscape:cy="60.472441"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5">
+    <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>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-265)">
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+       id="rect815"
+       width="28.201439"
+       height="19.529974"
+       x="1.8992805"
+       y="271.02399" />
+    <rect
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+       id="rect815-2"
+       width="16.767389"
+       height="2.9838984"
+       x="7.5203829"
+       y="276.35336" />
+    <g
+       id="g906"
+       transform="matrix(0.85488233,0,0,0.62461017,2.2473141,107.31378)"
+       style="stroke-width:1.36849201">
+      <rect
+         y="285.91129"
+         x="13.582733"
+         height="1.3045554"
+         width="4.8345346"
+         id="rect815-2-1"
+         style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:2.73698401;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" />
+      <rect
+         y="286.17984"
+         x="21.520235"
+         height="1.0359701"
+         width="4.8345346"
+         id="rect815-2-1-7"
+         style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:2.73698401;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" />
+      <rect
+         y="285.87289"
+         x="5.6452365"
+         height="1.3429247"
+         width="4.8345346"
+         id="rect815-2-1-8"
+         style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:2.73698401;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" />
+    </g>
+  </g>
+</svg>
diff --git a/res/themes/system/asbru_method_rdesktop.svg b/res/themes/system/asbru_method_rdesktop.svg
new file mode 100644
index 00000000..f9890639
--- /dev/null
+++ b/res/themes/system/asbru_method_rdesktop.svg
@@ -0,0 +1,57 @@
+<?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"
+   enable-background="new 0 0 24 24"
+   height="24px"
+   id="Layer_1"
+   version="1.1"
+   viewBox="0 0 24 24"
+   width="24px"
+   xml:space="preserve"
+   sodipodi:docname="asbru_method_rdesktop.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
+     id="metadata17"><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="defs15" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview13"
+     showgrid="false"
+     inkscape:zoom="9.8333333"
+     inkscape:cx="-8.5932204"
+     inkscape:cy="12"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1" /><path
+     inkscape:connector-curvature="0"
+     id="path2"
+     d="M 6.5367687,11.808543 C 5.1178185,11.926788 3.8171144,12.281526 2.9893935,12.518018 2.8711478,12.636264 2.6346561,12.636264 2.3981644,12.754509 L 0.26973949,19.84926 C 1.6886895,19.376276 2.8711478,19.139785 4.0536061,19.139785 c 2.0101792,0 3.4291291,0.709475 4.6115875,1.418949 C 9.2564227,18.548556 10.438882,14.646443 10.911865,13.109247 10.675374,12.991001 10.438882,12.872756 10.202389,12.754509 9.0199309,12.045035 7.7192269,11.690297 6.5367687,11.808543 Z"
+     style="fill:#0000ff;stroke-width:1" /><path
+     inkscape:connector-curvature="0"
+     id="path4"
+     d="m 12.204756,13.794915 -2.114926,7.16725 c 1.057463,0.587479 2.937398,1.409951 4.347348,1.409951 1.292455,0 2.819902,-0.352487 4.58234,-1.057463 l 1.99743,-6.814762 c -1.292454,0.352487 -2.584909,0.587479 -3.877364,0.587479 -2.114926,0 -3.877365,-0.704975 -4.934828,-1.292455 z"
+     style="fill:#ffcc00;stroke-width:0.99999994" /><path
+     inkscape:connector-curvature="0"
+     id="path6"
+     d="M 11.019269,11.297448 C 11.50085,9.8527042 12.223221,7.3244018 12.825198,5.3980766 L 13.306779,3.8329374 C 12.704802,3.4717513 11.621245,2.99017 10.778477,2.7493793 10.176501,2.628984 9.5745247,2.5085886 8.8521525,2.5085886 c -1.3243489,0 -2.6486976,0.361186 -4.2138369,0.9631627 L 2.591595,10.695472 C 4.036339,10.21389 5.3606875,9.9730991 6.5646409,9.9730991 c 1.9263254,0 3.3710682,0.6019779 4.4546281,1.3243489 z"
+     style="fill:#d40000;stroke-width:1" /><path
+     inkscape:connector-curvature="0"
+     id="path8"
+     d="m 19.819889,5.6515686 c -2.290056,0 -3.977465,-0.7231753 -5.062228,-1.4463508 l -2.169526,7.4728142 c 2.772173,1.687409 5.905931,1.807938 9.160222,0.361587 l 2.169525,-7.1112257 c -1.44635,0.6026461 -2.772173,0.7231753 -4.097993,0.7231753 z"
+     style="fill:#008000;stroke-width:0.99999988" /></svg>
\ No newline at end of file
diff --git a/res/themes/system/asbru_method_remote-tty.jpg b/res/themes/system/asbru_method_remote-tty.jpg
new file mode 100644
index 00000000..e7959f61
Binary files /dev/null and b/res/themes/system/asbru_method_remote-tty.jpg differ
diff --git a/res/themes/system/asbru_method_sftp.svg b/res/themes/system/asbru_method_sftp.svg
new file mode 100644
index 00000000..c0628b84
--- /dev/null
+++ b/res/themes/system/asbru_method_sftp.svg
@@ -0,0 +1,45 @@
+<?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"
+   enable-background="new 0 0 200 200"
+   height="32"
+   id="Layer_1"
+   version="1.1"
+   viewBox="0 0 32 32"
+   width="32"
+   xml:space="preserve"
+   sodipodi:docname="asbru_method_sftp.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
+     id="metadata9"><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="defs7" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview5"
+     showgrid="false"
+     inkscape:zoom="26.0625"
+     inkscape:cx="3.2997602"
+     inkscape:cy="16"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1" /><path
+     d="m 31.498797,7.6600216 v 5.3654454 c -0.20336,0.858595 -0.653945,1.647139 -1.319515,2.286746 -0.9362,0.898426 -2.18395,1.39359 -3.511525,1.39359 h -8.34706 v -1.633501 c 0,-0.690285 -0.564975,-1.255036 -1.255345,-1.255036 h -2.133265 c -0.69006,0 -1.25488,0.564906 -1.25488,1.255036 v 1.633501 H 5.3296859 c -1.327575,0 -2.575015,-0.495164 -3.511525,-1.39359 -0.66619,-0.638677 -1.116,-1.427841 -1.31936,-2.286126 V 7.6600216 c 0,-1.1566239 0.94705,-2.1035584 2.10397,-2.1035584 H 29.395137 c 1.156765,0 2.10366,0.9469345 2.10366,2.1035584 z M 17.065507,19.594186 c 0.110515,0 0.20274,-0.09237 0.20274,-0.202715 V 17.75766 16.705803 15.072302 c 0,-0.110346 -0.09222,-0.203335 -0.20274,-0.203335 h -2.13342 c -0.11005,0 -0.20336,0.09299 -0.20336,0.203335 v 1.633501 1.051857 1.633811 c 0,0.110346 0.09331,0.202715 0.20336,0.202715 z m 13.84274,-3.52334 c -1.13398,1.087502 -2.63903,1.686969 -4.24049,1.686969 h -8.34706 v 1.633811 c 0,0.689356 -0.564975,1.254572 -1.255345,1.254572 h -2.133265 c -0.69006,0 -1.25488,-0.565062 -1.25488,-1.254572 V 17.757815 H 5.3296859 c -1.60115,0 -3.10651,-0.599467 -4.240335,-1.686969 -0.21545,-0.2069 -0.41261,-0.426508 -0.59055,-0.656965 v 11.389406 c 0,1.157553 0.94705,2.103713 2.10397,2.103713 H 29.395137 c 1.156765,0 2.10366,-0.94616 2.10366,-2.103713 V 15.413881 c -0.17825,0.230457 -0.374635,0.450065 -0.59055,0.656965 z M 20.849677,1.9653962 C 20.438617,1.5543863 19.899992,1.3490364 19.361832,1.3490364 h -6.72545 c -0.53847,0 -1.077405,0.2053499 -1.488155,0.6163598 -0.41044,0.4106999 -0.61597,0.9491042 -0.61597,1.4873536 v 1.0518567 h 1.787925 V 3.4527498 c 0,-0.059668 0.01628,-0.1469221 0.093,-0.2231728 0.07595,-0.076251 0.16306,-0.092834 0.2232,-0.092834 h 6.725605 c 0.05921,0 0.14663,0.016583 0.222735,0.092834 0.07657,0.076251 0.09285,0.163505 0.09285,0.2231728 v 1.0518567 h 1.787925 V 3.4527498 c -1.6e-4,-0.5382494 -0.20538,-1.0764987 -0.61582,-1.4873536 z"
+     id="path2"
+     inkscape:connector-curvature="0"
+     style="fill:#447821;stroke:#ffffff;stroke-width:0.99999994;stroke-opacity:1" /></svg>
\ No newline at end of file
diff --git a/res/themes/system/asbru_method_ssh.svg b/res/themes/system/asbru_method_ssh.svg
new file mode 100644
index 00000000..ed344d54
--- /dev/null
+++ b/res/themes/system/asbru_method_ssh.svg
@@ -0,0 +1,67 @@
+<?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"
+   height="32px"
+   version="1.1"
+   viewBox="0 0 32 32"
+   width="32px"
+   id="svg11"
+   sodipodi:docname="asbru_method_ssh.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata15">
+    <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>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview13"
+     showgrid="false"
+     inkscape:zoom="20.270834"
+     inkscape:cx="16.091127"
+     inkscape:cy="20.614595"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg11" />
+  <desc
+     id="desc4" />
+  <defs
+     id="defs6" />
+  <g
+     id="Page-1"
+     style="fill:#217821;fill-rule:evenodd;stroke:none;stroke-width:0.84375"
+     transform="matrix(1.1851852,0,0,1.1851852,-3.5555558,-3.5555558)">
+    <g
+       id="icon-114-lock"
+       style="fill:#217821;stroke-width:0.84375">
+      <path
+         d="m 16,21.914647 v 2.594348 C 16,24.780169 16.231934,25 16.5,25 16.776142,25 17,24.772119 17,24.508995 V 21.914647 C 17.582596,21.708729 18,21.153109 18,20.5 18,19.671573 17.328427,19 16.5,19 15.671573,19 15,19.671573 15,20.5 c 0,0.653109 0.417404,1.208729 1,1.414647 z M 9,14.000013 V 10.499235 C 9,6.3567048 12.357864,3 16.5,3 20.633707,3 24,6.3575219 24,10.499235 v 3.500778 c 1.659147,0.0047 3,1.350304 3,3.009465 v 9.981044 C 27,28.663369 25.65292,30 23.991212,30 H 9.008788 C 7.3455902,30 6,28.652611 6,26.990522 V 17.009478 C 6,15.339581 7.3423335,14.004715 9,14.000013 Z M 12,14 V 10.500854 C 12,8.0092478 14.014719,6 16.5,6 18.980224,6 21,8.0151008 21,10.500854 V 14 Z"
+         id="lock"
+         style="fill:#217821;stroke-width:0.84375"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>
diff --git a/res/themes/system/asbru_method_telnet.svg b/res/themes/system/asbru_method_telnet.svg
new file mode 100644
index 00000000..9b8bd059
--- /dev/null
+++ b/res/themes/system/asbru_method_telnet.svg
@@ -0,0 +1,67 @@
+<?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"
+   height="32px"
+   version="1.1"
+   viewBox="0 0 32 32"
+   width="32px"
+   id="svg11"
+   sodipodi:docname="asbru_method_telnet.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata15">
+    <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>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview13"
+     showgrid="false"
+     inkscape:zoom="26.0625"
+     inkscape:cx="16"
+     inkscape:cy="16"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg11" />
+  <desc
+     id="desc4" />
+  <defs
+     id="defs6" />
+  <g
+     id="Page-1"
+     style="fill:#d40000;fill-rule:evenodd;stroke:none;stroke-width:0.96875012"
+     transform="matrix(1.0322581,0,0,1.0322581,-0.5161296,-1.0322586)">
+    <g
+       id="icon-115-lock-open"
+       style="fill:#d40000;stroke-width:0.96875012">
+      <path
+         d="m 20,23.914647 v 2.594348 C 20,26.780169 20.231934,27 20.5,27 20.776142,27 21,26.772119 21,26.508995 V 23.914647 C 21.582596,23.708729 22,23.153109 22,22.5 22,21.671573 21.328427,21 20.5,21 19.671573,21 19,21.671573 19,22.5 c 0,0.653109 0.417404,1.208729 1,1.414647 z M 13,8.4999175 C 13,6.0146817 10.980224,4 8.5,4 6.0147186,4 4,6.0168811 4,8.4999175 V 10 12.499167 C 4,13.321455 3.3284271,14 2.5,14 1.6657972,14 1,13.328054 1,12.499167 V 10 8.499235 C 1,4.3567048 4.3578644,1 8.5,1 12.633707,1 16,4.3575219 16,8.499235 V 16 H 27.991212 C 29.65441,16 31,17.347389 31,19.009478 v 9.981044 C 31,30.663369 29.65292,32 27.991212,32 H 13.008788 C 11.34559,32 10,30.652611 10,28.990522 v -9.981044 c 0,-1.669897 1.342334,-3.004763 3,-3.009466 z"
+         id="lock-open"
+         style="fill:#d40000;stroke-width:0.96875012"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>
diff --git a/res/themes/system/asbru_method_vncviewer.svg b/res/themes/system/asbru_method_vncviewer.svg
new file mode 100644
index 00000000..de6acfd3
--- /dev/null
+++ b/res/themes/system/asbru_method_vncviewer.svg
@@ -0,0 +1,88 @@
+<?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"
+   enable-background="new 0 0 75 61"
+   height="16"
+   id="Layer_1"
+   version="1.1"
+   viewBox="0 0 16 16"
+   width="16"
+   xml:space="preserve"
+   sodipodi:docname="asbru_method_vncviewer.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
+     id="metadata9"><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="defs7" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview5"
+     showgrid="false"
+     showguides="false"
+     inkscape:zoom="19.17937"
+     inkscape:cx="13.737479"
+     inkscape:cy="14.479008"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1" /><text
+     xml:space="preserve"
+     style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.35899734px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#008000;fill-opacity:1;stroke:none;stroke-width:0.32043648px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     x="0.22531466"
+     y="11.772177"
+     id="text17"
+     transform="scale(0.78181461,1.2790756)"><tspan
+       sodipodi:role="line"
+       id="tspan15"
+       x="0.22531466"
+       y="11.772177"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.35899734px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#008000;stroke-width:0.32043648px">V</tspan></text>
+<text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     x="11.36525"
+     y="4.6609974"
+     id="text21"><tspan
+       sodipodi:role="line"
+       id="tspan19"
+       x="11.36525"
+       y="40.05162"></tspan></text>
+<text
+     xml:space="preserve"
+     style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:10.58827019px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#0000ff;fill-opacity:1;stroke:none;stroke-width:0.20747451px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     x="8.708106"
+     y="7.6002789"
+     id="text25"
+     transform="scale(1.0010631,0.99893803)"><tspan
+       sodipodi:role="line"
+       id="tspan23"
+       x="8.708106"
+       y="7.6002789"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:10.58827019px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#0000ff;stroke-width:0.20747451px">n</tspan></text>
+<text
+     xml:space="preserve"
+     style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:12.49081612px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#d40000;fill-opacity:1;stroke:none;stroke-width:0.24945076px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     x="8.8415861"
+     y="15.172903"
+     id="text29"
+     transform="scale(0.99763601,1.0023696)"><tspan
+       sodipodi:role="line"
+       id="tspan27"
+       x="8.8415861"
+       y="15.172903"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:12.49081612px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#d40000;stroke-width:0.24945076px">c</tspan></text>
+</svg>
\ No newline at end of file
diff --git a/res/themes/system/asbru_node_add_16x16.svg b/res/themes/system/asbru_node_add_16x16.svg
new file mode 100644
index 00000000..65dc41eb
--- /dev/null
+++ b/res/themes/system/asbru_node_add_16x16.svg
@@ -0,0 +1,75 @@
+<?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"
+   id="Layer_1_1_"
+   version="1.1"
+   viewBox="0 0 32 32"
+   xml:space="preserve"
+   sodipodi:docname="asbru_node_add_16x16.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   width="32"
+   height="32"><metadata
+     id="metadata9"><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="defs7" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview5"
+     showgrid="false"
+     inkscape:zoom="26.0625"
+     inkscape:cx="16"
+     inkscape:cy="16"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1_1_" /><path
+     d="M 7.3188612,17.259575 H 23.863547 c 3.547916,0 6.434043,-2.725788 6.434043,-6.076596 0,-3.3508084 -2.886127,-6.0765963 -6.434043,-6.0765963 H 8.2380101 c 0,-1.9184671 -1.6452765,-3.4723392 -3.6765958,-3.4723392 -2.031319,0 -3.67659552,1.5538721 -3.67659552,3.4723392 0,1.9184691 1.64527652,3.4723412 3.67659552,3.4723412 1.3566638,0 2.529498,-0.7031494 3.1673873,-1.7361706 H 23.863547 c 2.533176,0 4.595744,1.9479822 4.595744,4.3404257 0,2.392443 -2.062568,4.340425 -4.595744,4.340425 H 7.3188612 c -3.5479149,0 -6.43404242,2.725788 -6.43404242,6.076591 0,3.35081 2.88612752,6.076594 6.43404242,6.076594 H 23.453606 c 0.636053,1.033025 1.808887,1.736172 3.167389,1.736172 2.031318,0 3.676595,-1.553872 3.676595,-3.472339 0,-1.918469 -1.645277,-3.472343 -3.676595,-3.472343 -2.031319,0 -3.676596,1.553874 -3.676596,3.472343 H 7.3188612 c -2.5331744,0 -4.5957446,-1.947986 -4.5957446,-4.340427 0,-2.392442 2.0625702,-4.34042 4.5957446,-4.34042 z"
+     id="path2"
+     style="fill:#999999;stroke:#999999;stroke-width:0.60000002;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1"
+     inkscape:connector-curvature="0" /><circle
+     style="opacity:0;fill:#ff0000;fill-opacity:1;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none"
+     id="path829"
+     cx="-9.3279467"
+     cy="-9.8042545"
+     r="0" /><circle
+     style="opacity:1;fill:#333333;fill-opacity:1;stroke:#333333;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+     id="path835"
+     cx="5.7869463"
+     cy="5.9914875"
+     r="5.7191491" /><circle
+     style="opacity:1;fill:#cccccc;fill-opacity:1;stroke:#808080;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+     id="path835-6"
+     cx="26.348646"
+     cy="26.280851"
+     r="5.7191491" /><g
+     id="g837"
+     transform="matrix(1.9373429,0,0,1.9373429,6.0036167,6.197711)"
+     style="fill:#000000;stroke:#000000;stroke-width:0.30970252;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"><rect
+       y="6.88729"
+       x="3.1270988"
+       height="2.2254195"
+       width="9.7458029"
+       id="rect818"
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.30970252;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" /><rect
+       transform="rotate(90)"
+       y="-9.11271"
+       x="3.1270983"
+       height="2.2254195"
+       width="9.7458029"
+       id="rect818-0"
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.30970252;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" /></g></svg>
\ No newline at end of file
diff --git a/res/themes/system/asbru_prompt.png b/res/themes/system/asbru_prompt.png
new file mode 100644
index 00000000..7ba70cb5
Binary files /dev/null and b/res/themes/system/asbru_prompt.png differ
diff --git a/res/themes/system/asbru_protected.png b/res/themes/system/asbru_protected.png
new file mode 100644
index 00000000..09866ad9
Binary files /dev/null and b/res/themes/system/asbru_protected.png differ
diff --git a/res/themes/system/asbru_quick_connect.svg b/res/themes/system/asbru_quick_connect.svg
new file mode 100644
index 00000000..d2bad228
--- /dev/null
+++ b/res/themes/system/asbru_quick_connect.svg
@@ -0,0 +1,44 @@
+<?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"
+   height="32"
+   id="Layer_1"
+   version="1.1"
+   viewBox="0 0 32 32"
+   width="32"
+   xml:space="preserve"
+   sodipodi:docname="asbru_quick_connect.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
+     id="metadata9"><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="defs7" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview5"
+     showgrid="false"
+     inkscape:zoom="7.8954133"
+     inkscape:cx="13.016949"
+     inkscape:cy="-3.2542373"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1" /><path
+     d="M 20.214619,-0.08375616 6.9062849,18.582909 H 14.889617 L 12.431284,31.916243 25.739618,13.249576 h -7.983332 z"
+     id="path2"
+     inkscape:connector-curvature="0"
+     style="stroke-width:1" /></svg>
\ No newline at end of file
diff --git a/res/themes/system/asbru_script.png b/res/themes/system/asbru_script.png
new file mode 100644
index 00000000..ce122ed1
Binary files /dev/null and b/res/themes/system/asbru_script.png differ
diff --git a/res/themes/system/asbru_shell.svg b/res/themes/system/asbru_shell.svg
new file mode 100644
index 00000000..a1f1c2bc
--- /dev/null
+++ b/res/themes/system/asbru_shell.svg
@@ -0,0 +1,56 @@
+<?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"
+   height="512"
+   width="512"
+   version="1.1"
+   id="svg4"
+   sodipodi:docname="asbru_shell.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata10">
+    <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="defs8" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="1.1649148"
+     inkscape:cx="-2.9654836"
+     inkscape:cy="271.18644"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4" />
+  <path
+     d="M 475.287,0.3623481 H 36.42986 c -20.199999,0 -36.5714281,19.0934309 -36.5714281,42.6519929 V 469.53405 c 0,23.55856 16.3714291,42.65199 36.5714281,42.65199 H 475.287 c 20.2,0 36.57143,-19.09343 36.57143,-42.65199 V 43.014341 C 511.85843,19.455779 495.487,0.3623481 475.287,0.3623481 Z M 73.001289,298.9261 146.14414,213.62212 73.001289,128.31819 109.57272,85.666302 219.287,213.62212 109.57272,341.57809 Z M 405.06058,343.29495 219.287,341.57809 V 298.9261 l 184.91515,0 z"
+     id="path2"
+     inkscape:connector-curvature="0"
+     style="fill:#4d4d4d;stroke-width:1"
+     sodipodi:nodetypes="ssssssssscccccccccccc" />
+</svg>
diff --git a/res/themes/system/asbru_tab.png b/res/themes/system/asbru_tab.png
new file mode 100644
index 00000000..3354871e
Binary files /dev/null and b/res/themes/system/asbru_tab.png differ
diff --git a/res/themes/system/asbru_treelist.svg b/res/themes/system/asbru_treelist.svg
new file mode 100644
index 00000000..bdb339eb
--- /dev/null
+++ b/res/themes/system/asbru_treelist.svg
@@ -0,0 +1,86 @@
+<?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"
+   height="16"
+   viewBox="0 0 16 16"
+   width="16"
+   version="1.1"
+   id="svg4"
+   sodipodi:docname="asbru_treelist.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata10">
+    <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="defs8" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1687"
+     inkscape:window-height="978"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="49.4375"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:window-x="194"
+     inkscape:window-y="51"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg4" />
+  <rect
+     style="opacity:1;fill:#666666;fill-opacity:1;stroke:#666666;stroke-width:1.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+     id="rect817"
+     width="8.7747412"
+     height="2.3712707"
+     x="6.4718328"
+     y="2.984359" />
+  <rect
+     style="opacity:1;fill:#e6e6e6;fill-opacity:1;stroke:#e6e6e6;stroke-width:1.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+     id="rect817-8"
+     width="3.6917095"
+     height="2.3712707"
+     x="0.73416901"
+     y="3.0152664" />
+  <rect
+     style="opacity:1;fill:#666666;fill-opacity:1;stroke:#666666;stroke-width:1.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+     id="rect817-6"
+     width="6.8878584"
+     height="2.3712707"
+     x="8.493495"
+     y="7.2050185" />
+  <rect
+     style="opacity:1;fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:1.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+     id="rect817-8-2"
+     width="3.6917095"
+     height="2.3712707"
+     x="3.0061305"
+     y="7.2359362" />
+  <rect
+     style="opacity:1;fill:#666666;fill-opacity:1;stroke:#666666;stroke-width:1.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+     id="rect817-6-9"
+     width="6.8878584"
+     height="2.3712707"
+     x="8.4583416"
+     y="11.588383" />
+</svg>
diff --git a/res/themes/system/asbru_unprotected.png b/res/themes/system/asbru_unprotected.png
new file mode 100644
index 00000000..91370324
Binary files /dev/null and b/res/themes/system/asbru_unprotected.png differ
diff --git a/res/themes/system/asbru_wol.svg b/res/themes/system/asbru_wol.svg
new file mode 100644
index 00000000..5e14540d
--- /dev/null
+++ b/res/themes/system/asbru_wol.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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="32"
+   viewBox="0 0 32 32"
+   width="32"
+   version="1.1"
+   id="svg6"
+   sodipodi:docname="asbru_wol.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata12">
+    <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="defs10">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient872">
+      <stop
+         style="stop-color:#00aa00;stop-opacity:1;"
+         offset="0"
+         id="stop868" />
+      <stop
+         style="stop-color:#00aa00;stop-opacity:0;"
+         offset="1"
+         id="stop870" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient872"
+       id="radialGradient874"
+       cx="16.398134"
+       cy="25.057543"
+       fx="16.398134"
+       fy="25.057543"
+       r="6.693624"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(8.8460339,0.19906688)" />
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1499"
+     inkscape:window-height="865"
+     id="namedview8"
+     showgrid="false"
+     inkscape:zoom="20.09375"
+     inkscape:cx="16"
+     inkscape:cy="16"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg6" />
+  <path
+     d="M 0,-16 H 48 V 32 H 0 Z"
+     id="path2"
+     inkscape:connector-curvature="0"
+     style="fill:none" />
+  <path
+     d="M 9.1857824,2.43527 7.1532259,0.75247158 0.01288136,9.3512252 7.1532259,17.956594 9.1857824,16.273796 3.4444703,9.3512252 Z M 8.1695042,10.671067 H 10.809187 V 8.0313833 H 8.1695042 Z M 21.367922,8.0313833 h -2.639683 v 2.6396837 h 2.639683 z m -7.919051,2.6396837 h 2.639684 V 8.0313833 h -2.639684 z m 8.93533,-9.9251946 -2.032557,1.6827984 5.741312,6.9225544 -5.741312,6.9159708 2.032557,1.682798 7.140344,-8.5987688 z"
+     id="path4"
+     inkscape:connector-curvature="0"
+     style="stroke-width:1" />
+  <circle
+     style="opacity:1;fill:url(#radialGradient874);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:7.55905533;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+     id="path822"
+     cx="25.244165"
+     cy="25.256609"
+     r="6.693624" />
+</svg>
diff --git a/res/themes/system/gtk-delete.svg b/res/themes/system/gtk-delete.svg
new file mode 100644
index 00000000..142592b9
--- /dev/null
+++ b/res/themes/system/gtk-delete.svg
@@ -0,0 +1,44 @@
+<?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"
+   id="Layer_1_1_"
+   version="1.1"
+   viewBox="0 0 32 32"
+   xml:space="preserve"
+   sodipodi:docname="gtk-delete.svg"
+   width="32"
+   height="32"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
+     id="metadata9"><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="defs7" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview5"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1_1_" /><path
+     d="M 16,0 C 14.896,0 14,0.896 14,2 H 0 v 4 h 2 v 22 c 0,2.21 1.79,4 4,4 h 20 c 2.21,0 4,-1.79 4,-4 V 6 h 2 V 2 H 18 C 18,0.896 17.104,0 16,0 Z M 8,28 H 6 V 10 h 2 z m 6,0 H 12 V 10 h 2 z m 6,0 H 18 V 10 h 2 z m 6,0 H 24 V 10 h 2 z"
+     id="path2"
+     inkscape:connector-curvature="0"
+     style="stroke-width:1" /></svg>
\ No newline at end of file
diff --git a/res/themes/system/gtk-edit.svg b/res/themes/system/gtk-edit.svg
new file mode 100644
index 00000000..2598385f
--- /dev/null
+++ b/res/themes/system/gtk-edit.svg
@@ -0,0 +1,67 @@
+<?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"
+   height="32px"
+   version="1.1"
+   viewBox="0 0 32 32"
+   width="32px"
+   id="svg11"
+   sodipodi:docname="gtk-edit.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata15">
+    <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>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview13"
+     showgrid="false"
+     inkscape:zoom="7.375"
+     inkscape:cx="-28.881356"
+     inkscape:cy="16"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg11" />
+  <desc
+     id="desc4" />
+  <defs
+     id="defs6" />
+  <g
+     id="Page-1"
+     style="fill:#1a1a1a;fill-rule:evenodd;stroke:none;stroke-width:0.84906781"
+     transform="matrix(1.1777622,0,0,1.1777622,-3.3807443,-3.2989684)">
+    <g
+       id="icon-136-document-edit"
+       style="fill:#1a1a1a;stroke-width:0.84906781">
+      <path
+         d="M 26.443228,12.150335 15.157013,23.449906 v 0 L 12.551447,20.84434 23.843538,9.5506451 Z M 27.149916,11.44281 28.879095,9.7115841 C 29.269069,9.3211489 29.266195,8.6865042 28.8743,8.295685 L 27.694487,7.11911 C 27.301865,6.7275656 26.669258,6.7245247 26.277913,7.1159253 L 24.550595,8.8434882 Z M 11.903706,21.610813 11.26416,24.72351 14.399065,24.106171 Z M 22,18 V 28.002578 C 22,29.109075 21.105724,30 20.002578,30 H 4.9974219 C 3.8909254,30 3,29.101288 3,27.99267 V 5.0073299 C 3,3.8983383 3.8992496,3 5.0085302,3 H 15 V 9.0018986 C 15,10.113294 15.898081,11 17.005919,11 H 21 l 4.580107,-4.5801067 c 0.792674,-0.7926743 2.051284,-0.7885027 2.830143,-0.00964 l 1.1795,1.1794992 c 0.776438,0.7764385 0.774542,2.0459582 -0.0096,2.8301435 z M 16,3 V 8.9970707 C 16,9.5509732 16.450975,10 16.990778,10 H 22 Z"
+         id="document-edit"
+         style="fill:#1a1a1a;stroke-width:0.84906781"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>
diff --git a/res/themes/system/gtk-find.svg b/res/themes/system/gtk-find.svg
new file mode 100644
index 00000000..7b399734
--- /dev/null
+++ b/res/themes/system/gtk-find.svg
@@ -0,0 +1,55 @@
+<?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"
+   height="32"
+   width="32"
+   version="1.1"
+   id="svg4"
+   sodipodi:docname="gtk-find.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata10">
+    <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="defs8" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="12.95122"
+     inkscape:cx="17"
+     inkscape:cy="10"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4" />
+  <path
+     d="m 30.961667,26.87326 -7.697992,-7.697992 c 1.098901,-1.794154 1.765169,-3.884732 1.765169,-6.145262 0,-6.5517821 -5.31482,-11.8656452 -11.865646,-11.8656452 -6.5517834,0 -11.8656461,5.3138631 -11.8656461,11.8656452 0,6.550826 5.3138627,11.865646 11.8656461,11.865646 2.26053,0 4.351108,-0.666268 6.145262,-1.761307 l 7.697992,7.69413 c 0.540752,0.540753 1.436855,0.53689 1.977607,0 l 1.977608,-1.977608 c 0.540753,-0.540752 0.540753,-1.436855 0,-1.977607 z M 13.163198,20.940437 c -4.3685044,0 -7.9104308,-3.541927 -7.9104308,-7.910431 0,-4.3685035 3.5419264,-7.9104298 7.9104308,-7.9104298 4.368504,0 7.910431,3.5419263 7.910431,7.9104298 0,4.368504 -3.541927,7.910431 -7.910431,7.910431 z"
+     id="path2"
+     inkscape:connector-curvature="0"
+     style="stroke-width:1" />
+</svg>
diff --git a/res/themes/system/gtk-spell-check.svg b/res/themes/system/gtk-spell-check.svg
new file mode 100644
index 00000000..136583ef
--- /dev/null
+++ b/res/themes/system/gtk-spell-check.svg
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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="32"
+   height="32"
+   viewBox="0 0 8.4666659 8.4666659"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="gtk-spell-check.svg">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="17.497415"
+     inkscape:cx="18.889315"
+     inkscape:cy="20.846388"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5">
+    <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>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-288.53334)">
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:3.52777767px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="0.30242562"
+       y="292.20654"
+       id="text817"><tspan
+         sodipodi:role="line"
+         id="tspan815"
+         x="0.30242562"
+         y="292.20654"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:3.52777767px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.26458332px">ABC</tspan></text>
+    <g
+       id="g848"
+       style="fill:#999999;stroke:none;stroke-width:0.81602418"
+       transform="matrix(1.2254539,0,0,1.2254539,-0.77539418,-67.044897)">
+      <rect
+         transform="rotate(45)"
+         y="206.14658"
+         x="208.99654"
+         height="0.83167046"
+         width="2.8730433"
+         id="rect819"
+         style="opacity:1;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.63204837;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" />
+      <rect
+         transform="rotate(-45)"
+         inkscape:transform-center-y="4.8319891"
+         inkscape:transform-center-x="4.1049014"
+         y="211.03792"
+         x="-206.97824"
+         height="0.83167046"
+         width="4.4305353"
+         id="rect819-3"
+         style="opacity:1;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.63204837;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" />
+    </g>
+  </g>
+</svg>
diff --git a/scripts/deploy.sh b/scripts/deploy.sh
new file mode 100755
index 00000000..3bc2a685
--- /dev/null
+++ b/scripts/deploy.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+readonly DEST="${1:-snapshots}"
+
+main() {
+  local var
+  local file
+
+  for var in PACKAGE OS DIST
+  do
+    if [ -z ${!var} ]
+    then
+      echo "ERROR: environment variable [${var}] must be set."
+      exit 1
+    fi
+  done
+
+  for file in build/*.${PACKAGE}
+  do
+    echo "Pushing $file to cloudsmith..."
+    cloudsmith push ${PACKAGE} asbru-cm/${DEST}/${OS}/${DIST} $file
+  done
+
+  if [ $PACKAGE == "deb" ]
+  then
+    echo "Pushing DSC files to cloudsmith..."
+    cloudsmith push ${PACKAGE} asbru-cm/${DEST}/${OS}/${DIST} build/*.dsc --sources-file build/*.debian.tar.xz
+  fi
+}
+main
diff --git a/scripts/deploy_docs.sh b/scripts/deploy_docs.sh
new file mode 100644
index 00000000..4841c2b4
--- /dev/null
+++ b/scripts/deploy_docs.sh
@@ -0,0 +1,65 @@
+#!/usr/bin/env bash
+GH_REPO="@github.com/asbru-cm-docs/asbrucm-docs.github.io.git"
+FULL_REPO="https://${GITHUB_API_KEY}$GH_REPO"
+
+if [ "$EXECUTE_BUILD_DOCS" != "true" ] || [ "$TRAVIS_BRANCH" != "master" ]; then
+    echo "Doc build skipped, flag=[$EXECUTE_BUILD_DOCS], branch is [$TRAVIS_BRANCH]."
+    exit 0
+fi
+
+if [ -z "$GITHUB_API_KEY" ]; then
+    echo "GITHUB_API_KEY not set.  This is probably a pull request from another repository.  Doc build skipped."
+    exit 0
+fi
+
+mkdir -p out
+cd out
+
+git init
+git remote add origin "$FULL_REPO"
+git fetch
+git config user.name "asbrucm-docs"
+git config user.email "travis@asbru-cm.net"
+git checkout master
+
+cd ../
+
+gem install rack -v 1.6.4
+gem install github_changelog_generator
+github_changelog_generator --token ${GITHUB_API_KEY} --release-branch master --user asbru-cm --project asbru-cm --output doc/General/Changelog.md --no-unreleased
+
+pip3 install --upgrade pip
+pip3 install --user --requirement <(cat <<EOF
+Click==7.0
+future==0.18.2
+Jinja2==2.11.1
+livereload==2.6.1
+lunr==0.5.6
+Markdown==3.2.1
+MarkupSafe==1.1.1
+mkdocs==1.1
+mkdocs-material==4.6.3
+nltk==3.4.5
+Pygments==2.5.2
+pymdown-extensions==6.3
+PyYAML==5.3
+six==1.14.0
+tornado==6.0.3
+EOF
+)
+
+mkdocs build --clean
+
+build_result=$?
+
+# Only deploy after merging to master
+if [ "$build_result" == "0" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "master" ]; then
+
+    cd out/
+    touch .
+    git add -A .
+    git commit -m "GH-Pages update by travis after $TRAVIS_COMMIT"
+    git push -q origin master
+else
+    exit ${build_result}  # return doc build result
+fi
diff --git a/scripts/deploy_loki.sh b/scripts/deploy_loki.sh
new file mode 100755
index 00000000..3e6a94d3
--- /dev/null
+++ b/scripts/deploy_loki.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+for f in build/*.${PACKAGE}
+do
+	echo "Processing $f"
+        cloudsmith push ${PACKAGE} asbru-cm/loki/${OS}/${DIST} $f
+done
+
+if [ $PACKAGE == "deb" ]
+then
+	cloudsmith push ${PACKAGE} asbru-cm/loki/${OS}/${DIST} build/*.dsc --sources-file build/*.debian.tar.xz
+fi
diff --git a/utils/anonymize.pl b/utils/anonymize.pl
new file mode 100644
index 00000000..d3d085ae
--- /dev/null
+++ b/utils/anonymize.pl
@@ -0,0 +1,107 @@
+#!/usr/bin/perl
+
+use utf8;
+binmode STDOUT,':utf8';
+binmode STDERR,':utf8';
+
+if (!$ARGV[0]) {
+	print "usage : perl anonymize.pl myfile.yml";
+}
+
+cleanUpPersonalData($ARGV[0]);
+
+sub cleanUpPersonalData {
+	my $file = shift;
+	my $out = 'debug.yml';
+
+	$SIG{__WARN__} = sub{};
+	print STDERR "SAVED IN : $file\nOUT: $out\n";
+	# Remove all personal information
+	open(F,"<:utf8",$file);
+	open(D,">:utf8",$out);
+	my $C = 0;
+	while (my $line = <F>) {
+		my $next = 0;
+		foreach my $key ('name','send','ip','user','prepend command','database','gui password','sudo password') {
+			if ($line =~ /^[\t ]+$key:/) {
+				$line =~ s/$key:.+/$key: 'removed'/;
+				$next = 1;
+			}
+			if ($next) {
+				next;
+			}
+		}
+		if ($line =~ /KPX title regexp/) {
+			$line =~ s/KPX title regexp:.+/KPX title regexp: ''/;
+		} elsif ($line =~ /^[\t ]+(title|name):/) {
+			my $p = $1;
+			if ($p eq 'name') {
+				$C++;
+			}
+			$line =~ s/$p:.+/$p: '$p $C'/;
+		} elsif (($line =~ /^[\t ]+(global variables|remote commands|local commands|expect|local before|local after|local connected):/) && ($line !~ /^[\t ]+(global variables|remote commands|local commands|expect|local before|local after|local connected): \[\]/)) {
+			my $global = 0;
+			my $indent = '';
+			if ($line =~ /global variables/) {
+				$global = 1;
+			}
+			if ($line =~ /^([\t ]+)/) {
+				$indent = $1;
+			}
+			print D $line;
+			while (my $l = <F>) {
+				if ($l =~ /^${indent}\w/) {
+					print D $l;
+					last;
+				} elsif ($global) {
+					next;
+				} elsif ($l =~ /description|expect|send|txt/) {
+					$l =~ s|(.+?):.+|$1: 'removed'|;
+				}
+				print D $l;
+			}
+			next;
+		} elsif ($line =~ /^[\t ]+options:/) {
+			$line =~ s/\/drive:.+?( |\')/\/drive: removed$1/;
+			$line =~ s/ disk:.+?( |\')/ disk: removed$1/;
+			$line =~ s/\/d:.+?( |\')/\/d: removed$1/;
+			$line =~ s/-d .+?( |\')/-d removed$1/;
+			if ($line =~ / -(D|L|R)/) {
+				$line =~ s/(^[\t ]+options):.+/$1: 'removed'/;
+			}
+		} elsif (($line =~ /^[\t ]+proxy (ip|pass|user):/)&&($line !~ /^[\t ]+proxy (ip|pass|user): \'\'/)) {
+			$line =~ s/(proxy.+?):.+/$1: 'removed'/;
+		} elsif (($line =~ /^[\t ]+jump (config|ip|pass|user|key):/)&&($line !~ /^[\t ]+jump (config|ip|pass|user|key): \'\'/)) {
+			$line =~ s/(jump.+?):.+/$1: 'removed'/;
+		} elsif ($line =~ /^[\t ]+description:/) {
+			$line =~ s/description:.+/description: 'Description'/;
+		} elsif ($line =~ /^[\t ]+public key: (.+)/) {
+			$line =~ s/public key:.+/public key: 'uses public key'/;
+		} elsif ($line =~ /^[\t ]+pass(word|phrase)?:/) {
+			$line =~ s/pass(word|phrase)?:.+/pass$1: 'removed'/;
+		} elsif ($line =~ /^[\t ]+use gui password( tray)?:/) {
+			$line =~ s/use gui password( tray)?:.+/use gui password$1: \'\'/;
+		} elsif ($line =~ /^[\t ]+passphrase user:/) {
+			$line =~ s/passphrase user:.+/passphrase user: 'removed'/;
+		}
+		$line =~ s|/home/.+?/|/home/PATH/|;
+		$line =~ s|$ENV{USER}|USER|;
+		print D $line;
+	}
+	# Add runtime information
+	print D "\n\n#$APPNAME : $APPVERSION\n\n# ENV Data\n";
+	my $user = $ENV{USER} ? $ENV{USER} : $ENV{LOGNAME};
+	foreach my $k (sort keys %ENV) {
+		if ($k =~ /token|hostname|startup|KPXC|AUTH/i) {
+			next;
+		}
+		my $str = $ENV{$k};
+		$str =~ s|$user|USER|g;
+		print D "#$k : $str\n";
+	}
+	print D "\n\n";
+	close F;
+	close D;
+	unlink $file;
+	return $out;
+}
diff --git a/utils/asbru2pac.pl b/utils/asbru2pac.pl
new file mode 100755
index 00000000..d50963ea
--- /dev/null
+++ b/utils/asbru2pac.pl
@@ -0,0 +1,188 @@
+#!/usr/bin/perl
+
+###############################################################################
+# This file is part of Ásbrú Connection Manager
+#
+# Copyright (C) 2020 Ásbrú Connection Manager team (https://asbru-cm.net)
+#
+# Ásbrú Connection Manager is free software: you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Ásbrú Connection Manager 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License version 3
+# along with Ásbrú Connection Manager.
+# If not, see <http://www.gnu.org/licenses/gpl-3.0.html>.
+###############################################################################
+
+use strict;
+use utf8;
+binmode STDOUT, ":utf8";
+binmode STDERR, ":utf8";
+
+use FindBin qw ($RealBin $Bin $Script);
+use lib "$RealBin/lib", "$RealBin/lib/ex", "$RealBin/lib/edit";
+
+use Config;
+
+our $VERBOSE        = $ARGV[2];
+our $SKIP_CONF      = $ARGV[3] // 0;
+our $CFG_DIR        = $ENV{"ASBRU_CFG"};
+our $BACKUP_DIR     = "bak";
+our $CFG_FILE_NAME  = "pac.yml";
+
+if ($VERBOSE) {
+    print STDERR "INFO: Executing downgrade from Ásbrú to PAC\n";
+    print STDERR "INFO: $ARGV[0] , $ARGV[1]\n";
+    print STDERR "INFO: RealBin = $RealBin\n";
+}
+
+if (!$ARGV[0] || !$ARGV[1]) {
+    print STDERR "INFO: Migration aborted missing directories\n";
+    exit 1;
+}
+
+migrate($ARGV[0], $ARGV[1]);
+
+exit 0;
+
+sub migrate {
+    my ($old_dir, $new_dir) = @_;
+    my ($ss);
+
+    if ($VERBOSE) {
+        print "INFO: Downgrade messages:\n";
+        print "  - Show confirmation dialog\n";
+    }
+    if (!$SKIP_CONF) {
+        my $resp = _wPopUP('Confirm', 'Ásbrú Downgrade Confirmation', setMessage());
+        if ($resp ne 'OK') {
+            if ($resp eq 'NOT AVAILABLE') {
+                print "WARN: Continue without gtk3 warning\n";
+            } else {
+                print "WARN: Ásbrú downgrade aborted\n";
+                exit 1;
+            }
+        }
+    }
+    if (-e $new_dir) {
+        if ($VERBOSE) {
+            print "  - $new_dir exists, we should not be here\n";
+        }
+        # Downgrade only once
+        return 0;
+    }
+    # Move saved upgraded dirs forward
+    for (my $n = 8; $n >= 0; $n--) {
+        my $m = $n+1;
+        if (-e "$old_dir.new$n") {
+            if (-e "$old_dir.old$m") {
+                system "$ENV{'ASBRU_ENV_FOR_EXTERNAL'} rm -Rf $old_dir.new$m";
+            }
+            system "$ENV{'ASBRU_ENV_FOR_EXTERNAL'} mv -f $old_dir.new$n $old_dir.new$m";
+        }
+    }
+    system "$ENV{'ASBRU_ENV_FOR_EXTERNAL'} cp -Rfp $old_dir $old_dir.new0";
+    if ($VERBOSE) {
+        print "  - Create $new_dir\n";
+    }
+    system "$ENV{'ASBRU_ENV_FOR_EXTERNAL'} mv $old_dir $new_dir";
+    foreach my $f ('asbru.yml', 'asbru_notray.notified', 'asbru.pcc', 'asbru.yml.gui', 'asbru.yml.tree', 'asbru_start.desktop', 'asbru.dumper') {
+        my $n = $f;
+        $n =~ s/asbru/pac/;
+        if (-e "$new_dir/$f") {
+            if ($VERBOSE) {print "  - move $f -> $n\n";}
+            system "$ENV{'ASBRU_ENV_FOR_EXTERNAL'} mv -f $new_dir/$f $new_dir/$n";
+        }
+    }
+    foreach my $f ('asbru_start.desktop') {
+        my $n = $f;
+        $n =~ s/asbru/pac/;
+        if (-e "$new_dir/autostart/$f") {
+            if ($VERBOSE) {
+                print "  - mv $f -> $n\n";
+            }
+            system "$ENV{'ASBRU_ENV_FOR_EXTERNAL'} mv -f $new_dir/autostart/$f $new_dir/autostart/$n";
+        }
+    }
+    # Rename BackUps
+    my $BACKUP_CFG_FILE  = "$CFG_DIR/$BACKUP_DIR/asbru.yml";
+    if ($VERBOSE) {
+        print "  - Move backups\n";
+    }
+    for (my $n=0; $n < 10; $n++) {
+        if (-e "$BACKUP_CFG_FILE.$n") {
+            system "$ENV{'ASBRU_ENV_FOR_EXTERNAL'} mv -f $BACKUP_CFG_FILE.$n $CFG_DIR/$BACKUP_DIR/$CFG_FILE_NAME.$n";
+        }
+    }
+    # Rename screenshost
+    if ($VERBOSE) {
+        print "  - Rename screenshots\n";
+    }
+    opendir($ss, "$new_dir/screenshots");
+    while (my $f = readdir($ss)) {
+        if ($f =~ /\.png/) {
+            my $n = $f;
+            $n =~ s/asbru/pac/;
+            system "$ENV{'ASBRU_ENV_FOR_EXTERNAL'} mv -f $new_dir/screenshots/$f $new_dir/screenshots/$n";
+        }
+    }
+    # Process asbru.yml
+    if ($VERBOSE) {
+        print "  - Fix paths in pac.yml\n";
+    }
+    open(YMLO, "<:utf8", "$new_dir/pac.yml");
+    open(YMLN, ">:utf8", "$new_dir/pac.yml.new");
+    while (my $l = <YMLO>) {
+        if ($l =~ m|$old_dir|) {
+            $l =~ s|$old_dir|$new_dir|;
+        } elsif ($l =~ /asbru_/) {
+            $l =~ s|asbru_|pac_|g;
+        }
+        print YMLN $l;
+    }
+    close YMLO;
+    close YMLN;
+    system "$ENV{'ASBRU_ENV_FOR_EXTERNAL'} mv -f $new_dir/pac.yml.new $new_dir/pac.yml";
+    # Remove nfreeze
+    if ($VERBOSE) {print "  - Remove nfreeze files to be recreated\n";}
+    system "$ENV{'ASBRU_ENV_FOR_EXTERNAL'} rm -f $new_dir/*.nfreeze";
+    return 0;
+
+    # Set warning message
+    # do not worry about tabs, spaces at the beginning ; Pango markup is OK
+    sub setMessage {
+        my $dir = shift;
+        my $msg = qq”Your configuration directory has been upgraded to a newer version of Ásbrú
+        that cannot be loaded by this version.
+
+        Do you want to downgrade your migrated configuration data ?
+
+        You may click <b>Cancel</b> to stop this operation immediately,
+        or <b>Continue</b> to start the downgrade.
+        ”;
+
+        if (!$VERBOSE) {
+            $msg .= "\nTo see detailed messages during the migration process,\nrun <b><i>asbru-cm --verbose</i></b> in a terminal.\n";
+        }
+
+        return $msg;
+    }
+}
+
+sub _wPopUP {
+    my ($type, $title, $msg) = @_;
+    my $PATH = "$RealBin/";
+
+    $msg =~ s/\t//mg;
+    $msg =~ s/^ +//mg;
+    $msg =~ s/\n/&cr;/g;
+    $msg =~ s/\"/&dquot;/g;
+    $msg =~ s/\'/&squot;/g;
+    return `'$^X' $PATH/asbru_confirm.pl '$type' '$title' '$msg' `;
+}
diff --git a/utils/asbru_confirm.pl b/utils/asbru_confirm.pl
new file mode 100755
index 00000000..e9775632
--- /dev/null
+++ b/utils/asbru_confirm.pl
@@ -0,0 +1,83 @@
+#!/usr/bin/perl
+
+###############################################################################
+# This file is part of Ásbrú Connection Manager
+#
+# Copyright (C) 2020 Ásbrú Connection Manager team (https://asbru-cm.net)
+# 
+# Ásbrú Connection Manager is free software: you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# Ásbrú Connection Manager 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 General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License version 3
+# along with Ásbrú Connection Manager.
+# If not, see <http://www.gnu.org/licenses/gpl-3.0.html>.
+###############################################################################
+
+use strict;
+
+use Gtk3 '-init';
+use utf8;
+use Encode;
+
+our (%window, %opt);
+
+($opt{type}, $opt{title}, $opt{msg}) = ($ARGV[0], decode('utf8',$ARGV[1]), decode('utf8',$ARGV[2]));
+
+$opt{msg} =~ s/&cr;/\n/g;
+$opt{msg} =~ s/&squot;/\'/g;
+$opt{msg} =~ s/&dquot;/\"/g;
+
+$window{main} = Gtk3::Window->new('GTK_WINDOW_TOPLEVEL');
+$window{main}->set_title($opt{'title'});
+$window{main}->set_position('center');
+$window{main}->set_keep_above(1);
+$window{main}->set_deletable(0);
+$window{main}->set_resizable(0);
+$window{main}->set_default_size(200, 100);
+$window{main}->signal_connect('destroy' => sub {
+    print "CANCEL";
+    Gtk3->main_quit();
+});
+$window{main}->set_border_width(8);
+
+$window{frame} = Gtk3::Frame->new();
+$window{main}->add($window{frame});
+
+$window{frame}{vbox} = Gtk3::VBox->new();
+$window{frame}{vbox}->set_border_width(8);
+$window{frame}->add($window{frame}{vbox});
+
+$window{frame}{msg} = Gtk3::Label->new();
+$window{frame}{msg}->set_markup($opt{msg});
+$window{frame}{vbox}->pack_start($window{frame}{msg}, 1, 1, 0);
+
+$window{frame}{hbox} = Gtk3::HBox->new();
+$window{frame}{vbox}->pack_start($window{frame}{hbox}, 1, 1, 0);
+if ($opt{type} eq 'Confirm') {
+    $window{frame}{btnCancel} = Gtk3::Button->new('Cancel');
+    $window{frame}{hbox}->pack_start($window{frame}{btnCancel}, 1, 1, 0);
+    $window{frame}{btnCancel}->signal_connect( 'clicked' => sub {
+        print "CANCEL";
+        Gtk3->main_quit();
+    });
+}
+
+$window{frame}{btnContinue} = Gtk3::Button->new('Continue');
+$window{frame}{hbox}->pack_start($window{frame}{btnContinue}, 1, 1, 0);
+
+$window{frame}{btnContinue}->signal_connect('clicked' => sub {
+    print "OK";
+    Gtk3->main_quit();
+});
+
+
+$window{main}->show_all();
+
+Gtk3->main();
diff --git a/utils/asbru_from_superputty.py b/utils/asbru_from_superputty.py
index e4eee1b0..dc792874 100755
--- a/utils/asbru_from_superputty.py
+++ b/utils/asbru_from_superputty.py
@@ -1,12 +1,12 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 #Author: Brian Raaen
 #Original code: https://www.brianraaen.com/2016/11/04/superputty-to-pac-manager/
 #
-#This script can convert a SuperPutty Sessions.xml file to an Asbru-cm yaml file. The  
-#resulting yaml file can then be imported into Asbru-cm.   
-#This script does require tweaking for your personal setup in the template section. 
+#This script can convert a SuperPutty Sessions.xml file to an Asbru-cm yaml file. The
+#resulting yaml file can then be imported into Asbru-cm.
+#This script does require tweaking for your personal setup in the template section.
 #For example, add the location of your personal ssh keys to "public key: /home/user".
-#Similarly if you want to use a jump off box you can add it to the options section.  
+#Similarly if you want to use a jump off box you can add it to the options section.
 #options: ' -X -o "proxycommand=ssh -W %h:%p myhostname.com"'
 #To create the Asbru-cm yaml file place your SuperPutty Sessions.xml file in the same
 # directory as this script and run asbru_from_superputty.py >importfile.yml.
@@ -14,7 +14,7 @@
 
 import uuid
 import xml.etree.ElementTree as ET
- 
+
 def branchListImport(devices):
     temp = []
     branches = {}
@@ -34,8 +34,8 @@ def branchListImport(devices):
             if str(x.uuid) == str(y.parent):
                 x.addChild(y.uuid)
     return temp
- 
- 
+
+
 def deviceListImport(devices, branchList):
     temp = []
     for x in devices:
@@ -47,8 +47,8 @@ def deviceListImport(devices, branchList):
                 y.addChild(str(x.uuid))
                 break
     return temp
- 
- 
+
+
 class device(object):
     def __init__(self, description="", parentName="Unknown", parentUuid=False, uuidNumber=False, ip="", port="", method="", username="", password=False):
         self.description = description
@@ -76,7 +76,7 @@ def __hash__(self):
     def __str__(self):
         return str(self.uuid)
     def __repr__(self):
-        return 'pac_template.device(description="{}", parentName={}, parentUuid="{}", uuidNumber="{}", ip="{}", port="{}", method="{}", username="{}", password="{}"'.format(self.description, self.parentName, self.parentUuid, self.uuid, self.ip, self.port, self.method, self.username, self.password)
+        return 'asbru_template.device(description="{}", parentName={}, parentUuid="{}", uuidNumber="{}", ip="{}", port="{}", method="{}", username="{}", password="{}"'.format(self.description, self.parentName, self.parentUuid, self.uuid, self.ip, self.port, self.method, self.username, self.password)
     @property
     def ymlString(self):
         if self.password == False:
@@ -84,8 +84,8 @@ def ymlString(self):
         else:
             password = self.password
         return elementTemplate.format(uuid=self.uuid, ip=self.ip, desc=self.description, parent=self.parentUuid, port=self.port, method=self.method, username=self.username, password=password)
- 
- 
+
+
 class branchPoint(object):
     def __init__(self, description="", name="", parent="__PAC__EXPORTED__", children=False,uuidNumber=False):
         self.description = description
@@ -104,7 +104,7 @@ def __hash__(self):
     def __str__(self):
         return str(self.uuid)
     def __repr__(self):
-        return 'pac_template.branchPoint(description="{}", name={}, parent="{}", children={}, uuidNumber="{}"'.format(self.description, self.name, self.parent, self.children, self.uuid)
+        return 'asbru_template.branchPoint(description="{}", name={}, parent="{}", children={}, uuidNumber="{}"'.format(self.description, self.name, self.parent, self.children, self.uuid)
     def addChild(self, child):
         if self.children == False:
             self.children = []
@@ -117,7 +117,7 @@ def ymlString(self):
                 temp += "    {}: 1\n".format(x)
         temp += "  cluster: []\n  description: Connection group '{0}'\n  name: {0}\n  parent: {1}\n  screenshots: ~\n  variables: []".format(self.description, self.parent)
         return temp
- 
+
 elementTemplate = """{uuid}:
   KPX title regexp: '.*{desc}.*'
   _is_group: 0
@@ -160,8 +160,10 @@ def ymlString(self):
   screenshots: ~
   search pass on KPX: 0
   send slow: 0
+  socks5 tunnel active: ''
   send string active: ''
   send string every: 60
+  send string only when idle: 0
   send string intro: 1
   send string txt: ''
   session log pattern: <UUID>_<NAME>_<DATE_Y><DATE_M><DATE_D>_<TIME_H><TIME_M><TIME_S>.txt
@@ -205,7 +207,7 @@ def ymlString(self):
   use sudo: ''
   user: {username}
   variables: []"""
- 
+
 def main():
     temp = []
     tree = ET.parse('Sessions.xml')
@@ -216,14 +218,14 @@ def main():
             devices.append(child.attrib)
     branchList = branchListImport(devices)
     deviceList = deviceListImport(devices, branchList)
- 
+
     temp.append("---\n__PAC__EXPORTED__:\n  children:")
     temp += ["    {}: 1".format(str(x.uuid)) for x in branchList if '__PAC__EXPORTED__' == x.parent]
     temp += [x.ymlString for x in branchList]
     temp += [x.ymlString for x in deviceList]
- 
+
     print("\n".join(temp))
- 
- 
+
+
 if __name__ == "__main__":
   main()
diff --git a/utils/pac2asbru.pl b/utils/pac2asbru.pl
new file mode 100755
index 00000000..8aff441f
--- /dev/null
+++ b/utils/pac2asbru.pl
@@ -0,0 +1,196 @@
+#!/usr/bin/perl
+
+###############################################################################
+# This file is part of Ásbrú Connection Manager
+#
+# Copyright (C) 2020 Ásbrú Connection Manager team (https://asbru-cm.net)
+#
+# Ásbrú Connection Manager is free software: you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Ásbrú Connection Manager 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License version 3
+# along with Ásbrú Connection Manager.
+# If not, see <http://www.gnu.org/licenses/gpl-3.0.html>.
+###############################################################################
+
+use strict;
+use utf8;
+binmode STDOUT, ":utf8";
+binmode STDERR, ":utf8";
+
+use FindBin qw ($RealBin $Bin $Script);
+use lib "$RealBin/lib", "$RealBin/lib/ex", "$RealBin/lib/edit";
+
+use Config;
+
+our $VERBOSE        = $ARGV[2];
+our $CFG_DIR        = $ENV{"ASBRU_CFG"};
+our $BACKUP_DIR     = "bak";
+our $CFG_FILE_NAME  = "asbru.yml";
+
+if ($VERBOSE) {
+    print STDERR "INFO: Executing migration from PAC to Ásbrú\n";
+    print STDERR "INFO: $ARGV[0] , $ARGV[1]\n";
+    print STDERR "INFO: RealBin = $RealBin\n";
+}
+
+if (!$ARGV[0] || !$ARGV[1]) {
+    print STDERR "INFO: Migration aborted missing directories\n";
+    exit 1;
+}
+
+migrate($ARGV[0], $ARGV[1]);
+
+exit 0;
+
+sub migrate {
+    my ($old_dir, $new_dir) = @_;
+    my ($ss);
+
+    if ($VERBOSE) {
+        print "INFO: Migration messages:\n";
+        print "  - Show confirmation dialog\n";
+    }
+    my $resp = _wPopUP('Confirm', 'Ásbrú Migration Confirmation', setMessage("$old_dir.old"));
+    if ($resp ne 'OK') {
+        if ($resp eq 'NOT AVAILABLE') {
+            print "WARN: Continue without gtk3 warning\n";
+        } else {
+            print "WARN: Ásbrú migration aborted\n";
+            if ($old_dir =~ /\.migration/) {
+                # Fix non standard config dir back to how it was
+                if ($VERBOSE) {
+                    print "  - Recover none standard directory $old_dir -> $new_dir\n";
+                }
+                system "$ENV{'ASBRU_ENV_FOR_EXTERNAL'} mv -f $old_dir $new_dir";
+            }
+            exit 1;
+        }
+    }
+    if (-e $new_dir) {
+        if ($VERBOSE) {
+            print "  - $new_dir exists, we should not be here\n";
+        }
+        # Migrate only once
+        return 0;
+    }
+    # Move saved dirs forward
+    for (my $n = 8; $n >= 0; $n--) {
+        my $m = $n+1;
+        if (-e "$old_dir.old$n") {
+            if (-e "$old_dir.old$m") {
+                system "$ENV{'ASBRU_ENV_FOR_EXTERNAL'} rm -Rf $old_dir.old$m";
+            }
+            system "$ENV{'ASBRU_ENV_FOR_EXTERNAL'} mv -f $old_dir.old$n $old_dir.old$m";
+        }
+    }
+    if (-e "$old_dir.old") {
+        system "$ENV{'ASBRU_ENV_FOR_EXTERNAL'} mv -f $old_dir.old $old_dir.old0";
+    }
+    system "$ENV{'ASBRU_ENV_FOR_EXTERNAL'} cp -rfpL $old_dir $old_dir.old";
+    if ($VERBOSE) {
+        print "  - Create $new_dir\n";
+    }
+    system "$ENV{'ASBRU_ENV_FOR_EXTERNAL'} mv $old_dir $new_dir";
+    foreach my $f ('pac.yml', 'pac_notray.notified', 'pac.pcc', 'pac.yml.gui', 'pac.yml.tree', 'pac_start.desktop', 'pac.dumper') {
+        my $n = $f;
+        $n =~ s/pac/asbru/;
+        if (-e "$new_dir/$f") {
+            if ($VERBOSE) {print "  - move $f -> $n\n";}
+            system "$ENV{'ASBRU_ENV_FOR_EXTERNAL'} mv -f $new_dir/$f $new_dir/$n";
+        }
+    }
+    foreach my $f ('pac_start.desktop') {
+        my $n = $f;
+        $n =~ s/pac/asbru/;
+        if (-e "$new_dir/autostart/$f") {
+            if ($VERBOSE) {
+                print "  - mv $f -> $n\n";
+            }
+            system "$ENV{'ASBRU_ENV_FOR_EXTERNAL'} mv -f $new_dir/autostart/$f $new_dir/autostart/$n";
+        }
+    }
+    # Rename Backups
+    my $BACKUP_CFG_FILE  = "$CFG_DIR/$BACKUP_DIR/pac.yml";
+    if ($VERBOSE) {
+        print "  - Move backups\n";
+    }
+    for (my $n=0; $n < 10; $n++) {
+        if (-e "$BACKUP_CFG_FILE.$n") {
+            system "$ENV{'ASBRU_ENV_FOR_EXTERNAL'} mv -f $BACKUP_CFG_FILE.$n $CFG_DIR/$BACKUP_DIR/$CFG_FILE_NAME.$n";
+        }
+    }
+    # Rename screenshost
+    if ($VERBOSE) {
+        print "  - Rename screenshots\n";
+    }
+    opendir($ss, "$new_dir/screenshots");
+    while (my $f = readdir($ss)) {
+        if ($f =~ /\.png/) {
+            my $n = $f;
+            $n =~ s/pac/asbru/;
+            system "$ENV{'ASBRU_ENV_FOR_EXTERNAL'} mv -f $new_dir/screenshots/$f $new_dir/screenshots/$n";
+        }
+    }
+    # Process pac.yml
+    if ($VERBOSE) {
+        print "  - Fix paths in asbru.yml\n";
+    }
+    open(YMLO, "<:utf8", "$new_dir/asbru.yml");
+    open(YMLN, ">:utf8", "$new_dir/asbru.yml.new");
+    while (my $l = <YMLO>) {
+        if ($l =~ m|$old_dir|) {
+            $l =~ s|$old_dir|$new_dir|;
+        } elsif ($l =~ /pac_/) {
+            $l =~ s|pac_|asbru_|g;
+        }
+        print YMLN $l;
+    }
+    close YMLO;
+    close YMLN;
+    system "$ENV{'ASBRU_ENV_FOR_EXTERNAL'} mv -f $new_dir/asbru.yml.new $new_dir/asbru.yml";
+    # Remove nfreeze
+    if ($VERBOSE) {print "  - Remove nfreeze files to be recreated\n";}
+    system "$ENV{'ASBRU_ENV_FOR_EXTERNAL'} rm -f $new_dir/*.nfreeze";
+    return 0;
+
+    # Set warning message, do not worrie about tabs, spaces at the beggining
+    # Pango markup is OK
+    sub setMessage {
+        my $dir = shift;
+        my $msg = qq”Before you can use this version of Ásbrú Connection Manager, your configuration needs to be migrated.
+
+        A backup copy of your original configuration will be created at : <b>$dir</b>
+
+        You can downgrade from your package manager if the migration fails.
+
+        You may click <b>Cancel</b> to stop this operation immediately,
+        or <b>Continue</b> to start the migration.
+        ”;
+
+        if (!$VERBOSE) {
+            $msg .= "\nTo see detailed messages during the migration process,\nrun <b><i>asbru-cm --verbose</i></b> in a terminal.\n";
+        }
+
+        return $msg;
+    }
+}
+
+sub _wPopUP {
+    my ($type, $title, $msg) = @_;
+    my $PATH = "$RealBin/";
+
+    $msg =~ s/\t//mg;
+    $msg =~ s/^ +//mg;
+    $msg =~ s/\n/&cr;/g;
+    $msg =~ s/\"/&dquot;/g;
+    $msg =~ s/\'/&squot;/g;
+    return `'$^X' $PATH/asbru_confirm.pl '$type' '$title' '$msg' `;
+}