updated theme styles and clean up