Also refactored the theme a little bit so it's generalized
Signed-off-by: Morten Linderud morten@linderud.pw
