Add dark theme to app
Merge dark theme with server changes