diff --git a/themes/bgbasic-light.theme b/themes/bgbasic-light.theme
index 1b6ca35..df2a535 100644
--- a/themes/bgbasic-light.theme
+++ b/themes/bgbasic-light.theme
@@ -160,8 +160,8 @@ abstracts = {
   # notices
   ownnotice = "[%G$0%W(%G$1-%W)]%n ";
   notice = "%W-%G$*%W-%n ";
-  pubnotice_channel = "%W:%m$*";
-  pvtnotice_host = "%W(%G$*%K)";
+  pubnotice_channel = "%W:%G$*";
+  pvtnotice_host = "%W(%G$*%W)";
   servernotice = "%G!$*%n ";
 
   # CTCPs
diff --git a/themes/bgbasic.theme b/themes/bgbasic.theme
index 48250a6..5c004d4 100644
--- a/themes/bgbasic.theme
+++ b/themes/bgbasic.theme
@@ -160,8 +160,8 @@ abstracts = {
   # notices
   ownnotice = "[%g$0%w(%g$1-%w)]%n ";
   notice = "%w-%g$*%w-%n ";
-  pubnotice_channel = "%w:%m$*";
-  pvtnotice_host = "%w(%g$*%K)";
+  pubnotice_channel = "%w:%g$*";
+  pvtnotice_host = "%w(%g$*%w)";
   servernotice = "%g!$*%n ";
 
   # CTCPs