added color-theme, removed custom font-lock junk