Fix thememapper and filemanager