#3 initial integration with theme