diff --git a/.gitignore b/.gitignore
index 0b6902a..dbfec7b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-dwm
-*.o
\ No newline at end of file
+./dwm
+./*.o
\ No newline at end of file
diff --git a/config.def.h b/config.def.h
index 9441519..cef8b49 100755
--- a/config.def.h
+++ b/config.def.h
@@ -59,6 +59,7 @@ static const Rule rules[] = {
 	{ "TelegramDesktop",     NULL,     NULL,           1 << 4,    0,          0,          0,          -1,        -1 },
 	{ "Discord",             NULL,     NULL,           1 << 4,    0,          0,          0,          -1,        -1 },
 	{ "cpsrc",               NULL,     NULL,           1 << 1,    0,          0,          0,          -1,        -1 },
+	{ "Emacs",               NULL,     NULL,           1 << 1,    0,          0,          0,          -1,        -1 },
 	{ NULL,                  NULL,     "Event Tester", 0,         0,          0,          0,           1,        -1 }, /* xev */
 };
 
@@ -99,8 +100,8 @@ static Key keys[] = {
     { 0,                            XK_Print,                   spawn,              SHCMD("~/scripts/screenshot.sh") },
     { 0,                            XF86XK_PowerOff,            spawn,              SHCMD("~/scripts/poweroff.sh") },
     { 0,                            XF86XK_AudioMute,           spawn,              SHCMD("pulsemixer --toggle-mute") },
-    { 0,                            XF86XK_AudioRaiseVolume,    spawn,              SHCMD("amixer -c 1 sset Master 1+") },
-    { 0,                            XF86XK_AudioLowerVolume,    spawn,              SHCMD("amixer -c 1 sset Master 1-") },
+    { 0,                            XF86XK_AudioRaiseVolume,    spawn,              SHCMD("amixer set Master 1%+") },
+    { 0,                            XF86XK_AudioLowerVolume,    spawn,              SHCMD("amixer set Master 1%-") },
     { 0,                            XF86XK_AudioPrev,           spawn,              SHCMD("cmus-remote --prev") },
     { 0,                            XF86XK_AudioNext,           spawn,              SHCMD("cmus-remote --next") },
     { 0,                            XF86XK_AudioPause,          spawn,              SHCMD("cmus-remote --pause") },
@@ -110,11 +111,13 @@ static Key keys[] = {
     { 0,                            XF86XK_AudioForward,        spawn,              SHCMD("cmus-remote --seek +10") },
     { 0,                            XF86XK_MonBrightnessUp,     spawn,              SHCMD("brightnessctl s +5%")},
     { 0,                            XF86XK_MonBrightnessDown,   spawn,              SHCMD("brightnessctl s 5%-")},
+    { ControlMask,                  XK_space,                   spawn,              SHCMD("dunstctl close") },
+    { ControlMask|ShiftMask,        XK_space,                   spawn,              SHCMD("dunstctl close-all") },
     { MODKEY|ShiftMask,             XK_space,                   togglealwaysontop,  {0} },
     { MODKEY,                       XK_w,                       spawn,              SHCMD("firefox") },
+    { MODKEY,                       XK_c,                       spawn,              SHCMD("~/scripts/showcal.sh") },
     { MODKEY|ShiftMask,             XK_l,                       spawn,              SHCMD("slock.sh") },
-    { MODKEY|ShiftMask,             XK_e,                       spawn,              SHCMD("emacs") },
-    { MODKEY|ShiftMask,             XK_m,                       spawn,              SHCMD("~/scripts/autostart.sh") },
+    { MODKEY|ShiftMask,             XK_e,                       spawn,              SHCMD("emacsclient --create-frame") },
     { MODKEY|ShiftMask,             XK_m,                       spawn,              SHCMD("~/scripts/autostart.sh") },
     { MODKEY|ShiftMask,             XK_j,                       spawn,              SHCMD("screenkey.sh") },
     { MODKEY|ShiftMask,             XK_s,                       spawn,              SHCMD("~/scripts/screenshot.sh 1") },
diff --git a/config.h b/config.h
index 9441519..cef8b49 100755
--- a/config.h
+++ b/config.h
@@ -59,6 +59,7 @@ static const Rule rules[] = {
 	{ "TelegramDesktop",     NULL,     NULL,           1 << 4,    0,          0,          0,          -1,        -1 },
 	{ "Discord",             NULL,     NULL,           1 << 4,    0,          0,          0,          -1,        -1 },
 	{ "cpsrc",               NULL,     NULL,           1 << 1,    0,          0,          0,          -1,        -1 },
+	{ "Emacs",               NULL,     NULL,           1 << 1,    0,          0,          0,          -1,        -1 },
 	{ NULL,                  NULL,     "Event Tester", 0,         0,          0,          0,           1,        -1 }, /* xev */
 };
 
@@ -99,8 +100,8 @@ static Key keys[] = {
     { 0,                            XK_Print,                   spawn,              SHCMD("~/scripts/screenshot.sh") },
     { 0,                            XF86XK_PowerOff,            spawn,              SHCMD("~/scripts/poweroff.sh") },
     { 0,                            XF86XK_AudioMute,           spawn,              SHCMD("pulsemixer --toggle-mute") },
-    { 0,                            XF86XK_AudioRaiseVolume,    spawn,              SHCMD("amixer -c 1 sset Master 1+") },
-    { 0,                            XF86XK_AudioLowerVolume,    spawn,              SHCMD("amixer -c 1 sset Master 1-") },
+    { 0,                            XF86XK_AudioRaiseVolume,    spawn,              SHCMD("amixer set Master 1%+") },
+    { 0,                            XF86XK_AudioLowerVolume,    spawn,              SHCMD("amixer set Master 1%-") },
     { 0,                            XF86XK_AudioPrev,           spawn,              SHCMD("cmus-remote --prev") },
     { 0,                            XF86XK_AudioNext,           spawn,              SHCMD("cmus-remote --next") },
     { 0,                            XF86XK_AudioPause,          spawn,              SHCMD("cmus-remote --pause") },
@@ -110,11 +111,13 @@ static Key keys[] = {
     { 0,                            XF86XK_AudioForward,        spawn,              SHCMD("cmus-remote --seek +10") },
     { 0,                            XF86XK_MonBrightnessUp,     spawn,              SHCMD("brightnessctl s +5%")},
     { 0,                            XF86XK_MonBrightnessDown,   spawn,              SHCMD("brightnessctl s 5%-")},
+    { ControlMask,                  XK_space,                   spawn,              SHCMD("dunstctl close") },
+    { ControlMask|ShiftMask,        XK_space,                   spawn,              SHCMD("dunstctl close-all") },
     { MODKEY|ShiftMask,             XK_space,                   togglealwaysontop,  {0} },
     { MODKEY,                       XK_w,                       spawn,              SHCMD("firefox") },
+    { MODKEY,                       XK_c,                       spawn,              SHCMD("~/scripts/showcal.sh") },
     { MODKEY|ShiftMask,             XK_l,                       spawn,              SHCMD("slock.sh") },
-    { MODKEY|ShiftMask,             XK_e,                       spawn,              SHCMD("emacs") },
-    { MODKEY|ShiftMask,             XK_m,                       spawn,              SHCMD("~/scripts/autostart.sh") },
+    { MODKEY|ShiftMask,             XK_e,                       spawn,              SHCMD("emacsclient --create-frame") },
     { MODKEY|ShiftMask,             XK_m,                       spawn,              SHCMD("~/scripts/autostart.sh") },
     { MODKEY|ShiftMask,             XK_j,                       spawn,              SHCMD("screenkey.sh") },
     { MODKEY|ShiftMask,             XK_s,                       spawn,              SHCMD("~/scripts/screenshot.sh 1") },
diff --git a/dwm b/dwm
index c31fa33..c1e48f4 100755
Binary files a/dwm and b/dwm differ
diff --git a/dwm.o b/dwm.o
index 3da69f4..6977b3e 100644
Binary files a/dwm.o and b/dwm.o differ