Fix Theme Errors - part (1)