Re-organized theme contents