Named theme and changed names of functions