Fix for edet and changed theme