removed themes path
minor changes/tests on themes