Start working on the themeing. 

#44