Revert "changed skins"

This reverts commit 4c2cc739ea64be55461f888a00f423384736a24e.
Revert "some code cleanup"

This reverts commit efde93aa91b6bb763935dd34339023a858c53baf.