plan theme fixes