Update theme layout and rebuild