Progress on my new theme. Lots to do though