theme support nearly complete

UI updates