Added dark theme and tried to work on some bugs!