Theme building moved to separate file