diff --git a/theme_template b/theme_template
index 2ad60b82..dd441161 100644
--- a/theme_template
+++ b/theme_template
@@ -1,169 +1,169 @@
 [colours]
+away=
 bkgnd=
-titlebar=
-titlebar.text=
-titlebar.brackets=
-titlebar.scrolled=
-titlebar.unencrypted=
-titlebar.encrypted=
-titlebar.untrusted=
-titlebar.trusted=
-titlebar.online=
-titlebar.offline=
-titlebar.away=
-titlebar.chat=
-titlebar.dnd=
-titlebar.xa=
-statusbar=
-statusbar.text=
-statusbar.time=
-statusbar.brackets=
-statusbar.active=
-statusbar.new=
-statusbar.current=
-main.text=
+chat=
+cmd.wins.unread=
+dnd=
+error=
+gone=
+incoming=
+input.text=
+main.help.header=
+main.splash=
+main.text.history=
 main.text.me=
 main.text.them=
-main.text.history=
-main.splash=
-main.help.header=
+main.text=
 main.time=
 main.trackbar=
-input.text=
-subscribed=
-unsubscribed=
+me=
+mention=
+occupants.header=
+offline=
+online=
+otr.ended=
 otr.started.trusted=
 otr.started.untrusted=
-otr.ended=
 otr.trusted=
 otr.untrusted=
-online=
-away=
-chat=
-dnd=
-xa=
-offline=
-incoming=
-mention=
+receipt.sent=
+roominfo=
+roommention.term=
+roommention=
+roomtrigger.term=
+roomtrigger=
+roster.away.active=
+roster.away.unread=
+roster.away=
+roster.chat.active=
+roster.chat.unread=
+roster.chat=
+roster.dnd.active=
+roster.dnd.unread=
+roster.dnd=
+roster.header=
+roster.offline.active=
+roster.offline.unread=
+roster.offline=
+roster.online.active=
+roster.online.unread=
+roster.online=
+roster.room.mention=
+roster.room.trigger=
+roster.room.unread=
+roster.room=
+roster.xa.active=
+roster.xa.unread=
+roster.xa=
+statusbar.active=
+statusbar.brackets=
+statusbar.current=
+statusbar.new=
+statusbar.text=
+statusbar.time=
+statusbar=
+subscribed=
+them=
+titlebar.away=
+titlebar.brackets=
+titlebar.chat=
+titlebar.dnd=
+titlebar.encrypted=
+titlebar.offline=
+titlebar.online=
+titlebar.scrolled=
+titlebar.text=
+titlebar.trusted=
+titlebar.unencrypted=
+titlebar.untrusted=
+titlebar.xa=
+titlebar=
 trigger=
 typing=
-gone=
-error=
-roominfo=
-roommention=
-roommention.term=
-roomtrigger=
-roomtrigger.term=
-me=
-them=
-roster.header=
-roster.chat=
-roster.online=
-roster.away=
-roster.xa=
-roster.dnd=
-roster.offline=
-roster.chat.active=
-roster.online.active=
-roster.away.active=
-roster.xa.active=
-roster.dnd.active=
-roster.offline.active=
-roster.chat.unread=
-roster.online.unread=
-roster.away.unread=
-roster.xa.unread=
-roster.dnd.unread=
-roster.offline.unread=
-roster.room=
-roster.room.unread=
-roster.room.trigger=
-roster.room.mention=
-occupants.header=
-receipt.sent=
+unsubscribed=
 untrusted=
-cmd.wins.unread=
+xa=
 
 [ui]
 beep=
-flash=
-splash=
-wrap=
-time.console=
-time.chat=
-time.muc=
-time.config=
-time.private=
-time.xmlconsole=
-time.lastactivity=
-time.statusbar=
-privileges=
-presence=
-intype=
+console.chat=
+console.muc=
+console.private=
+correction.char=
 enc.warn=
-tls.show=
-resource.title=
+flash=
+inputwin.position=
+intype=
+mainwin.position=
+occupants.char=
+occupants.header.char=
+occupants.indent=
+occupants.jid=
+occupants.offline=
+occupants.size=
+occupants.wrap=
+occupants=
+omemo.char=
+otr.char=
+pgp.char=
+presence=
+privileges=
 resource.message=
-statuses.console=
-statuses.chat=
-statuses.muc=
-roster=
-roster.offline=
-roster.empty=
+resource.title=
 roster.by=
-roster.order=
-roster.unread=
-roster.count=
-roster.count.zero=
-roster.priority=
-roster.size=
-roster.wrap=
-roster.header.char=
 roster.contact.char=
 roster.contact.indent=
-roster.resource=
+roster.contacts=
+roster.count.zero=
+roster.count=
+roster.empty=
+roster.header.char=
+roster.offline=
+roster.order=
+roster.presence.indent=
+roster.presence=
+roster.priority=
+roster.private.char=
+roster.private=
 roster.resource.char=
 roster.resource.indent=
 roster.resource.join=
-roster.presence=
-roster.presence.indent=
-roster.status=
-roster.contacts=
-roster.unsubscribed=
-roster.rooms=
-roster.rooms.order=
-roster.rooms.unread=
-roster.rooms.pos=
+roster.resource=
 roster.rooms.by=
-roster.rooms.title=
 roster.rooms.char=
+roster.rooms.order=
+roster.rooms.pos=
 roster.rooms.private.char=
-roster.private=
-roster.private.char=
-occupants=
-occupants.size=
-occupants.char=
-occupants.jid=
-occupants.offline=
-occupants.wrap=
-occupants.indent=
-occupants.header.char=
-otr.char=
-pgp.char=
-omemo.char=
-console.muc=
-console.chat=
-console.private=
+roster.rooms.title=
+roster.rooms.unread=
+roster.rooms=
+roster.size=
+roster.status=
+roster.unread=
+roster.unsubscribed=
+roster.wrap=
+roster=
+splash=
+statusbar.chat=
+statusbar.position=
+statusbar.room.title=
+statusbar.self=
 statusbar.show.name=
 statusbar.show.number=
-statusbar.self=
-statusbar.chat=
-statusbar.room.title=
-statusbar.tabs=
 statusbar.tablen=
+statusbar.tabs=
+statuses.chat=
+statuses.console=
+statuses.muc=
+time.chat=
+time.config=
+time.console=
+time.lastactivity=
+time.muc=
+time.private=
+time.statusbar=
+time.xmlconsole=
 titlebar.muc.title=
 titlebar.position=
-mainwin.position=
-statusbar.position=
-inputwin.position=
-correction.char=
+tls.show=
+wrap=