diff --git a/.bash_profile b/.bash_profile
index 93a550c..e13d22d 100644
--- a/.bash_profile
+++ b/.bash_profile
@@ -20,7 +20,7 @@ eval $(ssh-agent -s)
 if [ -z "$DISPLAY" ] && [ -n "$XDG_VTNR" ] && [ "$XDG_VTNR" -eq 1 ]; then
 	export GTK2_RC_FILES="$HOME/.gtkrc-2.0"
 	export QT_QPA_PLATFORMTHEME=qt5ct
-	export BROWSER="systemd-run --user --scope -p MemoryMax=2G -E MOZ_ENABLE_WAYLAND=1 firefox"
+	export BROWSER="systemd-run --user --scope -p MemoryMax=2G -p MemorySwapMax=3G -E MOZ_ENABLE_WAYLAND=1 firefox"
 	export TERMINAL=footclient
 	exec sway
 elif [ "$XDG_VTNR" -ne 6 ]; then
diff --git a/.config/base16-shell b/.config/base16-shell
index ce8e1e5..ec22dde 160000
--- a/.config/base16-shell
+++ b/.config/base16-shell
@@ -1 +1 @@
-Subproject commit ce8e1e540367ea83cc3e01eec7b2a11783b3f9e1
+Subproject commit ec22dde8c80cf2ab23d600461eb7f32ec21a65d0
diff --git a/.config/dunst/dunstrc b/.config/dunst/dunstrc
index c4bd2ea..06de3be 100644
--- a/.config/dunst/dunstrc
+++ b/.config/dunst/dunstrc
@@ -1,3 +1,5 @@
+# See dunst(5) for all configuration options
+
 [global]
     ### Display ###
 
@@ -17,21 +19,32 @@
     # will be ignored.
     follow = keyboard
 
-    # The geometry of the window:
-    #   [{width}]x{height}[+/-{x}+/-{y}]
-    # The geometry of the message window.
-    # The height is measured in number of notifications everything else
-    # in pixels.  If the width is omitted but the height is given
-    # ("-geometry x2"), the message window expands over the whole screen
-    # (dmenu-like).  If width is 0, the window expands to the longest
-    # message displayed.  A positive x is measured from the left, a
-    # negative from the right side of the screen.  Y is measured from
-    # the top and down respectively.
-    # The width can be negative.  In this case the actual width is the
-    # screen width minus the width defined in within the geometry option.
-    geometry = "1122x5-30+20"
+    ### Geometry ###
 
-    # Turn on the progess bar
+    # dynamic width from 0 to 300
+    # width = (0, 300)
+    # constant width of 300
+    width = (0, 1122)
+
+    # The maximum height of a single notification, excluding the frame.
+    height = 200
+
+    # Position the notification in the top right corner
+    origin = top-right
+
+    # Offset from the origin
+    offset = 30x20
+
+    # Scale factor. It is auto-detected if value is 0.
+    scale = 0
+
+    # Maximum number of notification (0 means no limit)
+    notification_limit = 5
+
+    ### Progress bar ###
+
+    # Turn on the progess bar. It appears when a progress hint is passed with
+    # for example dunstify -h int:value:12
     progress_bar = true
 
     # Set the progress bar height. This includes the frame, so make sure
@@ -48,23 +61,15 @@
     progress_bar_max_width = 300
 
 
-    # Show how many messages are currently hidden (because of geometry).
+    # Show how many messages are currently hidden (because of
+    # notification_limit).
     indicate_hidden = yes
 
-    # Shrink window if it's smaller than the width.  Will be ignored if
-    # width is 0.
-    shrink = yes
-
     # The transparency of the window.  Range: [0; 100].
     # This option will only work if a compositing window manager is
-    # present (e.g. xcompmgr, compiz, etc.).
+    # present (e.g. xcompmgr, compiz, etc.). (X11 only)
     transparency = 0
 
-    # The height of the entire notification.  If the height is smaller
-    # than the font height and padding combined, it will be raised
-    # to the font height and padding.
-    notification_height = 0
-
     # Draw a line of "separator_height" pixel height between two
     # notifications.
     # Set to 0 to disable.
@@ -102,7 +107,7 @@
     # Set to 0 to disable.
     # A client can set the 'transient' hint to bypass this. See the rules
     # section for how to disable this if necessary
-    idle_threshold = 120
+    # idle_threshold = 120
 
     ### Text ###
 
@@ -161,13 +166,9 @@
     # Set to -1 to disable.
     show_age_threshold = 60
 
-    # Split notifications into multiple lines if they don't fit into
-    # geometry.
-    word_wrap = yes
-
-    # When word_wrap is set to no, specify where to make an ellipsis in long lines.
+    # Specify where to make an ellipsis in long lines.
     # Possible values are "start", "middle" and "end".
-    ellipsize = end
+    ellipsize = middle
 
     # Ignore newlines '\n' in notifications.
     ignore_newline = no
@@ -223,20 +224,6 @@
     # Define the class of the windows spawned by dunst
     class = Dunst
 
-    # Print a notification on startup.
-    # This is mainly for error detection, since dbus (re-)starts dunst
-    # automatically after a crash.
-    startup_notification = false
-
-    # Manage dunst's desire for talking
-    # Can be one of the following values:
-    #  crit: Critical features. Dunst aborts
-    #  warn: Only non-fatal warnings
-    #  mesg: Important Messages
-    #  info: all unimportant stuff
-    # debug: all less than unimportant stuff
-    verbosity = mesg
-
     # Define the corner radius of the notification window
     # in pixel size. If the radius is 0, you have no rounded
     # corners.
@@ -277,10 +264,14 @@
     # Defines list of actions for each mouse event
     # Possible values are:
     # * none: Don't do anything.
-    # * do_action: If the notification has exactly one action, or one is marked as default,
-    #              invoke it. If there are multiple and no default, open the context menu.
+    # * do_action: Invoke the action determined by the action_name rule. If there is no
+    #              such action, open the context menu.
+    # * open_url: If the notification has exactly one url, open it. If there are multiple
+    #             ones, open the context menu.
     # * close_current: Close current notification.
     # * close_all: Close all notifications.
+    # * context: Open context menu for the notification.
+    # * context_all: Open context menu for all notifications.
     # These values can be strung together for each mouse event, and
     # will be executed in sequence.
     mouse_left_click = close_current
@@ -297,32 +288,6 @@
     # where there are multiple screens with very different dpi values.
     per_monitor_dpi = false
 
-# The internal keyboard shortcut support in dunst is now considered deprecated
-# and should be replaced by dunstctl calls. You can use the configuration of your
-# WM or DE to bind these to shortcuts of your choice.
-# Check the dunstctl manual page for more info.
-[shortcuts]
-
-    # Shortcuts are specified as [modifier+][modifier+]...key
-    # Available modifiers are "ctrl", "mod1" (the alt-key), "mod2",
-    # "mod3" and "mod4" (windows-key).
-    # Xev might be helpful to find names for keys.
-
-    # Close notification. Equivalent dunstctl command:
-    # dunstctl close
-    # close = ctrl+space
-
-    # Close all notifications. Equivalent dunstctl command:
-    # dunstctl close-all
-    # close_all = ctrl+shift+space
-
-    # Redisplay last message(s). Equivalent dunstctl command:
-    # dunstctl history-pop
-    # history = ctrl+grave
-
-    # Context menu. Equivalent dunstctl command:
-    # dunstctl context
-    # context = ctrl+shift+period
 
 [urgency_low]
     # IMPORTANT: colors have to be defined in quotation marks.
@@ -375,6 +340,7 @@
 #    set_transient
 #    timeout
 #    urgency
+#    action_name
 #
 # Shell-like globbing will get expanded.
 #
@@ -389,8 +355,6 @@
 #   script appname summary body icon urgency
 # where urgency can be "LOW", "NORMAL" or "CRITICAL".
 #
-# NOTE: if you don't want a notification to be displayed, set the format
-# to "".
 # NOTE: It might be helpful to run dunst -print in a terminal in order
 # to find fitting options for rules.
 
@@ -429,7 +393,7 @@
 #[ignore]
 #    # This notification will not be displayed
 #    summary = "foobar"
-#    format = ""
+#    skip_display = true
 
 #[history-ignore]
 #    # This notification will not be saved in history
diff --git a/.config/htop/htoprc b/.config/htop/htoprc
index b5df0db..bc4a7ff 100644
--- a/.config/htop/htoprc
+++ b/.config/htop/htoprc
@@ -3,7 +3,7 @@
 htop_version=3.1.0
 config_reader_min_version=2
 fields=0 48 17 18 113 38 39 40 119 111 2 46 47 49 1
-sort_key=46
+sort_key=119
 sort_direction=-1
 tree_sort_key=0
 tree_sort_direction=1
diff --git a/.config/i3blocks/config b/.config/i3blocks/config
index 92768b3..4da3400 100644
--- a/.config/i3blocks/config
+++ b/.config/i3blocks/config
@@ -239,5 +239,5 @@ signal=11
 separator=false
 
 [variety]
-interval=once
+interval=30
 signal=12
diff --git a/.config/mpv/mpv.conf b/.config/mpv/mpv.conf
index 38d2e38..8a73c09 100644
--- a/.config/mpv/mpv.conf
+++ b/.config/mpv/mpv.conf
@@ -42,4 +42,4 @@ prefetch-playlist=yes
 
 # YTDL
 ytdl-format="((bestvideo[vcodec^=av01][height<=?1080][width<=?1920]/bestvideo[vcodec=vp9][height<=?1080][width<=?1920]/bestvideo[height<=?1080][width<=?1920]/bestvideo)+(bestaudio[acodec=opus]/bestaudio[acodec=vorbis]/bestaudio))/best"
-# ytdl-raw-options=ignore-config=
+script-opts=ytdl_hook-ytdl_path=yt-dlp
diff --git a/.config/sway/config b/.config/sway/config
index c18be17..a6ec597 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -34,6 +34,7 @@ client.background	$base00
 input "type:keyboard" {
 	xkb_layout fr
 	xkb_variant bepo_afnor
+#	xkb_variant oss
 	xkb_numlock enable
 }
 
@@ -344,7 +345,7 @@ exec sleep 5 && footclient -a newsboat -T newsboat -o colors.alpha=1.0 -o colors
 exec steam-native -silent -noverifyfiles -language french
 exec play "$HOME/Musique/WELCOME BACK.wav"
 exec gammastep
-exec_always variety -n
+exec_always sleep 5 && variety -n
 exec claws-mail --online
 
 # Start swaybar to display a workspace bar (plus the system information swaystatus if available)
diff --git a/.local/bin/mccmd b/.local/bin/mccmd
index ae181e8..1ef9a21 100755
--- a/.local/bin/mccmd
+++ b/.local/bin/mccmd
@@ -4,9 +4,9 @@ cat | while read line
 do
 	if [[ "$line" =~ ^/ ]]
 	then
-		echo "$line" > /run/minecraft-server.stdin
+		echo "$line" > /run/minecraft-server.sock
 	else
-		echo "say $line" > /run/minecraft-server.stdin
+		echo "say $line" > /run/minecraft-server.sock
 #		echo "dynmap sendtoweb $line" > /run/minecraft-server.stdin
 	fi
 done
diff --git a/.local/bin/ytdl b/.local/bin/ytdl
deleted file mode 100755
index 810cd43..0000000
--- a/.local/bin/ytdl
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-youtube-dl --external-downloader aria2c "$@"
diff --git a/.local/bin/ytdl-stream b/.local/bin/ytdl-stream
deleted file mode 100755
index ef9660f..0000000
--- a/.local/bin/ytdl-stream
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-youtube-dl -F "$1"
-printf "Choose the audio format: "
-read afmt
-printf "Choose the video format: "
-read vfmt
-
-audio=$(youtube-dl -f "${afmt}" -g "$1")
-video=$(youtube-dl -f "${vfmt}" -g "$1")
-title=$(youtube-dl -e "$1")
-
-ffmpeg -i "${audio}" -i "${video}" -f matroska -c:a copy -c:v copy "$title.mkv"
-exit 0
diff --git a/.local/bin/ytdl_live b/.local/bin/ytdl_live
deleted file mode 100755
index 29a905a..0000000
--- a/.local/bin/ytdl_live
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-list="$@ "
-_PID=
-
-#echo -e "\n\n-- $(date "+%Y-%m-%d %H:%M:%S") ------------------------\n" >> ytdl.log
-
-if [ -n "$list" ]
-then
-	youtube-dl $list #2>>ytdl.err >>ytdl.log &
-	_PID=$(jobs -p)
-fi
-
-while true
-do
-	read -p "URL: " url
-	kill $_PID || (sleep 2; kill -9 $_PID)
-	if [ $url = "." ]
-	then
-		kill $_PID || (sleep 2; kill -9 $_PID)
-		exit 0
-	fi
-	list="${list}${url} "
-	#echo -e "\n\n-- $(date "+%Y-%m-%d %H:%M:%S") ------------------------\n" >> ytdl.log
-	youtube-dl $list #2>>ytdl.err >>ytdl.log &
-	_PID=$(jobs -p)
-done
-
-