diff --git a/rc.lua b/rc.lua
index 05c8584..eb642c7 100644
--- a/rc.lua
+++ b/rc.lua
@@ -552,14 +552,12 @@ awful.rules.rules = {
 	{
 		rule_any = {
 			class = {
-				'Audacious',
 				'Deadbeef',
 				'Google-musicmanager',
 				'mpv',
 				'Pavucontrol',
 				'pinentry',
 				'plugin-container',
-				'Qmmp',
 				'Skype',
 				'Vncviewer'
 			},
@@ -571,6 +569,19 @@ awful.rules.rules = {
 			floating = true
 		}
 	},
+	-- Floating borderless, because winamp nostalgia:
+	{
+		rule_any = {
+			class = {
+				'Audacious',
+				'Qmmp'
+			}
+		},
+		properties = {
+			border_width = 0,
+			floating = true
+		}
+	},
 	-- Per app rules
 	-- firefox
 	{
@@ -636,10 +647,7 @@ awful.rules.rules = {
 				'Strife',
 				'Symphony.bin.x86_64',
 				'eu4',
-				'witcher2',
-				-- non-games
-				'Audacious',
-				'Qmmp'
+				'witcher2'
 			},
 			instance = {
 				'Civ4BeyondSword.exe',