Sub Theme support fix logic