Initial experimental defines.lua overhaul complete
Merge pull request #41 from zijistark/defines-overhaul

Defines overhaul