DrawerMadness upgrade to unified

Upgraded and fixed errors.
Fire upgrade to unified.

Upgraded and fixed errors.