diff --git a/bin/btswitch.sh b/bin/btswitch.sh
new file mode 100755
index 0000000..6bafe5d
--- /dev/null
+++ b/bin/btswitch.sh
@@ -0,0 +1,39 @@
+#! /bin/bash
+
+HEADPHONE="88:D0:39:7D:6A:70"
+SPEAKERS="EC:81:93:94:92:73"
+
+if [ -z "$1" ]; then
+  echo "Missing profil"
+  echo "example: btswitch.sh <headphone|speakers>"
+  exit 1
+fi
+
+case ${1} in
+  headphone)
+    bluetoothctl disconnect ${SPEAKERS}
+    bluetoothctl connect ${HEADPHONE}
+    # INFO: Dirty
+    sleep 5
+    ;;
+  speakers)
+    bluetoothctl disconnect ${HEADPHONE}
+    bluetoothctl connect ${SPEAKERS}
+    ;;
+  *)
+    echo "Unknown mode"
+    exit 1
+esac
+
+
+OUTPUTID=`pactl list short sinks|grep bluez|cut -f 1`
+
+echo "Set Bluetooth as default output"
+pacmd set-default-sink ${OUTPUTID}
+
+echo "Move streams to default output"
+pactl list short sink-inputs|while read stream; do
+  streamId=$(echo $stream|cut '-d ' -f1)
+  echo "moving stream $streamId"
+  pactl move-sink-input "$streamId" "${OUTPUTID}"
+done
diff --git a/config/bpytop/bpytop.conf b/config/bpytop/bpytop.conf
index be3becf..4e3b478 100644
--- a/config/bpytop/bpytop.conf
+++ b/config/bpytop/bpytop.conf
@@ -1,4 +1,4 @@
-#? Config file for bpytop v. 1.0.54
+#? Config file for bpytop v. 1.0.61
 
 #* Color theme, looks for a .theme file in "/usr/[local/]share/bpytop/themes" and "~/.config/bpytop/themes", "Default" for builtin default theme.
 #* Prefix name by a plus sign (+) for a theme located in user themes folder, i.e. color_theme="+monokai"
@@ -7,8 +7,11 @@ color_theme="nord"
 #* If the theme set background should be shown, set to False if you want terminal background transparency
 theme_background=True
 
-#* Set bpytop view mode, "full" for everything shown, "proc" for cpu stats and processes, "stat" for cpu, mem, disks and net stats shown.
-view_mode=full
+#* Sets if 24-bit truecolor should be used, will convert 24-bit colors to 256 color (6x6x6 color cube) if false.
+truecolor=True
+
+#* Manually set which boxes to show. Available values are "cpu mem net proc", seperate values with whitespace.
+shown_boxes="cpu mem net proc"
 
 #* Update time in milliseconds, increases automatically if set below internal loops processing time, recommended 2000 ms or above for better sample times for graphs.
 update_ms=2000
@@ -42,6 +45,25 @@ proc_per_core=False
 #* Show process memory as bytes instead of percent
 proc_mem_bytes=True
 
+#* Sets the CPU stat shown in upper half of the CPU graph, "total" is always available, see:
+#* https://psutil.readthedocs.io/en/latest/#psutil.cpu_times for attributes available on specific platforms.
+#* Select from a list of detected attributes from the options menu
+cpu_graph_upper="total"
+
+#* Sets the CPU stat shown in lower half of the CPU graph, "total" is always available, see:
+#* https://psutil.readthedocs.io/en/latest/#psutil.cpu_times for attributes available on specific platforms.
+#* Select from a list of detected attributes from the options menu
+cpu_graph_lower="total"
+
+#* Toggles if the lower CPU graph should be inverted.
+cpu_invert_lower=True
+
+#* Set to True to completely disable the lower CPU graph.
+cpu_single_graph=False
+
+#* Shows the system uptime in the CPU box.
+show_uptime=True
+
 #* Check cpu temperature, needs "osx-cpu-temp" on MacOS X.
 check_temp=True
 
@@ -76,6 +98,25 @@ swap_disk=True
 #* If mem box should be split to also show disks info.
 show_disks=True
 
+#* Filter out non physical disks. Set this to False to include network disks, RAM disks and similar.
+only_physical=True
+
+#* Read disks list from /etc/fstab. This also disables only_physical.
+use_fstab=False
+
+#* Toggles if io stats should be shown in regular disk usage view
+show_io_stat=True
+
+#* Toggles io mode for disks, showing only big graphs for disk read/write speeds.
+io_mode=False
+
+#* Set to True to show combined read/write io graphs in io mode.
+io_graph_combined=False
+
+#* Set the top speed for the io graphs in MiB/s (10 by default), use format "device:speed" seperate disks with a comma ",".
+#* Example: "/dev/sda:100, /dev/sdb:20"
+io_graph_speeds=""
+
 #* Set fixed values for network graphs, default "10M" = 10 Mibibytes, possible units "K", "M", "G", append with "bit" for bits instead of bytes, i.e "100mbit"
 net_download="10M"
 net_upload="10M"
@@ -89,6 +130,9 @@ net_sync=False
 #* If the network graphs color gradient should scale to bandwith usage or auto scale, bandwith usage is based on "net_download" and "net_upload" values
 net_color_fixed=False
 
+#* Starts with the Network Interface specified here.
+net_iface=""
+
 #* Show battery stats in top right if battery is present
 show_battery=False
 
diff --git a/config/sway/config b/config/sway/config
index 06465d8..635d06e 100644
--- a/config/sway/config
+++ b/config/sway/config
@@ -13,7 +13,7 @@ input "type:keyboard" {
 set $mod Mod4
 
 # Displays
-set $display1 HDMI-A-3
+#set $display1 HDMI-A-3
 
 # Workspaces
 set $wksp1 "1: Main"
@@ -269,7 +269,7 @@ mode "move" {
 ### Default placement
 #
 
-workspace $wksp1 output $display1
+#workspace $wksp1 output $display1
 
 
 ### Default workspace layout
diff --git a/config/waybar/config b/config/waybar/config
index 6ebb68d..286797d 100644
--- a/config/waybar/config
+++ b/config/waybar/config
@@ -106,7 +106,8 @@
       "on-click": "~/bin/music.sh Next"
     },
     "mpd": {
-      "format": "{stateIcon}{randomIcon}{repeatIcon}{singleIcon} {artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) ",
+      "format": "{stateIcon}{randomIcon}{repeatIcon}{singleIcon} {artist} - {title} ",
+//      "format": "{stateIcon}{randomIcon}{repeatIcon}{singleIcon} {artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) ",
       "format-disconnected": "Disconnected ",
       "format-stopped": "{randomIcon}{repeatIcon}{singleIcon} Stopped ",
       "interval": 10,
diff --git a/icons/postman.png b/icons/postman.png
new file mode 100644
index 0000000..40f022d
Binary files /dev/null and b/icons/postman.png differ
diff --git a/applications/DataGrip.desktop b/local/share/applications/DataGrip.desktop
similarity index 100%
rename from applications/DataGrip.desktop
rename to local/share/applications/DataGrip.desktop
diff --git a/applications/Javaws.desktop b/local/share/applications/Javaws.desktop
similarity index 100%
rename from applications/Javaws.desktop
rename to local/share/applications/Javaws.desktop
diff --git a/applications/Minecraft.desktop b/local/share/applications/Minecraft.desktop
similarity index 100%
rename from applications/Minecraft.desktop
rename to local/share/applications/Minecraft.desktop
diff --git a/local/share/applications/Postman.desktop b/local/share/applications/Postman.desktop
new file mode 100644
index 0000000..30b4c80
--- /dev/null
+++ b/local/share/applications/Postman.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Name=Postman
+Comment=The collaboration platform for API Development
+Exec=/home/dbroqua/Softwares/Postman/app/Postman
+Icon=/home/dbroqua/icons/postman.png
+Categories=Development;IDE;
+StartupNotify=true
+Terminal=false
diff --git a/applications/Ultimaker.desktop b/local/share/applications/Ultimaker.desktop
similarity index 100%
rename from applications/Ultimaker.desktop
rename to local/share/applications/Ultimaker.desktop
diff --git a/applications/Zettlr.desktop b/local/share/applications/Zettlr.desktop
similarity index 100%
rename from applications/Zettlr.desktop
rename to local/share/applications/Zettlr.desktop
diff --git a/local/share/rofi/finder.sh b/local/share/rofi/finder.sh
deleted file mode 120000
index 8e50b85..0000000
--- a/local/share/rofi/finder.sh
+++ /dev/null
@@ -1 +0,0 @@
-/home/dbroqua/Projects/forked/rofi-scripts/rofi-finder/finder.sh
\ No newline at end of file
diff --git a/local/share/rofi/rofi-file-browser.sh b/local/share/rofi/rofi-file-browser.sh
deleted file mode 120000
index c252860..0000000
--- a/local/share/rofi/rofi-file-browser.sh
+++ /dev/null
@@ -1 +0,0 @@
-/home/dbroqua/Projects/forked/rofi-scripts/mode-scripts/rofi-file-browser.sh
\ No newline at end of file