diff --git a/config.h b/config.h
index b231a3e..acdcbf2 100644
--- a/config.h
+++ b/config.h
@@ -12,7 +12,7 @@ static const unsigned int gappoh           = 1; /* horiz outer gap between windo
 static const unsigned int gappov           = 1; /* vert outer gap between windows and screen edge */
 static const char *cursor_theme            = "Adwaita";
 static const char cursor_size[]            = "24"; /* Make sure it's a valid integer, otherwise things will break */
-static const int user_bh		               = 30; /* 0 means that dwl will calculate barheight, >= 1 means dwl will use user_bh as the bar height. */
+static const int user_bh		   = 30; /* 0 means that dwl will calculate barheight, >= 1 means dwl will use user_bh as the bar height. */
 static const int showbar                   = 1;  /* 0 means no bar */
 static const int topbar                    = 1;  /* 0 means bottom bar */
 static const char *fonts[]                 = {"inconsolata:size=11"};
@@ -27,8 +27,8 @@ static int log_level = WLR_ERROR;
 
 /* Environment variables */
 static const Env envs[] = {
-	  /* variable			          value    */
-    { "XDG_CURRENT_DESKTOP",	"wlroots" },
+	/* variable			value    */
+	  { "XDG_CURRENT_DESKTOP",	"wlroots" },
   	{ "QT_QPA_PLATFORM",	    "wayland" },
   	{ "QT_QPA_PLATFORMTHEME",	"qt6ct"   },
 };
@@ -82,8 +82,8 @@ static const struct xkb_rule_names xkb_rules = {
 	/* example:
 	.options = "ctrl:nocaps",
 	*/
-	.layout = "latam",
-  .options = NULL,
+	  .layout = "latam",
+  	.options = NULL,
 };
 
 static const int repeat_rate = 25;
@@ -149,6 +149,7 @@ static const char *termcmd[] = { "footclient", NULL }; // Terminal
 static const char *menucmd[] = { "tofi-drun",  NULL }; // Application launcher
 static const char *fmgrcmd[] = { "pcmanfm-qt", NULL }; // File manager
 static const char *lockcmd[] = { "swaylock",   NULL }; // Launch swaylock
+static const char *pwmncmd[] = { "powermenu",  NULL }; // Launch powermenu
 static const char *emojcmd[] = { "tofiunicode",NULL }; // Launch emoji menu
 
 static const Key keys[] = {
@@ -159,18 +160,21 @@ static const Key keys[] = {
 	{ MODKEY,                    XKB_KEY_e,          spawn,          {.v = fmgrcmd} },
   { MODKEY,                    XKB_KEY_l,          spawn,          {.v = lockcmd} },
   { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_E,          spawn,          {.v = emojcmd} },
-  { 0,                         XKB_KEY_XF86AudioMicMute,     spawn,SHCMD("wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle")  },
-  { 0,                         XKB_KEY_XF86AudioMute,        spawn,SHCMD("wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle")    },
-  { 0,                         XKB_KEY_XF86AudioLowerVolume, spawn,SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-")     },
-  { 0,                         XKB_KEY_XF86AudioRaiseVolume, spawn,SHCMD("wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+")},
-  { 0,                         XKB_KEY_XF86MonBrightnessUp,  spawn,SHCMD("brightnessctl s +5%")},
-  { 0,                         XKB_KEY_XF86MonBrightnessDown,spawn,SHCMD("brightnessctl s 5%-")},
+  { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_Q,          spawn,          {.v = pwmncmd} },
+	{ 0,                         XKB_KEY_XF86AudioMicMute,     spawn,SHCMD("setvol -m mute") },	
+  { WLR_MODIFIER_SHIFT,        XKB_KEY_XF86AudioLowerVolume, spawn,SHCMD("setvol -m down") },
+  { WLR_MODIFIER_SHIFT,        XKB_KEY_XF86AudioRaiseVolume, spawn,SHCMD("setvol -m up")   },
+	{ 0,                         XKB_KEY_XF86AudioMute,        spawn,SHCMD("setvol mute")    },
+	{ 0,                         XKB_KEY_XF86AudioLowerVolume, spawn,SHCMD("setvol down")    },
+  { 0,                         XKB_KEY_XF86AudioRaiseVolume, spawn,SHCMD("setvol up")      },
+  { 0,                         XKB_KEY_XF86MonBrightnessUp,  spawn,SHCMD("setbrightness increase")},
+  { 0,                         XKB_KEY_XF86MonBrightnessDown,spawn,SHCMD("setbrightness decrease")},
   { MODKEY,                    XKB_KEY_b,          togglebar,      {0} },
   { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_S,          togglesticky,   {0} },
   { MODKEY,                    XKB_KEY_j,          focusstack,     {.i = +1} },
 	{ MODKEY,                    XKB_KEY_k,          focusstack,     {.i = -1} },
-	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_d,          incnmaster,     {.i = +1} },
-	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_a,          incnmaster,     {.i = -1} },
+  { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_A,          incnmaster,     {.i = -1} },
+	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_D,          incnmaster,     {.i = +1} },
   { MODKEY|WLR_MODIFIER_CTRL,  XKB_KEY_a,          setmfact,       {.f = -0.05f} },
 	{ MODKEY|WLR_MODIFIER_CTRL,  XKB_KEY_d,          setmfact,       {.f = +0.05f} },
   /*
@@ -183,7 +187,7 @@ static const Key keys[] = {
   */
 	{ MODKEY,                    XKB_KEY_0,          togglegaps,     {0} },
 	/*
-  { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_parenright, defaultgaps,    {0} },
+ 	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_parenright, defaultgaps,    {0} },
 	{ MODKEY,                    XKB_KEY_y,          incihgaps,      {.i = +1 } },
 	{ MODKEY,                    XKB_KEY_o,          incihgaps,      {.i = -1 } },
 	{ MODKEY|WLR_MODIFIER_CTRL,  XKB_KEY_y,          incivgaps,      {.i = +1 } },
@@ -209,9 +213,9 @@ static const Key keys[] = {
 	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_parenright, tag,            {.ui = ~0} },
 	{ MODKEY,                    XKB_KEY_comma,      focusmon,       {.i = WLR_DIRECTION_LEFT} },
 	{ MODKEY,                    XKB_KEY_period,     focusmon,       {.i = WLR_DIRECTION_RIGHT} },
-	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_less,       tagmon,         {.i = WLR_DIRECTION_LEFT} },
-	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_greater,    tagmon,         {.i = WLR_DIRECTION_RIGHT} },
-	*/
+  { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_semicolon,  tagmon,         {.i = WLR_DIRECTION_LEFT}  },
+	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_colon,      tagmon,         {.i = WLR_DIRECTION_RIGHT} },
+  */
   TAGKEYS(          XKB_KEY_1, XKB_KEY_exclam,                     0),
 	TAGKEYS(          XKB_KEY_2, XKB_KEY_at,                         1),
 	TAGKEYS(          XKB_KEY_3, XKB_KEY_numbersign,                 2),
@@ -221,14 +225,16 @@ static const Key keys[] = {
 	TAGKEYS(          XKB_KEY_7, XKB_KEY_ampersand,                  6),
 	TAGKEYS(          XKB_KEY_8, XKB_KEY_asterisk,                   7),
 	TAGKEYS(          XKB_KEY_9, XKB_KEY_parenleft,                  8),
+	/*
 	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_Q,          quit,           {0} },
+	*/
 
 	/* Ctrl-Alt-Backspace and Ctrl-Alt-Fx used to be handled by X server */
 	{ WLR_MODIFIER_CTRL|WLR_MODIFIER_ALT,XKB_KEY_Terminate_Server, quit, {0} },
 	/* Ctrl-Alt-Fx is used to switch to another VT, if you don't know what a VT is
 	 * do not remove them.
 	 */
-#define CHVT(n) { WLR_MODIFIER_CTRL|WLR_MODIFIER_ALT,XKB_KEY_XF86Switch_VT_##n, chvt, {.ui = (n)} }
+	#define CHVT(n) { WLR_MODIFIER_CTRL|WLR_MODIFIER_ALT,XKB_KEY_XF86Switch_VT_##n, chvt, {.ui = (n)} }
 	CHVT(1), CHVT(2), CHVT(3), CHVT(4), CHVT(5), CHVT(6),
 	CHVT(7), CHVT(8), CHVT(9), CHVT(10), CHVT(11), CHVT(12),
 };
diff --git a/config.mk b/config.mk
index e2f1816..c3f6317 100644
--- a/config.mk
+++ b/config.mk
@@ -24,11 +24,11 @@ WLR_LIBS = `$(PKG_CONFIG) --libs wlroots-0.19`
 #	-I$(PWD)/wlroots/0.19/include/wlroots-0.19
 #WLR_LIBS = -Wl,-rpath,$(PWD)/wlroots/0.19/lib64 -L$(PWD)/wlroots/0.19/lib64 -lwlroots-0.19
 
-XWAYLAND =
-XLIBS =
+#XWAYLAND =
+#XLIBS =
 # Uncomment to build XWayland support
-#XWAYLAND = -DXWAYLAND
-#XLIBS = xcb xcb-icccm
+XWAYLAND = -DXWAYLAND
+XLIBS = xcb xcb-icccm
 
 # dwl itself only uses C99 features, but wlroots' headers use anonymous unions (C11).
 # To avoid warnings about them, we do not use -std=c99 and instead of using the