Added Flat Dark
fix merge