Version 2

Change light/dark versions with set bg=dark/light and fixes lots of inconsistencies.