diff --git a/Makefile b/Makefile
index ffa69b4..b1352b6 100644
--- a/Makefile
+++ b/Makefile
@@ -42,4 +42,7 @@ uninstall:
 	rm -f ${DESTDIR}${PREFIX}/bin/dwm\
 		${DESTDIR}${MANPREFIX}/man1/dwm.1
 
+echo:
+	echo "${OBJ}"
+
 .PHONY: all clean dist install uninstall
diff --git a/config.h b/config.h
index 915e6ff..889c21e 100644
--- a/config.h
+++ b/config.h
@@ -37,9 +37,9 @@ static const Rule rules[] = {
 	 *	WM_CLASS(STRING) = instance, class
 	 *	WM_NAME(STRING) = title
 	 */
-	/* class       instance  name                  tags mask  isfloating  monitor */
-	{ "Firefox",   NULL,     "Picture-in-Picture", 0,         1,          -1 },
-	{ "copyq",     "copyq",  NULL,	               0,         1,          -1 },
+	/* class		 instance  name			 tags mask  isfloating  monitor */
+	{ "Firefox",		 NULL,     "Picture-in-Picture", 0,         1,          -1 },
+	{ "copyq",     		 "copyq",  NULL,	         0,         1,          -1 },
 };
 
 
@@ -114,6 +114,7 @@ static const Key keys[] = {
 	{ MODKEY,             XK_o,      spawn,          SHCMD("dunstctl", "close") },
 	{ MODKEY|ShiftMask,   XK_i,      spawn,          SHCMD("dunstctl", "set-paused", "false") },
 	{ MODKEY|ShiftMask,   XK_o,      spawn,          SHCMD("dunstctl", "set-paused", "true") },
+	{ MODKEY|ShiftMask,   XK_r,      spawn,          SHCMD("xr") },
 	{ MODKEY,             XK_x,      spawn,          SHCMD("discord") },
 
 	// tags
@@ -127,7 +128,6 @@ static const Key keys[] = {
 	TAGKEYS(              XK_8,                      7)
 	TAGKEYS(              XK_9,                      8)
 	{ MODKEY|ShiftMask,   XK_q,      quit,           {0} },
-	{ MODKEY|ShiftMask,   XK_r,      quit,           {1} },
 	{ MODKEY,             XK_h,      focusmon,       {.i = -1 } },
 	{ MODKEY,             XK_l,      focusmon,       {.i = +1 } },
 	{ MODKEY|ControlMask, XK_h,      tagmon,         {.i = -1 } },
@@ -139,17 +139,18 @@ static const Key keys[] = {
 /* button definitions */
 /* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */
 static const Button buttons[] = {
-	/* click              event mask      button          function        argument */
-	{ ClkLtSymbol,        0,              Button1,        setlayout,      {0} },
-	{ ClkLtSymbol,        0,              Button3,        setlayout,      {.v = &layouts[2]} },
-	{ ClkWinTitle,        0,              Button2,        zoom,           {0} },
-	{ ClkStatusText,      0,              Button2,        spawn,          {.v = termcmd } },
-	{ ClkClientWin,       MODKEY,         Button1,        movemouse,      {0} },
-	{ ClkClientWin,       MODKEY,         Button2,        togglefloating, {0} },
-	{ ClkClientWin,       MODKEY,         Button3,        resizemouse,    {0} },
-	{ ClkTagBar,          0,              Button1,        view,           {0} },
-	{ ClkTagBar,          0,              Button3,        toggleview,     {0} },
-	{ ClkTagBar,          MODKEY,         Button1,        tag,            {0} },
-	{ ClkTagBar,          MODKEY,         Button3,        toggletag,      {0} },
+	/* click              event mask        button          function        argument */
+	{ ClkLtSymbol,        0,                  Button1,        setlayout,      {0} },
+	{ ClkLtSymbol,        0,                  Button3,        setlayout,      {.v = &layouts[2]} },
+	{ ClkWinTitle,        0,                  Button2,        zoom,           {0} },
+	{ ClkStatusText,      0,                  Button2,        spawn,          {.v = termcmd } },
+	{ ClkClientWin,       MODKEY,             Button1,        movemouse,      {0} },
+	{ ClkClientWin,       MODKEY,             Button2,        togglefloating, {0} },
+	{ ClkClientWin,       MODKEY,             Button3,        resizemouse,    {0} },
+	{ ClkClientWin,       MODKEY|ControlMask, Button1,        resizemouse,    {0} },
+	{ ClkTagBar,          0,                  Button1,        view,           {0} },
+	{ ClkTagBar,          0,                  Button3,        toggleview,     {0} },
+	{ ClkTagBar,          MODKEY,             Button1,        tag,            {0} },
+	{ ClkTagBar,          MODKEY,             Button3,        toggletag,      {0} },
 };
 
diff --git a/config.mk b/config.mk
index a5e4840..95819ec 100644
--- a/config.mk
+++ b/config.mk
@@ -1,5 +1,5 @@
 # dwm version
-VERSION = 6.4
+VERSION = 6.5
 
 # Customize below to fit your system
 
diff --git a/dwm.c b/dwm.c
index d100621..192ade4 100644
--- a/dwm.c
+++ b/dwm.c
@@ -1811,7 +1811,19 @@ tagmon(const Arg *arg)
 {
 	if (!selmon->sel || !mons->next)
 		return;
-	sendmon(selmon->sel, dirtomon(arg->i));
+
+	int restore_fullscreen = 0;
+	Client *window = selmon->sel;
+
+	if (window->isfullscreen) {
+		setfullscreen(window, 0);
+		restore_fullscreen = 1;
+	}
+
+	sendmon(window, dirtomon(arg->i));
+
+	if (restore_fullscreen)
+		setfullscreen(window, 1);
 }
 
 void