cleanup namespaces
cleanup skin and use styles in theme