Ports corrected for dan's theme