Theme and Role management changes