Minimized packages

2021-10-28 15:57:06 +02:00
parent 04dfb19349
commit a18780614b
113 changed files with 321 additions and 8531 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,15 @@
 .venv/
 doc/html/
+cache
+cache/
+chroot/
+chroot
+chroot.*
+binary/
+binary
+.build
+build.log
+live-image*
+binary.modified_timestamps
+*.deb
+*.iso
--- a/.readthedocs.yml
+++ b/.readthedocs.yml
@@ -1,15 +0,0 @@
-# .readthedocs.yml
-# Read the Docs configuration file
-# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
-
-# Required
-version: 2
-
-# Build documentation with MkDocs
-sphinx:
-  configuration: doc/md/conf.py
-
-# Optionally set the version of Python and requirements required to build your docs
-# https://github.com/rtfd/readthedocs.org/issues/5250
-python:
-  version: 3.5
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,207 +0,0 @@
-# Change Log
-
-All notable changes to this project will be documented in this file.  
-The format is based on [Keep a Changelog](http://keepachangelog.com/).
-
-## [v3.0.0](https://gitlab.com/nodiscc/dlc/releases/tag/3.0.0) - UNRELEASED
-
-### Changed
-
- rebase on [Debian 11.1.0 "Bullseye"](https://www.debian.org/releases/bullseye/)
- doc: increase RAM requirements to 2GB/recommended 4GB
- apt: update APT sources lists/configuration
- replace [backintime](https://packages.debian.org/bullseye/backintime-qt) backup tool with [deja-dup](https://wiki.gnome.org/Apps/DejaDup)
- games: install lutris from official Debian repositories, remove third-party package download
- extras: use `.deb` packages to manage additional/unofficial software ([bleachbit-cleanerml](https://github.com/bleachbit/cleanerml), [yt-dlp](https://github.com/yt-dlp/yt-dlp), [pidgin-opensteamworks](https://github.com/eionrobb/pidgin-opensteamworks), [user.js](https://github.com/nodiscc/user.js)), remove custom installation logic, update all extra packages to latest releases
- network/audio-video: replace [youtube-dl](https://packages.debian.org/bullseye/youtube-dl)/[streamlink](https://packages.debian.org/bullseye/streamlink) with [yt-dlp](https://github.com/yt-dlp/yt-dlp) ([third-party package](https://nodiscc.gitlab.io/toolbox/))
- skel: update and fix [conky](https://packages.debian.org/bullseye/conky-all) configuration for recent versions
- skel/session: don't autostart blueman bluetooth manager by default
- skel/session: don't autostart keepassxc by default
- skel: update default UI configuration for thunar, ristretto, xfce4-desktop, xfce4-panel
- skel: replace xfce4-power-manager notification icon with battery panel plugin
- skel: xfwm4: enable video compositing by default (transparency effects)
- skel: xfwm4: disable confusing "Use mouse wheel on title bar to roll up the window" setting
- skel: thunar: add custom right-click menu actions to restore files/directories with deja-dup, and analyze disk usage (baobab) in the selected directory
- skel: vlc: don't ask for network metadata access, disable it by default
- reduce ISO image size (don't keep APT indices on the live filesystem)
- doc: update user/maintainer documentation/download links
- doc: installation: rotate GPG key (old key expired)
- doc: update alternative/suggested packages list, remove packages no longer available in Debian 11
- skel/desktop: update backgrounds/themes for Debian 11
- skel: update default bash aliases (alias `diff` to `colordiff`, don't alias `diff`)
- tools: update tests/build configuration and tools, make build completely non-interactive
- system/config: enable UFW firewall at boot by default
-
-### Added
-
- network: add support for more protocols in pidgin instant messenger: [Discord](https://packages.debian.org/bullseye/purple-discord), [Telegram](https://packages.debian.org/bullseye/telegram-purple), [Rocket.Chat](https://packages.debian.org/bullseye/purple-rocketchat), XMPP [HTTP upload](https://packages.debian.org/bullseye/purple-xmpp-http-upload) and [message carbons](https://packages.debian.org/bullseye/purple-xmpp-carbons), [OMEMO encryption](https://packages.debian.org/bullseye/purple-lurch)
- graphics: add [gcolor3](https://packages.debian.org/bullseye/gcolor3) color picker
- doc: add [Software: Extras](https://debian-live-config.readthedocs.io/en/latest/packages/extras.html) page listing all third-party downloads
-
-### Removed
-
- system: remove [primus](https://packages.debian.org/bullseye/primus) (conflicts with nvidia drivers), [irqbalance](https://packages.debian.org/bullseye/irqbalance) (unused, 
- utilities: remove [xfce4-notes](https://packages.debian.org/buster/xfce4-notes) (package was removed from Debian 11)
- remove less used/unused packages by default, reduce dependencies and image size: [asunder](https://packages.debian.org/bullseye/asunder) (audio CD ripper), [xfburn](https://packages.debian.org/bullseye/xfburn) (CD/DVD burning), [libasound2-plugin-equal](https://packages.debian.org/bullseye/libasound2-plugin-equal) (can be replaced with [pulseaudio-equalizer](https://packages.debian.org/bullseye/pulseaudio-equalizer)),  [gimp-gmic](https://packages.debian.org/bullseye/gimp-gmic) (image processing utilities), [pulseaudio-module-zeroconf](https://packages.debian.org/bullseye/pulseaudio-module-zeroconf), [pandoc](https://packages.debian.org/bullseye/pandoc) (documentation generator), [advancecomp](https://packages.debian.org/bullseye/advancecomp) (compression utilities), [blender](https://packages.debian.org/bullseye/blender) (3D editor), [shellcheck](https://packages.debian.org/bullseye/shellcheck), [asciinema](https://packages.debian.org/bullseye/asciinema), [gnome-settings-daemon](https://packages.debian.org/bullseye/gnome-settings-daemon), [wine](https://packages.debian.org/bullseye/wine) (let lutris manage wine versions/architectures), [inkscape](https://packages.debian.org/bullseye/inkscape) vector editor, [pstoedit](https://packages.debian.org/bullseye/pstoedit), [gimp-help-fr](https://packages.debian.org/bullseye/gimp-help-fr), [cmatrix](https://packages.debian.org/bullseye/cmatrix), [gitg](https://packages.debian.org/bullseye/gitg) (git repository viewer), reduce number of default installed fonts
- extras: remove [xfce4-terminal-colorschemes](https://gitlab.com/nodiscc/xfce4-terminal-colorschemes)
- extras: remove custom [nano text editor syntax highlighting](https://github.com/scopatz/nanorc)
- remove custom grub configuration, revert to debian defaults
- remove [HTTPS everywhere](https://packages.debian.org/bullseye/webext-https-everywhere) firefox addon (replaced with built-in "HTTPS only" mode)
-
-### Fixed
-
- always install/upgrade Linux kernel and Nvidia drivers from [backports](https://backports.debian.org/)
- fix default file associations for text and media files
- fix unbootable system when selecting "whole disk with encrypted LVM" in debian installer disk partitioning options
-
-### Upgrade procedure
-
-If you have a system installed from a previous version of `debian-live-config`:
-
- Recommended: [Backup](https://backintime.readthedocs.io/en/latest/) user data, [download](https://debian-live-config.readthedocs.io/en/latest/download-and-installation.html) the latest ISO image, reinstall (overwrite the existing installation), restore data from backups
- To upgrade without reinstalling:
-
-```bash
-# read Debian 11 release notes: https://www.debian.org/News/2021/20210814
-# replace buster with bullseye in your APT sources
-sudo sed -i 's/buster/bullseye/g' /etc/apt/sources.list /etc/apt/sources.list.d/*
-# install the updated APT configuration
-sudo rm -v /etc/apt/sources.list.d/debian-buster-updates-security-backports.list
-wget https://gitlab.com/nodiscc/debian-live-config/-/blob/bullseye/config/archives/debian-updates-security-backports.list.chroot
-sudo mv -v debian-updates-security-backports.list.chroot /etc/apt/sources.list.d/
-# run the upgrade
-sudo apt update && sudo apt dist-upgrade
-# optionally, update your configuration according to changes since the last release:
-# https://gitlab.com/nodiscc/debian-live-config/-/compare/2.2.5...3.0.0
-# /etc/skel modifications will only take effect after creating a new user account
-```
-
-## [v2.2.5](https://gitlab.com/nodiscc/dlc/releases/tag/2.2.5) - 2020-12-16
-
-### Removed
-
- remove [Liferea](https://packages.debian.org/buster/liferea) feed reader from default install
- remove [gnome-maps](https://packages.debian.org/buster/gnome-maps) from default install
-
-### Fixed
-
- nano: fix loading of syntax highlighting configuratio from ~/.nano/*.nanorc
-
-
-### Changed
-
- update third-party Lutris package to 0.5.8.1
- update documentation/.gitconfig examples
- tools: improve build/cleanup mechanisms
-
-------------------------------
-
-## [v2.2.4](https://gitlab.com/nodiscc/dlc/releases/tag/2.2.4) - 2020-10-22
-
-### Added
-
- add [Lutris](https://lutris.net) gaming platform
- add sensible defaults for mousepad text editor
-
-### Fixed
-
- fix display of virt-manager console (add missing  gir1.2-spiceclientgtk-3.0 package)
-
-
-### Changed
-
- update all packages to latest version (Debian 10.6)
- replace ntp time synchronization service with [chrony](https://chrony.tuxfamily.org/)
- keyboard shortcuts: add ctrl+alt+shift+left/down/right/up to move current windows to the left/down/right/up workspace
- libvirt: set the default URI to qemu:///system (virsh now works without sudo or --connect)
- dotfiles/conky: don't draw shades by default
- update documentation
- tools: various Makefile improvements
-
-------------------------------
-
-## [v2.2.3](https://gitlab.com/nodiscc/dlc/releases/tag/2.2.3) - 2020-05-10
-
-Bugfix release.
-
-### Fixed
-
- packages: add non-free nvidia-driver (fix no display at X startup on nvidia cards)
- packages: fix inability to mount luks encrypted disks (missing libblockdev-crypto2 package)
- packages: fix lightdm not showing the user list (missing accountsservice package)
- doc: fix readthedocs TOC/typos/syntax, reorder graphics package list, update auto-generated documentation (make doc), add links to source mirrors
-
-### Changed
-
- dotfiles: .bash_aliases: add example of return code indication in bash prompt
- tools: remove unused build dependencies (xmlstarlet, shellcheck), add gnupg to build dependencies (checksums signing), add python3-venv to build dependencies (doc generation)
-
-------------------------------
-
-## [v2.2.2](https://gitlab.com/nodiscc/debian-live-config/-/tags/2.2.2) - 2020-04-11
-
-### Changed
-
- Disable window manager compositor by default (improve video performance/prevent tearing)
- Update user.js to 0.1
- Remove unused locales from live system (only keep en/fr), decrease iso image size
-
-### Added
-
- Documentation at https://debian-live-config.readthedocs.io/ (auto-generated with Sphinx/python script)
-
-### Fixed
-
- Fix APT sources lists not present in the final image
- Improve/cleanup makefile and package lists
- Fix error during installation in EFI boot mode
-
-
-------------------------------
-
-
-## [v2.2.1](https://gitlab.com/nodiscc/debian-live-config/-/tags/2.2.1) - 2020-03-14
-
-### Changed
-
- remove all plymouth/wallpaper customizations, use Debian defaults
- display plymouth boot loading screen
- Makefile: move 3rd party downloads to separate file, improve 'clean' target, improve idempotence/separation of concerns
- skel: quodlibet: set default rating to 0
- skel: xfwm: decrease default number of workspaces to 2
- skel: xfwm4: disable window shadows
- update README
-
-### Added
-
- add third party package for https://github.com/EionRobb/pidgin-opensteamworks/
- add third party download for https://addons.mozilla.org/en-US/firefox/addon/keepassxc-browser/
- add third party download for https://addons.mozilla.org/en-US/firefox/addon/cookie-autodelete/
- add third party download for https://github.com/nodiscc/user.js
- add third-party download for https://github.com/az0/cleanerml
- add (disabled) third party download for  https://www.sublimetext.com/
- Makefile: add a target to generate a TODO.md from a list of gitea issues, add TODO.md
-
-### Removed
-
- remove Samba server
-
-### Fixed
-
- fix broken installation of graphics/image packages list
- associate SVG files with ristretto
-
-------------------------------
-
-## [v2.2](https://gitlab.com/nodiscc/dlc/releases/tag/2.2) - 2020-03-08
-
-Initial release, git repository reset and rebuilt from scratch. See commit messages and documentation.
-
-<!--
-### Changed
-### Added
-### Removed
-### Fixed
-### Security
-### Deprecated
-->
--- a/4
+++ b/4
@@ -4,14 +4,14 @@
 SHELL := /bin/bash

 # remove 'download_extra' to build without third party software/dotfiles
-all: install_buildenv download_extra build
+all: install_buildenv build

 download_extra:
 	make -f Makefile.extra

 install_buildenv:
 	# Install packages required to build the image
-	sudo apt -y install live-build make build-essential wget git unzip colordiff apt-transport-https rename ovmf rsync python3-venv gnupg
+	sudo apt -y install live-build make build-essential wget git unzip colordiff apt-transport-https rename ovmf rsync python3-venv gnupg apt-utils cpio

 ##############################

--- a/Makefile.extra
+++ b/Makefile.extra
@@ -1,5 +1,4 @@
 #!/usr/bin/make
-# please update doc/md/packages/extras.md after adding changes to this file
 WGET=wget --continue --no-verbose --show-progress --directory-prefix=cache/downloads/

 all: download_extra
@@ -7,36 +6,16 @@ all: download_extra
 clean:
 	rm -rvf config/packages.chroot/
 	rm -rvf cache/downloads
-	rm -rf config/includes.chroot/usr/lib/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}
 	
 clean_all: clean
 	rm -rvf cache/downloads/


 download_extra: clean
-	# Download additional software from third-party repository (https://nodiscc.gitlab.io/toolbox)
 	# TODO use the APT repository at build time, but disable it in the final chroot/image
 	# TODO file ITPs on bugs.debian.org
 	mkdir -p cache/downloads/ config/packages.chroot/
    
-	# EXTRA https://github.com/az0/cleanerml
-	$(WGET) https://nodiscc.gitlab.io/toolbox/pool/main/b/bleachbit-cleanerml/bleachbit-cleanerml_0.0.1~git0+5bc2961_all.deb
-	cp cache/downloads/bleachbit-cleanerml_0.0.1~git0+5bc2961_all.deb config/packages.chroot/
-
-	# EXTRA https://github.com/yt-dlp/yt-dlp
-	$(WGET) https://nodiscc.gitlab.io/toolbox/pool/main/y/yt-dlp/yt-dlp_2021.09.25_amd64.deb
-	cp cache/downloads/yt-dlp_2021.09.25_amd64.deb config/packages.chroot/
-
-	# https://github.com/EionRobb/pidgin-opensteamworks/
-	$(WGET) https://nodiscc.gitlab.io/toolbox/pool/main/p/pidgin-opensteamworks/pidgin-opensteamworks_1.7-1_amd64.deb
-	cp cache/downloads/pidgin-opensteamworks_1.7-1_amd64.deb config/packages.chroot/
-
-	# EXTRA https://github.com/nodiscc/user.js
-	$(WGET) https://nodiscc.gitlab.io/toolbox/pool/main/u/user.js/user.js_0.3.3-1_all.deb
-	cp cache/downloads/user.js_0.3.3-1_all.deb config/packages.chroot/
-
-	# EXTRA https://addons.mozilla.org/en-US/firefox/addon/keepassxc-browser/
-	# EXTRA https://addons.mozilla.org/en-US/firefox/addon/cookie-autodelete/
-	mkdir -p config/includes.chroot/usr/lib/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}
-	$(WGET) https://addons.mozilla.org/firefox/downloads/file/3465157/keepassxc_browser-latest-fx.xpi -O config/includes.chroot/usr/lib/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/keepassxc-browser@keepassxc.org.xpi
-	$(WGET) https://addons.mozilla.org/firefox/downloads/file/3711829/cookie_autodelete-3.6.0-an+fx.xpi -O config/includes.chroot/usr/lib/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/CookieAutoDelete@kennydo.com.xpi
+	# EXTRA Google Chrome
+	$(WGET) https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
+	cp cache/downloads/google-chrome-stable_current_amd64.deb config/packages.chroot/
--- a/README.md
+++ b/README.md
@@ -1,56 +1,10 @@
-# debian-live-config
-
-[Debian GNU/Linux](https://www.debian.org/) desktop operating system, preconfigured for personal computers/workstations.
-
-![](https://i.imgur.com/xbRbpM3.png)
-
-## Features
-
- Ready-to-use operating system for personal computers/workstations
- Preinstalled/preconfigured software for most office/multimedia/internet tasks
- Installation time < 10 minutes, without Internet access
- Can also run [live](https://en.wikipedia.org/wiki/Live_USB) from USB/DVD (no installation required)
- Fits on a 2GB USB drive
- Reliable, low maintenance (Based on Debian [stable](https://wiki.debian.org/DebianStable) + [backports](https://wiki.debian.org/Backports))
- Lightweight/low resource usage, good performance on low-end or recycled hardware
- Proprietary drivers/firmware for good compatibility with recent hardware
-
-This repository contains the `live-build` configuration and scripts used to build a custom Debian ISO image. See [Building a custom Debian ISO image](doc/md/custom.md).
+# debian-Custom-live
+Custom debian iso


-## Download
-
-**[![](doc/md/download.png) Download .ISO image](https://github.com/nodiscc/debian-live-config/releases/download/3.0.0/dlc-3.0.0-debian-bullseye-amd64.hybrid.iso)** (64-bit)
-
-
-## Documentation
-
- [Download and installation](doc/md/download-and-installation.md)
- [Usage](doc/md/usage.md)
- [Software: Utility](doc/md/packages/utility.md)
- [Software: Internet and network](doc/md/packages/network.md)
- [Software: Audio and video](doc/md/packages/audio-video.md)
- [Software: Office](doc/md/packages/office.md)
- [Software: Graphics](doc/md/packages/graphics.md)
- [Software: System](doc/md/packages/system.md)
- [Software: Development](doc/md/packages/development.md)
- [Software: Games](doc/md/packages/games.md)
- [Software: Extras](doc/md/packages/extras.md)
- [Changelog](CHANGELOG.md)
-
-
-## Screenshots
-
-![](https://i.imgur.com/xbRbpM3.png)
-
-![](https://i.imgur.com/iyA3bov.png)
-
-
-## Source code
-
-Mirrors:
- [Gitlab](https://gitlab.com/nodiscc/debian-live-config)
- [Github](https://github.com/nodiscc/debian-live-config)
+## Original creator / Source
+nodiscc  
+[Original project on Gitlab](https://gitlab.com/nodiscc/debian-live-config)


 ## License
--- a/auto/clean
+++ b/auto/clean
@@ -32,4 +32,5 @@ rm -rf	.build/ \
 	config/hooks/normal/0440-update-nvidia-alternative.hook.chroot \
 	config/hooks/live/0010-disable-kexec-tools.hook.chroot \
 	config/hooks/live/0050-disable-sysvinit-tmpfs.hook.chroot \
-	config/package-lists/live.list.chroot
+	config/package-lists/live.list.chroot \
+	cache
--- a/auto/config
+++ b/auto/config
@@ -16,9 +16,9 @@ lb config noauto \
 --checksums sha256 \
 --clean \
 --debconf-frontend noninteractive \
--debian-installer live \
+--debian-installer false \
 --debian-installer-distribution bullseye \
--debian-installer-gui true \
+--debian-installer-gui false \
 --debootstrap-options "--include=apt-transport-https,ca-certificates,openssl" \
 --distribution bullseye \
 --firmware-binary true \
@@ -27,8 +27,8 @@ lb config noauto \
 --iso-publisher dlc \
 --iso-volume dlc-3.0.0 \
 --linux-packages "linux-image linux-headers" \
--bootappend-live "boot=live config splash" \
+--bootappend-live "boot=live config" \
 --memtest memtest86+ \
--win32-loader true
-
+--win32-loader true \
+--apt-http-proxy "http://192.168.2.83:80"
 "${@}"
--- a/config/archives/debian-updates-security-backports.list.binary
+++ b/config/archives/debian-updates-security-backports.list.binary
@@ -1,5 +1,5 @@
-deb https://deb.debian.org/debian/ bullseye main contrib non-free
+deb http://deb.debian.org/debian/ bullseye main contrib non-free
 deb http://security.debian.org/debian-security bullseye-security main contrib non-free
-deb https://deb.debian.org/debian/ bullseye-proposed-updates main contrib non-free
-deb https://deb.debian.org/debian/ bullseye-updates main contrib non-free
-deb https://deb.debian.org/debian/ bullseye-backports main contrib non-free
+deb http://deb.debian.org/debian/ bullseye-proposed-updates main contrib non-free
+deb http://deb.debian.org/debian/ bullseye-updates main contrib non-free
+deb http://deb.debian.org/debian/ bullseye-backports main contrib non-free
--- a/config/archives/debian-updates-security-backports.list.chroot
+++ b/config/archives/debian-updates-security-backports.list.chroot
@@ -1,5 +1,5 @@
-deb https://deb.debian.org/debian/ bullseye main contrib non-free
+deb http://deb.debian.org/debian/ bullseye main contrib non-free
 deb http://security.debian.org/debian-security bullseye-security main contrib non-free
-deb https://deb.debian.org/debian/ bullseye-proposed-updates main contrib non-free
-deb https://deb.debian.org/debian/ bullseye-updates main contrib non-free
-deb https://deb.debian.org/debian/ bullseye-backports main contrib non-free
+deb http://deb.debian.org/debian/ bullseye-proposed-updates main contrib non-free
+deb http://deb.debian.org/debian/ bullseye-updates main contrib non-free
+deb http://deb.debian.org/debian/ bullseye-backports main contrib non-free
--- a/config/bootloaders/grub-pc/grub.cfg
+++ b/config/bootloaders/grub-pc/grub.cfg
@@ -27,35 +27,21 @@ terminal_output gfxterm
 insmod play
 play 960 440 1 0 4 440 1

-# Live boot
-LINUX_LIVE

-# You can add more entries like this
-# menuentry "Alternate live boot" {
-# linux KERNEL_LIVE APPEND_LIVE custom options here
-# initrd INITRD_LIVE
-# }
-# menuentry "Alternate graphical installer" {
-# linux KERNEL_GI APPEND_GI custom options here
-# initrd INITRD_GI
-# }
-# menuentry "Alternate textual installer" {
-# linux KERNEL_DI APPEND_DI custom options here
-# initrd INITRD_DI
-# }
-menuentry "Live system (French)" {
-linux KERNEL_LIVE APPEND_LIVE locales=fr_FR.UTF-8
+menuentry "Live system " {
+    linux KERNEL_LIVE APPEND_LIVE locales=en_US.UTF-8
    initrd INITRD_LIVE
 }

-
-
-# Installer (if any)
-LINUX_INSTALL
+menuentry "Live system (ToRam)" {
+    linux KERNEL_LIVE APPEND_LIVE toram locales=en_US.UTF-8
+    initrd INITRD_LIVE
+}

 submenu 'Advanced options...' {

 # More installer entries (if any)
+LINUX_LIVE
 LINUX_ADVANCED_INSTALL

 # Memtest (if any)
--- a/config/bootloaders/isolinux/hdt.c32
+++ b/config/bootloaders/isolinux/hdt.c32
@@ -1 +0,0 @@
-/usr/share/live/build/bootloaders/isolinux/hdt.c32
--- a/config/bootloaders/isolinux/isolinux.bin
+++ b/config/bootloaders/isolinux/isolinux.bin
@@ -1 +0,0 @@
-/usr/share/live/build/bootloaders/isolinux/isolinux.bin
--- a/config/bootloaders/isolinux/ldlinux.c32
+++ b/config/bootloaders/isolinux/ldlinux.c32
@@ -1 +0,0 @@
-/usr/share/live/build/bootloaders/isolinux/ldlinux.c32
--- a/config/bootloaders/isolinux/libcom32.c32
+++ b/config/bootloaders/isolinux/libcom32.c32
@@ -1 +0,0 @@
-/usr/share/live/build/bootloaders/isolinux/libcom32.c32
--- a/config/bootloaders/isolinux/libgpl.c32
+++ b/config/bootloaders/isolinux/libgpl.c32
@@ -1 +0,0 @@
-/usr/share/live/build/bootloaders/isolinux/libgpl.c32
--- a/config/bootloaders/isolinux/libmenu.c32
+++ b/config/bootloaders/isolinux/libmenu.c32
@@ -1 +0,0 @@
-/usr/share/live/build/bootloaders/isolinux/libmenu.c32
--- a/config/bootloaders/isolinux/libutil.c32
+++ b/config/bootloaders/isolinux/libutil.c32
@@ -1 +0,0 @@
-/usr/share/live/build/bootloaders/isolinux/libutil.c32
--- a/config/bootloaders/isolinux/live.cfg.in
+++ b/config/bootloaders/isolinux/live.cfg.in
@@ -4,26 +4,13 @@ menu width 82
 menu title dlc 3.0.0 - Boot menu
 include stdmenu.cfg

-label live-@FLAVOUR@-english
+label live-@FLAVOUR@
        menu label ^Live (@FLAVOUR@) (English)
        menu default
        linux @LINUX@
        initrd @INITRD@
        append @APPEND_LIVE@ locales=en_US.UTF-8

-label live-@FLAVOUR@-french
-        menu label ^Live (@FLAVOUR@) (French)
-        menu default
-        linux @LINUX@
-        initrd @INITRD@
-        append @APPEND_LIVE@ locales=fr_FR.UTF-8
-
-label installgui
-    menu label ^Install
-	linux /install/gtk/vmlinuz
-	initrd /install/gtk/initrd.gz
-	append video=vesa:ywrap,mtrr vga=788 @APPEND_INSTALL@ --- quiet
-
 menu begin advanced
 	menu title Advanced options
 	include stdmenu.cfg
--- a/config/bootloaders/isolinux/menu.cfg
+++ b/config/bootloaders/isolinux/menu.cfg
@@ -3,6 +3,38 @@ menu width 82

 menu title debian-live-config 3.0.0 (Debian 11.1.0)
 include stdmenu.cfg
-include live.cfg
+
+label live-amd64
+        menu label ^Live system (amd64) (English)
+        menu default
+        linux /live/vmlinuz
+        initrd /live/initrd.img
+        append boot=live config locales=en_US.UTF-8
+
+label live-amd64-r
+        menu label ^Live system (ToRam)
+        menu default
+        linux /live/vmlinuz
+        initrd /live/initrd.img
+        append boot=live config toram locales=en_US.UTF-8
+
+menu begin advanced
+	menu title Advanced options
+	include stdmenu.cfg
+
+	label live-amd64-failsafe
+		menu label ^Live (amd64 failsafe)
+		linux /live/vmlinuz
+		initrd /live/initrd.img
+		append boot=live components memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=788
+
+	label memtest
+		menu label ^Memory Diagnostic Tool (memtest86+)
+		linux /live/memtest
+
+	label mainmenu
+		menu label ^Back..
+		menu exit
+

 menu clear
--- a/config/bootloaders/isolinux/stdmenu.cfg
+++ b/config/bootloaders/isolinux/stdmenu.cfg
@@ -1 +0,0 @@
-/usr/share/live/build/bootloaders/isolinux/stdmenu.cfg
--- a/config/bootloaders/isolinux/stdmenu.cfg
+++ b/config/bootloaders/isolinux/stdmenu.cfg
@@ -0,0 +1,15 @@
+menu background splash.png
+menu color title	* #FFFFFFFF *
+menu color border	* #00000000 #00000000 none
+menu color sel		* #ffffffff #76a1d0ff *
+menu color hotsel	1;7;37;40 #ffffffff #76a1d0ff *
+menu color tabmsg	* #ffffffff #00000000 *
+menu color help		37;40 #ffdddd00 #00000000 none
+menu vshift 12
+menu rows 10
+menu helpmsgrow 15
+# The command line must be at least one line from the bottom.
+menu cmdlinerow 16
+menu timeoutrow 16
+menu tabmsgrow 18
+menu tabmsg Press ENTER to boot or TAB to edit a menu entry
--- a/config/bootloaders/isolinux/vesamenu.c32
+++ b/config/bootloaders/isolinux/vesamenu.c32
@@ -1 +0,0 @@
-/usr/share/live/build/bootloaders/isolinux/vesamenu.c32
--- a/config/hooks/normal/0090-remove-unwanted-packages.hook.chroot
+++ b/config/hooks/normal/0090-remove-unwanted-packages.hook.chroot
@@ -1,3 +1,3 @@
 #!/bin/bash
 echo "I: running $0"
-aptitude -y purge exim4-base nfs-common rpcbind
+apt -y purge exim4-base nfs-common rpcbind
--- a/config/hooks/normal/0500-reproducible-glibc.hook.chroot
+++ b/config/hooks/normal/0500-reproducible-glibc.hook.chroot
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+# Remove the non-reproducible file that is created by ldconfig
+#
+# The file does not need to exist, see elf/cache.c:load_aux_cache
+# The file and folder will be recreated when needed, see elf/cache.c:save_aux_cache
+rm -fr /var/cache/ldconfig
--- a/config/includes.chroot/etc/apt/apt.conf.d/50unattended-upgrades
+++ b/config/includes.chroot/etc/apt/apt.conf.d/50unattended-upgrades
@@ -1,157 +0,0 @@
-// Debian automatic APT upgrades configuration (unattended-upgrades)
-// Unattended-Upgrade::Origins-Pattern controls which packages are
-// upgraded.
-//
-// Lines below have the format format is "keyword=value,...".  A
-// package will be upgraded only if the values in its metadata match
-// all the supplied keywords in a line.  (In other words, omitted
-// keywords are wild cards.) The keywords originate from the Release
-// file, but several aliases are accepted.  The accepted keywords are:
-//   a,archive,suite (eg, "stable")
-//   c,component     (eg, "main", "contrib", "non-free")
-//   l,label         (eg, "Debian", "Debian-Security")
-//   o,origin        (eg, "Debian", "Unofficial Multimedia Packages")
-//   n,codename      (eg, "jessie", "jessie-updates")
-//     site          (eg, "http.debian.net")
-// The available values on the system are printed by the command
-// "apt-cache policy", and can be debugged by running
-// "unattended-upgrades -d" and looking at the log file.
-//
-// Within lines unattended-upgrades allows 2 macros whose values are
-// derived from /etc/debian_version:
-//   ${distro_id}            Installed origin.
-//   ${distro_codename}      Installed codename (eg, "bullseye")
-Unattended-Upgrade::Origins-Pattern {
-        // Codename based matching:
-        // This will follow the migration of a release through different
-        // archives (e.g. from testing to stable and later oldstable).
-        // Software will be the latest available for the named release,
-        // but the Debian release itself will not be automatically upgraded.
-        "origin=Debian,codename=${distro_codename}-updates";
-        "origin=Debian,codename=${distro_codename}-proposed-updates";
-        "origin=Debian,codename=${distro_codename},label=Debian";
-        "origin=Debian,codename=${distro_codename},label=Debian-Security";
-        "origin=Debian,codename=${distro_codename},label=Debian Backports";
-
-        // Archive or Suite based matching:
-        // Note that this will silently match a different release after
-        // migration to the specified archive (e.g. testing becomes the
-        // new stable).
-//      "o=Debian,a=stable";
-//      "o=Debian,a=stable-updates";
-//      "o=Debian,a=proposed-updates";
-//      "o=Debian Backports,a=${distro_codename}-backports,l=Debian Backports";
-};
-
-// Python regular expressions, matching packages to exclude from upgrading
-Unattended-Upgrade::Package-Blacklist {
-    // The following matches all packages starting with linux-
-//  "linux-";
-
-    // Use $ to explicitely define the end of a package name. Without
-    // the $, "libc6" would match all of them.
-//  "libc6$";
-//  "libc6-dev$";
-//  "libc6-i686$";
-
-    // Special characters need escaping
-//  "libstdc\+\+6$";
-
-    // The following matches packages like xen-system-amd64, xen-utils-4.1,
-    // xenstore-utils and libxenstore3.0
-//  "(lib)?xen(store)?";
-
-    // For more information about Python regular expressions, see
-    // https://docs.python.org/3/howto/regex.html
-};
-
-// This option allows you to control if on a unclean dpkg exit
-// unattended-upgrades will automatically run 
-//   dpkg --force-confold --configure -a
-// The default is true, to ensure updates keep getting installed
-//Unattended-Upgrade::AutoFixInterruptedDpkg "true";
-
-// Split the upgrade into the smallest possible chunks so that
-// they can be interrupted with SIGTERM. This makes the upgrade
-// a bit slower but it has the benefit that shutdown while a upgrade
-// is running is possible (with a small delay)
-Unattended-Upgrade::MinimalSteps "true";
-
-// Install all updates when the machine is shutting down
-// instead of doing it in the background while the machine is running.
-// This will (obviously) make shutdown slower.
-// Unattended-upgrades increases logind's InhibitDelayMaxSec to 30s.
-// This allows more time for unattended-upgrades to shut down gracefully
-// or even install a few packages in InstallOnShutdown mode, but is still a
-// big step back from the 30 minutes allowed for InstallOnShutdown previously.
-// Users enabling InstallOnShutdown mode are advised to increase
-// InhibitDelayMaxSec even further, possibly to 30 minutes.
-//Unattended-Upgrade::InstallOnShutdown "false";
-
-// Send email to this address for problems or packages upgrades
-// If empty or unset then no email is sent, make sure that you
-// have a working mail setup on your system. A package that provides
-// 'mailx' must be installed. E.g. "user@example.com"
-Unattended-Upgrade::Mail "root";
-
-// Set this value to "true" to get emails only on errors. Default
-// is to always send a mail if Unattended-Upgrade::Mail is set
-Unattended-Upgrade::MailOnlyOnError "true";
-
-// Remove unused automatically installed kernel-related packages
-// (kernel images, kernel headers and kernel version locked tools).
-//Unattended-Upgrade::Remove-Unused-Kernel-Packages "true";
-
-// Do automatic removal of newly unused dependencies after the upgrade
-//Unattended-Upgrade::Remove-New-Unused-Dependencies "true";
-
-// Do automatic removal of unused packages after the upgrade
-// (equivalent to apt-get autoremove)
-//Unattended-Upgrade::Remove-Unused-Dependencies "false";
-
-// Automatically reboot *WITHOUT CONFIRMATION* if
-//  the file /var/run/reboot-required is found after the upgrade
-//Unattended-Upgrade::Automatic-Reboot "false";
-
-// Automatically reboot even if there are users currently logged in
-// when Unattended-Upgrade::Automatic-Reboot is set to true
-//Unattended-Upgrade::Automatic-Reboot-WithUsers "true";
-
-// If automatic reboot is enabled and needed, reboot at the specific
-// time instead of immediately
-//  Default: "now"
-//Unattended-Upgrade::Automatic-Reboot-Time "02:00";
-
-// Use apt bandwidth limit feature, this example limits the download
-// speed to 70kb/sec
-//Acquire::http::Dl-Limit "70";
-
-// Enable logging to syslog. Default is False
-Unattended-Upgrade::SyslogEnable "true";
-
-// Specify syslog facility. Default is daemon
-// Unattended-Upgrade::SyslogFacility "daemon";
-
-// Download and install upgrades only on AC power
-// (i.e. skip or gracefully stop updates on battery)
-// Unattended-Upgrade::OnlyOnACPower "true";
-
-// Download and install upgrades only on non-metered connection
-// (i.e. skip or gracefully stop updates on a metered connection)
-// Unattended-Upgrade::Skip-Updates-On-Metered-Connections "true";
-
-// Verbose logging
-// Unattended-Upgrade::Verbose "false";
-
-// Print debugging information both in unattended-upgrades and
-// in unattended-upgrade-shutdown
-// Unattended-Upgrade::Debug "false";
-
-// automatically update package lists
-APT::Periodic::Update-Package-Lists "1";
-// automatically download upgradeable packages
-APT::Periodic::Download-Upgradeable-Packages "1";
-// Do "apt-get autoclean" every n-days (0=disable)
-APT::Periodic::AutocleanInterval "7";
-// automatically run package upgrades
-APT::Periodic::Unattended-Upgrade "1";
--- a/config/includes.chroot/etc/apt/preferences.d.off/99backports
+++ b/config/includes.chroot/etc/apt/preferences.d.off/99backports
--- a/config/includes.chroot/etc/apt/sources.list.d/debian-live-config.list
+++ b/config/includes.chroot/etc/apt/sources.list.d/debian-live-config.list
@@ -1,2 +0,0 @@
-# Uncomment to receive updates fro packages installed from https://nodiscc.gitlab.io/toolbox
-#deb https://nodiscc.gitlab.io/toolbox/ bullseye main
--- a/config/includes.chroot/etc/default/keyboard
+++ b/config/includes.chroot/etc/default/keyboard
@@ -3,7 +3,7 @@
 # Consult the keyboard(5) manual page.

 XKBMODEL="pc104"
-XKBLAYOUT="fr"
+XKBLAYOUT="us,fr"
 XKBVARIANT="oss"
 XKBOPTIONS=""

--- a/config/includes.chroot/etc/fonts/conf.d/10-unhinted.conf
+++ b/config/includes.chroot/etc/fonts/conf.d/10-unhinted.conf
@@ -1 +0,0 @@
-../conf.avail/10-unhinted.conf
--- a/config/includes.chroot/etc/fonts/conf.d/10-unhinted.conf
+++ b/config/includes.chroot/etc/fonts/conf.d/10-unhinted.conf
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+<!--  Disable hinting --> 
+  <match target="font">
+    <edit name="hinting" mode="assign"><bool>false</bool></edit>
+  </match>
+</fontconfig>
--- a/config/includes.chroot/etc/fonts/conf.d/11-lcdfilter-default.conf
+++ b/config/includes.chroot/etc/fonts/conf.d/11-lcdfilter-default.conf
@@ -1 +0,0 @@
-../conf.avail/11-lcdfilter-default.conf
--- a/config/includes.chroot/etc/fonts/conf.d/11-lcdfilter-default.conf
+++ b/config/includes.chroot/etc/fonts/conf.d/11-lcdfilter-default.conf
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+<!--  Use lcddefault as default for LCD filter -->
+  <match target="font">
+    <edit mode="assign" name="lcdfilter">
+      <const>lcddefault</const>
+    </edit>
+  </match>
+</fontconfig>
--- a/config/includes.chroot/etc/fonts/conf.d/42-antialias.conf
+++ b/config/includes.chroot/etc/fonts/conf.d/42-antialias.conf
@@ -1 +0,0 @@
-../conf.avail/42-antialias.conf
--- a/config/includes.chroot/etc/fonts/conf.d/42-antialias.conf
+++ b/config/includes.chroot/etc/fonts/conf.d/42-antialias.conf
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+  <match target="font">
+    <edit name="antialias" mode="assign"><bool>true</bool></edit>
+  </match>
+</fontconfig>
--- a/config/includes.chroot/etc/locale.gen
+++ b/config/includes.chroot/etc/locale.gen
@@ -1,2 +1 @@
 en_US.UTF-8 UTF-8
-fr_FR.UTF-8 UTF-8
--- a/config/includes.chroot/etc/locale.nopurge
+++ b/config/includes.chroot/etc/locale.nopurge
@@ -62,6 +62,3 @@ SHOWFREEDSPACE
 en
 en_US
 en_US.UTF-8
-fr
-fr_FR
-fr_FR.UTF-8
--- a/config/includes.chroot/etc/plymouth/plymouthd.conf
+++ b/config/includes.chroot/etc/plymouth/plymouthd.conf
@@ -1,3 +0,0 @@
-# Administrator customizations go in this file
-[Daemon]
-Theme=homeworld
--- a/config/includes.chroot/etc/skel/.audacity-data/Theme/ImageCache.png
+++ b/config/includes.chroot/etc/skel/.audacity-data/Theme/ImageCache.png
--- a/config/includes.chroot/etc/skel/.audacity-data/audacity.cfg
+++ b/config/includes.chroot/etc/skel/.audacity-data/audacity.cfg
@@ -1,4 +0,0 @@
-[GUI]
-ShowSplashScreen=1
-[Theme]
-LoadAtStart=1
--- a/config/includes.chroot/etc/skel/.bash_aliases
+++ b/config/includes.chroot/etc/skel/.bash_aliases
@@ -1,103 +0,0 @@
-#!/bin/bash
-
-#shortcuts
-alias d="colordiff" #pretty diffs
-alias n="nano" # nano text editor
-alias m="mousepad" # mousepad text editor
-alias o="xdg-open" # open file with associated program
-alias encrypt="gpg -c" # encrypt file with GPG
-alias decrypt="gpg -d" # decrypt GPG encrypted file
-alias chx='chmod a+x' # set execute permission
-alias clipboard='xclip -selection c; notify-send --icon=gtk-paste "Copied to clipboard." 2>/dev/null' # send stdin to clipboard
-function f { find ./ -name "*$1*"; } # find files in the currect directory
-function psg { ps -fp $(pgrep -f "$@"); } # find running process matching a name
-# alias rm="trash-put" # do not delete files with rm, put them to trash
-# alias frm="\rm" # add an alias for rm
-# alias mkdir='mkdir -pv' # create directories and their parents by default
-
-#ls and grep aliases
-if [ -x /usr/bin/dircolors ]; then
-    test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
-    alias ls='ls -F --color=auto'
-    alias ll='ls -lhF --color=auto'
-    alias ls='ls -F --color=auto'
-    alias grep='grep --color=auto'
-    alias fgrep='fgrep --color=auto'
-    alias egrep='egrep --color=auto'
-fi
-
-# Aliases for going up multiple directories
-# alias .1='cd ../'
-# alias .2='cd ../../'
-# alias .3='cd ../../../'
-# alias .4='cd ../../../../'
-# alias .5='cd ../../../../../'
-
-#load autojump
-if [ -f /usr/share/autojump/autojump.sh ]; then . /usr/share/autojump/autojump.sh; fi
-
-#use a colored prompt
-force_color_prompt=yes
-
-# Prevent ">" from overwriting existing files, use ">|" instead
-set -o noclobber
-
-# Append commands to history file instead of overwriting it
-shopt -s histappend
-
-# Don't put duplicate lines in the history and do not add lines that start with a space
-export HISTCONTROL=erasedups:ignoredups:ignorespace
-
-# History length and file size
-#HISTSIZE=1000
-#HISTFILESIZE=2000
-
-# Use windows-style (cycling) Tab-completion (default disabled)
-#bind '"\t":menu-complete'
-
-# Automatically correct typos in directories names
-#shopt -s cdspell
-
-# Check recursively for subdirectories when using cd
-#export CDPATH=.:~
-
-# Automatically cd to a directory when you enter it's name on its own
-#shopt -s autocd
-
-# Check the window size after each command and, if necessary, update the values of LINES and COLUMNS
-#shopt -s checkwinsize
-
-# Ignore case on auto-completion
-#bind "set completion-ignore-case on"; fi
-#bind "set show-all-if-ambiguous On"; fi
-
-# show a ✔ or ✕ symbol before the prompt depending on return code of previous command
-# $(__exit_code_block) must be added to your $PS1
-#function __exit_code_block() {
-#	if [[ "$?" == 0 ]]; then echo -e "✔ ";
-#	else echo -e "✕ "; fi
-#}
-
-####### Colored manpages ##########
-export LESS_TERMCAP_mb=$'\E[01;31m'       # begin blinking
-export LESS_TERMCAP_md=$'\E[01;38;5;74m'  # begin bold
-export LESS_TERMCAP_me=$'\E[0m'           # end mode
-export LESS_TERMCAP_se=$'\E[0m'           # end standout-mode
-export LESS_TERMCAP_so=$'\E[36;7;246m'    # begin standout-mode - info box
-export LESS_TERMCAP_ue=$'\E[0m'           # end underline
-export LESS_TERMCAP_us=$'\E[04;38;5;146m' # begin underline
-
-# Syntax colors in less (possibly insecure, disabled)
-# if [ -f /usr/share/source-highlight/src-hilite-lesspipe.sh ]
-# then
-#     export LESSOPEN="| /usr/share/source-highlight/src-hilite-lesspipe.sh %s"
-#     export LESS=' -R '
-# fi
-
-
-#git prompt configuration
-PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w $(__git_ps1 "(%s)")\[\033[00m\]\$ '
-GIT_PS1_SHOWDIRTYSTATE=1
-GIT_PS1_SHOWSTASHSTATE=1
-GIT_PS1_SHOWUNTRACKEDFILES=1
-GIT_PS1_SHOWUPSTREAM="auto"
--- a/config/includes.chroot/etc/skel/.config/Thunar/uca.xml
+++ b/config/includes.chroot/etc/skel/.config/Thunar/uca.xml
@@ -1,47 +0,0 @@
-<?xml encoding="UTF-8" version="1.0"?>
-<actions>
-<action>
-	<icon>utilities-terminal</icon>
-	<name>Open terminal here</name>
-	<unique-id>1376925988838423-2</unique-id>
-	<command>exo-open --working-directory %f --launch TerminalEmulator</command>
-	<description>Open a terminal emulator window</description>
-	<patterns>*</patterns>
-	<startup-notify/>
-	<directories/>
-</action>
-<action>
-	<icon>system-search</icon>
-	<name>Search...</name>
-	<unique-id>1376145324304167-1</unique-id>
-	<command>catfish %f</command>
-	<description>Search files and directories</description>
-	<patterns>*</patterns>
-	<directories/>
-</action>
-<action>
-	<icon>deja-dup</icon>
-	<name>Restore files...</name>
-	<unique-id>1623864079910491-1</unique-id>
-	<command>deja-dup --restore %F</command>
-	<description>Restore files from backups</description>
-	<patterns>*</patterns>
-	<startup-notify/>
-	<directories/>
-	<audio-files/>
-	<image-files/>
-	<other-files/>
-	<text-files/>
-	<video-files/>
-</action>
-<action>
-	<icon>disk-usage-analyzer</icon>
-	<name>Analyze disk usage</name>
-	<unique-id>1630524112313436-1</unique-id>
-	<command>baobab %f</command>
-	<description>Analyze disk usage by subdirectory under this directory</description>
-	<patterns>*</patterns>
-	<startup-notify/>
-	<directories/>
-</action>
-</actions>
--- a/config/includes.chroot/etc/skel/.config/Trolltech.conf
+++ b/config/includes.chroot/etc/skel/.config/Trolltech.conf
@@ -1,4 +0,0 @@
-[Qt]
-font="Roboto,10,-1,5,50,0,0,0,0,0"
-style=GTK+
-GUIEffects=none
--- a/config/includes.chroot/etc/skel/.config/autostart/conky.desktop
+++ b/config/includes.chroot/etc/skel/.config/autostart/conky.desktop
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=Conky
-Comment=Display information on your desktop
-Exec=conky -p 20
-Icon=user-desktop
-Path=
-Terminal=false
-StartupNotify=false
-Hidden=true
--- a/config/includes.chroot/etc/skel/.config/autostart/gnome-keyring-gpg.desktop
+++ b/config/includes.chroot/etc/skel/.config/autostart/gnome-keyring-gpg.desktop
@@ -1,123 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=GPG Password Agent
-Name[af]=GPG-wagwoordagent
-Name[ar]=عميل كلمة السر GPG
-Name[as]=GPG পাছৱাৰ্ড সহায়ক
-Name[ast]=Axente de contraseñes GPG
-Name[be]=GPG-агент пароляў
-Name[bg]=Агент за пароли на GPG
-Name[bn]=GPG পাসওয়ার্ড এজেন্ট
-Name[ca]=Agent de contrasenyes GPG
-Name[ca@valencia]=Agent de contrasenyes GPG
-Name[cs]=Agent hesel GPG
-Name[da]=GPG-adgangskodeagent
-Name[de]=GPG-Passwort-Agent
-Name[el]=Πρόγραμμα κωδικού GPG
-Name[en_GB]=GPG Password Agent
-Name[es]=Agente de contraseñas GPG
-Name[et]=GPG-võtmete agent
-Name[eu]=GPG pasahitzaren agentea
-Name[fa]=مامور گذرواژه GPG
-Name[fi]=GPG-salasanojen agentti
-Name[fr]=Agent de mot de passe GPG
-Name[gl]=Axente de contrasinais GPG
-Name[gu]=GPG પાસવર્જ ઍજન્ટ
-Name[he]=סוכן ססמאות ה־PGP
-Name[hu]=GPG jelszóügynök
-Name[id]=Agen Sandi GPG
-Name[it]=Agente password GPG
-Name[ja]=GPG パスワードエージェント
-Name[km]=ភ្នាក់ងារពាក្យសម្ងាត់របស់ GPG
-Name[ko]=GPG 암호 에이전트
-Name[lt]=GPG slaptažodžių agentas
-Name[lv]=GPG paroles aģents
-Name[mk]=Агент за лозинки за GPG
-Name[nb]=GPG passordagent
-Name[nl]=GPG-wachtwoordagent
-Name[nn]=Passordagent for GPG
-Name[pa]=GPG ਪਾਸਵਰਡ ਏਜੰਟ
-Name[pl]=Agent hasła GPG
-Name[pt]=Agente de Senha GPG
-Name[pt_BR]=Agente de senha GPG
-Name[ro]=Agent parole GPG
-Name[ru]=Агент пароля GPG
-Name[sl]=GPG agent gesel
-Name[sr]=Агент за ГПГ лозинке
-Name[sr@latin]=Agent za GPG lozinke
-Name[sv]=GPG-lösenordsagent
-Name[ta]=ஜிபிஜி கடவுச்சொல்லின் பலம்
-Name[te]=GPG సంకేతపదం వాహకం
-Name[th]=เอเจนต์รหัสผ่าน GPG
-Name[tr]=GPG Parola Aracı
-Name[ug]=GPG ئىم ياردەمچىسى
-Name[uk]=Агента паролів GPG
-Name[vi]=Agent cho mật khẩu GPG
-Name[zh_CN]=GPG 密码代理
-Name[zh_HK]=GPG 密碼代理程式
-Name[zh_TW]=GPG 密碼代理程式
-Comment=GNOME Keyring: GPG Agent
-Comment[af]=GNOME-sleutelring: GPG-agent
-Comment[ar]=حلقة مفاتيح جنوم: عميل GPG
-Comment[as]=GNOME Keyring: GPG সহায়ক
-Comment[ast]=Aniellu de claves de GNOME: Axente GPG
-Comment[be]=Вязкі ключоў GNOME: GPG-агент
-Comment[bg]=Ключодържател на GNOME: агент на GPG
-Comment[bn]=GNOME কীরিং: GPG এজেন্ট
-Comment[ca]=Anell de claus del GNOME: agent GPG
-Comment[ca@valencia]=Anell de claus del GNOME: agent GPG
-Comment[cs]=Klíčenka GNOME: Agent GPG
-Comment[da]=GNOME-nøglering: GPG-agent
-Comment[de]=GNOME-Schlüsselbunddienst: GPG-Agent
-Comment[el]=Κλειδοθήκη GNOME: Πράκτορας (agent) GPG
-Comment[en_GB]=GNOME Keyring: GPG Agent
-Comment[es]=Depósito de claves de GNOME: agente GPG
-Comment[et]=GNOME võtmerõngas: GPG-agent
-Comment[eu]=GNOMEren gako-sorta: GPG agentea
-Comment[fa]=دسته‌کلید گنوم: مامور GPG
-Comment[fi]=Gnomen avainnippu: GPG-agentti
-Comment[fr]=Trousseau de clés GNOME : agent GPG
-Comment[gl]=Anel de chaves de GNOME: axente GPG
-Comment[gu]=GNOME કીરીંગ: GPG ઍજન્ટ
-Comment[he]=קבוצת מפתחות GNOME: סוכן GPG
-Comment[hu]=GNOME kulcstartó: GPG-ügynök
-Comment[id]=Ring Kunci GNOME: Agen GPG
-Comment[it]=Portachiavi di GNOME: agente GPG
-Comment[ja]=GNOME キーリング: GPG エージェント
-Comment[km]=GNOME Keyring ៖ ភ្នាក់ងារ GPG
-Comment[ko]=그놈 키 모음: GPG 에이전트
-Comment[lt]=GNOME raktinė: GPG agentas
-Comment[lv]=GNOME Keyring: GPG aģents
-Comment[mk]=Приврзок за GNOME: GPG агент
-Comment[nb]=GNOME nøkkelring: GPG-agent
-Comment[nl]=Gnome-sleutelbos: GPG-agent
-Comment[nn]=GNOME Nøkkelring: GPG-agent
-Comment[pa]=ਗਨੋਮ ਕੀਰਿੰਗ: GPG ਏਜੰਟ
-Comment[pl]=Baza kluczy dla środowiska GNOME: agent GPG
-Comment[pt]=GNOME Keyring: Agente GPG
-Comment[pt_BR]=Chaveiro do GNOME: Agente GPG
-Comment[ro]=Inelul de chei GNOME: Agent GPG
-Comment[ru]=Связка ключей GNOME: GPG-агент
-Comment[sl]=GNOME zbirka ključev: GPG agent
-Comment[sr]=Гномови привесци: ГПГ агент
-Comment[sr@latin]=Gnomovi privesci: GPG agent
-Comment[sv]=GNOME-nyckelring: GPG-agent
-Comment[ta]=GNOME கீரிங்: ஜிபிஜி முகவர்
-Comment[te]=GNOME కీరింగ్: GPG వాహకం
-Comment[th]=พวงกุญแจของ GNOME: เอเจนต์ GPG
-Comment[tr]=GNOME Anahtarlığı: GPG Aracı
-Comment[ug]=NOME ئاچقۇچ ھالقىسى：GPG ياردەمچىسى
-Comment[uk]=Служба в'язки ключів GNOME: агент GPG
-Comment[vi]=Vòng Khoá GNOME: GPG Agent
-Comment[zh_CN]=GNOME 密钥环：GPG 代理
-Comment[zh_HK]=GNOME 密碼匙圈：GPG 代理程式
-Comment[zh_TW]=GNOME 鑰匙圈：GPG 代理程式
-Exec=/usr/bin/gnome-keyring-daemon --start --components=gpg
-OnlyShowIn=GNOME;Unity;
-X-GNOME-Autostart-Phase=Initialization
-X-GNOME-AutoRestart=false
-X-GNOME-Autostart-Notify=true
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=gnome-keyring
-X-GNOME-Bugzilla-Component=general
-X-GNOME-Bugzilla-Version=3.4.1
--- a/config/includes.chroot/etc/skel/.config/autostart/gnome-keyring-pkcs11.desktop
+++ b/config/includes.chroot/etc/skel/.config/autostart/gnome-keyring-pkcs11.desktop
@@ -1,127 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Certificate and Key Storage
-Name[af]=Sertifikaat- en sleutelberging
-Name[ar]=مخزن الشهادات والمفاتيح
-Name[as]=প্ৰমাণপত্ৰ আৰু চাবি সংৰক্ষণ
-Name[ast]=Certificaos y almacenamientu de claves
-Name[be]=Сховішча сертыфікатаў і ключоў
-Name[bg]=Съхранение на сертификати и ключове
-Name[bn]=সার্টিফিকেট এবং কী স্টোরেজ
-Name[ca]=Magatzem de certificats i de claus
-Name[ca@valencia]=Magatzem de certificats i de claus
-Name[cs]=Odemknout certifikáty a umístění klíčů
-Name[da]=Certifikat- og nøglelager
-Name[de]=Zertifikat-/Schlüsselverwahrung
-Name[el]=Αποθήκη πιστοποιητικών και κλειδιών
-Name[en_GB]=Certificate and Key Storage
-Name[eo]=Memorejo de atestiloj kaj ŝlosiloj
-Name[es]=Certificados y almacenamiento de claves
-Name[et]=Sertifikaadi- ja võtmehoidla
-Name[eu]=Ziurtagirien/gakoen biltegia
-Name[fa]=مخزن گواهی‌نامه و کلید
-Name[fi]=Varmenne- ja avainsäilö
-Name[fr]=Stockage de certificats et de clés
-Name[gl]=Almacenamento de chave ou certificado
-Name[gu]=પ્રમાણપત્ર અને કી સંગ્રહ
-Name[he]=אחסון תעודה ומפתח
-Name[hu]=Tanúsítvány- és kulcstároló
-Name[id]=Penyimpanan Kunci dan Sertifikat
-Name[it]=Archivio certificati e chiavi
-Name[ja]=証明書および鍵を格納するストレージ
-Name[km]=វិញ្ញាបនបត្រ និងការផ្ទុកសោ
-Name[ko]=인증서 및 키 저장소
-Name[lt]=Liudijimų ir raktų saugykla
-Name[lv]=Sertifikātu un atslēgu glabātava
-Name[mk]=Склад на клучеви и сертификати
-Name[ms]=Sijil dan Penyimpanan Kekunci
-Name[nb]=Lager for sertifikat/nøkkel
-Name[nl]=Certificaat- en sleutelopslag
-Name[nn]=Serifikat- og nøkkellager
-Name[pa]=ਸਰਟੀਫਿਕੇਟ ਅਤੇ ਕੁੰਜੀ ਸਟੋਰੇਜ਼
-Name[pl]=Przechowalnia certyfikatów i kluczy
-Name[pt]=Armazenamento de Chaves e Certificados
-Name[pt_BR]=Certificados e armazenamento de chaves
-Name[ro]=Mediu de stocare pentru certificate și chei
-Name[ru]=Хранилище сертификатов и ключей
-Name[sk]=Úložisko certifikátov a kľúčov
-Name[sl]=Hranjenje potrdil in ključev
-Name[sr]=Складиште сертификата и кључева
-Name[sr@latin]=Skladište sertifikata i ključeva
-Name[sv]=Certifikat och nyckellagring
-Name[ta]=சான்றிதழ்/விசை சேமிப்பகம்
-Name[te]=ధృవీకరణపత్రం మరియు కీ నిల్వ
-Name[th]=แหล่งใบรับรองและกุญแจ
-Name[tr]=Sertifika ve Anahtar Deposu
-Name[ug]=گۇۋاھنامە ۋە شىفىرلىق ئاچقۇچ ئامبىرى
-Name[uk]=Сертифікат та сховище ключів
-Name[vi]=Lưu trữ Chứng nhận và Khoá
-Name[zh_CN]=证书和密钥存储
-Name[zh_HK]=證書與密碼匙儲存區
-Name[zh_TW]=憑證與金鑰儲存區
-Comment=GNOME Keyring: PKCS#11 Component
-Comment[af]=GNOME-sleutelring: PKCS#11-komponent
-Comment[ar]=حلقة مفاتيح جنوم: مكون PKCS#11
-Comment[as]=GNOME Keyring: PKCS#11 উপাদান
-Comment[ast]=Depósitu de claves de GNOME: Componente PKCS#11
-Comment[be]=Вязкі ключоў GNOME: кампанент PKCS#11
-Comment[bg]=Ключодържател на GNOME: компонент за PKCS#11
-Comment[bn]=GNOME কী রিং: PKCS#11 কম্পোনেন্ট
-Comment[ca]=Anell de claus del GNOME: component PKCS#11
-Comment[ca@valencia]=Anell de claus del GNOME: component PKCS#11
-Comment[cs]=Klíčenka GNOME: komponenta PKCS#11
-Comment[da]=GNOME-nøgleringsdæmon: PKCS#11-komponent
-Comment[de]=GNOME-Schlüsselbunddienst: PKCS#11-Komponente
-Comment[el]=Κλειδοθήκη GNOME: Συνιστώσα PKCS#11
-Comment[en_GB]=GNOME Keyring: PKCS#11 Component
-Comment[es]=Depósito de claves de GNOME: Componente PKCS#11
-Comment[et]=GNOME võtmerõngas: PKCS#11 komponent
-Comment[eu]=GNOMEren gako-sorta: PKCS#11 osagaia
-Comment[fa]=دسته‌کلید گنوم: عناصر PKCS#11
-Comment[fi]=Gnomen avainnippu: PKCS#11-komponentti
-Comment[fr]=Trousseau de clés GNOME : composant PKCS#11
-Comment[gl]=GNOME Keyring: compoñente PKCS#11
-Comment[gu]=GNOME કીરીંગ: PKCS#11 ઘટક
-Comment[he]=קבוצת מפתחות של GNOME:רכיב PKCS#11
-Comment[hu]=GNOME kulcstartó – PKCS#11 összetevő
-Comment[id]=GNOME Keyring: Komponen PKCS#11
-Comment[it]=Portachiavi di GNOME: componente PKCS#11
-Comment[ja]=GNOME キーリング: PKCS#11 コンポーネント
-Comment[km]=GNOME Keyring ៖ សមាសភាគ PKCS#11
-Comment[ko]=그놈 키 모음: PKCS#11 컴포넌트
-Comment[lt]=GNOME raktinė: PKCS#11 komponentas
-Comment[lv]=GNOME Keyring: PKCS#11 komponente
-Comment[mk]=Приврзок на GNOME: PKCS#11 компонента
-Comment[ms]=GNOME Keyring: Komponen PKCS#11
-Comment[nb]=GNOME nøkkelring: PKCS#11-komponent
-Comment[nl]=Sleutelbos-service: PKCS#11-component
-Comment[nn]=GNOME Nøkkelring: PKCS#11-komponent
-Comment[pa]=ਗਨੋਮ ਕੀਰਿੰਗ: PKCS#11 ਭਾਗ
-Comment[pl]=Baza kluczy dla środowiska GNOME: składnik PKCS#11
-Comment[pt]=GNOME Keyring: Componente PKCS#11
-Comment[pt_BR]=Chaveiro do GNOME: Componente PKCS#11
-Comment[ro]=Inelul de chei GNOME: Componenta PKCS#11
-Comment[ru]=Связка ключей GNOME: компонент PKCS#11
-Comment[sl]=GNOME zbirka ključev: PKCS#11 enota
-Comment[sr]=Гномови привесци: ПКЦС#11 компонента
-Comment[sr@latin]=Gnomovi privesci: PKCS#11 komponenta
-Comment[sv]=GNOME-nyckelring: PKCS#11-komponent
-Comment[ta]=GNOME கீரிங்:  PKCS#11 கூறு
-Comment[te]=GNOME కీరింగ్: PKCS#11 అంశం
-Comment[th]=พวงกุญแจของ GNOME: องค์ประกอบ PKCS#11
-Comment[tr]=GNOME Anahtarlığı: PKCS#11 Bileşeni
-Comment[ug]=GNOME ئاچقۇچ ھالقىسى：PKCS#11 دېتالى
-Comment[uk]=Служба в'язки ключів GNOME: компонент PKCS#11
-Comment[vi]=Vòng Khoá GNOME: thành phần PKCS#11
-Comment[zh_CN]=GNOME 密钥环：PKCS#11 组件
-Comment[zh_HK]=GNOME 密碼匙圈：PKCS#11 元件
-Comment[zh_TW]=GNOME 鑰匙圈：PKCS#11 元件
-Exec=/usr/bin/gnome-keyring-daemon --start --components=pkcs11
-OnlyShowIn=GNOME;Unity;
-X-GNOME-Autostart-Phase=Initialization
-X-GNOME-AutoRestart=false
-X-GNOME-Autostart-Notify=true
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=gnome-keyring
-X-GNOME-Bugzilla-Component=general
-X-GNOME-Bugzilla-Version=3.4.1
--- a/config/includes.chroot/etc/skel/.config/autostart/gnome-keyring-secrets.desktop
+++ b/config/includes.chroot/etc/skel/.config/autostart/gnome-keyring-secrets.desktop
@@ -1,126 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Secret Storage Service
-Name[af]=Geheimbergingsdiens
-Name[ar]=خدمة حفظ سرية
-Name[as]=গুপ্ত সংৰক্ষণ সেৱা
-Name[ast]=Serviciu d'almacenamientu de secretos
-Name[be]=Служба сховішча для сакрэтаў
-Name[bg]=Услуга за шифриран носител
-Name[bn]=গোপন সংরক্ষণ সম্পর্কিত সার্ভিস
-Name[ca]=Servei d'emmagatzematge de secrets
-Name[ca@valencia]=Servei d'emmagatzematge de secrets
-Name[cs]=Služba utajení dat
-Name[da]=Secret Storage Service
-Name[de]=Sicherheitsdienst
-Name[el]=Υπηρεσία κρυφής αποθήκευσης
-Name[en_GB]=Secret Storage Service
-Name[eo]=Servo pri sekreta memorejo
-Name[es]=Servicio de almacenamiento de secretos
-Name[et]=Saladuste hoidmise teenus
-Name[eu]=Ezkutuko biltegiaren zerbitzua
-Name[fa]=سرویس مخزن محرمانه
-Name[fi]=Salaisuuksien säilöntäpalvelu
-Name[fr]=Service de stockage secret
-Name[gl]=Servizo de almacenamento segredo
-Name[gu]=ખાનગી સંગ્રહ સેવા
-Name[he]=שרות אחסון חשאי
-Name[hu]=Titoktároló szolgáltatás
-Name[id]=Layanan Penyimpanan Rahasia
-Name[it]=Servizio archivio segreto
-Name[ja]=シークレットストレージサービス
-Name[km]=សេវាផ្ទុកសម្ងាត់
-Name[ko]=비밀 저장고 서비스
-Name[lt]=Slaptoji saugojimo tarnyba
-Name[lv]=Slepenās glabātavas serviss
-Name[mk]=Сервис за склад на тајни
-Name[ms]=Servis Rahsia Penyimpanan
-Name[nb]=Lagringstjeneste for hemmeligheter
-Name[nl]=Secret Storage Service
-Name[nn]=Hemmeleg lagerteneste
-Name[pa]=ਗੁਪਤ ਸਟੋਰੇਜ਼ ਸਰਵਿਸ
-Name[pl]=Usługa przechowywania haseł
-Name[pt]=Serviço de Armazenamento Secreto
-Name[pt_BR]=Serviço de armazenamento secreto
-Name[ro]=Serviciul secret de stocare
-Name[ru]=Служба безопасного хранения
-Name[sl]=Shranjevanje skritih storitev
-Name[sr]=Сервис са тајно складиштење
-Name[sr@latin]=Servis sa tajno skladištenje
-Name[sv]=Lagringstjänst för hemligheter
-Name[ta]= ரகசிய சேமிப்பு சேவை
-Name[te]=రహస్య నిల్వ సేవ
-Name[th]=บริการเก็บข้อมูลลับ
-Name[tr]=Gizli Depolama Hizmeti
-Name[ug]=مەخپىيەتلىكنى ساقلاش مۇلازىمېتى
-Name[uk]=Служба шифрування дисків
-Name[vi]=Dịch vụ lưu trữ mật
-Name[zh_CN]=保密存储服务
-Name[zh_HK]=保密儲存區服務
-Name[zh_TW]=保密儲存區服務
-Comment=GNOME Keyring: Secret Service
-Comment[af]=GNOME-sleutelring: geheimdiens
-Comment[ar]=حلقة مفاتيح جنوم: خدمة سرية
-Comment[as]=GNOME Keyring: গুপ্ত সেৱা
-Comment[ast]=Depósitu de claves de GNOME: Serviciu de secretos
-Comment[be]=Вязкі ключоў GNOME: служба сакрэтаў
-Comment[bg]=Ключодържател на GNOME: услуга за тайни
-Comment[bn]=GNOME কী রিং: গোপন সার্ভিস
-Comment[ca]=Anell de claus del GNOME: servei de secrets
-Comment[ca@valencia]=Anell de claus del GNOME: servei de secrets
-Comment[cs]=Klíčenka GNOME: Služba utajení dat
-Comment[da]=GNOME-nøglering: Secret Service
-Comment[de]=GNOME-Schlüsselbunddienst: Sicherheitsdienst
-Comment[el]=Κλειδοθήκη GNOME: Κρυφή υπηρεσία
-Comment[en_GB]=GNOME Keyring: Secret Service
-Comment[es]=Depósito de claves de GNOME: Servicio de secretos
-Comment[et]=GNOME võtmerõngas: saladuste teenus
-Comment[eu]=GNOMEren gako-sorta: ezkutuko zerbitzua
-Comment[fa]=دسته‌کلید گنوم: سرویس محرمانه
-Comment[fi]=Gnomen avainnippu: Salainen palvelu
-Comment[fr]=Trousseau de clés GNOME : service secret
-Comment[gl]=GNOME Keyring: servizo segredo
-Comment[gu]=GNOME કીરીંગ: ખાનગી સેવા
-Comment[he]=קבוצת מפתחות של GNOME: שירות חשאי
-Comment[hu]=GNOME kulcstartó – titokszolgáltatás
-Comment[id]=GNOME Keyring: Layanan Rahasia
-Comment[it]=Portachiavi di GNOME: servizio segreto
-Comment[ja]=GNOME キーリング: シークレットサービス
-Comment[km]=GNOME Keyring ៖ សេវាសម្ងាត់
-Comment[ko]=그놈 키 모음: 비밀 서비스
-Comment[lt]=GNOME raktinė: slaptoji tarnyba
-Comment[lv]=GNOME Keyring: slepenais serviss
-Comment[mk]=Приврзок на GNOME: таен сервис
-Comment[ms]=GNOME Keyring: Servis Rahsia
-Comment[nb]=GNOME nøkkelring: Hemmelige tjenester
-Comment[nl]=Sleutelbos-service: Secret Service
-Comment[nn]=GNOME Nøkkelring: Hemmeleg teneste
-Comment[pa]=ਗਨੋਮ ਕੀਰਿੰਗ ਡੈਮਨ: ਗੁਪਤ ਸਰਵਿਸ
-Comment[pl]=Baza kluczy dla środowiska GNOME: usługa haseł
-Comment[pt]=GNOME Keyring: Serviço Secreto
-Comment[pt_BR]=Chaveiro do GNOME: Serviço secreto
-Comment[ro]=Inelul de chei GNOME: Serviciul secret
-Comment[ru]=Связка ключей GNOME: служба безопасности
-Comment[sl]=GNOME zbirka ključev: skrite storitve
-Comment[sr]=Гномови привесци: сервис за тајност
-Comment[sr@latin]=Gnomovi privesci: servis za tajnost
-Comment[sv]=GNOME-nyckelring: Hemlighetstjänst
-Comment[ta]=GNOME கீரிங்: ரகசிய சேவை
-Comment[te]=GNOME కీరింగ్: రహస్య సేవ
-Comment[th]=พวงกุญแจของ GNOME: บริการเก็บข้อมูลลับ
-Comment[tr]=GNOME Anahtarlığı: Gizli Hizmet
-Comment[ug]=GNOME ئاچقۇچ ھالقىسى：مەخپىيەت مۇلازىمېتى
-Comment[uk]=Служба в'язки ключів GNOME: служба шифрування
-Comment[vi]=Vòng Khoá GNOME: dịch vụ mật
-Comment[zh_CN]=GNOME 密钥环：保密服务
-Comment[zh_HK]=GNOME 密碼匙圈：保密服務
-Comment[zh_TW]=GNOME 鑰匙圈：保密服務
-Exec=/usr/bin/gnome-keyring-daemon --start --components=secrets
-OnlyShowIn=GNOME;Unity;
-X-GNOME-Autostart-Phase=Initialization
-X-GNOME-AutoRestart=false
-X-GNOME-Autostart-Notify=true
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=gnome-keyring
-X-GNOME-Bugzilla-Component=general
-X-GNOME-Bugzilla-Version=3.4.1
--- a/config/includes.chroot/etc/skel/.config/autostart/gnome-keyring-ssh.desktop
+++ b/config/includes.chroot/etc/skel/.config/autostart/gnome-keyring-ssh.desktop
@@ -1,125 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=SSH Key Agent
-Name[af]=SSH-sleutelagent
-Name[ar]=عميل مفاتيح SSH
-Name[as]=SSH চাবি সহায়ক
-Name[ast]=Axente de claves SSH
-Name[be]=SSH-агент ключоў
-Name[bg]=Агентът на SSH за ключове
-Name[bn]=SSH কী এজেন্ট
-Name[ca]=Agent de claus SSH
-Name[ca@valencia]=Agent de claus SSH
-Name[cs]=Agent klíčů SSH
-Name[da]=SSH-nøgleagent
-Name[de]=SSH-Schlüsselagent
-Name[el]=Πράκτορας (agent) κλειδιού SSH
-Name[en_GB]=SSH Key Agent
-Name[es]=Agente de claves SSH
-Name[et]=SSH-võtmete agent
-Name[eu]=SSH gako-agentea
-Name[fa]=مامور کلید SSH
-Name[fi]=SSH-avainten agentti
-Name[fr]=Agent de clés SSH
-Name[gl]=Axente de chave SSH
-Name[gu]=SSH કી ઍજન્ટ
-Name[he]=סוכן מפתחות SSH
-Name[hu]=SSH-kulcs ügynök
-Name[id]=Agen Kunci SSH
-Name[it]=Agente chiavi SSH
-Name[ja]=SSH 鍵エージェント
-Name[km]=ភ្នាក់ងារសោ SSH
-Name[ko]=SSH 키 에이전트
-Name[lt]=SSH raktų tarnyba
-Name[lv]=SSH atslēgu aģents
-Name[mk]=Агент за SSH клучеви
-Name[ms]=Agen Kekunci SSH
-Name[nb]=SSH-nøkkelagent
-Name[nl]=SSH-sleutelagent
-Name[nn]=Nøkkelagent for SSH
-Name[pa]=SSH ਕੁੰਜੀ ਏਜੰਟ
-Name[pl]=Agent kluczy SSH
-Name[pt]=Agente de Chaves SSH
-Name[pt_BR]=Agente de chaves SSH
-Name[ro]=Agent pentru chei SSH
-Name[ru]=Агент ключей SSH
-Name[sl]=SSH Agent ključev
-Name[sr]=Агент за ССХ кључеве
-Name[sr@latin]=Agent za SSH ključeve
-Name[sv]=SSH-nyckelagent
-Name[ta]=SSH முகவர்
-Name[te]=SSH కీ వాహకము
-Name[th]=เอเจนต์กุญแจ SSH
-Name[tr]=SSH Anahtar Aracı
-Name[ug]=SSH  ئاچقۇچ ياردەمچىسى
-Name[uk]=Агент ключів SSH
-Name[vi]=Tác nhân khoá SSH
-Name[zh_CN]=SSH 密钥代理
-Name[zh_HK]=SSH 密碼匙代理程式
-Name[zh_TW]=SSH 金鑰代理程式
-Comment=GNOME Keyring: SSH Agent
-Comment[af]=GNOME-sleutelring: SSH-agent
-Comment[ar]=حلقة مفاتيح جنوم: عميل SSH
-Comment[as]=GNOME Keyring: SSH সহায়ক
-Comment[ast]=Depósitu de claves de GNOME: axente SSH
-Comment[be]=Вязкі ключоў GNOME: SSH-агент
-Comment[bg]=Ключодържател на GNOME: агент на SSH
-Comment[bn]=GNOME কী রিং: SSH এজেন্ট
-Comment[ca]=Anell de claus del GNOME: agent SSH
-Comment[ca@valencia]=Anell de claus del GNOME: agent SSH
-Comment[cs]=Klíčenka GNOME: Agent SSH
-Comment[da]=GNOME-nøgleringsdæmon: SSH-agent
-Comment[de]=GNOME-Schlüsselbunddienst: SSH-Agent
-Comment[el]=Κλειδοθήκη GNOME: Πράκτορας (agent) SSH
-Comment[en_GB]=GNOME Keyring: SSH Agent
-Comment[es]=Depósito de claves de GNOME: agente SSH
-Comment[et]=GNOME võtmerõngas: SSH-agent
-Comment[eu]=GNOMEren gako-sorta: SSH agentea
-Comment[fa]=دسته‌کلید گنوم: مامور SSH
-Comment[fi]=Gnomen avainnippu: SSH-agentti
-Comment[fr]=Trousseau de clés GNOME : agent SSH
-Comment[gl]=GNOME Keyring: Axente SSH
-Comment[gu]=GNOME કીરીંગ: SSH ઍજન્ટ
-Comment[he]=קבוצת מפתחות של GNOME: סוכן SSH
-Comment[hu]=GNOME kulcstartó – SSH-ügynök
-Comment[id]=Ring Kunci GNOME: Agen SSH
-Comment[it]=Portachiavi di GNOME: agente SSH
-Comment[ja]=GNOME キーリング: SSH エージェント
-Comment[km]=GNOME Keyring ៖ ភ្នាក់ងារ SSH
-Comment[ko]=그놈 키 모음: SSH 에이전트
-Comment[lt]=GNOME raktinė: SSH tarnyba
-Comment[lv]=GNOME Keyring: SSH aģents
-Comment[mk]=Приврзок на GNOME: SSH агент
-Comment[ms]=GNOME Keyring: Agen SSH
-Comment[nb]=GNOME nøkkelring: SSH-agent
-Comment[nl]=Sleutelbos-service: SSH-agent
-Comment[nn]=GNOME Nøkkelring: SSH-agent
-Comment[pa]=ਗਨੋਮ ਕੀਰਿੰਗ: SSH ਏਜੰਟ
-Comment[pl]=Baza kluczy dla środowiska GNOME: agent SSH
-Comment[pt]=GNOME Keyring: Agente SSH
-Comment[pt_BR]=Chaveiro do GNOME: Agente SSH
-Comment[ro]=Inelul de chei GNOME: Agent SSH
-Comment[ru]=Связка ключей GNOME: SSH-агент
-Comment[sl]=GNOME zbirka ključev: SSH agent
-Comment[sr]=Гномови привесци: ССХ агент
-Comment[sr@latin]=Gnomovi privesci: SSH agent
-Comment[sv]=GNOME-nyckelring: SSH-agent
-Comment[ta]=GNOME கீரிங்: SSH முகவர்
-Comment[te]=GNOME కీరింగ్: SSH వాహకం
-Comment[th]=พวงกุญแจของ GNOME: เอเจนต์ SSH
-Comment[tr]=GNOME Anahtarlığı: SSH Aracı
-Comment[ug]=GNOME ئاچقۇچ ھالقىسى：SSH  ياردەمچىسى
-Comment[uk]=Служба в'язки ключів GNOME: агент SSH
-Comment[vi]=Vòng Khoá GNOME: SSH Agent
-Comment[zh_CN]=GNOME 密钥环：SSH 代理
-Comment[zh_HK]=GNOME 密碼匙圈：SSH 代理程式
-Comment[zh_TW]=GNOME 鑰匙圈：SSH 代理程式
-Exec=/usr/bin/gnome-keyring-daemon --start --components=ssh
-OnlyShowIn=GNOME;Unity;
-X-GNOME-Autostart-Phase=Initialization
-X-GNOME-AutoRestart=false
-X-GNOME-Autostart-Notify=true
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=gnome-keyring
-X-GNOME-Bugzilla-Component=general
-X-GNOME-Bugzilla-Version=3.4.1
--- a/config/includes.chroot/etc/skel/.config/autostart/liferea.desktop
+++ b/config/includes.chroot/etc/skel/.config/autostart/liferea.desktop
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Application
-Exec=liferea --mainwindow-state=iconified
-NotShowIn=GNOME
-Hidden=true
-Name[fr_FR]=Lecteur de Flux Liferea
-Name=Lecteur de Flux Liferea
-Comment[fr_FR]=Lecteur de nouvelles RSS
-Comment=Lecteur de nouvelles RSS
-Icon=liferea
--- a/config/includes.chroot/etc/skel/.config/autostart/org.keepassxc.KeePassXC.desktop
+++ b/config/includes.chroot/etc/skel/.config/autostart/org.keepassxc.KeePassXC.desktop
@@ -1,2 +0,0 @@
-[Desktop Entry]
-Hidden=True
--- a/config/includes.chroot/etc/skel/.config/autostart/pidgin.desktop
+++ b/config/includes.chroot/etc/skel/.config/autostart/pidgin.desktop
@@ -1,176 +0,0 @@
-[Desktop Entry]
-Name=Pidgin Internet Messenger
-Name[af]=Pidgin Internetboodskapper
-Name[ar]=مرسال الإنترنت بِدْجِن
-Name[be@latin]=Internet-kamunikatar Pidgin
-Name[bn]=পিজিন ইন্টারনেট বার্তাবাহক
-Name[bn_IN]=Pidgin ইন্টারনেট মেসেঞ্জার
-Name[ca]=Missatger d'Internet Pidgin
-Name[ca@valencia]=Missatger d'Internet Pidgin
-Name[cs]=Pidgin Internet Messenger
-Name[da]=Pidgin Internet Besked
-Name[de]=Pidgin Internet-Sofortnachrichtendienst
-Name[el]=Αποστολέας μηνυμάτων διαδικτύου Pidgin
-Name[en_GB]=Pidgin Internet Messenger
-Name[eo]=Piĝin Interreta Mesaĝilo
-Name[es]=Cliente de mensajería de Internet Pidgin
-Name[et]=Pidgin, Interneti sõnumivahetus
-Name[eu]=Pidgin Internet-Mezularia
-Name[fa]=پیغام‌رسان اینترنتی پیجین
-Name[fi]=Pidgin-pikaviestin
-Name[fr]=Messagerie internet Pidgin
-Name[gl]=Mensaxería na Internet de Pidgin
-Name[gu]=Pidgin Internet Messenger
-Name[he]=פידג'ין למסרים באינטרנט
-Name[hi]=पिडगिन इंटरनेट मैसेंजर
-Name[hu]=Pidgin üzenetküldő
-Name[id]=Pesan Internet Pidgin
-Name[it]=Pidgin Internet Messenger
-Name[ja]=Pidgin インターネット・メッセンジャー
-Name[km]=កម្មវិធីផ្ញើសារអ៊ីនធឺណិតរបស់ Pidgin
-Name[kn]=ಪಿಜಿನ್ ಇಂಟರ್ನೆಟ್ ಮೆಸೆಂಜರ್
-Name[ko]=Pidgin 인터넷 메신저
-Name[lt]=Pidgin pokalbiai internete
-Name[mai]=पिजिन इंटरनेट मेसेंजर
-Name[mhr]=Pidgin писе каласымаш алмаш клиент
-Name[mk]=Pidgin инстант пораки
-Name[mn]=Пизин Интернет Мессенжер
-Name[mr]=Pidgin इंटरनेट संदेशवाहक
-Name[nb]=Pidgin Lynmeldingsklient
-Name[nl]=Pidgin Internet Messenger
-Name[nn]=Pidgin Internett meldingsklient
-Name[or]=ପିଜିନ୍ ଇଣ୍ଟରନେଟ ସଂଦେଶବାହକ
-Name[pa]=ਪਿਡਗਿਨ ਇੰਟਰਨੈਟ ਮੈਸੰਜ਼ਰ
-Name[pl]=Komunikator internetowy Pidgin
-Name[pt_BR]=Mensageiro da Internet Pidgin
-Name[ro]=Mesagerul Pidgin
-Name[ru]=Клиент обмена мгновенными сообщениями Pidgin
-Name[sk]=Internetový komunikátor Pidgin
-Name[sl]=Spletni sel Pidgin
-Name[sq]=Pidgin Internet Messenger
-Name[sr]=Пиџин Интернет писмоноша
-Name[sr@latin]=Pidžin Internet pismonoša
-Name[sv]=Pidgin Meddelandeklient
-Name[ta]=Pidgin இணையத்தள மேலாளர்
-Name[te]=పిడ్జిన్ ఇంటర్నెట్ మెసెంజర్
-Name[tr]=Pidgin İnternet Mesajlaşma Aracı
-Name[uk]=Клієнт обміну миттєвими повідомленнями Pidgin
-Name[vi]=Tin Nhắn Pidgin
-Name[zh_CN]=Pidgin 互联网通讯程序
-Name[zh_HK]=Pidgin 網絡即時通
-Name[zh_TW]=Pidgin 網路即時通
-GenericName=Internet Messenger
-GenericName[af]=Internetboodskapper
-GenericName[ar]=مرسال إنترنت
-GenericName[be@latin]=Internet-kamunikatar
-GenericName[bg]=Бързи съобщения
-GenericName[bn]=ইন্টারনেট বার্তাবাহক
-GenericName[bn_IN]=ইন্টারনেট মেসেঞ্জার
-GenericName[ca]=Missatger d'Internet
-GenericName[ca@valencia]=Missatger d'Internet
-GenericName[cs]=Internet Messenger
-GenericName[da]=Internet beskeder
-GenericName[de]=Internet-Sofortnachrichtendienst
-GenericName[dz]=ཨིན་ཊར་ནེཊི་འཕྲིན་སྐྱེལ་པ།
-GenericName[el]=Αποστολέας μηνυμάτων διαδικτύου
-GenericName[en_GB]=Internet Messenger
-GenericName[eo]=Interreta Mesaĝilo
-GenericName[es]=Cliente de mensajería de Internet
-GenericName[et]=Interneti sõnumivahetus
-GenericName[eu]=Internet-Mezularia
-GenericName[fa]=پیغام‌رسان اینترنتی
-GenericName[fi]=Pikaviestin
-GenericName[fr]=Messagerie internet
-GenericName[gl]=Mensaxería na Internet
-GenericName[gu]=Internet Messenger
-GenericName[he]=למסרים באינטרנט
-GenericName[hi]=इंटरनेट मेसेंजर
-GenericName[hu]=Azonnali üzenetküldés
-GenericName[id]=Pengirim Pesan Internet
-GenericName[it]=Internet Messenger
-GenericName[ja]=インターネット・メッセンジャー
-GenericName[km]=កម្មវិធីផ្ញើសារអ៊ីនធឺណិត
-GenericName[kn]=ಇಂಟರ್ನೆಟ್ ಮೆಸ್ಸೆಂಜರ್ 
-GenericName[ko]=인터넷 메신저
-GenericName[ku]=Peyamnêra înternetê
-GenericName[lt]=Pokalbiai internete
-GenericName[mai]=इंटरनेट मेसेंजर
-GenericName[mhr]=Писе каласымаш алмаш клиент
-GenericName[mk]=Инстант пораки
-GenericName[mn]=Интернет Мессенжер
-GenericName[mr]=इंटरनेट मेसेंजर
-GenericName[nb]=Lynmeldingsklient
-GenericName[nl]=Internet Messenger
-GenericName[nn]=Lynmeldingsklient
-GenericName[or]=ଇଣ୍ଟରନେଟ ସଂଦେଶବାହାକ
-GenericName[pa]=ਇੰਟਰਨੈਟ ਮੈਸੰਜ਼ਰ
-GenericName[pl]=Komunikator internetowy
-GenericName[ps]=د انترنت زری
-GenericName[pt]=Mensageiro Internet
-GenericName[pt_BR]=Mensageiro da Internet
-GenericName[ro]=Mesagerie instant
-GenericName[ru]=Клиент обмена мгновенными сообщениями
-GenericName[si]=අන්තර්ජාල පණිවිඩකරු
-GenericName[sk]=Internetový komunikátor
-GenericName[sl]=Spletni sel
-GenericName[sq]=Lajmësjellës Internet
-GenericName[sr]=Интернет писмоноша
-GenericName[sr@latin]=Internet pismonoša
-GenericName[sv]=Meddelandeklient
-GenericName[ta]=இணையதள தூதுவர்
-GenericName[te]=ఇంటర్నెట్ మెసెంజర్
-GenericName[th]=โปรแกรมข้อความด่วน
-GenericName[tr]=İnternet Mesajlaşma Aracı
-GenericName[uk]=Спілкування миттєвими повідомленнями
-GenericName[ur]=ا نٹرنیٹ میسینجر
-GenericName[vi]=Tin Nhắn
-GenericName[zh_CN]=互联网通讯程序
-GenericName[zh_HK]=網絡即時通
-GenericName[zh_TW]=網路即時通
-Comment=Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more
-Comment[af]=Gesels met kitsboodsappe.  Daar is ondersteuning vir AIM, Google Talk, Jabber/XMPP, MSN, Yahoo en meer
-Comment[bn]=IM-এর মাধ্যমে আড্ডা দিন। যা AIM, Google Talk, Jabber/XMPP, MSN, Yahoo এবং আরও অনেক কিছু সমর্থন করে 
-Comment[bn_IN]=IM-র মাধ্যমে আলাপ।  AIM, Google Talk, Jabber/XMPP, MSN, Yahoo এবং আরো অনেক সমর্থিত হয়
-Comment[ca]=Xategeu amb missatgeria instantània, amb AIM, Google Talk, Jabber/XMPP, MSN, Yahoo i més
-Comment[ca@valencia]=Xategeu amb missatgeria instantània, amb AIM, Google Talk, Jabber/XMPP, MSN, Yahoo i més
-Comment[cs]=Chat pomocí IM. Podporuje AIM, Google Talk, Jabber/XMPP, MSN, Yahoo a další
-Comment[de]=Chatten mit Kurznachrichten.  Unterstützt AIM, Google Talk, Jabber/XMPP, MSN, Yahoo und weitere
-Comment[en_GB]=Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more
-Comment[es]=Chat sobre MI. Ofrece soporte para AMI, Google Talk, Jabber/XMPP, MSN, Yahoo! y más
-Comment[fr]=Conversation par messages instantanés. Supporte AIM, Google Talk, Jabber/XMPP, MSN, Yahoo et d'autres
-Comment[gu]=IM પર વાતચીત. AIM, Google Talk, Jabber/XMPP, MSN, Yahoo અને વધારેને આધાર આપે છે
-Comment[he]=צ'אט בעזרת הודעות-מיידיות.  תומך AIM, Google Talk, Jabber/XMPP, MSN, Yahoo ועוד
-Comment[hi]=IM पर चैट.  AIM, Google Talk, Jabber/XMPP, MSN, Yahoo और कुछ और का समर्थन करता है
-Comment[hu]=Azonnali üzenetküldés AIM, Google Talk, Jabber/XMPP, MSN, Yahoo és más protokollok támogatásával
-Comment[it]=Chat attraverso MI. Supporta AIM, Google Talk, Jabber/XMPP, MSN, Yahoo ed altri ancora
-Comment[km]=ជជែកកំសាន្តតាម IM ។ គាំទ្រ AIM, Google Talk, Jabber/XMPP, MSN, យ៉ាហ៊ូ និងផ្សេងៗទៀត
-Comment[kn]=IM ಮೂಲಕ ಮಾತುಕತೆ.  AIM, Google Talk, Jabber/XMPP, MSN, Yahoo ಹಾಗು ಇನ್ನೂ ಬಹಳಷ್ಟನ್ನು ಬೆಂಬಲಿಸುತ್ತದೆ
-Comment[mhr]=Писе каласымаш дене тототлымвер. AIM, Google Talk, Jabber/XMPP, MSN, Yahoo да молылын эҥерта
-Comment[mr]=IM वरील संभाषण. AIM, Google Talk, Jabber/XMPP, MSN, Yahoo व आणखीकरीता समर्थन पुरवतो
-Comment[nb]=Samtale over IM. Støtter AIM, Google Talk, Jabber/XMPP, MSN, Yahoo! og mer
-Comment[nl]=Chat over IM. Ondersteunt AIM, Google Talk, Jabber/XMPP, MSN, Yahoo en meer
-Comment[nn]=Prat ved hjelp av lynmeldingar.  Støttar AIM, Google Talk, Jabber/XMPP, MSN, Yahoo og fleire
-Comment[or]=IM ଉପରେ ଚାର୍ଟ।  AIM, Google Talk, Jabber/XMPP, MSN, Yahoo ଏବଂ ସେହିପରି ଅନେକକୁ ସମର୍ଥନ କରିଥାଏ
-Comment[pa]=IM ਰਾਹੀਂ ਗੱਲਬਾਤ। AIM, ਗੂਗਲ ਟਾਕ, ਜੱਬਰ/XMPP, MSN, ਯਾਹੂ ਅਤੇ ਹੋਰ ਲਈ ਸਹਾਇਕ।
-Comment[pl]=Rozmawianie przez komunikator. Obsługuje sieci AIM, Google Talk, Jabber/XMPP, MSN, Yahoo oraz więcej
-Comment[ro]=Chat prin mesaje instant. Suportă rețelele AIM, Google Talk, Jabber/XMPP, MSN, Yahoo și altele.
-Comment[ru]=Переписка мгновенными сообщениями.  Поддерживает AIM, Google Talk, Jabber/XMPP, MSN, Yahoo и не только
-Comment[sk]=Chat cez IM.  Podporuje AIM, Google Talk, Jabber/XMPP, MSN, Yahoo a ďalšie
-Comment[sl]=Klepetajte s svetom. Podpira AIM, Google Talk, Jabber/XMPP, MSN, Yahoo in druge.
-Comment[sq]=Fjalosje përmes IM-së.  Mbulon AIM, Google Talk, Jabber/XMPP, MSN, Yahoo dhe të tjera
-Comment[sv]=Skicka snabbmeddelanden. Stödjer AIM, Google Talk, Jabber/XMPP, MSN, Yahoo med fler
-Comment[ta]=அரட்டை IM முடிந்தது.  AIMக்கு துணைபுரிகிறது, Google Talk, Jabber/XMPP, MSN, Yahoo மற்றும் மேலும்
-Comment[te]=IM నందు చాట్.  AIM, Google Talk, Jabber/XMPP, MSN, Yahoo మరియు మరిన్ని మద్దతిస్తుంది
-Comment[uk]=Балачка через миттєві повідомлення. Підтримує AIM, Google Talk, Jabber/XMPP, MSN, Yahoo та інші
-Comment[vi]=Trò chuyện qua mạng tin nhắn tức khắc: hỗ trợ AIM, Google Talk, Jabber/XMPP, MSN, Yahoo và nhiều mạng khác
-Comment[zh_CN]=互联网通讯程序。 支持 AIM、Google Talk、Jabber/XMPP、MSN、Yahoo 和更多
-Comment[zh_HK]=讓你可以透過即時通訊與好友聊天，支援 AIM、Google Talk、Jabber/XMPP、MSN、Yahoo 等等
-Comment[zh_TW]=讓您可以透過即時通訊與好友聊天，支援 AIM、Google Talk、Jabber/XMPP、MSN、Yahoo 等等
-Exec=pidgin
-Icon=pidgin
-StartupNotify=true
-Terminal=false
-Type=Application
-Categories=Network;InstantMessaging;
-NotShowIn=GNOME
-Hidden=true
--- a/config/includes.chroot/etc/skel/.config/autostart/print-applet.desktop
+++ b/config/includes.chroot/etc/skel/.config/autostart/print-applet.desktop
@@ -1,99 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Print Queue Applet
-Name[ar]=بريمج طابور الطباعة
-Name[as]=মূদ্ৰণ কৰক
-Name[bg]=Аплет за печат на опашката
-Name[br]=Arloadig al lostennad moullañ
-Name[ca]=Miniaplicació de la cua d'impressió
-Name[cs]=Applet tiskové fronty
-Name[da]=Panelprogram for udskriftskø
-Name[de]=Applet für Druckerwarteschlange
-Name[el]=Μικροεφαρμογή ουράς εκτύπωσης
-Name[en_GB]=Print Queue Applet
-Name[es]=Applet de la Cola de Impresión
-Name[et]=Trükijärjekorra aplett
-Name[fi]=Tulostusjonosovelma
-Name[fr]=Applet de file d'attente d'impression
-Name[gu]=છાપન કતાર એપ્લેટ
-Name[he]=יישומון תורי הדפסה
-Name[hr]=Aplet čekanja ispisa
-Name[hu]=Nyomtatásisor-alkalmazás
-Name[is]=Prentbiðraðarsmáforrit
-Name[it]=Applet coda di stampa
-Name[ja]=印刷待ち行列アプレット
-Name[kn]=ಮುದ್ರಕ ಸರತಿ Applet
-Name[ko]=인쇄 대기 상태 애플릿
-Name[nb]=Panelprogram for utskriftskø
-Name[nl]=Printwachtrij-applet
-Name[nn]=Panelprogram for utskriftskø
-Name[or]=ମୂଦ୍ରଣୀ ଧାଡି ଆପ୍ଲେଟ
-Name[pl]=Aplet kolejki drukowania
-Name[pt]=Applet da fila de impressão
-Name[pt_BR]=Miniaplicativo da fila de impressão
-Name[ro]=Mini-aplicație coadă tipărire
-Name[ru]=Апплет очереди печати
-Name[sk]=Applet tlačovej fronty
-Name[sr]=Програмче за ред штампања
-Name[sr@latin]=Programče za red štampanja
-Name[sv]=Panelprogram för utskriftskö
-Name[th]=แอพเพลตคิวพิมพ์
-Name[uk]=Аплет черги друку
-Name[vi]=Tiểu dụng hàng đợi in
-Name[zh_CN]=打印队列 Applet
-Name[zh_TW]=列印佇列面板程式
-Comment=System tray icon for managing print jobs
-Comment[ar]=أيقونة لوحة النظام لإدارة مهام الطباعة
-Comment[as]=মূদ্ৰণ কাৰ্য্য পৰিচালনাৰ বাবে ব্যৱস্থাপ্ৰণালী-ট্ৰে তে প্ৰদৰ্শনযোগ্য আইকন
-Comment[bg]=Systray икона за управление на задачите на принтера
-Comment[bn_IN]=প্রিন্ট কর্ম পরিচালনার জন্য সিস্টেম-ট্রে তে প্রদর্শনযোগ্য আইকন
-Comment[br]=Arlun ar maez rebuziñ evit ardeiñ al labourioù moullañ
-Comment[ca]=Icona de l'àrea de notificació per a gestionar les tasques d'impressió
-Comment[cs]=Ikona v oznamovací oblasti pro správu tiskových úloh
-Comment[da]=Statusikon til håndtering af udskriftsjob
-Comment[de]=Info-Symbol zur Verwaltung von Druckaufträgen
-Comment[el]=Εικονίδιο μπάρας συστήματος για διαχείριση εργασιών εκτύπωσης
-Comment[en_GB]=System tray icon for managing print jobs
-Comment[es]=Icono del area de notificación para administrar trabajos de impresión
-Comment[et]=Süsteemse salve ikoon trükitööde haldamiseks
-Comment[fi]=Ilmoitusalueen kuvake tulostustöiden hallintaan
-Comment[fr]=Zone de notification pour la gestion des tâches d'impression
-Comment[gu]=છાપન ક્રિયાઓની વ્યવસ્થા કરવા માટે સિસ્ટમ ટ્રે ચિહ્ન
-Comment[he]=צלמית במגש המערכת עבור ניהול משימות הדפסה
-Comment[hi]=छपाई काम प्रबंधन के लिये सिस्टम ट्रे प्रतीक
-Comment[hr]=Ikona trake sustava za upravljanje zadacima ispisivanja
-Comment[hu]=Rendszertálca-ikon nyomtatási feladatok kezeléséhez
-Comment[is]=Táknmynd á spjaldið til að stýra prentverkum
-Comment[it]=Icona dell'area di notifica di sistema per gestire i lavori di stampa
-Comment[ja]=印刷ジョブを管理するシステムトレイアイコン
-Comment[kn]=ಮುದ್ರಣ ಕಾರ್ಯಗಳನ್ನು ನಿರ್ವಹಿಸಲು ಗಣಕ ಟ್ರೇ ಲಾಂಛನ
-Comment[ko]=인쇄 작업 관리를 위한 시스템 트레이 아이콘
-Comment[ml]=പ്റിന്‍റ് ചെയ്യുവാനുളളവ കൈകാര്യം ചെയ്യുന്നതിനുളള സിസ്റ്റം ട്റെ ഐക്കണ്‍
-Comment[nb]=Varselikon for utskriftsjobber for systemområdet
-Comment[nl]=Systeemvak icoon voor het beheren van printopdrachten
-Comment[nn]=Systemtrauikon for handsaming av utskriftsjobbar
-Comment[or]=ମୁଦ୍ରଣ କାର୍ଯ୍ଯ ମାନଙ୍କୁ ପରିଚାଳନା କରିବା ପାଇଁ ତନ୍ତ୍ର ଟ୍ରେ ଚିତ୍ରସଙ୍କେତ
-Comment[pl]=Ikona w obszarze powiadamiania do zarządzania zadaniami wydruku
-Comment[pt]=Ícone para gerir as tarefas de impressão
-Comment[pt_BR]=Ícone de bandeja do sistema para o gerenciamento de trabalhos de impressão
-Comment[ro]=Iconiță în zona de notificare pentru gestionarea proceselor de tipărire
-Comment[ru]=Иконка области уведомления для управления заданиями печати
-Comment[sk]=Ikona na paneli úloh pre správu tlačových úloh
-Comment[sr]=Икона системске обавештајне зоне за управљање штампарским пословима
-Comment[sr@latin]=Ikona sistemske obaveštajne zone za upravljanje štamparskim poslovima
-Comment[sv]=Aktivitetsfältsikon för administration av utskriftsjobb
-Comment[ta]=அச்சு பணிகளை மேலாண்மை செய்ய கணின தட்டு சின்னம்
-Comment[th]=ไอคอนแถบสถานะสำหรับจัดการงานพิมพ์
-Comment[uk]=Значок у системній області для керування завданнями друку
-Comment[vi]=Biểu tượng khay hệ thống để quản lý các công việc in
-Comment[zh_CN]=管理打印任务的系统托盘图标
-Comment[zh_TW]=管理列印工作的系統匣圖示
-Exec=system-config-printer-applet
-Terminal=false
-Type=Application
-Icon=printer
-NotShowIn=KDE;
-StartupNotify=false
-Categories=GTK;Monitor;System;
-NotShowIn=GNOME
-Hidden=True
--- a/config/includes.chroot/etc/skel/.config/bleachbit/bleachbit.ini
+++ b/config/includes.chroot/etc/skel/.config/bleachbit/bleachbit.ini
@@ -1,18 +0,0 @@
-[bleachbit]
-first_start = False
-check_beta = False
-check_online_updates = False
-auto_hide = True
-version = 1.10
-auto_start = False
-shred = True
-exit_done = True
-delete_confirmation = True
-
-[preserve_languages]
-fr = True
-en = True
-
-[whitelist/paths]
-0_type = folder
-0_path = ~/.gvfs
--- a/config/includes.chroot/etc/skel/.config/chromium/First
+++ b/config/includes.chroot/etc/skel/.config/chromium/First
--- a/config/includes.chroot/etc/skel/.config/google-chrome/First
+++ b/config/includes.chroot/etc/skel/.config/google-chrome/First
--- a/config/includes.chroot/etc/skel/.config/gtk-3.0/gtk.css
+++ b/config/includes.chroot/etc/skel/.config/gtk-3.0/gtk.css
@@ -1,5 +0,0 @@
-#pulseaudio-button * {
-
-gtk-icon-transform: scale(.6);
-
-}
--- a/config/includes.chroot/etc/skel/.config/keepassxc/keepassxc.ini
+++ b/config/includes.chroot/etc/skel/.config/keepassxc/keepassxc.ini
@@ -1,18 +0,0 @@
-[General]
-MinimizeOnCopy=false
-OpenPreviousDatabasesOnStartup=true
-RememberLastDatabases=true
-SingleInstance=true
-
-[Browser]
-Enabled=true
-SearchInAllDatabases=true
-
-[GUI]
-HidePasswords=true
-HideUsernames=false
-MinimizeOnClose=true
-MinimizeOnStartup=true
-MinimizeToTray=true
-ShowTrayIcon=true
-TrayIconAppearance=monochrome-light
--- a/config/includes.chroot/etc/skel/.config/libvirt/libvirt.conf
+++ b/config/includes.chroot/etc/skel/.config/libvirt/libvirt.conf
@@ -1 +0,0 @@
-uri_default = 'qemu:///system'
--- a/config/includes.chroot/etc/skel/.config/mimeapps.list
+++ b/config/includes.chroot/etc/skel/.config/mimeapps.list
@@ -1,23 +1,7 @@
 [Added Associations]
-application/pdf=org.gnome.Evince.desktop;
-application/x-extension-htm=firefox-esr.desktop
-application/x-extension-html=firefox-esr.desktop
+application/x-extension-htm=google-chrome.desktop
+application/x-extension-html=google-chrome.desktop
 application/x-shellscript=mousepad.desktop
-audio/flac=vlc.desktop;
-audio/mp4=vlc.desktop;
-audio/mpeg=vlc.desktop
-audio/ogg=vlc.desktop;
-audio/x-aiff=vlc.desktop;
-audio/x-opus+ogg=vlc.desktop;
-audio/x-vorbis+ogg=vlc.desktop;
-audio/x-wav=vlc.desktop;
-image/bmp=ristretto.desktop
-image/gif=ristretto.desktop
-image/jpeg=ristretto.desktop
-image/png=ristretto.desktop
-image/svg+xml=ristretto.desktop
-image/tiff=ristretto.desktop
-image/x-pixmap=ristretto.desktop
 text/css=mousepad.desktop
 text/plain=mousepad.desktop
 text/x-log=mousepad.desktop
@@ -26,10 +10,3 @@ text/x-markdown=mousepad.desktop
 text/x-python=mousepad.desktop
 text/x-python3=mousepad.desktop
 text/x-yaml=mousepad.desktop
-video/mp4=vlc.desktop;
-video/quicktime=vlc.desktop;
-video/webm=vlc.desktop;
-video/x-flv=vlc.desktop;
-video/x-matroska=vlc.desktop
-video/x-ms-wmv=vlc.desktop;
-video/x-msvideo=vlc.desktop;
--- a/config/includes.chroot/etc/skel/.config/redshift.conf
+++ b/config/includes.chroot/etc/skel/.config/redshift.conf
@@ -1,15 +0,0 @@
-; Global settings
-[redshift]
-temp-day=5500
-temp-night=3000
-transition=1
-; gamma=0.8:0.7:0.8
-location-provider=manual
-adjustment-method=randr
-
-; The location provider and adjustment method settings
-; are in their own sections.
-[manual]
-lat=48.48
-lon=2.20
-
--- a/config/includes.chroot/etc/skel/.config/transmission/settings.json
+++ b/config/includes.chroot/etc/skel/.config/transmission/settings.json
@@ -1,31 +0,0 @@
-{
-    "compact-view": true, 
-    "dht-enabled": true, 
-    "encryption": 1, 
-    "inhibit-desktop-hibernation": true, 
-    "lpd-enabled": false, 
-    "peer-limit-global": 350, 
-    "peer-limit-per-torrent": 160, 
-    "peer-port": 52943, 
-    "peer-port-random-on-start": false, 
-    "pex-enabled": true, 
-    "play-download-complete-sound": true, 
-    "port-forwarding-enabled": false, 
-    "preallocation": 0, 
-    "prompt-before-exit": false, 
-    "rename-partial-files": true, 
-    "rpc-enabled": false, 
-    "rpc-whitelist-enabled": true, 
-    "show-desktop-notification": true, 
-    "show-extra-peer-details": false, 
-    "show-filterbar": true, 
-    "show-notification-area-icon": true, 
-    "show-options-window": true, 
-    "show-statusbar": true, 
-    "show-toolbar": true, 
-    "sort-mode": "sort-by-state", 
-    "sort-reversed": false, 
-    "start-added-torrents": true, 
-    "statusbar-stats": "total-ratio", 
-    "user-has-given-informed-consent": true, 
-}
--- a/config/includes.chroot/etc/skel/.config/vlc/vlcrc
+++ b/config/includes.chroot/etc/skel/.config/vlc/vlcrc
@@ -1,3 +0,0 @@
-[qt]
-# Ask for network policy at start (boolean)
-qt-privacy-ask=0
--- a/config/includes.chroot/etc/skel/.config/xfce4/panel/launcher-18/14230559391.desktop
+++ b/config/includes.chroot/etc/skel/.config/xfce4/panel/launcher-18/14230559391.desktop
@@ -1,14 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Firefox Web Browser
-Name[fr]=Navigateur Web Firefox
-Comment=Browse the World Wide Web
-Comment[fr]=Naviguer sur le Web
-GenericName=Web Browser
-GenericName[fr]=Navigateur Web
-Exec=firefox %u
-Terminal=false
-X-MultipleArgs=false
-Type=Application
-Icon=firefox
-StartupNotify=true
--- a/config/includes.chroot/etc/skel/.config/xfce4/panel/launcher-2/15797758814.desktop
+++ b/config/includes.chroot/etc/skel/.config/xfce4/panel/launcher-2/15797758814.desktop
@@ -0,0 +1,14 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Exec=exo-open --launch FileManager %u
+Icon=org.xfce.filemanager
+StartupNotify=true
+Terminal=false
+Categories=Utility;X-XFCE;X-Xfce-Toplevel;
+OnlyShowIn=XFCE;
+X-XFCE-MimeType=inode/directory;x-scheme-handler/trash;
+X-AppStream-Ignore=True
+Name=File Manager
+Comment=Browse the file system
+X-XFCE-Source=file:///usr/share/applications/xfce4-file-manager.desktop
--- a/config/includes.chroot/etc/skel/.config/xfce4/panel/launcher-3/15797759346.desktop
+++ b/config/includes.chroot/etc/skel/.config/xfce4/panel/launcher-3/15797759346.desktop
@@ -0,0 +1,14 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Exec=exo-open --launch WebBrowser %u
+Icon=web-browser
+StartupNotify=true
+Terminal=false
+Categories=Network;X-XFCE;X-Xfce-Toplevel;
+OnlyShowIn=XFCE;
+X-XFCE-MimeType=x-scheme-handler/http;x-scheme-handler/https;
+X-AppStream-Ignore=True
+Name=Web Browser
+Comment=Browse the web
+X-XFCE-Source=file:///usr/share/applications/exo-web-browser.desktop
--- a/config/includes.chroot/etc/skel/.config/xfce4/panel/launcher-4/15797759488.desktop
+++ b/config/includes.chroot/etc/skel/.config/xfce4/panel/launcher-4/15797759488.desktop
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Exec=exo-open --launch TerminalEmulator
+Icon=utilities-terminal
+StartupNotify=true
+Terminal=false
+Categories=Utility;X-XFCE;X-Xfce-Toplevel;
+OnlyShowIn=XFCE;
+X-AppStream-Ignore=True
+Name=Terminal Emulator
+Comment=Use the command line
+X-XFCE-Source=file:///usr/share/applications/exo-terminal-emulator.desktop
--- a/config/includes.chroot/etc/skel/.config/xfce4/panel/launcher-5/16336291841.desktop
+++ b/config/includes.chroot/etc/skel/.config/xfce4/panel/launcher-5/16336291841.desktop
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Name=Mousepad
+Comment=Simple Text Editor
+GenericName=Text Editor
+Exec=mousepad %F
+Icon=accessories-text-editor
+Terminal=false
+StartupNotify=true
+Type=Application
+Categories=Utility;TextEditor;GTK;
+MimeType=text/plain;
+X-Desktop-File-Install-Version=0.23
+X-XFCE-Source=file:///usr/share/applications/mousepad.desktop
--- a/config/includes.chroot/etc/skel/.config/xfce4/panel/whiskermenu-2.rc
+++ b/config/includes.chroot/etc/skel/.config/xfce4/panel/whiskermenu-2.rc
@@ -1,66 +0,0 @@
-favorites=exo-file-manager.desktop,thunderbird.desktop,firefox.desktop,pidgin.desktop,backintime-qt4.desktop,org.xfce.Catfish.desktop,io.github.quodlibet.QuodLibet.desktop,exo-terminal-emulator.desktop,org.gnome.Packages.desktop
-button-title=Applications
-button-icon=distributor-logo-debian
-button-single-row=true
-show-button-title=false
-show-button-icon=true
-launcher-show-name=true
-launcher-show-description=true
-launcher-show-tooltip=true
-item-icon-size=0
-hover-switch-category=false
-category-icon-size=0
-load-hierarchy=false
-recent-items-max=10
-favorites-in-recent=true
-display-recent-default=false
-position-search-alternate=true
-position-commands-alternate=true
-position-categories-alternate=true
-menu-width=464
-menu-height=510
-menu-opacity=100
-command-settings=xfce4-settings-manager
-show-command-settings=true
-command-lockscreen=xflock4
-show-command-lockscreen=true
-command-switchuser=gdmflexiserver
-show-command-switchuser=false
-command-logout=xfce4-session-logout
-show-command-logout=true
-command-menueditor=menulibre
-show-command-menueditor=true
-command-profile=users-admin
-show-command-profile=false
-search-actions=5
-
-[action0]
-name=Manual pages
-pattern=man
-command=exo-open --launch TerminalEmulator man %s
-regex=false
-
-[action1]
-name=Web search (Duckduckgo)
-pattern=?
-command=exo-open --launch WebBrowser https://duckduckgo.com/?q=%u
-regex=false
-
-[action2]
-name=Wikipedia
-pattern=!w
-command=exo-open --launch WebBrowser https://wikipedia.org/wiki/%u
-regex=false
-
-[action3]
-name=Open location
-pattern=^(file|http|https):\\/\\/(.*)$
-command=exo-open \\0
-regex=true
-
-[action4]
-name=Search files
-pattern=/
-command=catfish --start / "%u"
-regex=false
-
--- a/config/includes.chroot/etc/skel/.config/xfce4/terminal/terminalrc
+++ b/config/includes.chroot/etc/skel/.config/xfce4/terminal/terminalrc
@@ -1,22 +0,0 @@
-[Configuration]
-FontName=Hack 9
-MiscAlwaysShowTabs=FALSE
-MiscCursorBlinks=FALSE
-MiscCursorShape=TERMINAL_CURSOR_SHAPE_BLOCK
-MiscDefaultGeometry=100x24
-MiscInheritGeometry=FALSE
-MiscMenubarDefault=TRUE
-MiscMouseAutohide=FALSE
-MiscToolbarDefault=FALSE
-MiscConfirmClose=TRUE
-MiscCycleTabs=TRUE
-MiscTabCloseButtons=TRUE
-MiscTabCloseMiddleClick=TRUE
-MiscTabPosition=GTK_POS_TOP
-MiscHighlightUrls=TRUE
-ScrollingOnOutput=FALSE
-ColorForeground=#e5e5e5
-ColorBackground=#1d1d1d
-ColorCursor=#e5e5e5
-ColorPalette=#121212;#a35b66;#99ab6f;#ca9733;#495d6e;#825969;#839191;#E0E0E0;#2e3436;#ab6b74;#acb792;#ccaa69;#687987;#977381;#98A4A4;#e5e5e5
-
--- a/config/includes.chroot/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/keyboard-layout.xml
+++ b/config/includes.chroot/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/keyboard-layout.xml
@@ -3,7 +3,7 @@
 <channel name="keyboard-layout" version="1.0">
  <property name="Default" type="empty">
    <property name="XkbDisable" type="bool" value="false"/>
-    <property name="XkbLayout" type="string" value="fr"/>
+    <property name="XkbLayout" type="string" value="us,fr"/>
    <property name="XkbVariant" type="string" value="oss"/>
    <property name="XkbOptions" type="empty">
      <property name="Compose" type="string" value=""/>
--- a/config/includes.chroot/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/ristretto.xml
+++ b/config/includes.chroot/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/ristretto.xml
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding=UTF-8"?>
-
-<channel name="ristretto" version="1.0">
-  <property name="window" type="empty">
-    <property name="navigationbar" type="empty">
-      <property name="position" type="string" value="left"/>
-    </property>
-    <property name="statusbar" type="empty">
-      <property name="show" type="bool" value="false"/>
-    </property>
-    <property name="thumbnails" type="empty">
-      <property name="size" type="uint" value="4"/>
-      <property name="show" type="bool" value="false"/>
-    </property>
-  </property>
-</channel>
--- a/config/includes.chroot/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
+++ b/config/includes.chroot/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
@@ -25,6 +25,7 @@
    <property name="icon-size" type="uint" value="32"/>
    <property name="file-icons" type="empty">
      <property name="show-filesystem" type="bool" value="false"/>
+      <property name="show-removable" type="bool" value="false"/>
    </property>
  </property>
  <property name="desktop-menu" type="empty">
--- a/config/includes.chroot/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
+++ b/config/includes.chroot/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
@@ -1,205 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="xfce4-keyboard-shortcuts" version="1.0">
-  <property name="commands" type="empty">
-    <property name="default" type="empty">
-      <property name="&lt;Alt&gt;F1" type="empty"/>
-      <property name="&lt;Alt&gt;F2" type="empty">
-        <property name="startup-notify" type="empty"/>
-      </property>
-      <property name="&lt;Alt&gt;F3" type="empty">
-        <property name="startup-notify" type="empty"/>
-      </property>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;Delete" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;l" type="empty"/>
-      <property name="XF86Display" type="empty"/>
-      <property name="&lt;Super&gt;p" type="empty"/>
-      <property name="&lt;Primary&gt;Escape" type="empty"/>
-      <property name="XF86WWW" type="empty"/>
-      <property name="XF86Mail" type="empty"/>
-    </property>
-    <property name="custom" type="empty">
-      <property name="override" type="bool" value="true"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;Delete" type="string" value="xfce4-taskmanager"/>
-      <property name="&lt;Super&gt;e" type="string" value="Thunar">
-        <property name="startup-notify" type="bool" value="true"/>
-      </property>
-      <property name="&lt;Super&gt;f" type="string" value="catfish">
-        <property name="startup-notify" type="bool" value="true"/>
-      </property>
-      <property name="&lt;Super&gt;i" type="string" value="firefox">
-        <property name="startup-notify" type="bool" value="true"/>
-      </property>
-      <property name="&lt;Super&gt;l" type="string" value="xflock4"/>
-      <property name="&lt;Super&gt;m" type="string" value="thunderbird">
-        <property name="startup-notify" type="bool" value="true"/>
-      </property>
-      <property name="&lt;Super&gt;Pause" type="string" value="xfce4-settings-manager">
-        <property name="startup-notify" type="bool" value="true"/>
-      </property>
-      <property name="&lt;Super&gt;p" type="string" value="xfce4-display-settings">
-        <property name="startup-notify" type="bool" value="true"/>
-      </property>
-      <property name="&lt;Super&gt;q" type="string" value="xfce4-session-logout"/>
-      <property name="&lt;Super&gt;r" type="string" value="gmrun"/>
-      <property name="&lt;Super&gt;space" type="string" value="xfce4-popup-whiskermenu"/>
-      <property name="&lt;Super&gt;s" type="string" value="amixer set Master toggle"/>
-      <property name="&lt;Super&gt;t" type="string" value="xfce4-terminal">
-        <property name="startup-notify" type="bool" value="true"/>
-      </property>
-      <property name="XF86Display" type="string" value="xfce4-display-settings"/>
-      <property name="startup-notify" type="bool" value="true"/>
-      <property name="XF86Mail" type="string" value="thunderbird">
-        <property name="startup-notify" type="bool" value="true"/>
-      </property>
-      <property name="XF86WWW" type="string" value="firefox">
-        <property name="startup-notify" type="bool" value="true"/>
-      </property>
-      <property name="XF86Tools" type="string" value="quodlibet">
-        <property name="startup-notify" type="bool" value="true"/>
-      </property>
-      <property name="Print" type="string" value="xfce4-screenshooter -d 0 -f"/>
-    </property>
-  </property>
-  <property name="xfwm4" type="empty">
-    <property name="default" type="empty">
-      <property name="&lt;Alt&gt;Insert" type="empty"/>
-      <property name="Escape" type="empty"/>
-      <property name="Left" type="empty"/>
-      <property name="Right" type="empty"/>
-      <property name="Up" type="empty"/>
-      <property name="Down" type="empty"/>
-      <property name="&lt;Alt&gt;Tab" type="empty"/>
-      <property name="&lt;Alt&gt;&lt;Shift&gt;Tab" type="empty"/>
-      <property name="&lt;Alt&gt;Delete" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;Down" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;Left" type="empty"/>
-      <property name="&lt;Shift&gt;&lt;Alt&gt;Page_Down" type="empty"/>
-      <property name="&lt;Alt&gt;F4" type="empty"/>
-      <property name="&lt;Alt&gt;F6" type="empty"/>
-      <property name="&lt;Alt&gt;F7" type="empty"/>
-      <property name="&lt;Alt&gt;F8" type="empty"/>
-      <property name="&lt;Alt&gt;F9" type="empty"/>
-      <property name="&lt;Alt&gt;F10" type="empty"/>
-      <property name="&lt;Alt&gt;F11" type="empty"/>
-      <property name="&lt;Alt&gt;F12" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Shift&gt;&lt;Alt&gt;Left" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;End" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;Home" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Shift&gt;&lt;Alt&gt;Right" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Shift&gt;&lt;Alt&gt;Up" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_1" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_2" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_3" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_4" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_5" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_6" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_7" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_8" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_9" type="empty"/>
-      <property name="&lt;Alt&gt;space" type="empty"/>
-      <property name="&lt;Shift&gt;&lt;Alt&gt;Page_Up" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;Right" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;d" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;Up" type="empty"/>
-      <property name="&lt;Super&gt;Tab" type="empty"/>
-      <property name="&lt;Primary&gt;F1" type="empty"/>
-      <property name="&lt;Primary&gt;F2" type="empty"/>
-      <property name="&lt;Primary&gt;F3" type="empty"/>
-      <property name="&lt;Primary&gt;F4" type="empty"/>
-      <property name="&lt;Primary&gt;F5" type="empty"/>
-      <property name="&lt;Primary&gt;F6" type="empty"/>
-      <property name="&lt;Primary&gt;F7" type="empty"/>
-      <property name="&lt;Primary&gt;F8" type="empty"/>
-      <property name="&lt;Primary&gt;F9" type="empty"/>
-      <property name="&lt;Primary&gt;F10" type="empty"/>
-      <property name="&lt;Primary&gt;F11" type="empty"/>
-      <property name="&lt;Primary&gt;F12" type="empty"/>
-      <property name="&lt;Control&gt;&lt;Alt&gt;Down" type="empty"/>
-      <property name="&lt;Control&gt;&lt;Alt&gt;Left" type="empty"/>
-      <property name="&lt;Control&gt;&lt;Shift&gt;&lt;Alt&gt;Left" type="empty"/>
-      <property name="&lt;Alt&gt;&lt;Control&gt;End" type="empty"/>
-      <property name="&lt;Alt&gt;&lt;Control&gt;Home" type="empty"/>
-      <property name="&lt;Control&gt;&lt;Shift&gt;&lt;Alt&gt;Right" type="empty"/>
-      <property name="&lt;Control&gt;&lt;Shift&gt;&lt;Alt&gt;Up" type="empty"/>
-      <property name="&lt;Alt&gt;&lt;Control&gt;KP_1" type="empty"/>
-      <property name="&lt;Alt&gt;&lt;Control&gt;KP_2" type="empty"/>
-      <property name="&lt;Alt&gt;&lt;Control&gt;KP_3" type="empty"/>
-      <property name="&lt;Alt&gt;&lt;Control&gt;KP_4" type="empty"/>
-      <property name="&lt;Alt&gt;&lt;Control&gt;KP_5" type="empty"/>
-      <property name="&lt;Alt&gt;&lt;Control&gt;KP_6" type="empty"/>
-      <property name="&lt;Alt&gt;&lt;Control&gt;KP_7" type="empty"/>
-      <property name="&lt;Alt&gt;&lt;Control&gt;KP_8" type="empty"/>
-      <property name="&lt;Alt&gt;&lt;Control&gt;KP_9" type="empty"/>
-      <property name="&lt;Control&gt;&lt;Alt&gt;Right" type="empty"/>
-      <property name="&lt;Control&gt;&lt;Alt&gt;d" type="empty"/>
-      <property name="&lt;Control&gt;&lt;Alt&gt;Up" type="empty"/>
-      <property name="&lt;Control&gt;F1" type="empty"/>
-      <property name="&lt;Control&gt;F2" type="empty"/>
-      <property name="&lt;Control&gt;F3" type="empty"/>
-      <property name="&lt;Control&gt;F4" type="empty"/>
-      <property name="&lt;Control&gt;F5" type="empty"/>
-      <property name="&lt;Control&gt;F6" type="empty"/>
-      <property name="&lt;Control&gt;F7" type="empty"/>
-      <property name="&lt;Control&gt;F8" type="empty"/>
-      <property name="&lt;Control&gt;F9" type="empty"/>
-      <property name="&lt;Control&gt;F10" type="empty"/>
-      <property name="&lt;Control&gt;F11" type="empty"/>
-      <property name="&lt;Control&gt;F12" type="empty"/>
-    </property>
-    <property name="custom" type="empty">
-      <property name="&lt;Alt&gt;Tab" type="string" value="cycle_windows_key"/>
-      <property name="&lt;Control&gt;&lt;Alt&gt;Right" type="string" value="right_workspace_key"/>
-      <property name="Left" type="string" value="left_key"/>
-      <property name="&lt;Control&gt;&lt;Shift&gt;&lt;Alt&gt;Left" type="string" value="move_window_left_key"/>
-      <property name="&lt;Control&gt;&lt;Shift&gt;&lt;Alt&gt;Right" type="string" value="move_window_right_key"/>
-      <property name="Up" type="string" value="up_key"/>
-      <property name="&lt;Alt&gt;F4" type="string" value="close_window_key"/>
-      <property name="&lt;Alt&gt;F6" type="string" value="stick_window_key"/>
-      <property name="&lt;Control&gt;&lt;Alt&gt;Down" type="string" value="down_workspace_key"/>
-      <property name="&lt;Alt&gt;F7" type="string" value="move_window_key"/>
-      <property name="&lt;Alt&gt;F9" type="string" value="hide_window_key"/>
-      <property name="&lt;Alt&gt;F11" type="string" value="fullscreen_key"/>
-      <property name="&lt;Alt&gt;F8" type="string" value="resize_window_key"/>
-      <property name="Escape" type="string" value="cancel_key"/>
-      <property name="&lt;Alt&gt;&lt;Control&gt;KP_1" type="string" value="move_window_workspace_1_key"/>
-      <property name="&lt;Alt&gt;&lt;Control&gt;KP_2" type="string" value="move_window_workspace_2_key"/>
-      <property name="&lt;Alt&gt;&lt;Control&gt;KP_3" type="string" value="move_window_workspace_3_key"/>
-      <property name="&lt;Alt&gt;&lt;Control&gt;KP_4" type="string" value="move_window_workspace_4_key"/>
-      <property name="&lt;Alt&gt;&lt;Control&gt;KP_5" type="string" value="move_window_workspace_5_key"/>
-      <property name="&lt;Alt&gt;&lt;Control&gt;KP_6" type="string" value="move_window_workspace_6_key"/>
-      <property name="Down" type="string" value="down_key"/>
-      <property name="&lt;Control&gt;&lt;Shift&gt;&lt;Alt&gt;Up" type="string" value="move_window_up_key"/>
-      <property name="&lt;Shift&gt;&lt;Alt&gt;Page_Down" type="string" value="lower_window_key"/>
-      <property name="&lt;Alt&gt;F12" type="string" value="above_key"/>
-      <property name="&lt;Alt&gt;&lt;Control&gt;KP_8" type="string" value="move_window_workspace_8_key"/>
-      <property name="&lt;Alt&gt;&lt;Control&gt;KP_9" type="string" value="move_window_workspace_9_key"/>
-      <property name="Right" type="string" value="right_key"/>
-      <property name="&lt;Alt&gt;F10" type="string" value="maximize_window_key"/>
-      <property name="&lt;Control&gt;&lt;Alt&gt;Up" type="string" value="up_workspace_key"/>
-      <property name="&lt;Control&gt;F10" type="string" value="workspace_10_key"/>
-      <property name="&lt;Alt&gt;&lt;Control&gt;KP_7" type="string" value="move_window_workspace_7_key"/>
-      <property name="&lt;Alt&gt;&lt;Control&gt;End" type="string" value="move_window_next_workspace_key"/>
-      <property name="&lt;Alt&gt;Delete" type="string" value="del_workspace_key"/>
-      <property name="&lt;Control&gt;&lt;Alt&gt;Left" type="string" value="left_workspace_key"/>
-      <property name="&lt;Control&gt;F12" type="string" value="workspace_12_key"/>
-      <property name="&lt;Alt&gt;space" type="string" value="popup_menu_key"/>
-      <property name="&lt;Alt&gt;&lt;Shift&gt;Tab" type="string" value="cycle_reverse_windows_key"/>
-      <property name="&lt;Shift&gt;&lt;Alt&gt;Page_Up" type="string" value="raise_window_key"/>
-      <property name="&lt;Alt&gt;Insert" type="string" value="add_workspace_key"/>
-      <property name="&lt;Alt&gt;&lt;Control&gt;Home" type="string" value="move_window_prev_workspace_key"/>
-      <property name="&lt;Control&gt;F11" type="string" value="workspace_11_key"/>
-      <property name="override" type="bool" value="true"/>
-      <property name="&lt;Super&gt;d" type="string" value="show_desktop_key"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;Tab" type="string" value="switch_application_key"/>
-      <property name="&lt;Primary&gt;&lt;Shift&gt;&lt;Alt&gt;Up" type="string" value="move_window_up_workspace_key"/>
-      <property name="&lt;Primary&gt;&lt;Shift&gt;&lt;Alt&gt;Down" type="string" value="move_window_down_workspace_key"/>
-      <property name="&lt;Primary&gt;&lt;Shift&gt;&lt;Alt&gt;Left" type="string" value="move_window_left_workspace_key"/>
-      <property name="&lt;Primary&gt;&lt;Shift&gt;&lt;Alt&gt;Right" type="string" value="move_window_right_workspace_key"/>
-    </property>
-  </property>
-  <property name="providers" type="array">
-    <value type="string" value="xfwm4"/>
-    <value type="string" value="commands"/>
-  </property>
-</channel>
--- a/config/includes.chroot/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
+++ b/config/includes.chroot/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
@@ -1,63 +1,91 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <channel name="xfce4-panel" version="1.0">
  <property name="configver" type="int" value="2"/>
  <property name="panels" type="array">
    <value type="int" value="1"/>
    <property name="panel-1" type="empty">
-      <property name="position" type="string" value="p=8;x=683;y=752"/>
+      <property name="position" type="string" value="p=8;x=960;y=1059"/>
      <property name="length" type="uint" value="100"/>
      <property name="position-locked" type="bool" value="true"/>
-      <property name="size" type="uint" value="28"/>
+      <property name="icon-size" type="uint" value="16"/>
+      <property name="size" type="uint" value="26"/>
      <property name="plugin-ids" type="array">
-        <value type="int" value="2"/>
-        <value type="int" value="18"/>
-        <value type="int" value="8"/>
-        <value type="int" value="3"/>
-        <value type="int" value="15"/>
-        <value type="int" value="6"/>
        <value type="int" value="1"/>
-        <value type="int" value="7"/>
-        <value type="int" value="5"/>
+        <value type="int" value="2"/>
+        <value type="int" value="3"/>
        <value type="int" value="4"/>
+        <value type="int" value="5"/>
+        <value type="int" value="6"/>
+        <value type="int" value="7"/>
+        <value type="int" value="8"/>
+        <value type="int" value="9"/>
+        <value type="int" value="10"/>
+        <value type="int" value="11"/>
+        <value type="int" value="12"/>
+        <value type="int" value="13"/>
+        <value type="int" value="14"/>
+        <value type="int" value="15"/>
        <value type="int" value="16"/>
      </property>
-      <property name="autohide-behavior" type="uint" value="0"/>
    </property>
  </property>
  <property name="plugins" type="empty">
-    <property name="plugin-3" type="string" value="tasklist">
-      <property name="flat-buttons" type="bool" value="true"/>
-      <property name="show-handle" type="bool" value="false"/>
-      <property name="grouping" type="uint" value="0"/>
-      <property name="show-wireframes" type="bool" value="false"/>
-      <property name="middle-click" type="uint" value="1"/>
+    <property name="plugin-1" type="string" value="applicationsmenu">
+      <property name="custom-menu" type="bool" value="false"/>
    </property>
-    <property name="plugin-15" type="string" value="separator">
+    <property name="plugin-2" type="string" value="launcher">
+      <property name="items" type="array">
+        <value type="string" value="15797758814.desktop"/>
+      </property>
+    </property>
+    <property name="plugin-3" type="string" value="launcher">
+      <property name="items" type="array">
+        <value type="string" value="15797759346.desktop"/>
+      </property>
+    </property>
+    <property name="plugin-4" type="string" value="launcher">
+      <property name="items" type="array">
+        <value type="string" value="15797759488.desktop"/>
+      </property>
+    </property>
+    <property name="plugin-5" type="string" value="launcher">
+      <property name="items" type="array">
+        <value type="string" value="16336291841.desktop"/>
+      </property>
+    </property>
+    <property name="plugin-6" type="string" value="separator">
+      <property name="style" type="uint" value="0"/>
+    </property>
+    <property name="plugin-7" type="string" value="tasklist">
+      <property name="grouping" type="uint" value="1"/>
+    </property>
+    <property name="plugin-8" type="string" value="separator">
      <property name="expand" type="bool" value="true"/>
      <property name="style" type="uint" value="0"/>
    </property>
-    <property name="plugin-4" type="string" value="pager">
-      <property name="rows" type="uint" value="2"/>
+    <property name="plugin-9" type="string" value="pager">
+      <property name="rows" type="uint" value="1"/>
    </property>
-    <property name="plugin-5" type="string" value="clock">
+    <property name="plugin-10" type="string" value="separator">
+      <property name="style" type="uint" value="0"/>
+    </property>
+    <property name="plugin-11" type="string" value="systray">
      <property name="show-frame" type="bool" value="false"/>
-      <property name="digital-format" type="string" value="%R %a %d"/>
+      <property name="square-icons" type="bool" value="true"/>
    </property>
-    <property name="plugin-6" type="string" value="systray">
-      <property name="show-frame" type="bool" value="false"/>
+    <property name="plugin-12" type="string" value="separator">
+      <property name="style" type="uint" value="0"/>
    </property>
-    <property name="plugin-16" type="string" value="showdesktop"/>
-    <property name="plugin-18" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="14230559391.desktop"/>
-      </property>
-    </property>
-    <property name="plugin-7" type="string" value="pulseaudio">
+    <property name="plugin-13" type="string" value="pulseaudio">
      <property name="enable-keyboard-shortcuts" type="bool" value="true"/>
    </property>
-    <property name="plugin-8" type="string" value="places"/>
-    <property name="plugin-2" type="string" value="whiskermenu"/>
-    <property name="plugin-1" type="string" value="battery"/>
-  </property>1
+    <property name="plugin-14" type="string" value="battery"/>
+    <property name="plugin-15" type="string" value="clock">
+      <property name="mode" type="uint" value="2"/>
+      <property name="digital-format" type="string" value="%R"/>
+    </property>
+    <property name="plugin-16" type="string" value="xkb">
+      <property name="display-type" type="uint" value="2"/>
+    </property>
+  </property>
 </channel>
--- a/config/includes.chroot/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
+++ b/config/includes.chroot/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <channel name="xfce4-session" version="1.0">
-  <property name="splash" type="empty">
-    <property name="Engine" type="string" value=""/>
-  </property>
  <property name="general" type="empty">
+    <property name="FailsafeSessionName" type="empty"/>
+    <property name="LockCommand" type="empty"/>
    <property name="SessionName" type="string" value="Default"/>
    <property name="SaveOnExit" type="bool" value="false"/>
  </property>
@@ -12,26 +11,21 @@
    <property name="Failsafe" type="empty">
      <property name="IsFailsafe" type="empty"/>
      <property name="Count" type="empty"/>
-      <property name="Client0_Command" type="array">
-        <value type="string" value="xfwm4"/>
-      </property>
+      <property name="Client0_Command" type="empty"/>
+      <property name="Client0_Priority" type="empty"/>
      <property name="Client0_PerScreen" type="empty"/>
      <property name="Client1_Command" type="empty"/>
+      <property name="Client1_Priority" type="empty"/>
      <property name="Client1_PerScreen" type="empty"/>
-      <property name="Client2_Command" type="array">
-        <value type="string" value="xfce4-panel"/>
-      </property>
+      <property name="Client2_Command" type="empty"/>
+      <property name="Client2_Priority" type="empty"/>
      <property name="Client2_PerScreen" type="empty"/>
      <property name="Client3_Command" type="empty"/>
+      <property name="Client3_Priority" type="empty"/>
      <property name="Client3_PerScreen" type="empty"/>
      <property name="Client4_Command" type="empty"/>
+      <property name="Client4_Priority" type="empty"/>
      <property name="Client4_PerScreen" type="empty"/>
    </property>
  </property>
-  <property name="compat" type="empty">
-    <property name="LaunchGNOME" type="bool" value="true"/>
-  </property>
-  <property name="shutdown" type="empty">
-    <property name="LockScreen" type="bool" value="true"/>
-  </property>
 </channel>
--- a/config/includes.chroot/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
+++ b/config/includes.chroot/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
@@ -26,9 +26,8 @@
    <property name="snap_to_windows" type="bool" value="true"/>
    <property name="snap_width" type="int" value="8"/>
    <property name="sync_to_vblank" type="bool" value="true"/>
-    <property name="theme" type="string" value="Arc-Darker"/>
+    <property name="theme" type="string" value="Adwaita-dark"/>
    <property name="title_alignment" type="string" value="left"/>
-    <property name="title_font" type="string" value="Roboto 10"/>
    <property name="title_horizontal_offset" type="int" value="0"/>
    <property name="title_shadow_active" type="string" value="false"/>
    <property name="titleless_maximize" type="bool" value="false"/>
@@ -36,10 +35,9 @@
    <property name="urgent_blink" type="bool" value="true"/>
    <property name="use_compositing" type="bool" value="true"/>
    <property name="zoom_desktop" type="bool" value="true"/>
-    <property name="workspace_count" type="int" value="2"/>
+    <property name="workspace_count" type="int" value="1"/>
    <property name="workspace_names" type="array">
      <value type="string" value="Workspace 1"/>
-      <value type="string" value="Workspace 2"/>
    </property>
  </property>
 </channel>
--- a/config/includes.chroot/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
+++ b/config/includes.chroot/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
@@ -2,8 +2,8 @@

 <channel name="xsettings" version="1.0">
  <property name="Net" type="empty">
-    <property name="ThemeName" type="string" value="Arc-Darker"/>
-    <property name="IconThemeName" type="string" value="Papirus-Dark"/>
+    <property name="ThemeName" type="string" value="Adwaita-dark"/>
+    <property name="IconThemeName" type="string" value="Adwaita"/>
  </property>
  <property name="Xft" type="empty">
    <property name="DPI" type="empty"/>
@@ -13,7 +13,6 @@
    <property name="RGBA" type="string" value="none"/>
  </property>
  <property name="Gtk" type="empty">
-    <property name="FontName" type="string" value="Roboto 10"/>
    <property name="ToolbarStyle" type="string" value="icons"/>
    <property name="ToolbarIconSize" type="int" value="3"/>
    <property name="MenuImages" type="bool" value="true"/>
--- a/config/includes.chroot/etc/skel/.config/youtube-dl/config
+++ b/config/includes.chroot/etc/skel/.config/youtube-dl/config
@@ -1,2 +0,0 @@
--add-metadata
--output '%(title)s-%(id)s-%(extractor)s.%(ext)s'
--- a/config/includes.chroot/etc/skel/.conkyrc
+++ b/config/includes.chroot/etc/skel/.conkyrc
@@ -1,133 +0,0 @@
-conky.config = {
-	-- Conky configuration
-	-- https://gitlab.com/nodiscc/debian-live-config
-	-- Enable more items by commenting out their respective lines
-	-- To install/enable scripts for extra functionality:
-	-- git clone https://gitlab.com/nodiscc/toolbox; sudo cp -r toolbox/ARCHIVE/conky-scripts /opt/
-	background = false,
-	border_margin = '5',
-	border_width = 5,
-	cpu_avg_samples = 2,
-	-- default_outline_color 000000
-	-- default_shade_color 000000
-	double_buffer = true,
-	draw_borders = false,
-	draw_graph_borders = false,
-	draw_outline = false,
-	draw_shades = false,
-	gap_x = 30,
-	gap_y = 50,
-	max_specials = '1024',
-	max_user_text = 10000,
-	maximum_width = 900,
-	minimum_width = 350,
-	net_avg_samples = 2,
-	no_buffers = true,
-	override_utf8_locale = true,
-	own_window_class = 'Conky',
-	own_window = true,
-	own_window_argb_visual = true,
-	-- own_window_argb_value 0
-	-- own_window_colour 000000
-	own_window_hints = 'undecorated,below,sticky,skip_taskbar,skip_pager',
-	own_window_transparent = true,
-	own_window_type = 'normal',
-	pad_percents = 2,
-	short_units = true,
-	stippled_borders = 3,
-	text_buffer_size = 8000,
-	total_run_times = 0,
-	uppercase = false,
-	use_spacer = 'right',
-	use_xft = true,
-	xftalpha = 1,
-	update_interval = 5.0,
-	-- update_interval 1.0 # for second-precision clock
-	alignment = 'top_right',
-	default_color = '#FFFFFF',
-	-- default_color 000000
-	color1 = '#C6B59B',
-	color2 = '#FF0000',
-	color3 = '#00FF00',
-	font = 'Roboto:pixelsize=17',
-	font = 'Roboto:pixelsize=17',
-
-};
-
-conky.text = [[
-##### CLOCK #####
-### DAY OF WEEK ###
-${font Roboto:pixelsize=40}${time %A}${font}
-${hr}
-### DATE ###
-${font}${time %B %d, %Y}
-### TIME ###
-${font Roboto:pixelsize=40}${time %H:%M}${font}
-### TIME WITH SECONDS ###
-#${font Roboto:pixelsize=40}${time %H:%M:%S}${font}
-
-##### SYSTEM MONITOR #####
-### MEMORY/CPU USAGE (%) ###
-#${color1}MEM ${color}${memperc}% ${color1}CPU ${color}${cpu cpu0}%${color1}
-#
-### MEMORY USAGE (ABSOLUTE) ###
-#${color1}MEM USED ${color}${mem} ${color1}MEM FREE ${color}${memeasyfree}${color1}
-#
-### SWAP USAGE (ABSOLUTE) ###
-#${color1}SWP USED ${color}${swap} ${color1}SWP FREE ${color}${swapfree}${color1}
-#
-### NETWORK UP/DOWN SPEED ###
-#${color1}NET UP ${color}${upspeedf eth0} ${color1}NET DWN ${color}${downspeedf eth0}
-#
-### PRIVATE IP ADDRESS ###
-#${color1}LAN IP ${color}${addr eth0}
-#
-### PUBLIC IP ADDRESS ###
-#${color1}WAN IP ${color}${texeci 10800 curl -s https://ifconfig.me}
-#
-### FREE DISK SPACE ###
-#${execpi 30 /opt/conky-scripts/conky-alldisks-free.sh}
-#
-### BATTERY/UPTIME ###
-#${color1}BAT ${color}${battery_percent BAT0}% ${color1}UPTIME ${color}${uptime}
-#
-### NUMBER OF RUNNING PROCESSES ###
-#${color1}PROCESSES ${color}${processes}
-#
-### TOP PROCESSES ###
-#${font sans-serif:bold:size=8}TOP PROCESS ${hr}
-#${font sans-serif:normal:size=8}NAME $alignr PID    CPU
-#${top name 1} $alignr [${top pid 1}] ${top cpu 1}
-#${top name 2} $alignr ${top pid 2} ${top cpu 2}
-#${top name 3} $alignr ${top pid 3} ${top cpu 3}
-#${top name 4} $alignr ${top pid 4} ${top cpu 4}
-#${top name 5} $alignr ${top pid 5} ${top cpu 5}
-#${font}${color}
-#
-##### UTILITY/SCRIPTS #####
-#
-### MASTER VOLUME LEVEL ###
-#${color1}VOLUME ${color}${texeci 5 /opt/conky-scripts/conky-master-volume.sh}
-#
-### QUODLIBET CURRENT TRACK + COVER ART ###
-# argument: vertical position of the cover art, in pixels
-#${execpi 5 /opt/conky-scripts/conky-quodlibet.sh 185}
-#
-#
-### TIMESTAMP CHECKS ###
-#${execpi 10 /opt/conky-scripts/check-max-age.py ~/.local/cache/last_backup_timestamp 2678400}
-#${execpi 10 /opt/conky-scripts/check-max-age.py ~/.local/share/last_cron_success 604800}
-#
-### MESSAGE OF THE DAY ###
-#${color1}NEWS ${color}${hr}
-#${font sans-serif:normal:size=8}${texeci 300 cat /etc/motd | fold -w55}
-#
-### THUNDERBIRD EVENTS ###
-#${color1}EVENTS ${color}${hr}
-#${font Roboto:pixelsize=12}${execpi 35 /opt/conky-scripts/thundercal -l 5 events}${font}
-#
-### THUNDERBIRD TASKS ###
-#${color1}TASKS ${color}${hr}
-#${font Roboto:pixelsize=12}${execpi 30 /opt/conky-scripts/thundercal -l 5 tasks}${font}
-
-]];
--- a/config/includes.chroot/etc/skel/.gimp-2.8/sessionrc
+++ b/config/includes.chroot/etc/skel/.gimp-2.8/sessionrc
@@ -1,11 +0,0 @@
-# GIMP sessionrc
-# 
-# This file takes session-specific info (that is info, you want to keep
-# between two GIMP sessions).  You are not supposed to edit it manually, but
-# of course you can do.  The sessionrc will be entirely rewritten every time
-# you quit GIMP.  If this file isn't found, defaults are used.
-
-(hide-docks no)
-(single-window-mode yes)
-
-# end of sessionrc
--- a/config/includes.chroot/etc/skel/.gitconfig
+++ b/config/includes.chroot/etc/skel/.gitconfig
@@ -1,27 +0,0 @@
-[color]
-	ui = true
-[merge]
-	tool = meld
-[alias]
-	st = status
-	a = add
-	ch = checkout
-	b = branch -a
-	c = commit
-	ru = remote update
-	l = "log --graph --abbrev-commit --decorate --date=relative --pretty=oneline --all"
-	d = diff
-    wd = diff --color-words=.
-	sl = shortlog
-	gc = gc --aggressive
-	thanks = shortlog -sne
-
-# force GPG signing of all commits and tags
-#[commit]
-#    gpgSign = true
-#[tag]
-#    forceSignAnnotated = true
-#[gpg]
-#    program = gpg
-#[user]
-#    signingKey = EE73FC8FD71E3CC83606FDF361B23168A539DBBD
--- a/config/includes.chroot/etc/skel/.local/share/applications/display-im6.desktop
+++ b/config/includes.chroot/etc/skel/.local/share/applications/display-im6.desktop
@@ -1,3 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Hidden=True
--- a/config/includes.chroot/etc/skel/.local/share/applications/display-im6.q16.desktop
+++ b/config/includes.chroot/etc/skel/.local/share/applications/display-im6.q16.desktop
@@ -1,3 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Hidden=True
--- a/config/includes.chroot/etc/skel/.purple/prefs.xml
+++ b/config/includes.chroot/etc/skel/.purple/prefs.xml
@@ -1,114 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' ?>
-
-<pref version='1' name='/'>
-
-	<pref name='purple'>
-		<pref name='away'>
-			<pref name='idle_reporting' type='string' value='none'/>
-			<pref name='away_when_idle' type='bool' value='0'/>
-			<pref name='mins_before_away' type='int' value='5'/>
-			<pref name='auto_reply' type='string' value='never'/>
-		</pref>
-
-		<pref name='savedstatus'>
-			<pref name='startup_current_status' type='bool' value='1'/>
-		</pref>
-
-		<pref name='conversations'>
-			<pref name='im'>
-				<pref name='send_typing' type='bool' value='1'/>
-			</pref>
-		</pref>
-
-		<pref name='logging'>
-			<pref name='log_ims' type='bool' value='1'/>
-			<pref name='log_chats' type='bool' value='1'/>
-			<pref name='log_system' type='bool' value='1'/>
-			<pref name='format' type='string' value='html'/>
-		</pref>
-	</pref>
-
-	<pref name='plugins'>
-		<pref name='core'>
-			<pref name='statenotify'>
-				<pref name='notify_away' type='bool' value='1'/>
-				<pref name='notify_idle' type='bool' value='0'/>
-				<pref name='notify_signon' type='bool' value='1'/>
-			</pref>
-
-			<pref name='newline'>
-				<pref name='im' type='bool' value='1'/>
-				<pref name='chat' type='bool' value='1'/>
-			</pref>
-		</pref>
-
-		<pref name='lopl'/>
-			<pref name='gtk'>
-				<pref name='libnotify'>
-					<pref name='newmsg' type='bool' value='1'/>
-					<pref name='blocked' type='bool' value='1'/>
-					<pref name='newconvonly' type='bool' value='0'/>
-					<pref name='signon' type='bool' value='0'/>
-					<pref name='signoff' type='bool' value='0'/>
-					<pref name='only_available' type='bool' value='1'/>
-					<pref name='auto_loaded' type='bool' value='1'/>
-				</pref>
-			</pref>
-		</pref>
-
-	<pref name='pidgin'>
-		<pref name='browsers'>
-			<pref name='browser' type='string' value='custom'/>
-			<pref name='place' type='int' value='0'/>
-			<pref name='manual_command' type='string' value='gnome-www-browser %s'/>
-		</pref>
-
-		<pref name='plugins'>
-			<pref name='loaded' type='pathlist'>
-				<item value='/usr/lib/purple-2/statenotify.so'/>
-				<item value='/usr/lib/pidgin/gnome-keyring.so'/>
-				<item value='/usr/lib/pidgin/history.so'/>
-				<item value='/usr/lib/purple-2/irchelper.so'/>
-				<item value='/usr/lib/purple-2/irc-more.so'/>
-				<item value='/usr/lib/purple-2/joinpart.so'/>
-				<item value='/usr/lib/pidgin/lastseen.so'/>
-				<item value='/usr/lib/pidgin/notify.so'/>
-				<item value='/usr/lib/pidgin/pidgin-otr.so'/>
-				<item value='/usr/lib/purple-2/pidgin-libnotify.so'/>
-				<item value='/usr/lib/pidgin/sendbutton.so'/>
-				<item value='/usr/lib/pidgin/vvconfig.so'/>
-			</pref>
-		</pref>
-
-		<pref name='sound'>
-			<pref name='mute' type='bool' value='1'/>
-			<pref name='method' type='string' value='automatic'/>
-			<pref name='volume' type='int' value='40'/>
-		</pref>
-
-		<pref name='blist'>
-			<pref name='show_buddy_icons' type='bool' value='1'/>
-			<pref name='show_empty_groups' type='bool' value='0'/>
-			<pref name='show_idle_time' type='bool' value='1'/>
-			<pref name='show_offline_buddies' type='bool' value='1'/>
-			<pref name='show_protocol_icons' type='bool' value='1'/>
-			<pref name='list_visible' type='bool' value='0'/>
-			<pref name='list_maximized' type='bool' value='0'/>
-			<pref name='sort_type' type='string' value='status'/>
-		</pref>
-
-		<pref name='conversations'>
-			<pref name='toolbar'>
-				<pref name='wide' type='bool' value='0'/>
-			</pref>
-		</pref>
-	</pref>
-
-	<pref name='OTR'>
-		<pref name='enabled' type='bool' value='1'/>
-		<pref name='automatic' type='bool' value='0'/>
-		<pref name='onlyprivate' type='bool' value='0'/>
-		<pref name='avoidloggingotr' type='bool' value='1'/>
-	</pref>
-
-</pref>
--- a/config/includes.chroot/etc/skel/.quodlibet/config
+++ b/config/includes.chroot/etc/skel/.quodlibet/config
@@ -1,71 +0,0 @@
-[header_maps]
-
-[__config__]
-version = 0
-
-[player]
-replaygain = false
-time_remaining = false
-
-[settings]
-jump = true
-columns = ~rating,~#track,~title~version,artist,~album~discsubtitle,~#disc,genre,~#length,~#bitrate,~filename,~#lastplayed,~format
-ratings = 5
-repeat = False
-default_rating = 0.0
-
-[browsers]
-panes = artist	<album>	genre	~rating
-rating_click = true
-color = true
-album_covers = true
-
-[memory]
-browser = Paned
-maximized = 0
-quodlibet_maximized = 4
-open_browsers = 
-order = inorder
-queue = True
-queue_expanded = False
-shuffle = False
-shufflequeue = false
-songlist = true
-sortby = 0~#track
-volume = 1.0
-
-[editing]
-alltags = true
-save_to_songs = true
-
-[plugins]
-active_plugins = Title Case
-	Burn CD
-	ExportMeta
-	Browse Folders
-	MusicBrainz lookup
-	Alarm Clock
-	Picture Saver
-	CDDB lookup
-	Download Album art
-	Tray Icon
-	filterbrowser
-	Equalizer
-	SeekBar
-	Export to HTML
-	Duplicates
-	mpris
-	Notify
-	Playlist Export
-	Force Write
-	Search artist in Wikipedia
-browsefolders = thunar
-cover_fn = folder.jpg
-icon_tooltip = <album|<album~discnumber~part~tracknumber~title~version>|<artist~title~version>>
-k3b = xfburn
-notify_show_notifications = all
-wikipedia = en
-
-[library]
-refresh_on_start = true
-
--- a/config/includes.chroot/etc/skel/.ssh/config
+++ b/config/includes.chroot/etc/skel/.ssh/config
@@ -1,5 +0,0 @@
-Host *
-    PubkeyAuthentication yes
-    ControlPath ~/.ssh/master-%r@%h:%p
-    ControlMaster auto
-    ControlPersist 60
--- a/config/includes.chroot/etc/systemd/network/99-default.link
+++ b/config/includes.chroot/etc/systemd/network/99-default.link
@@ -1 +0,0 @@
-/dev/null
--- a/config/includes.chroot/etc/systemd/network/99-default.link
+++ b/config/includes.chroot/etc/systemd/network/99-default.link
--- a/config/package-lists/audio-video.list.chroot
+++ b/config/package-lists/audio-video.list.chroot
@@ -1,111 +1,4 @@
-#Title: Audio/video
-#Section: Video players
-#Description: vlc
-#Description: mpv
-vlc
-vlc-plugin-notify
-vlc-plugin-jack
-vlc-plugin-samba
-vlc-plugin-skins2
-vlc-plugin-video-splitter
-vlc-plugin-visualization
-vlc-plugin-video-output
-vlc-plugin-base
-vlc-plugin-qt
-libdvd-pkg
-mpv
-#Alt: freetuxtv
-#Alt: gnome-dvb-client
-#Alt: gnome-mpv
-#Alt: kodi
-#Alt: mpv
-#Alt: parole
-#Alt: smplayer
-#Alt: subdownloader
-#Alt: totem
-#Alt: totem-plugins
-#Alt: vlc-plugin-svg
-#Alt: celluloid
-#zapping # buster only
-#vlc-plugin-zvbi # buster only
-#libdvdread4 # buster only
-#vlc-plugin-vlsub # buster only
-
-
-#Section: Music players/library managers
-#Description: quodlibet
-quodlibet
-exfalso
-libgpod-common
-libgpod4
-#python-cddb # buster only
-#python-feedparser # buster only
-#python-musicbrainzngs # buster only
-#python-pyinotify # buster only
-sox
-#Alt: gnome-music
-#Alt: rhythmbox
-#Alt: rhythmbox-plugins
-#Alt: clementine
-#Alt: audacious
-#Alt: audacious-plugins
-#Alt: projectm-pulseaudio
-#Alt: mpd
-#Alt: sonata
-#Alt: ario
-#Alt: cantata
-#Alt: ncmpcpp
-#Alt: mpc
-#Alt: moc
-#Alt: cmus
-#Alt: moc-ffmpeg-plugin
-#Alt: mpg123
-#Alt: beets
-#Alt: cowbell
-#Alt: easytag
-#Alt: puddletag
-#Alt: eyed3
-#Alt: kid3
-#Alt: picard
-#Alt: mussort
-#Alt: vagalume
-#Alt: gpodder
-#Alt: go-mtpfs
-#Alt: gtkpod
-#Alt: playerctl
-#Alt: streamtuner2
-#gmusicbrowser # buster only
-#musique # buster only
-#radiotray # buster
-
-
-#Section: Webcam
-#Description: cheese
-cheese
-gnome-video-effects
-#Alt: guvcview
-#Alt: gnome-video-effects-frei0r
-#Alt: v4l2loopback-dkms
-#Alt: v4l2loopback-utils
-#Alt: kamoso
-#Alt: zoneminder
-
-#Section: Screen recording/screencasting
-#Description: obs-studio
-#Description: vokoscreen
-obs-studio
-vokoscreen
-#Alt: kazam
-#Alt: byzanz
-#Alt: obs-studio
-#Alt: simplescreenrecorder
-#gtk-recordmydesktop # buster only
-#key-mon # buster only
-
-
 #Section: Media conversion/codecs
-#Description: qwinff
-qwinff
 ffmpeg
 flac
 gstreamer1.0-alsa
@@ -123,49 +16,6 @@ libxvidcore4
 musepack-tools
 mediainfo
 media-player-info
-#Alt: handbrake
-#Alt: mp3splt
-#Alt: oggvideotools
-#Alt: ogmrip
-#Alt: ogmrip-plugins
-#Alt: soundconverter
-#Alt: winff
-#Alt: winff-doc
-#Alt: winff-qt
-#Alt: x264
-#Alt: x265
-#Alt: qhimdtransfer
-#Alt: minidisc-utils
-#Alt: mat
-#Alt: ffmpegfs
-
-
-#Section: Audio CD extraction
-##Description: asunder
-#Alt: asunder
-#Alt: sound-juicer
-#Alt: goobox
-#Alt: ripperx
-#Alt: xcfa
-
-
-#Section: Subtitles
-subliminal
-#Alt: subtitleeditor
-#Alt: gaupol
-#Alt: gnome-subtitles
-
-#Section: Audio recording/editing
-#Description: audacity
-#Description: gnome-sound-recorder
-audacity
-gnome-sound-recorder
-#Alt: gwc
-#Alt: gjacktransport
-
-##Section: Lighting
-#Alt: qlcplus
-

 #Section: Audio system
 #Description: pulseaudio
@@ -184,9 +34,3 @@ libasound2-plugins
 oss-compat
 alsa-firmware-loaders
 rtkit
-#Alt: pasystray
-#Alt: paprefs
-#Alt: pnmixer
-#Alt: pamix
-#Alt: pulseaudio-equalizer
-#Alt: libasound2-plugin-equal
--- a/config/package-lists/development.list.chroot
+++ b/config/package-lists/development.list.chroot
@@ -1,30 +1,3 @@
-#Title: Development
-#Section: Version control
-#Description: meld
-#Description: gource
-git
-meld
-gource
-colordiff
-dwdiff
-cloc
-#Alt: gitg
-#Alt: fossil
-#Alt: ghi
-#Alt: git-mediawiki
-#Alt: git-sizer
-#Alt: svn2git
-#Alt: github-backup
-#Alt: hub
-#Alt: mercurial
-#Alt: myrepos
-#Alt: python3-gitlab
-#Alt: subversion
-#Alt: tig
-#Alt: icdiff
-#Alt: qgit
-#Alt: git-secrets
-
 #Section: Shell & basic utilities
 bash
 autojump
@@ -36,128 +9,11 @@ util-linux-locales
 whiptail
 moreutils
 less
-dialog
-manpages
-manpages-dev
-#Alt: shellcheck
-#Alt: asciinema
-#Alt: undistract-me
-#Alt: inotify-tools
-#Alt: lr
-#Alt: ack
-#Alt: bd
-#Alt: beep
-#Alt: command-not-found
-#Alt: detox
-#Alt: grc
-#Alt: pv
-#Alt: reptyr
-#Alt: source-highlight
-#Alt: tmux
-#Alt: ttyrec
-#Alt: fasd
-#Alt: pdd
-#Alt: termrec
-#Alt: ripgrep
-#Alt: retry
-
-
-#Section: Parsers/converters/documentation generators
-jq
-xmlstarlet
-aha
-groff
-dos2unix
-#Alt: pandoc
-#Alt: man2html-base
-#Alt: txt2tags
-#Alt: mkdocs
-#Alt: csvkit
-#Alt: roffit
-#Alt: archmage
-#Alt: html2text
-
 #Section: Packaging
 debhelper
-autoconf
-devscripts
-dh-make
 equivs
-build-essential
 checkinstall
-fakeroot
 debconf-utils
 lintian
-git-buildpackage
-#Alt: apt-build
-#Alt: python3-stdeb
-#Alt: pypi2deb
-#Alt: dgit
-#Alt: aptly
-#lintian-brush # buster only
-
-#Section: Debuggers
-gdb
-
-#Section: Python
-python3-all-dev
-python3-setuptools
-python3-wheel
-python3-pip
-python3-venv
-
 #Section: Live system
 live-build
-#Alt: debootstrap
-#Alt: live-config-doc
-#Alt: live-manual-pdf
-#Alt: live-manual-html
-#Alt: debian-handbook
-#Alt: blends-tasks
-#Alt: live-task-lxde
-#Alt: live-task-base
-#Alt: live-task-cinnamon
-#Alt: live-task-extra
-#Alt: live-task-gnome
-#Alt: live-task-kde
-#Alt: live-task-localisation
-#Alt: live-task-localisation-desktop
-#Alt: live-task-mate
-#Alt: live-task-recommended
-#Alt: live-task-xfce
-
-#Section: Hex editors
-#Alt: wxhexeditor
-#Alt: hexcurse
-#Alt: dhex
-#Alt: bless
-
-#Section: Translation/localization
-#Alt: poedit
-
-#Section: Game development
-#Alt: godot3
-
-#Section: Ruby
-#Alt: ruby-dev
-
-#Section: HTML/CC/JS
-#Alt: csstidy
-#Alt: sqlite3
-#Alt: vera
-#Alt: nodejs
-#Alt: npm
-#Alt: jsbeautifier
-#webcheck # buster only
-
-#Section: PHP
-#Alt: php-cli
-
-#Section: Android
-#Alt: android-sdk
-#Alt: android-sdk-platform-tools-common
-#Alt: fastboot
-#Alt: adb
-#Alt: fastboot
-#Alt: scrcpy
-#gplaycli # bookworm only
--- a/config/package-lists/games.list.chroot
+++ b/config/package-lists/games.list.chroot
@@ -1,110 +0,0 @@
-#Title: Games
-
-#Section: Games
-#Description: lutris
-#Screenshot: lutris
-lutris
-#Alt: cmatrix
-#Alt: cmatrix-xfont
-#Alt: endless-sky
-#Alt: play.it
-#Alt: steam:i386
-#Alt: supertuxkart
-#Alt: hedgewars
-#Alt: 0ad
-#Alt: minetest
-#Alt: wesnoth
-#Alt: nexuiz
-#Alt: cube2
-#Alt: redeclipse
-#Alt: chromium-bsu
-#Alt: gunroar
-#Alt: marsshooter
-#Alt: gnome-games
-#Alt: pychess
-#Alt: games-adventure
-#Alt: games-programming
-#Alt: games-sport
-#Alt: games-arcade
-#Alt: games-finest
-#Alt: games-puzzle
-#Alt: games-strategy
-#Alt: games-board
-#Alt: games-tasks
-#Alt: games-card
-#Alt: games-fps
-#Alt: games-python3-dev
-#Alt: games-tetris
-#Alt: games-c++-dev
-#Alt: games-java-dev
-#Alt: games-racing
-#Alt: games-thumbnails
-#Alt: games-chess
-#Alt: games-minesweeper
-#Alt: games-rogue
-#Alt: games-toys
-#Alt: games-console
-#Alt: games-mud
-#Alt: games-rpg
-#Alt: games-typing
-#Alt: games-content-dev
-#Alt: games-perl-dev
-#Alt: games-shootemup
-#Alt: games-education
-#Alt: games-platform
-#Alt: games-simulation
-#Alt: naev
-#Alt: gamemode
-#Alt: fortune-mod
-#Alt: cowsay
-#Alt: nyancat
-#Alt: sl
-#Alt: hollywood
-#Alt: wine64
-#Alt: wine32:i386
-#Alt: libgl1-mesa-dri:i386
-#Alt: playonlinux
-#Alt: fonts-wine
-#Alt: winetricks
-#gweled # buster only
-
-#Section: Game console emulators
-#Alt: pcsxr
-#Alt: zsnes:i386
-#Alt: higan
-#Alt: desmume
-#Alt: mupen64plus-qt
-#Alt: mupen64plus-input-all
-#Alt: mupen64plus-audio-all
-#Alt: mupen64plus-rsp-all
-#Alt: mupen64plus-video-all
-#Alt: retroarch
-#Alt: libretro-beetle-pce-fast
-#Alt: libretro-beetle-psx
-#Alt: libretro-beetle-vb
-#Alt: libretro-beetle-wswan
-#Alt: libretro-bsnes-mercury-accuracy
-#Alt: libretro-bsnes-mercury-balanced
-#Alt: libretro-bsnes-mercury-performance
-#Alt: libretro-desmume
-#Alt: libretro-gambatte
-#Alt: libretro-mgba
-#Alt: libretro-nestopia
-#Alt: libretro-snes9x
-#Alt: yabause-gtk
-#Alt: games-emulator
-#Alt: gnome-video-arcade
-#Alt: mednafen
-#Alt: virtualjaguar
-#Alt: mame
-#Alt: stella
-#Alt: mame
-#Alt: mame-tools
-#Alt: mame-extra
-#Alt: nestopia
-#Alt: dosbox
-#Alt: pcsx2:i386
-#Alt: games-emulator
-#mupen64plus # buster only
-#libretro-genesisplusgx # buster only
-#dolphin-emu # buster only
--- a/config/package-lists/graphics.list.chroot
+++ b/config/package-lists/graphics.list.chroot
@@ -1,170 +0,0 @@
-#Title: Graphics
-
-#Section: Image viewers and managers
-#Description: ristretto
-ristretto
-#Alt: eog
-#Alt: eog-plugins
-#Alt: viewnior
-#Alt: pqiv
-#Alt: qiv
-#Alt: feh
-#Alt: mcomix
-#Alt: gpicview
-#Alt: mirage
-#Alt: xzgv
-#Alt: sxiv
-#Alt: catimg
-#Alt: shotwell
-#Alt: gthumb
-#Alt: digikam
-#Alt: fotoxx
-#Alt: geeqie
-#nomacs # sid only
-
-
-#Section: Image editors
-#Description: gimp
-gimp
-gimp-data-extras
-gimp-gap
-gimp-plugin-registry
-gimp-texturize
-gimp-gutenprint
-gimp-lensfun
-create-resources
-#Alt: gimp-help-fr
-#Alt: krita
-#Alt: gimp-gmic
-#Alt: drawing
-#Alt: mypaint
-#Alt: mtpaint
-#Alt: xpaint
-#Alt: gnome-paint
-#gimp-ufraw # buster only
-#delaboratory # buster only
-#pinta # sid only
-
-
-#Section: Vector editors
-##Description: inkscape
-#Alt: inkscape
-#Alt: create-resources
-#Alt: pstoedit
-#Alt: pencil2d
-#Alt: dia
-#Alt: birdfont
-#python-lxml # buster only
-
-
-#Section: Drawing
-#Description: xournal
-xournal
-#Alt: akira
-
-
-#Section: Non-destructive editors (lightroom)
-#Alt: darktable
-#Alt: rawtherapee
-#Alt: luminance-hdr
-
-#Section: Color pickers
-gcolor3
-#Alt: gpick
-
-#Section: Batch image processing
-#Alt: aspic
-#Alt: pixelize
-#Alt: hugin
-#Alt: aaphoto
-
-#Section: Camera upload/management
-#Alt: rapid-photo-downloader
-#Alt: gtkam
-
-
-#Section: Game asset editors
-#Alt: tiled
-#Alt: games-content-dev
-
-#Section: Color grading
-#Alt: colorhug-client
-
-#Section: Diagram editors
-#Description: dia
-dia
-dia-shapes
-gsfonts-x11 
-#asciio # buster only
-
-#Section: Label/barcode editors
-##Screenshot: glabels
-#Alt: glabels
-#Alt: qrencode
-#Alt: qtqr
-#Alt: zbar-tools
-
-#Section: 3D editors
-##Description: blender
-#Alt: blender
-#Alt: g3dviewer
-#Alt: sweethome3d
-#Alt: sweethome3d-furniture
-#Alt: sweethome3d-furniture-editor
-#Alt: sweethome3d-textures-editor
-#Alt: sweethome3d-furniture-nonfree
-#makehuman # buster only
-
-
-#Section: CAD editors
-#Alt: librecad
-#Alt: kicad
-#Alt: freecad
-#Alt: pcb-gtk
-#Alt: qelectrotech
-
-#Section: Video editors
-#Alt: openshot
-#Alt: kdenlive
-#Alt: devede
-#Alt: dvdauthor
-#Alt: imagination
-#Alt: ffdiaporama
-#Alt: screenkey
-#Alt: dvgrab
-#Alt: vgrabbj
-#Alt: dvbcut
-#Alt: multimedia-video
-#Alt: flowblade
-#Alt: handbrake
-#Alt: lives
-#Alt: rtmpdump
-#Alt: shotdetect
-#Alt: tsdecrypt
-#Alt: videotrans
-#Alt: voctomix
-#Alt: stopmotion
-#Alt: education-video
-#Alt: slowmovideo
-
-#Section: Command-line image manipulation
-imagemagick
-optipng
-jpegoptim
-pngcrush
-exifprobe
-findimagedupes
-librsvg2-bin
-figlet
-toilet
-#Alt: converseen
-#Alt: fbi
-#Alt: gifsicle
-#Alt: jp2a
-#Alt: pecomato
-#Alt: aview
-#Alt: chafa
-#Alt: lolcat
-#Alt: advancecomp
-#Alt: caca-utils
-#timg # bookworm only
--- a/config/package-lists/installer.list.binary
+++ b/config/package-lists/installer.list.binary
@@ -1,9 +1,9 @@
 # These packages are required by the installer to install the system in UEFIM boot mode
-grub-efi-amd64-bin
-grub-efi-amd64
-grub-efi-amd64-signed
-mokutil
-shim-unsigned
-shim-helpers-amd64-signed
-shim-signed-common
-shim-signed
+#grub-efi-amd64-bin
+#grub-efi-amd64
+#grub-efi-amd64-signed
+#mokutil
+#shim-unsigned
+#shim-helpers-amd64-signed
+#shim-signed-common
+#shim-signed
--- a/config/package-lists/network.list.chroot
+++ b/config/package-lists/network.list.chroot
@@ -1,183 +1,21 @@
 #Title: Internet and network

 #Section: Web browsers
-#Description: firefox-esr
-firefox-esr
-firefox-esr-l10n-fr
-#pkg-mozilla-archive-keyring # buster only
-webext-ublock-origin
-#Alt: webext-https-everywhere
-#Alt: midori
-#Alt: luakit
-#Alt: chromium
-#Alt: nss-passwords
-#Alt: w3m
-#Alt: links2
-#Alt: surf
-#Alt: elinks
-
-#Section: Instant messaging
-#Description: pidgin
-pidgin
-pidgin-otr
-libpurple-bin
-purple-lurch
-purple-rocketchat
-purple-discord
-purple-xmpp-http-upload
-purple-xmpp-carbons
-pidgin-plugin-pack
-pidgin-extprefs
-pidgin-gnome-keyring
-telegram-purple
-#Alt: empathy
-#Alt: finch
-#Alt: telegram-desktop
-#Alt: pidgin-skype
-#Alt: dino-im
-#Alt: gajim
-#Alt: mcabber
-#Alt: smuxi
-#Alt: weechat
-#Alt: purple-mm-sms
-#Alt: purple-xmpp-http-upload
-#purple-matrix # sid only
-#xchat # buster only
-#ekg2 # buster only
-
-#Section: VoIP/videoconference
-#Description: mumble
-mumble
-#Alt: jami
-#Alt: linphone
-
-
-#Section: Mail clients
-#Description: thunderbird
-thunderbird
-thunderbird-l10n-fr
-#Alt: geary
-#Alt: claws-mail
-#Alt: claws-mail-plugins
-#Alt: mailnag
-#Alt: mutt
-#Alt: alpine
-#Alt: getmail
-#Alt: evolution
-#Alt: evolution-plugins
-#Alt: evolution-rss
-#Alt: offlineimap
-
-
-#Section: File transfer and synchronization
-#Description: nextcloud-desktop
-nextcloud-desktop
-nextcloud-desktop-cmd
-rsync
-#Alt: lftp
-#Alt: unison-gtk
-#Alt: rclone
-#Alt: git-annex
-#Alt: nautilus-dropbox
-#Alt: syncthing
-#Alt: sparkleshare
-#Alt: seafile-cli
-#Alt: seafile-daemon
-#Alt: seafile-gui
-#Alt: grsync
-#Alt: filezilla
-#Alt: gftp
-#Alt: pastebinit
-#owncloud-client # buster only
-
-
-#Section: Bittorrent
-#Firewall: transmission bittorrent client
-#Description: transmission-gtk
-transmission-gtk
-transmission-cli
-#Alt: qbittorrent
-#Alt: deluge-gtk
-#Alt: deluge-console
-#Alt: deluge-web
-#Alt: transmission-daemon
-#Alt: transmission-remote-gtk
-#Alt: uget
-#Alt: aria2
-#Alt: amule
-#Alt: amule-gnome-support
-#Alt: rtorrent
-#Alt: btfs
-#transmission-remote-cli # buster only
-#nicotine # buster only
-
-#Section: Media download
-##Description: youtube-dl
-#Alt: youtube-dl
-#Alt: streamlink
-#Alt: minitube
-#Alt: smtube
-#get-flash-videos # buster only
-#gnome-twitch # buster only
+#firefox-esr
+#When building with extras (only AMD64)#google-chrome-stable
+chromium

 #Section: Downloaders/web crawlers
 curl
 wget
-#Alt: aria2
-#Alt: kiwix
-#Alt: kiwix-tools
-#Alt: zim-tools
-#Alt: httrack
-#Alt: axel
-#Alt: plowshare
-
-#Section: Feed readers
-##Description: liferea
-#Alt: liferea
-#Alt: newsboat
-#Alt: gnome-feeds
-#Alt: quiterss
-#Alt: tickr
-#Alt: feedreader
-
-#Section: LAN file sharing
-##Firewall: samba server
-#Alt: samba
-#Alt: samba-vfs-modules 
-#Alt: smbclient
-#smbc # buster only

 #Section: Network management
 #Description: network-manager-gnome
 network-manager-gnome
-network-manager-openvpn-gnome
 dnsmasq-base
 hostname
 bridge-utils
 ethtool
-#Alt: connman
-#Alt: connman-ui
-#Alt: cmst
-#Alt: wpagui
-#Alt: network-manager-ssh
-#Alt: efax-gtk
-#Alt: avahi-daemon
-#Alt: libnss-mdns
-#Alt: avahi-autoipd
-#Alt: avahi-dnsconfd
-#Alt: avahi-discover
-#Alt: avahi-ui-utils
-#wicd # buster only
-#wicd-curses # buster only
-#wammu # buster only
-
-#Section: Cellphone and modem support
-#Alt: modemmanager
-#Alt: modem-manager-gui
-#Alt: mobile-broadband-provider-info
-#Alt: usb-modeswitch
-#Alt: gnome-phone-manager
-#Alt: kdeconnect

 #Section: Wireless
 #Description: blueman
@@ -186,170 +24,12 @@ bluetooth
 blueman
 crda
 wireless-regdb
-#Alt: gnome-bluetooth
-#Alt: gnome-user-share
-#Alt: ganyremote
-#Alt: hostapd
-#Alt: aircrack-ng
-#Alt: btscanner
-#blueproximity # buster only

 #Section: Firewall
-#Description: gufw
 ufw
-gufw
 iptables
-#Alt: ferm
-#Alt: iptables-persistent
-#Alt: firehol
-#Alt: fail2ban
-#Alt: ipset-persistent
+

 #Section: Network diagnostic/monitoring
-#Description: gnome-nettool
-gnome-nettool
 traceroute
 dnsutils
-#Alt: dnsmasq
-#Alt: dns-root-data
-#Alt: arp-scan
-#Alt: arpwatch
-#Alt: bwm-ng
-#Alt: darkstat
-#Alt: ddupdate
-#Alt: driftnet
-#Alt: dsniff
-#Alt: fping
-#Alt: httpry
-#Alt: ifstat
-#Alt: iftop
-#Alt: ipcalc
-#Alt: ipcalc-ng
-#Alt: iperf
-#Alt: iptraf-ng
-#Alt: jmeter
-#Alt: jnettop
-#Alt: logstalgia
-#Alt: macchanger
-#Alt: mitmproxy
-#Alt: mtr
-#Alt: natpmpc
-#Alt: nethogs
-#Alt: netmask
-#Alt: nmon
-#Alt: prips
-#Alt: slurm
-#Alt: socat
-#Alt: speedometer
-#Alt: speedtest-cli
-#Alt: sslsniff
-#Alt: subnetcalc
-#Alt: tcpdump
-#Alt: tcpstat
-#Alt: thc-ipv6
-#Alt: trickle
-#Alt: tshark
-#Alt: usbip
-#Alt: vnstat
-#Alt: vnstati
-#Alt: wireshark
-#Alt: termshark
-#Alt: fierce
-#namebench # buster only
-#ntopng # buster only
-#snetz # buster only
-#sslstrip # buster only
-#python-scapy # buster only
-#dropwatch # sid only
-
-#Section: SSH
-#Alt: sshuttle
-#Alt: sshfs
-#Alt: pssh
-#Alt: putty-tools
-#Alt: autossh
-#Alt: endlessh
-
-
-#Section: Remote access/desktop clients
-#Alt: remmina
-#Alt: remmina-plugin-nx
-#Alt: remmina-plugin-rdp
-#Alt: remmina-plugin-spice
-#Alt: remmina-plugin-vnc
-#Alt: remmina-plugin-xdmcp
-#Alt: vinagre
-#Alt: weevely
-#Alt: x2goclient
-#remmina-plugin-telepathy # buster only
-
-
-#Section: SSH
-#Firewall: SSH server
-#Description: openssh-server
-openssh-server
-#Alt: barrier
-#Alt: xpra
-#Alt: lightdm-remote-session-x2go
-#Alt: x2godesktopsharing
-#Alt: x2goserver
-#Alt: x2goserver-desktopsharing
-#Alt: x2goserver-extensions
-#Alt: x2goserver-x2goagent
-#Alt: x2goserver-xsession
-#Alt: x2goserver-printing
-#Alt: tinysshd
-#Alt: vino
-
-#Section: Load testing
-#Alt: siege
-#Alt: tsung
-
-#Section: Scanners
-#Alt: nmap
-#Alt: nikto
-#Alt: zmap
-#Alt: sqlmap
-#Alt: themole
-#Alt: arp-scan
-#Alt: arping
-#Alt: whatweb
-#Alt: knockpy
-#Alt: spectre-meltdown-checker
-#Alt: ndiff
-#Alt: masscan
-#Alt: pompem
-#Alt: dirb
-#Alt: dhcpig
-#Alt: wafw00f
-#Alt: smbmap
-#Alt: wig
-#Alt: reaver
-#Alt: bully
-#Alt: hydra
-#Alt: hydra-gtk
-#Alt: ophcrack
-#Alt: hashcat
-#Alt: hashcat-data
-#Alt: mdk3
-#Alt: dnsmap
-#Alt: dnsenum
-#prads # buster only
-#zenmap # buster only
-#kismet # buster only
-#kismet-plugins # buster only
-#pcredz # buster only
-
-#Section: Tor
-#Alt: tor-geoipdb
-#Alt: tor
-#Alt: torsocks
-#Alt: torbrowser-launcher
-
-#Section: GeoIP databases
-#Alt: geoip-bin
-#Alt: geoip-database
-
-#Section: Out-of-band management
-#Alt: ipmitool
-#gwakeonlan # buster only
--- a/config/package-lists/office.list.chroot
+++ b/config/package-lists/office.list.chroot
@@ -1,226 +0,0 @@
-#Title: Office
-
-#Section: Office suite
-#Description: libreoffice
-libreoffice-writer
-libreoffice-impress
-libreoffice-draw
-libreoffice-calc
-libreoffice-base
-libreoffice-gtk3
-libreoffice-java-common
-libreoffice-gnome
-libreoffice-avmedia-backend-gstreamer
-libwmf-bin
-hyphen-fr
-libreoffice-l10n-fr
-mythes-fr
-libreoffice-help-fr
-#Alt: abiword
-#Alt: calligraplan
-#Alt: calligrasheets
-#Alt: calligrastage
-#Alt: calligrawords
-#Alt: dia
-#Alt: ebook2odt
-#Alt: gnumeric
-#Alt: gromit
-#Alt: impressive
-#Alt: karbon
-#Alt: key2odp
-#Alt: libreoffice-dmaths
-#Alt: libreoffice-math
-#Alt: libreoffice-style-sifr
-#Alt: lyx
-#Alt: python3-uno
-#Alt: retext python3-enchant python3-yaml
-#Alt: scribus
-#Alt: scribus-template
-#Alt: spotlighter
-#Alt: tpp
-#Alt: unoconv
-#Alt: plume-creator
-#braindump # sid only
-#calligraflow # sid only
-#sozi # buster only
-#libreoffice-style-tango # buster only
-#libreoffice-pdfimport # buster only
-#libreoffice-avmedia-backend-vlc # buster only
-
-
-# Section: Calendars/contacts management
-# Description: lightning
-lightning
-#Alt: gnome-calendar
-#Alt: evolution-data-server
-#Alt: abook
-#orage # buster only
-#lightning-l10n-fr # buster only
-#pycarddav # buster only
-
-
-#Section: Personal finance
-#Description: homebank
-homebank
-#Alt: gnucash
-#Alt: grisbi
-
-
-#Section: Document viewers
-#Description: evince
-evince
-#Alt: mupdf
-#Alt: apvlv
-#Alt: xpdf
-#Alt: calibre
-#Alt: zathura
-#Alt: fbreader
-#Alt: yelp
-#Alt: xchm
-#bookworm #bookworm only
-
-#Section: E-book
-#Alt: calibre
-#cdcat # buster only
-
-
-#Section: PDF editor/utilities
-#Description: pdfchain
-pdfchain
-pdfgrep
-poppler-utils
-#Alt: qpdf
-#Alt: pdfmod
-#Alt: pdfshuffler
-#Alt: pdftk
-#Alt: pdfcrack
-#Alt: diffpdf
-#Alt: comparepdf
-#Alt: enscript
-#Alt: html2text
-#Alt: pdfarranger
-#Alt: pdfproctools
-#python-html2text # buster only
-#chm2pdf # buster only
-
-
-#Section: Tasks/Personal information management
-#Alt: osmo
-#Alt: zim
-#Alt: tasque
-#Alt: gnote
-#Alt: email-reminder
-#Alt: todotxt-cli
-#Alt: lifeograph
-#Alt: tudu
-#Alt: tina
-#Alt: taskwarrior
-#Alt: vit
-#Alt: w2do
-#Alt: devtodo
-#Alt: gnome-todo
-#Alt: bijiben
-#Alt: wyrd
-#Alt: calcurse
-#Alt: gnome-contacts
-#Alt: gnome-documents
-#Alt: khal
-#Alt: treesheets
-#Alt: hnb
-#Alt: etm
-#Alt: almanah
-#Alt: nixnote2
-#gtg # buster only
-#Alt: cherrytree
-#taskcoach # buster only
-#keepnote # buster only
-
-
-#Section: Image scanning
-#Description: simple-scan
-simple-scan
-imagemagick
-sane-utils
-#Alt: scanbd
-#Alt: xsane
-
-
-#Section: Optical Character Recognition (OCR)
-#Alt: paperwork-gtk
-#Alt: ocrfeeder
-#Alt: tesseract-ocr-fra
-#Alt: unpaper
-#Alt: yagf
-#Alt: ocrad
-
-
-#Section: Printing
-#Description: system-config-printer
-cups
-cups-client
-gutenprint-locales
-cups-pk-helper
-printer-driver-all
-printer-driver-cups-pdf
-printer-driver-gutenprint
-system-config-printer
-system-config-printer-udev
-cups-browsed
-#Alt: hplip-gui
-#Alt: mtink
-#Alt: colord
-
-#Section: Fonts
-#Description: fonts-hack-ttf
-fonts-averia-gwf
-fonts-breip
-fonts-cabinsketch
-fonts-cantarell
-fonts-century-catalogue
-fonts-crosextra-caladea
-fonts-dancingscript
-fonts-dosis
-fonts-droid-fallback
-fonts-dustin
-fonts-ecolier-court
-fonts-f500
-fonts-freefont-ttf
-fonts-hack-ttf
-fonts-inconsolata
-fonts-junicode
-fonts-jura
-fonts-kaushanscript
-fonts-knda
-fonts-levien-museum
-fonts-liberation
-fonts-linuxlibertine
-fonts-lobster
-fonts-lobstertwo
-fonts-ocr-a
-fonts-opensymbol
-fonts-roboto
-fonts-rufscript
-fonts-sil-andika
-fonts-sil-gentium-basic
-fonts-ubuntu-title
-ttf-mscorefonts-installer
-xfonts-terminus
-#Alt: fonts-beteckna
-#Alt: fonts-cabin
-#Alt: fonts-comfortaa
-#Alt: fonts-crosextra-carlito
-#Alt: fonts-fanwood
-#Alt: fonts-fork-awesome
-#Alt: fonts-lato
-#Alt: fonts-lindenhill
-#Alt: fonts-open-sans
-#Alt: fonts-opendin
-#Alt: fonts-play
-#Alt: fonts-prociono
-#Alt: fonts-quattrocento
-#Alt: fonts-sil-galatia
-#Alt: fonts-sil-gentium
-#Alt: fonts-tomsontalks
-#Alt: fonts-vollkorn
-#Alt: fonts-yanone-kaffeesatz
-#fonts-pecita # buster only
--- a/config/package-lists/system.list.chroot
+++ b/config/package-lists/system.list.chroot
@@ -1,40 +1,15 @@
 #Title: System

 #Section: Package management
-#Description: gnome-packagekit
-#Description: synaptic
 apt-listchanges
 apt-transport-https
-aptitude
+#aptitude
 debconf-utils
 debian-archive-keyring
 debian-keyring
 debsecan
 debsums
-gnome-packagekit
-packagekit
-packagekit-tools
-reportbug
-software-properties-gtk
-synaptic
-unattended-upgrades
 vrms
-#Alt: appstream-generator
-#Alt: apt-config-auto-update
-#Alt: apt-file
-#Alt: apt-forktracer
-#Alt: apt-listbugs
-#Alt: aptitude-doc-fr
-#Alt: debian-security-support
-#Alt: deborphan
-#Alt: debtree
-#Alt: gnome-software
-#Alt: gstreamer1.0-packagekit
-#Alt: needrestart
-#Alt: packagekit-command-not-found
-#Alt: packagekit-gtk3-module
-#Alt: extrepo
-#pk-update-icon # buster only

 #Section: Task management/monitoring
 #Description: xfce4-taskmanager
@@ -46,55 +21,15 @@ hddtemp
 inxi
 lsof
 strace
-memtest86+
-#Alt: gnome-system-monitor
-#Alt: screenfetch
-#screentest # bookworm only
-#Alt: hardinfo
-#Alt: cputool
-#Alt: usbview
-#Alt: stress
-#Alt: stressapptest
-#Alt: lshw
-#Alt: lshw-gtk
-#Alt: bonnie++
-#Alt: x86info
-#Alt: memtester
-#Alt: dstat
-#Alt: sysstat
-#Alt: cacti
-#Alt: hwloc
-#Alt: memlockd
-#Alt: read-edid
-#Alt: cpu-x
-#glances # buster only
-
-
-#Section: Backup
-#Screenshot: deja-dup
-#Description: deja-dup
-deja-dup
-#Alt: backintime-qt4
-#Alt: tmfs
-#Alt: duplicity
-#Alt: rdiff-backup
-#Alt: grsync
-#Alt: unison
-#Alt: unison-gtk
-#Alt: rsync
-#Alt: rsbackup
-#Alt: fsarchiver
-#Alt: backupninja
-#Alt: duply
-#rsnapshot # buster only
+#memtest86+

 #Section: Disk management
 #Description: gnome-disk-utility
 #Description: gparted
 #Description: baobab
 gnome-disk-utility
-gparted
-baobab
+#gparted
+#baobab
 ncdu
 dfc
 smartmontools
@@ -103,120 +38,35 @@ gdisk
 parted
 hdparm
 sdparm
-dosfstools
-hfsprogs
-ntfs-3g
+#dosfstools
+#hfsprogs
+#ntfs-3g
 kpartx
 xorriso
-lvm2
-#Alt: gsmartcontrol
-#Alt: fsarchiver
-#Alt: partclone
-#Alt: pmount
-#Alt: bilibop-udev
-#Alt: ecryptfs-utils
-#Alt: partimage
-#Alt: forensics-full
-#Alt: steghide
-#Alt: gdmap
-#Alt: clonezilla
-#Alt: exfatprogs
-#Alt: crazydiskinfo
-#Alt: disk-filltest
-#disk-manager # buster only
-
-#Section: data recovery
-#Description: testdisk
-testdisk
-#Alt: foremost
-#Alt: scalpel
-#Alt: gddrescue
-#Alt: ddrescueview
-#Alt: extundelete
-#Alt: fatcat
-#Alt: safecopy
-
-#Section: File cleaners/linters
-#Description: bleachbit
-bleachbit
-localepurge
-#fslint # buster only
+#lvm2

 #Section: Log viewers
 #Description: lnav
 lnav
 colortail
-#Alt: gnome-logs
-#Alt: glogg
-#Alt: logtop
-#Alt: since
-#Alt: multitail
-
-
-#Section: Virtualization
-#Description: virt-manager
-virt-manager
-virtinst
-virt-viewer
-ebtables
-dnsmasq-base
-libvirt-daemon-system
-gir1.2-spiceclientgtk-3.0
-qemu-system-x86
-qemu-system-arm
-qemu-utils
-#virt-top # buster only
-netcat-openbsd
-#Alt: virt-what
-#Alt: libguestfs-tools
-#Alt: lxc
-#Alt: gnome-boxes
-#Alt: lxc-templates
-#Alt: docker.io
-#Alt: docker-registry
-#Alt: docker-doc
-#Alt: anbox
-#Alt: vagrant
-#Alt: schroot
-#virt-sandbox # buster only
-
-#Section: Configuration management
-#Alt: ansible

 #Section: Java
-default-jre
+#default-jre

 #Section: Display manager/screen locker
 #Description: lightdm
 lightdm
 lightdm-gtk-greeter
 light-locker
-#Alt: accountsservice
-#Alt: slim
-#Alt: gdm3
-#Alt: arctica-greeter
-#Alt: xsecurelock
-#Alt: xscreensaver
-#Alt: xscreensaver-data-extra
-#Alt: xscreensaver-gl
-#Alt: xscreensaver-gl-extra

 #Section: Boot screen
-plymouth
-plymouth-x11
-plymouth-themes
+#plymouth
+#plymouth-x11
+#plymouth-themes

 #Section: Scheduling
 at

-#Section: Desktop performance
-#Alt: haveged
-#Alt: oomd
-#Alt: irqbalance
-#Alt: preload
-#ulatencyd # buster only
-
-
 #Section: Security & sandboxing
 apparmor
 apparmor-easyprof
@@ -224,13 +74,9 @@ apparmor-profiles
 apparmor-utils
 libpam-tmpdir
 sudo
-#Alt: apparmor-notify
-#Alt: apparmor-profiles-extra
-#Alt: doas

 #Section: Time
 chrony
-#Alt: ntp

 #Section: Display
 mesa-utils
@@ -258,26 +104,28 @@ xserver-xorg-video-all
 xserver-xorg-video-intel
 xfonts-base
 hwdata
-nvidia-driver
+
+#Section nvidiaDriver
+#nvidia-driver
+##if ARCHITECTURES amd64
+#linux-headers-amd64
+#endif
+##if ARCHITECTURES i386
+#linux-headers-686:i386
+##endif
+#module-assistant
+#dkms
+#build-essential
+

 #Section: Kernel/boot/init
-#if ARCHITECTURES amd64
-linux-headers-amd64
-#endif
-#if ARCHITECTURES i386
-linux-headers-686:i386
-#endif
-module-assistant
-dkms
-build-essential
 systemd
 os-prober
 initramfs-tools
 console-setup
 user-setup
 libpam-systemd
-#Alt: kexec-tools
-#Alt: kthresher
+

 #Section: Firmwares
 firmware-linux-free
@@ -285,15 +133,6 @@ firmware-linux-nonfree
 amd64-microcode
 intel-microcode

-#Section: Hardware-specific packages
-#Alt: driverctl
-#Alt: pommed
-#Alt: lomoco
-#Alt: wmgui
-#Alt: mbpfan
-#Alt: usbmuxd
-#Alt: fprintd
-
 #Section: Live system components
 live-boot
 live-config
--- a/config/package-lists/utility.list.chroot
+++ b/config/package-lists/utility.list.chroot
@@ -2,48 +2,15 @@

 #Section: File management
 #Description: thunar
-gvfs-backends
-gvfs-bin
-gvfs-fuse
-jdupes
 libgphoto2-l10n
 libmtp-runtime
 mlocate
 ooo-thumbnailer
 rename
-secure-delete
 thunar
 thunar-archive-plugin
 thunar-media-tags-plugin
 thunar-volman
-trash-cli
-tree
-tumbler
-catfish
-#Alt: pcmanfm
-#Alt: gprename
-#Alt: thunar-gtkhash
-#Alt: nautilus
-#Alt: nautilus-sendto
-#Alt: ooo-thumbnailer
-#Alt: nautilus-wipe
-#Alt: nautilus-image-converter
-#Alt: gnome-sushi
-#Alt: gtkhash
-#Alt: gnome-split
-#Alt: ffmpegthumbnailer
-#Alt: tdfsb
-#Alt: cksfv
-#Alt: safe-rm
-#Alt: mmv
-#Alt: hardlink
-#Alt: ranger
-#Alt: chkboot
-#Alt: reflex
-#Alt: fzf
-#Alt: ripgrep
-#Alt: fd-find
-

 #Section: Desktop environment
 #Description: xfce4
@@ -51,203 +18,40 @@ xfdesktop4
 xfwm4
 xfce4-session
 xfce4-notifyd
-xfce4-whiskermenu-plugin
-gmrun
 xfce4-panel
 xfce4-places-plugin
-xfce4-weather-plugin
-xfce4-netload-plugin
 xfce4-pulseaudio-plugin
-#Alt: plank
-#Alt: kupfer
-#Alt: gnome-pie
-#Alt: xfce4-appfinder
-#Alt: synapse
-#Alt: zeitgeist
-#Alt: zeitgeist-datahub
-#Alt: compiz
-#Alt: compiz-plugins
-#Alt: compiz-plugins-default
-#Alt: compiz-plugins-extra
-#Alt: compiz-plugins-main
-#Alt: compton
-#Alt: compton-conf
-#activity-log-manager # buster only
-
+xfce4-xkb-plugin

 #Section: Archive management
-#Description: file-roller
-file-roller
-atool
-p7zip
-p7zip-full
-arj
-cabextract
-cpio
-lzip
-lzma
-lzop
-lzip
-unace
-unalz
-unrar-free
-rar
-unzip
-zip
-iat
-nrg2iso
-gzrt
-#Alt: xarchiver
-#Alt: isomaster
-#Alt: p7zip-rar
-#Alt: gztool
-
-
-#Section: Password management/file/disk encryption
-#Description: keepassxc
-keepassxc
-seahorse
-seahorse-daemon
-gnome-keyring
-ssh-askpass-gnome
-libpam-gnome-keyring
-gnupg
-gnupg2
-pwgen
-nss-passwords
-cryptsetup
-cryptsetup-initramfs
-libblockdev-crypto2
-#Alt: keepassx
-#Alt: keepass2
-#Alt: qtpass
-#Alt: revelation
-#Alt: apg
-#Alt: tcplay
-#Alt: xkcdpass
-#Alt: pass
-#Alt: tomb
-#Alt: zulucrypt-gui
-#Alt: zulumount-gui
-#Alt: libzulucrypt-plugins
-
+squashfs-tools

 #Section: Text editors
 #Description: mousepad
 #Description: nano
 mousepad
 nano
-vim-tiny
-#Alt: gnome-builder flatpak-builder python3-lxml python3-jedi
-#Alt: vim
-#Alt: vim-doc
-#Alt: vim-scripts
-#Alt: vim-addon-manager
-#Alt: focuswriter
-#Alt: gedit
-#Alt: gedit-plugins
-#Alt: gedit-source-code-browser-plugin
-#Alt: geany
-#Alt: nfoview

-#Section: Sticky notes
-#xfce4-notes # buster only
-#Alt: xpad
-
-
-#Section: Maps
-##Description: gnome-maps
-#Alt: gnome-maps
-#Alt: marble-qt
-#alt: marble-plugins
-#Alt: geoclue-2.0
-#Alt: josm
-#Alt: navit
-#Alt: gpsd
-#Alt: routino
-#Alt: mkgmapgui
-#Alt: mkgmap
-#Alt: foxtrotgps
-#Alt: gis-tasks
-#Alt: gpsprune

 #Section: Screenshots
-#Description: xfce4-screenshooter
 xfce4-screenshooter
-#Alt: scrot
-#Alt: gnome-screenshot
-#Alt: flameshot

-#Section: Clocks/timers
-#Description: gnome-clocks
-gnome-clocks
-tty-clock
-#Alt: dclock
-#Alt: gtimer
-#Alt: stopwatch
-#Alt: xfce4-timer-plugin
-#Alt: screenruler
-
-
-#Section: Calculators
-#Description: gnome-calculator
-#Screenshot: gnome-calculator
-gnome-calculator
-bc
-units
-#Alt: num-utils
-#Alt: speedcrunch
-#Alt: gbase
-#Alt: graphmonkey
-#qalculate # bookworm only

 #Section: Terminal emulators
 #Description: xfce4-terminal
 xfce4-terminal
-#Alt: lxterminal
-#Alt: gnome-terminal
-#Alt: guake
-#Alt: terminator
-#Alt: rxvt-unicode
-#Alt: tilda

-#Section: Science
-#Alt: stellarium
-#Alt: lightspeed
-#Alt: wxmaxima
-#Alt: gramps
-
-#Section: Color management
-#Description: redshift-gtk
-redshift-gtk
-#Alt: workrave
-#Alt: safeeyes
-
-#Section: CD burning
-##Description: xfburn
-#Alt: xfburn
-#Alt: brasero
-#Alt: brasero-cdrkit
-#Alt: cdrdao

 #Section: Desktop configuration utilities
 xfce4-settings
-gnome-system-tools
-menulibre
-#gconf-editor # buster only
-dconf-editor
 dconf-cli
-#qt4-qtconfig # buster only
-dconf-gsettings-backend
-#Alt: gnome-tweaks
-#Alt: gnome-settings-daemon

 #Section: Power management
 #Description: xfce4-power-manager
 xfce4-power-manager
 xfce4-battery-plugin
-radeontool
-bumblebee
+#radeontool
+#bumblebee
 vbetool
 powertop
 usbutils
@@ -258,77 +62,31 @@ laptop-mode-tools
 fancontrol
 rfkill
 cpufrequtils
-#hibernate # buster only
 pm-utils
-#Alt: powerdebug
-#Alt: tlp
-#Alt: powerstat
-#Alt: i8kutils
-#Alt: usbtop
-#Alt: primus
-#Alt: hd-idle
-#eeepc-acpi-scripts #sid only
-
-#Section: Character map/font viewer
-gucharmap
-gnome-font-viewer
-#Alt: font-manager
-#Alt: thunar-font-manager
-
-#Section: Spell checking/dictionaries
-hunspell
-hunspell-en-us
-hunspell-fr
-aspell
-aspell-fr
-hunspell-fr
-ispell
-iamerican
-ibritish
-ifrench-gut
-wfrench
-#Alt: xfce4-dict
-#Alt: gnome-dictionary
-#Alt: goldendict
-#Alt: verbiste-gnome

 #Section: Resources
 desktop-base
-papirus-icon-theme
-arc-theme
+#papirus-icon-theme
+#arc-theme
 gnome-themes-standard
 sound-theme-freedesktop
 gnome-audio
-#Alt: faenza-icon-theme
-#Alt: deepin-icon-theme
-#Alt: paper-icon-theme
-#clearlooks-phenix-theme # buster only
-
-#Section: Virtual keyboards
-#Alt: onboard
-#Alt: onboard-data
-#Alt: cellwriter
-#florence # buster only

 #Section: Other
+sudo
 libnotify-bin
-zenity
+#zenity
 numlockx
-x11-apps
-xbitmaps
+#x11-apps
+#xbitmaps
 wmctrl
 xclip
 xcalib
 xbacklight
-conky-all
 gtk2-engines
 gtk2-engines-murrine
 gtk2-engines-pixbuf
 #gtk2-engines-xfce # buster only
 xdg-user-dirs-gtk
 libfile-mimeinfo-perl
-policykit-1-gnome
-#Alt: randtype
-#Alt: winwrangler
-#Alt: xdotool
-#scrcpy # sid only
+#policykit-1-gnome
--- a/doc/gen_package_lists.py
+++ b/doc/gen_package_lists.py
@@ -1,88 +0,0 @@
-#!/usr/bin/python3
-
-import apt_pkg
-import re
-
-# list of lists, in the form [ 'sourcefile.list.chroot', 'destinationfile.md' ]
-package_lists = [
-	[ 'config/package-lists/utility.list.chroot', 'doc/md/packages/utility.md' ],
-	[ 'config/package-lists/network.list.chroot', 'doc/md/packages/network.md' ],
-	[ 'config/package-lists/office.list.chroot', 'doc/md/packages/office.md' ] ,
-	[ 'config/package-lists/graphics.list.chroot', 'doc/md/packages/graphics.md' ],
-	[ 'config/package-lists/audio-video.list.chroot', 'doc/md/packages/audio-video.md' ],
-	[ 'config/package-lists/system.list.chroot', 'doc/md/packages/system.md' ],
-	[ 'config/package-lists/development.list.chroot', 'doc/md/packages/development.md' ],
-	[ 'config/package-lists/games.list.chroot', 'doc/md/packages/games.md' ]
-	]
-
-def get_package_metadata(package):
-	'''get package metadata from apt database/hardcoded URLs
-	returns: list of strings'''
-	print('[INFO] parsing metadata for %s' % package)
-	pkg = cache[(package)]
-	candidate = depcache.get_candidate_ver(pkg)
-	desc = candidate.translated_description
-	version = candidate.ver_str
-	(f, index) = desc.file_list.pop(0)
-	records = apt_pkg.PackageRecords(cache)
-	records.lookup((f, index))
-	short_desc = records.short_desc
-	long_desc = records.long_desc.replace(' .', '')
-	long_desc = re.sub(r'^[A-z].*', '', long_desc)
-	long_desc = long_desc.split('\n\n')[0]
-	screenshot_url = 'https://screenshots.debian.net/thumbnail-with-version/{}/{}'.format(package, version)
-	pdo_url = 'https://packages.debian.org/bullseye/{}'.format(package)
-	return short_desc, long_desc, screenshot_url, pdo_url, version
-
-
-def package_to_markdown(package, short_desc, long_desc, screenshot_url, pdo_url, version, pkg_type):
-	'''format package metdata to markdown
-	returns: markdown string'''
-	installed_icon = '![](green.png)'
-	optional_icon = '![](grey.png)'
-	if pkg_type == 'description':
-		markdown = '\n</sub>\n\n<img align="right" src="{}">\n\n**[{}]({})** - {}\n\n{}\n\n<sub>\n\n-----------------------\n\n'.format(screenshot_url, package, pdo_url, short_desc, long_desc)
-	elif pkg_type == 'short':
-		markdown = '- {} [{}]({}) `{}` - {}'.format(installed_icon, package, pdo_url, version, short_desc)
-	elif pkg_type == 'alt':
-		markdown = '- {} _[{}]({}) `{}` - {}_'.format(optional_icon, package, pdo_url, version, short_desc)
-	return markdown
-
-
-if __name__ == "__main__":
-	'''main loop'''
-	apt_pkg.init()
-	cache = apt_pkg.Cache()
-	depcache = apt_pkg.DepCache(cache)
-	package_state_key = '\n![](green.png) installed - ![](grey.png) suggested\n\n'
-	for pkg_list, destination in package_lists:
-		output = ''
-		with open(pkg_list, 'r') as list:
-			#print(pkg_list) #DEBUG
-			for line in list:
-				if line.startswith('#Title:'):
-					list_title = line.split(' ', 1)[1].strip()
-					output = output + '\n### {}\n'.format(list_title)
-					output = output + package_state_key
-				elif line.startswith('#Section:'):
-					section_title = line.split(' ', 1)[1].strip()
-					output = output + '\n#### {}\n'.format(section_title)
-				if line.startswith('#Description:'):
-					pkg_type = 'description'
-					package = line.split(' ')[1].strip()
-				elif line.startswith('#Alt'):
-					pkg_type = 'alt'
-					package = line.split(' ')[1].strip()
-				elif re.match(r'^[0-9, A-z].*', line):
-					pkg_type = 'short'
-					package = line.split(' ')[0].strip()
-				else:
-					pkg_type = None
-				if pkg_type:
-					#print(package) #DEBUG
-					short_desc, long_desc, screenshot_url, pdo_url, version = get_package_metadata(package)
-					markdown = package_to_markdown(package, short_desc, long_desc, screenshot_url, pdo_url, version, pkg_type)
-					output = output + '\n' + markdown
-		with open(destination, 'w+') as out:
-			out.write(output)
-
--- a/doc/md/CHANGELOG.md
+++ b/doc/md/CHANGELOG.md
@@ -1,193 +0,0 @@
-# Change Log
-
-All notable changes to this project will be documented in this file.  
-The format is based on [Keep a Changelog](http://keepachangelog.com/).
-
-## [v3.0.0](https://gitlab.com/nodiscc/dlc/releases/tag/3.0.0) - 2021-10-24
-
-### Changed
-
- rebase on [Debian 11.1.0 "Bullseye"](https://www.debian.org/releases/bullseye/)
- doc: increase RAM requirements to 2GB/recommended 4GB
- apt: update APT sources lists/configuration
- replace [backintime](https://packages.debian.org/bullseye/backintime-qt) backup tool with [deja-dup](https://wiki.gnome.org/Apps/DejaDup)
- games: install lutris from official Debian repositories, remove third-party package download
- extras: use `.deb` packages to manage additional/unofficial software ([bleachbit-cleanerml](https://github.com/bleachbit/cleanerml), [yt-dlp](https://github.com/yt-dlp/yt-dlp), [pidgin-opensteamworks](https://github.com/eionrobb/pidgin-opensteamworks), [user.js](https://github.com/nodiscc/user.js)), remove custom installation logic, update all extra packages to latest releases
- network/audio-video: replace [youtube-dl](https://packages.debian.org/bullseye/youtube-dl)/[streamlink](https://packages.debian.org/bullseye/streamlink) with [yt-dlp](https://github.com/yt-dlp/yt-dlp) ([third-party package](https://nodiscc.gitlab.io/toolbox/))
- skel: update and fix [conky](https://packages.debian.org/bullseye/conky-all) configuration for recent versions
- skel/session: don't autostart blueman bluetooth manager by default
- skel/session: don't autostart keepassxc by default
- skel: update default UI configuration for thunar, ristretto, xfce4-desktop, xfce4-panel
- skel: replace xfce4-power-manager notification icon with battery panel plugin
- skel: xfwm4: enable video compositing by default (transparency effects)
- skel: xfwm4: disable confusing "Use mouse wheel on title bar to roll up the window" setting
- skel: thunar: add custom right-click menu actions to restore files/directories with deja-dup, and analyze disk usage (baobab) in the selected directory
- skel: vlc: don't ask for network metadata access, disable it by default
- reduce ISO image size (don't keep APT indices on the live filesystem)
- doc: update user/maintainer documentation/download links
- doc: installation: rotate GPG key (old key expired)
- doc: update alternative/suggested packages list, remove packages no longer available in Debian 11
- skel/desktop: update backgrounds/themes for Debian 11
- skel: update default bash aliases (alias `diff` to `colordiff`, don't alias `diff`)
- tools: update tests/build configuration and tools, make build completely non-interactive
- system/config: enable UFW firewall at boot by default
-
-### Added
-
- network: add support for more IM protocols in pidgin: [OMEMO encryption](https://packages.debian.org/bullseye/purple-lurch), [discord](https://packages.debian.org/bullseye/purple-discord), [telegram](https://packages.debian.org/bullseye/telegram-purple), (rocketchat)[https://packages.debian.org/bullseye/purple-rocketchat], XMPP [HTTP upload](https://packages.debian.org/bullseye/purple-xmpp-http-upload) and [message carbons](https://packages.debian.org/bullseye/purple-xmpp-carbons)
- graphics: add [gcolor3](https://packages.debian.org/bullseye/gcolor3) color picker
- doc: add [Software: Extras](https://debian-live-config.readthedocs.io/en/latest/packages/extras.html) page listing all third-party downloads
-
-### Removed
-
- system: remove [primus](https://packages.debian.org/bullseye/primus) (conflicts with nvidia drivers)
- system: remove [irqbalance](https://packages.debian.org/bullseye/irqbalance) (unused, benefits unclear)
- utilities: remove [xfce4-notes](https://packages.debian.org/buster/xfce4-notes) (package was removed from Debian 11)
- remove less used/unused packages to reduce dependencies and image size: reduce number of default installed fonts, [asunder](https://packages.debian.org/bullseye/asunder), [cmatrix](https://packages.debian.org/bullseye/cmatrix), [pandoc](https://packages.debian.org/bullseye/pandoc), [advancecomp](https://packages.debian.org/bullseye/advancecomp), [libasound2-plugin-equal](https://packages.debian.org/bullseye/libasound2-plugin-equal) (can be replaced with [pulseaudio-equalizer](https://packages.debian.org/bullseye/pulseaudio-equalizer)), [gnome-settings-daemon](https://packages.debian.org/bullseye/gnome-settings-daemon), [gitg](https://packages.debian.org/bullseye/gitg), [gimp-gmic](https://packages.debian.org/bullseye/gimp-gmic), [pulseaudio-module-zeroconf](https://packages.debian.org/bullseye/pulseaudio-module-zeroconf), [xfburn](https://packages.debian.org/bullseye/xfburn), [blender](https://packages.debian.org/bullseye/blender), [shellcheck](https://packages.debian.org/bullseye/shellcheck), [asciinema](https://packages.debian.org/bullseye/asciinema), [wine](https://packages.debian.org/bullseye/wine) (let lutris manage wine versions/architectures), [inkscape](https://packages.debian.org/bullseye/inkscape), [pstoedit](https://packages.debian.org/bullseye/pstoedit), [gimp-help-fr](https://packages.debian.org/bullseye/gimp-help-fr)
- extras: remove [xfce4-terminal-colorschemes](https://gitlab.com/nodiscc/xfce4-terminal-colorschemes) (deprecated)
- extras: remove custom [nano text editor syntax highlighting](https://github.com/scopatz/nanorc)
- remove custom grub configuration, revert to debian defaults
- remove [webext-https-everywhere](https://packages.debian.org/bullseye/webext-https-everywhere) firefox addon (replaced with built-in "HTTPS only" mode)
-
-### Fixed
-
- always install/upgrade linux kernel and nvidia drivers from bullseye-backports
- fix default file associations for text and media files
-
-### Upgrade procedure
-
-If you have a system installed from a previous version of `debian-live-config`:
-
- Recommended: [Backup](https://backintime.readthedocs.io/en/latest/) user data, [download](https://debian-live-config.readthedocs.io/en/latest/download-and-installation.html) the latest ISO image, reinstall (overwrite the existing installation), restore data from backups
- To upgrade without reinstalling: replace `buster` with `bullseye` in `/etc/apt/sources.list`, `/etc/apt/sources.list.d/*`, remove `/etc/apt/sources.list.d/debian-buster-updates-security-backports.list`, install [`/etc/apt/sources.list.d/debian-buster-updates-security-backports.list`](https://gitlab.com/nodiscc/debian-live-config/-/blob/bullseye/config/archives/debian-updates-security-backports.list.chroot), run `sudo apt update && sudo apt dist-upgrade` (read Debian 11 [Release notes](https://www.debian.org/News/2021/20210814)). Optionally update your configuration according to [changes since the last release](https://gitlab.com/nodiscc/debian-live-config/-/compare/2.2.5...3.0.0). `skel` modifications will only take effect on newly created user accounts.
-
-
-## [v2.2.5](https://gitlab.com/nodiscc/dlc/releases/tag/2.2.5) - 2020-12-16
-
-### Removed
-
- remove [Liferea](https://packages.debian.org/buster/liferea) feed reader from default install
- remove [gnome-maps](https://packages.debian.org/buster/gnome-maps) from default install
-
-### Fixed
-
- nano: fix loading of syntax highlighting configuratio from ~/.nano/*.nanorc
-
-
-### Changed
-
- update third-party Lutris package to 0.5.8.1
- update documentation/.gitconfig examples
- tools: improve build/cleanup mechanisms
-
-------------------------------
-
-## [v2.2.4](https://gitlab.com/nodiscc/dlc/releases/tag/2.2.4) - 2020-10-22
-
-### Added
-
- add [Lutris](https://lutris.net) gaming platform
- add sensible defaults for mousepad text editor
-
-### Fixed
-
- fix display of virt-manager console (add missing  gir1.2-spiceclientgtk-3.0 package)
-
-
-### Changed
-
- update all packages to latest version (Debian 10.6)
- replace ntp time synchronization service with [chrony](https://chrony.tuxfamily.org/)
- keyboard shortcuts: add ctrl+alt+shift+left/down/right/up to move current windows to the left/down/right/up workspace
- libvirt: set the default URI to qemu:///system (virsh now works without sudo or --connect)
- dotfiles/conky: don't draw shades by default
- update documentation
- tools: various Makefile improvements
-
-------------------------------
-
-## [v2.2.3](https://gitlab.com/nodiscc/dlc/releases/tag/2.2.3) - 2020-05-10
-
-Bugfix release.
-
-### Fixed
-
- packages: add non-free nvidia-driver (fix no display at X startup on nvidia cards)
- packages: fix inability to mount luks encrypted disks (missing libblockdev-crypto2 package)
- packages: fix lightdm not showing the user list (missing accountsservice package)
- doc: fix readthedocs TOC/typos/syntax, reorder graphics package list, update auto-generated documentation (make doc), add links to source mirrors
-
-### Changed
-
- dotfiles: .bash_aliases: add example of return code indication in bash prompt
- tools: remove unused build dependencies (xmlstarlet, shellcheck), add gnupg to build dependencies (checksums signing), add python3-venv to build dependencies (doc generation)
-
-------------------------------
-
-## [v2.2.2](https://gitlab.com/nodiscc/debian-live-config/-/tags/2.2.2) - 2020-04-11
-
-### Changed
-
- Disable window manager compositor by default (improve video performance/prevent tearing)
- Update user.js to 0.1
- Remove unused locales from live system (only keep en/fr), decrease iso image size
-
-### Added
-
- Documentation at https://debian-live-config.readthedocs.io/ (auto-generated with Sphinx/python script)
-
-### Fixed
-
- Fix APT sources lists not present in the final image
- Improve/cleanup makefile and package lists
- Fix error during installation in EFI boot mode
-
-
-------------------------------
-
-
-## [v2.2.1](https://gitlab.com/nodiscc/debian-live-config/-/tags/2.2.1) - 2020-03-14
-
-### Changed
-
- remove all plymouth/wallpaper customizations, use Debian defaults
- display plymouth boot loading screen
- Makefile: move 3rd party downloads to separate file, improve 'clean' target, improve idempotence/separation of concerns
- skel: quodlibet: set default rating to 0
- skel: xfwm: decrease default number of workspaces to 2
- skel: xfwm4: disable window shadows
- update README
-
-### Added
-
- add third party package for https://github.com/EionRobb/pidgin-opensteamworks/
- add third party download for https://addons.mozilla.org/en-US/firefox/addon/keepassxc-browser/
- add third party download for https://addons.mozilla.org/en-US/firefox/addon/cookie-autodelete/
- add third party download for https://github.com/nodiscc/user.js
- add third-party download for https://github.com/az0/cleanerml
- add (disabled) third party download for  https://www.sublimetext.com/
- Makefile: add a target to generate a TODO.md from a list of gitea issues, add TODO.md
-
-### Removed
-
- remove Samba server
-
-### Fixed
-
- fix broken installation of graphics/image packages list
- associate SVG files with ristretto
-
-------------------------------
-
-## [v2.2](https://gitlab.com/nodiscc/dlc/releases/tag/2.2) - 2020-03-08
-
-Initial release, git repository reset and rebuilt from scratch. See commit messages and documentation.
-
-<!--
-### Changed
-### Added
-### Removed
-### Fixed
-### Security
-### Deprecated
-->
--- a/doc/md/LICENSE.md
+++ b/doc/md/LICENSE.md
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`/usr/share/live/build/bootloaders/isolinux/hdt.c32`