Revert "Put new theme inside"

This reverts commit 7fb258a5905a6ab217579c4d15bb0dd29ab879f9.
Revert "polishing"

This reverts commit e5005a4b434a4189ec3bfa4939e91747d4c142c3.
reverted