Some Cleanup and fixing some themes