port themes service to 4.3