Updated themes slightly, still work in progress