New Theme: Added code back from original commit
See here: 1b27b33694099e8922d29c478965ffb29e771b55