Remove PLUGIN_DIR
Removed THEME_DIR
Merge branch 'feature-config' into evolution