Added themes support