Add themes support