Revert "more overlay fixes"

This reverts commit 3539e5ddf78ce24c61e6dccf56ce47137ab28255.
Revert "again more overlay fixes"

This reverts commit 5feccb9d3354078be7751e3ab680ff2fb6a4a63d.
Revert "more overlay xml fixes"

This reverts commit c820f1e14352823e55c9a6d2d765a542e2d7e636.
Revert "more overlay fixes"

This reverts commit 1a191def05870788bf2953d91c6bf0e50d5c38e8.
Revert "fix overlay errors because i want my fucking candy already :P"

This reverts commit 2bfe0cf8677999dad2df383da15e3cc8d942b1bf.