updated theme, and fixed focus