Integrate theme properly