Theme functions updated