Changed default theme to 'moe-dark'
Resolved conflicts