Tidied theme.c
Added [ui] preferences to themes
Merge branch 'master' into xep-0223