Modified default theme. Needs more work