Updated theme layout