Neaten up + new functions for themes.

Signed-off-by: Clienthax <clienthax@gmail.com>