Fix Diff
Fix Diff
Fix Diff
Allow change of theme folder
Change comment
Fixed namespace