Added spring themes support