consolidate 6 themes
refactor the rest