theme and backend fixes