add theme, adjust a few things