Merge dark and light themes together

Also there is some renaming and some other stuff going on.