Data dir logic 3
Better debug
Themes plugin removed