Added some themes, nav plugin, tidied up init