add theme support & fix things