Reorganized theme path