Bu fixes

Minor bug fixes
Added new 'Dark' theme