color theme fixes and going back to slock