Reorganized themes extending from initial base theme