Update theme structure — a lot more changes needed