cleanup, fixes cursor-type and removes obsolete color-theme.