Fix #53
Implement Dark Theme(Fix #46)
Bugfixing(for Bugs caused by changing Theme) and Cleanup
Merge