FTE-11 clean up theme