diff --git a/sway/config.vaio-vjf155f11x.fc29 b/sway/config.vaio-vjf155f11x.fc29
index 0acf388..3eb5b83 100644
--- a/sway/config.vaio-vjf155f11x.fc29
+++ b/sway/config.vaio-vjf155f11x.fc29
@@ -19,7 +19,7 @@ set $Right ccedilla
 
 # Your preferred terminal emulator
 #set $term urxvt256c-ml
-set $term gnome-terminal
+set $term gnome-terminal --hide-menubar
 #set $term konsole
 
 # Your preferred application launcher
@@ -236,7 +236,7 @@ bindsym $mod+r mode "resize"
  # Status Bar:
  #
  # Read `man 5 sway-bar` for more information about this section.
- bar {
+bar {
      position bottom
      colors {
          statusline #ffffff
@@ -246,7 +246,8 @@ bindsym $mod+r mode "resize"
     # Polybar
    #status_command $HOME/.config/polybar/launch.sh
    #status_command i3status
-   status_command waybar
+   #status_command waybar
+    swaybar_command waybar
 }
 
 
@@ -265,13 +266,22 @@ set $lock import -window root -colorspace gray /tmp/i3lock.png; convert /tmp/i3l
 
 ### KEYBINDINGS ###
 ## xmodmap -pke
-bindsym $mod+z exec $lock
-bindsym $mod+Shift+z mode "$mode_exit"
 
 # Exit
 
 # exit i3 (logs you out of your X session)
-set $exit "swaynag -t warning -m 'Do you really want to exit your current session? All unsaved work will be lost!' -s 'No! Cancel!' -b 'Yes, exit!' 'swaymsg exit'"
+set $exit-nag "swaynag -t warning -m 'Do you really want to exit your current session? All unsaved work will be lost!' -s 'No! Cancel!' -b 'Yes, exit!' 'swaymsg exit'"
+
+#set $lock swaynag -m "(see above)"
+set $logout exec $exit-nag
+set $suspend exec $lock && systemctl suspend
+set $hibernate exec $lock && systemctl hibernate
+set $reboot exec systemctl reboot
+set $shutdown exec systemctl poweroff
+
+set $exit-alt "swaynag -t warning -b 'Lock'"
+
+set $exit $exit-nag
 
 #bindsym $mod+Shift+e mode "$mode_exit"
 
@@ -294,25 +304,35 @@ bindsym $mod+period scratchpad show
 bindsym $mod+Shift+d exec $menu-alt
 
 
-# mode Exit - requires i3exit script
-#
- set $mode_exit System (l) lock, (e) logout, (s) suspend, (h) hibernate, (r) reboot, (Shift+s) shutdown
-mode "$mode_exit" {
-    bindsym l exec --no-startup-id /home/renato/src/sysadmin/i3wm/i3exit.sh lock, mode "default"
-    bindsym e exec --no-startup-id /home/renato/src/sysadmin/i3wm/i3exit.sh logout, mode "default"
-    bindsym s exec --no-startup-id /home/renato/src/sysadmin/i3wm/i3exit.sh suspend, mode "default"
-    bindsym h exec --no-startup-id /home/renato/src/sysadmin/i3wm/i3exit.sh hibernate, mode "default"
-    bindsym r exec --no-startup-id /home/renato/src/sysadmin/i3wm/i3exit.sh reboot, mode "default"
-    bindsym Shift+s exec --no-startup-id /home/renato/src/sysadmin/i3wm/i3exit.sh shutdown, mode "default"
 
+
+set $mode_exit System (l) lock, (e) logout, (s) suspend, (h) hibernate, (r) reboot, (Shift+s) shutdown
+
+mode "$mode_exit" {
+    #bindsym l exec --no-startup-id /home/renato/src/sysadmin/i3wm/i3exit.sh lock, mode "default"
+    #bindsym e exec --no-startup-id /home/renato/src/sysadmin/i3wm/i3exit.sh logout, mode "default"
+    #bindsym s exec --no-startup-id /home/renato/src/sysadmin/i3wm/i3exit.sh suspend, mode "default"
+    #bindsym h exec --no-startup-id /home/renato/src/sysadmin/i3wm/i3exit.sh hibernate, mode "default"
+    #bindsym r exec --no-startup-id /home/renato/src/sysadmin/i3wm/i3exit.sh reboot, mode "default"
+    #bindsym Shift+s exec --no-startup-id /home/renato/src/sysadmin/i3wm/i3exit.sh shutdown, mode "default"
+
+    bindsym l $lock, mode "default"
+    bindsym e $logout, mode "default"
+    bindsym s $suspend, mode "default"
+    bindsym h $hibernate, mode "default"
+    bindsym r $reboot, mode "default"
+    bindsym Shift+s $shutdown, mode "default"
+    
     # back to normal: Enter or Escape
     bindsym Return mode "default"
     bindsym Escape mode "default"
 }
 
+bindsym $mod+z exec $lock
+bindsym $mod+Shift+z mode "$mode_exit"
 
 # XKBOPTIONS compose key
-exec_always --no-startup-id setxkbmap -option "compose:menu"
+#exec_always --no-startup-id setxkbmap -option "compose:menu"
 
 
 # Pulse Audio controls
@@ -344,6 +364,8 @@ bindsym XF86AudioPrev exec playerctl previous
 
 ### EXEC ###
 
+# Waybar
+#exec waybar
 
 # Tapping Enabled
 #exec_always xinput set-prop "SynPS/2 Synaptics TouchPad" 302 1 
@@ -362,7 +384,7 @@ exec --no-startup-id /home/renato/.joplin/Joplin.AppImage
 #exec /opt/Mattermost/mattermost-desktop --hidden
 
 # Skype For Linux
-#exec /usr/bin/skypeforlinux
+exec /usr/bin/skypeforlinux
 
 # Remmina Applet
 #exec remmina -i
@@ -371,7 +393,7 @@ exec --no-startup-id /home/renato/.joplin/Joplin.AppImage
 #exec --no-startup-id feh --bg-scale ~/src/wallpapers/default.jpg
 
 # NetworkManager Tray Icon
-exec --no-startup-id nm-tray
+exec nm-tray
 
 # Numlock On
 #exec --no-startup-id numlockx on
diff --git a/waybar/config.fc29 b/waybar/config.fc29
index 312a265..7ab4e97 100644
--- a/waybar/config.fc29
+++ b/waybar/config.fc29
@@ -1,7 +1,7 @@
 {
-    "layer": "top", // Waybar at top layer
-    // "position": "bottom", // Waybar at the bottom of your screen
-    // "height": 30, // Waybar height
+    //"layer": "top", // Waybar at top layer
+    "position": "bottom", // Waybar at the bottom of your screen
+    "height": 24, // Waybar height
     // "width": 1280, // Waybar width
     // Choose the order of the modules
     "modules-left": ["sway/workspaces", "sway/mode", "custom/spotify"],
@@ -38,6 +38,7 @@
         "spacing": 10
     },
     "clock": {
+        "format": "{:%Y-%m-%d | %H:%M}",
         "tooltip-format": "{:%Y-%m-%d | %H:%M}",
         "format-alt": "{:%Y-%m-%d}"
     },
@@ -70,9 +71,9 @@
         // "format-full": "",
         "format-icons": ["", "", "", "", ""]
     },
-    "battery#bat2": {
-        "bat": "BAT2"
-    },
+    //"battery#bat2": {
+    //    "bat": "BAT2"
+    //},
     "network": {
         // "interface": "wlp2s0", // (Optional) To force the use of this interface
         "format-wifi": "{essid} ({signalStrength}%) ",