Add in bug from openform
Remove theme menu setting from pretty much everywhere