New dark colors and refactor