Themes are now fully working, removed menu for now, have not decided what to do for the menu yet