Improvements toward release

Improved method for removing nested elements
Implemented adding classes to code element based on theme selection