Revert "getting rid of conflicting files"

This reverts commit b700ab7da24b1e74191f4514f5f1f25ad9ad5ffc.
Revert "Installing a real theme for once"

This reverts commit e3093153a4bad25700010c30e089789707327014.