Started Adaption to new theme