Fix conflicts / Added Dark UI (SlimROMs)