Theme refactoring

Made some changes mainly to light theme.

Related to #7.