add THEME variable, updatae comments etc