diff --git a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/theme/Color.kt b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/theme/Color.kt
index 37a6dab3..2290c842 100644
--- a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/theme/Color.kt
+++ b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/theme/Color.kt
@@ -54,6 +54,8 @@ data class AslColorScheme(
     val terminalStdout: Color,
     val terminalStderr: Color,
     val terminalPrompt: Color,
+
+    val graphLanes: List<Color>,
 )
 
 val AslLightColors = AslColorScheme(
@@ -107,6 +109,15 @@ val AslLightColors = AslColorScheme(
     terminalStdout = Color(0xFF1E1E2E),
     terminalStderr = Color(0xFFDC2626),
     terminalPrompt = Color(0xFF059669),
+
+    graphLanes = listOf(
+        Color(0xFF8250DF),
+        Color(0xFF1F883D),
+        Color(0xFF9A6700),
+        Color(0xFF0A3069),
+        Color(0xFF6E7781),
+        Color(0xFFA40E26),
+    ),
 )
 
 val AslDarkColors = AslColorScheme(
@@ -160,6 +171,15 @@ val AslDarkColors = AslColorScheme(
     terminalStdout = Color(0xFFD4D4D4),
     terminalStderr = Color(0xFFF87171),
     terminalPrompt = Color(0xFF34D399),
+
+    graphLanes = listOf(
+        Color(0xFF6897BB),
+        Color(0xFF4EC9B0),
+        Color(0xFFCC7832),
+        Color(0xFFE8A5C4),
+        Color(0xFFDCDCAA),
+        Color(0xFFBD93F9),
+    ),
 )
 
 val LocalAslColors = staticCompositionLocalOf { AslDarkColors }
diff --git a/feature/git/detekt-baseline.xml b/feature/git/detekt-baseline.xml
index 18e604a4..483cdf63 100644
--- a/feature/git/detekt-baseline.xml
+++ b/feature/git/detekt-baseline.xml
@@ -6,7 +6,6 @@
     <ID>CyclomaticComplexMethod:GitErrorMessageMapper.kt$fun gitErrorMessage(error: Throwable): String</ID>
     <ID>CyclomaticComplexMethod:GitHistoryScreen.kt$@Composable private fun GitHistoryScreen( uiState: GitHistoryUiState, interactionListener: GitHistoryInteractionListener, onBack: () -&gt; Unit, onOpenDiff: (String, String) -&gt; Unit, )</ID>
     <ID>CyclomaticComplexMethod:GitPanelScreen.kt$@Composable private fun GitPanelScreen( uiState: GitPanelUiState, interactionListener: GitPanelInteractionListener, onClose: () -&gt; Unit, onOpenDiff: (String, GitDiffTarget) -&gt; Unit, onOpenHistory: () -&gt; Unit, onOpenBranches: () -&gt; Unit, onOpenTags: () -&gt; Unit, onOpenStashes: () -&gt; Unit, onOpenConflicts: () -&gt; Unit, )</ID>
-    <ID>ForbiddenImport:GitHistoryScreen.kt$import androidx.compose.material3.MaterialTheme</ID>
     <ID>LongMethod:GitAuthPrompt.kt$@Composable fun GitHubAuthDialog(state: GitAuthPromptState, actions: GitAuthPromptActions)</ID>
     <ID>LongMethod:GitDiffScreen.kt$@Composable private fun GitDiffScreen( uiState: GitDiffUiState, interactionListener: GitDiffInteractionListener, onBack: () -&gt; Unit, )</ID>
     <ID>LongMethod:GitHistoryScreen.kt$@Composable private fun GitHistoryScreen( uiState: GitHistoryUiState, interactionListener: GitHistoryInteractionListener, onBack: () -&gt; Unit, onOpenDiff: (String, String) -&gt; Unit, )</ID>
diff --git a/feature/git/src/main/java/com/ahmadkharfan/androidstudiolite/feature/editor/git/history/GitHistoryScreen.kt b/feature/git/src/main/java/com/ahmadkharfan/androidstudiolite/feature/editor/git/history/GitHistoryScreen.kt
index 88868347..15e25ac1 100644
--- a/feature/git/src/main/java/com/ahmadkharfan/androidstudiolite/feature/editor/git/history/GitHistoryScreen.kt
+++ b/feature/git/src/main/java/com/ahmadkharfan/androidstudiolite/feature/editor/git/history/GitHistoryScreen.kt
@@ -16,7 +16,6 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material3.HorizontalDivider
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -33,7 +32,6 @@ import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.res.stringResource
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
@@ -299,14 +297,7 @@ private val GitGraphRowHeight = 72.dp
 @Composable
 private fun GitGraphGutter(row: GitGraphRow) {
     val colors = AslTheme.colors
-    val palette = listOf(
-        colors.accentPrimary,
-        MaterialTheme.colorScheme.tertiary,
-        MaterialTheme.colorScheme.secondary,
-        colors.error,
-        Color(0xFF43A047),
-        Color(0xFFFF8F00),
-    )
+    val palette = colors.graphLanes
     Box(
         modifier = Modifier
             .width(GitGraphGutterWidth)