done layout, make theme now