Add nord theme
Resolve merge conflict