Until the night falls, we're the only ones left

Removed !DOCTYPE checking from encapsulation
Renamed some things back