diff --git a/zpa-toolkit/build.gradle.kts b/zpa-toolkit/build.gradle.kts
index 3260bbcd..b7b3af7b 100644
--- a/zpa-toolkit/build.gradle.kts
+++ b/zpa-toolkit/build.gradle.kts
@@ -9,6 +9,7 @@ plugins {
 dependencies {
     implementation(Libs.flr_xpath)
     implementation(Libs.flr_toolkit)
+    implementation("com.formdev:flatlaf:2.2")
     implementation(project(":zpa-core"))
 }
 
diff --git a/zpa-toolkit/src/main/kotlin/com/felipebz/flr/toolkit/Toolkit.kt b/zpa-toolkit/src/main/kotlin/com/felipebz/flr/toolkit/Toolkit.kt
index 361b0e9c..8c97fae5 100644
--- a/zpa-toolkit/src/main/kotlin/com/felipebz/flr/toolkit/Toolkit.kt
+++ b/zpa-toolkit/src/main/kotlin/com/felipebz/flr/toolkit/Toolkit.kt
@@ -23,8 +23,8 @@ package com.felipebz.flr.toolkit
 import com.felipebz.flr.internal.toolkit.SourceCodeModel
 import com.felipebz.flr.internal.toolkit.ToolkitPresenter
 import com.felipebz.flr.internal.toolkit.ToolkitViewImpl
+import com.formdev.flatlaf.FlatIntelliJLaf
 import javax.swing.SwingUtilities
-import javax.swing.UIManager
 
 /**
  * Creates a Toolkit with a title, and the given [ConfigurationModel].
@@ -34,19 +34,10 @@ import javax.swing.UIManager
  *
  * @since 1.17
  */
-public class Toolkit(private val title: String, private val configurationModel: ConfigurationModel) {
-    public fun run() {
+class Toolkit(private val title: String, private val configurationModel: ConfigurationModel) {
+    fun run() {
         SwingUtilities.invokeLater {
-            try {
-                for (info in UIManager.getInstalledLookAndFeels()) {
-                    if ("Nimbus" == info.name) {
-                        UIManager.setLookAndFeel(info.className)
-                        break
-                    }
-                }
-            } catch (e: Exception) {
-                throw RuntimeException(e)
-            }
+            FlatIntelliJLaf.setup()
             val model = SourceCodeModel(configurationModel)
             val presenter = ToolkitPresenter(configurationModel, model)
             presenter.setView(ToolkitViewImpl(presenter))