Merge branch 'master' into osx-functional

themes/boothj5

@@ -100,7 +100,6 @@ roster.empty=false
 roster.by=group
 roster.order=presence
 roster.unread=after
-roster.count=true
 roster.priority=false
 roster.size=25
 roster.wrap=true

themes/boothj5_slack

@@ -24,25 +24,26 @@ main.text.them=bold_white
 main.splash=bold_red
 main.time=yellow
 input.text=bold_green
-subscribed=bold_green
+subscribed=green
 unsubscribed=red
 otr.started.trusted=green
 otr.started.untrusted=yellow
 otr.ended=red
 otr.trusted=green
 otr.untrusted=yellow
-online=bold_green
+online=green
-away=bold_cyan
+away=cyan
-chat=bold_white
+chat=white
 dnd=magenta
-xa=bold_blue
+xa=blue
 offline=red
 incoming=bold_yellow
 typing=yellow
 gone=red
 error=red
 roominfo=yellow
-roommention=bold_red
+roommention=bold_cyan
+roomtrigger=bold_blue
 me=blue
 them=bold_green
 roster.header=bold_yellow
@@ -66,6 +67,8 @@ roster.dnd.unread=bold_magenta
 roster.offline.unread=bold_red
 roster.room=green
 roster.room.unread=bold_green
+roster.room.mention=bold_cyan
+roster.room.trigger=bold_blue
 occupants.header=bold_yellow
 receipt.sent=bold_black
 
@@ -83,35 +86,38 @@ time.xml=%H:%M:%S
 time.statusbar=%H:%M:%S
 time.lastactivity=%d/%m/%y %H:%M:%S
 privileges=false
-presence=true
+presence=false
 intype=true
-enc.warn=true
+enc.warn=false
 resource.title=false
 resource.message=false
 statuses.console=none
-statuses.chat=none
+statuses.chat=all
 statuses.muc=none
 roster=true
 roster.offline=false
 roster.empty=false
-roster.by=presence
+roster.by=none
 roster.order=presence
-roster.unread=before
+roster.unread=after
-roster.count=true
 roster.priority=false
-roster.size=35
+roster.size=25
 roster.wrap=true
 roster.header.char=@
 roster.contact.indent=1
 roster.resource=false
-roster.presence=true
+roster.presence=false
-roster.presence.indent=-1
 roster.status=true
 roster.contacts=true
 roster.rooms=true
 roster.rooms.order=name
-roster.rooms.unread=before
+roster.rooms.unread=after
 roster.rooms.pos=first
+roster.rooms.by=service
+roster.rooms.private.char=/
+roster.private=room
+roster.count=unread
+roster.count.zero=false
 occupants=true
 occupants.size=15
 occupants.jid=false
@@ -119,4 +125,4 @@ wins.autotidy=true
 otr.char=@
 pgp.char=%
 tls.show=true
-console.muc=all
+console.muc=first

themes/complex

@@ -24,7 +24,6 @@ roster.empty=true
 roster.by=presence
 roster.order=presence
 roster.unread=after
-roster.count=true
 roster.priority=true
 roster.size=25
 roster.wrap=true

themes/simple

@@ -23,7 +23,6 @@ roster.empty=false
 roster.by=none
 roster.order=presence
 roster.unread=off
-roster.count=false
 roster.priority=false
 roster.size=25
 roster.wrap=false