diff --git a/TODO.md b/TODO.md
index 65ec519b..c44517a5 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,10 +1,9 @@
 # TODO
 
+- theme changelog
 - update nio requirement
-- improve auto completion delegate
 
 - refresh server list button
-- server list sorting method / explain what the % number is (stability)
 
 - global presence control
 
diff --git a/src/gui/Pages/Chat/AutoCompletion/CompletableUserDelegate.qml b/src/gui/Pages/Chat/AutoCompletion/CompletableUserDelegate.qml
index 9e308d65..1a279a92 100644
--- a/src/gui/Pages/Chat/AutoCompletion/CompletableUserDelegate.qml
+++ b/src/gui/Pages/Chat/AutoCompletion/CompletableUserDelegate.qml
@@ -20,6 +20,7 @@ HTile {
             displayName: model.display_name
             mxc: model.avatar_url
             compact: root.compact
+            radius: theme.chat.userAutoCompletion.avatarsRadius
 
             implicitHeight:
                 compact ?
@@ -33,7 +34,7 @@ HTile {
                 (model.display_name || model.id) + (
                     model.display_name ?
                     " ".repeat(2) + utils.htmlColorize(
-                        model.id, theme.chat.roomPane.listView.member.subtitle,
+                        model.id, theme.chat.userAutoCompletion.userIds,
                     ) :
                     ""
                 )
@@ -41,7 +42,7 @@ HTile {
             color:
                 root.colorName ?
                 utils.nameColor(model.display_name || model.id.substring(1)) :
-                theme.chat.roomPane.listView.member.name
+                theme.chat.userAutoCompletion.displayNames
 
             Behavior on color { HColorAnimation {} }
         }
diff --git a/src/gui/Pages/Chat/AutoCompletion/UserAutoCompletion.qml b/src/gui/Pages/Chat/AutoCompletion/UserAutoCompletion.qml
index 1d1a285f..469667a3 100644
--- a/src/gui/Pages/Chat/AutoCompletion/UserAutoCompletion.qml
+++ b/src/gui/Pages/Chat/AutoCompletion/UserAutoCompletion.qml
@@ -146,7 +146,7 @@ HListView {
     Rectangle {
         anchors.fill: parent
         z: -1
-        color: theme.chat.typingMembers.background
+        color: theme.chat.userAutoCompletion.background
     }
 
     Connections {
diff --git a/src/themes/Glass.qpl b/src/themes/Glass.qpl
index 020150e2..ebda86c9 100644
--- a/src/themes/Glass.qpl
+++ b/src/themes/Glass.qpl
@@ -498,6 +498,12 @@ chat:
     fileTransfer:
         color background: chat.typingMembers.background
 
+    userAutoCompletion:
+        color background:   chat.typingMembers.background
+        int avatarsRadius:  controls.avatar.radius
+        color displayNames: colors.text
+        color userIds:      colors.dimText
+
     composer:
         color background: colors.strongBackground
 
diff --git a/src/themes/Midnight.qpl b/src/themes/Midnight.qpl
index b7a95f23..86e7da0f 100644
--- a/src/themes/Midnight.qpl
+++ b/src/themes/Midnight.qpl
@@ -507,6 +507,12 @@ chat:
     fileTransfer:
         color background: chat.typingMembers.background
 
+    userAutoCompletion:
+        color background:   chat.typingMembers.background
+        int avatarsRadius:  controls.avatar.radius
+        color displayNames: colors.text
+        color userIds:      colors.dimText
+
     composer:
         color background: colors.strongBackground