Updated to newer, darker style