BACKLOG-4005 : handle theme properly