theme 1 tuning/refactoring