diff --git a/.scalafmt.conf b/.scalafmt.conf
index c930b972..e8016fb0 100644
--- a/.scalafmt.conf
+++ b/.scalafmt.conf
@@ -1,6 +1,6 @@
 version = 3.8.3
 
-runner.dialect = scala213
+runner.dialect = scala213source3
 project.layout = standardConvention
 project.git = true
 
@@ -18,3 +18,5 @@ indentOperator.preset = spray
 
 rewrite.rules = [RedundantBraces, RedundantParens, SortImports, SortModifiers, PreferCurlyFors]
 rewrite.redundantBraces.maxLines = 5
+rewrite.scala3.convertToNewSyntax = true
+rewrite.scala3.newSyntax.control = false
diff --git a/examples/src/main/scala/org/parboiled2/examples/ABCParser.scala b/examples/src/main/scala/org/parboiled2/examples/ABCParser.scala
index 5530c5ef..715dfb26 100644
--- a/examples/src/main/scala/org/parboiled2/examples/ABCParser.scala
+++ b/examples/src/main/scala/org/parboiled2/examples/ABCParser.scala
@@ -19,7 +19,7 @@ package org.parboiled2.examples
 import scala.annotation.tailrec
 import scala.util.{Failure, Success}
 import scala.io.StdIn
-import org.parboiled2._
+import org.parboiled2.*
 
 object ABCParser extends App {
   repl()
diff --git a/examples/src/main/scala/org/parboiled2/examples/Calculator1.scala b/examples/src/main/scala/org/parboiled2/examples/Calculator1.scala
index 82f05350..d5029244 100644
--- a/examples/src/main/scala/org/parboiled2/examples/Calculator1.scala
+++ b/examples/src/main/scala/org/parboiled2/examples/Calculator1.scala
@@ -19,7 +19,7 @@ package org.parboiled2.examples
 import scala.annotation.tailrec
 import scala.util.{Failure, Success}
 import scala.io.StdIn
-import org.parboiled2._
+import org.parboiled2.*
 
 object Calculator1 extends App {
   repl()
diff --git a/examples/src/main/scala/org/parboiled2/examples/Calculator2.scala b/examples/src/main/scala/org/parboiled2/examples/Calculator2.scala
index 46fed4ed..330adf2e 100644
--- a/examples/src/main/scala/org/parboiled2/examples/Calculator2.scala
+++ b/examples/src/main/scala/org/parboiled2/examples/Calculator2.scala
@@ -19,7 +19,7 @@ package org.parboiled2.examples
 import scala.annotation.tailrec
 import scala.util.{Failure, Success}
 import scala.io.StdIn
-import org.parboiled2._
+import org.parboiled2.*
 
 object Calculator2 extends App {
   repl()
@@ -65,7 +65,7 @@ object Calculator2 extends App {
   * for them, to be evaluated in a separate phase, after parsing is completed.
   */
 class Calculator2(val input: ParserInput) extends Parser {
-  import Calculator2._
+  import Calculator2.*
 
   def InputLine = rule(Expression ~ EOI)
 
diff --git a/examples/src/main/scala/org/parboiled2/examples/CsvParser.scala b/examples/src/main/scala/org/parboiled2/examples/CsvParser.scala
index 230168af..406f2c27 100644
--- a/examples/src/main/scala/org/parboiled2/examples/CsvParser.scala
+++ b/examples/src/main/scala/org/parboiled2/examples/CsvParser.scala
@@ -17,7 +17,7 @@
 package org.parboiled2.examples
 
 import scala.collection.immutable
-import org.parboiled2._
+import org.parboiled2.*
 
 object CsvParser {
 
@@ -43,7 +43,7 @@ object CsvParser {
   */
 class CsvParser(val input: ParserInput, headerPresent: Boolean, fieldDelimiter: Char)
     extends Parser with StringBuilding {
-  import CsvParser._
+  import CsvParser.*
 
   val TEXTDATA = `TEXTDATA-BASE` -- fieldDelimiter
 
diff --git a/examples/src/main/scala/org/parboiled2/examples/JsonParser.scala b/examples/src/main/scala/org/parboiled2/examples/JsonParser.scala
index 45bc96cb..16bd1725 100644
--- a/examples/src/main/scala/org/parboiled2/examples/JsonParser.scala
+++ b/examples/src/main/scala/org/parboiled2/examples/JsonParser.scala
@@ -17,22 +17,22 @@
 package org.parboiled2.examples
 
 import scala.annotation.switch
-import org.parboiled2._
-import spray.json.{ParserInput => _, _}
+import org.parboiled2.*
+import spray.json.{ParserInput as _, *}
 
 /** This is a feature-complete JSON parser implementation that almost directly
   * models the JSON grammar presented at http://www.json.org as a parboiled2 PEG parser.
   */
 class JsonParser(val input: ParserInput) extends Parser with StringBuilding {
   import CharPredicate.{Digit, Digit19, HexDigit}
-  import JsonParser._
+  import JsonParser.*
 
   // the root rule
   def Json = rule(WhiteSpace ~ Value ~ EOI)
 
   def JsonObject: Rule1[JsObject] =
     rule {
-      ws('{') ~ zeroOrMore(Pair).separatedBy(ws(',')) ~ ws('}') ~> ((fields: Seq[JsField]) => JsObject(fields: _*))
+      ws('{') ~ zeroOrMore(Pair).separatedBy(ws(',')) ~ ws('}') ~> ((fields: Seq[JsField]) => JsObject(fields*))
     }
 
   def Pair = rule(JsonStringUnwrapped ~ ws(':') ~ Value ~> ((_, _)))
@@ -62,7 +62,7 @@ class JsonParser(val input: ParserInput) extends Parser with StringBuilding {
 
   def JsonNumber = rule(capture(Integer ~ optional(Frac) ~ optional(Exp)) ~> (JsNumber(_)) ~ WhiteSpace)
 
-  def JsonArray = rule(ws('[') ~ zeroOrMore(Value).separatedBy(ws(',')) ~ ws(']') ~> (JsArray(_: _*)))
+  def JsonArray = rule(ws('[') ~ zeroOrMore(Value).separatedBy(ws(',')) ~ ws(']') ~> (JsArray(_*)))
 
   def Characters = rule(zeroOrMore(NormalChar | '\\' ~ EscapedChar))
 
diff --git a/examples/src/test/scala/org/parboiled2/examples/CsvParserSpec.scala b/examples/src/test/scala/org/parboiled2/examples/CsvParserSpec.scala
index 076583a0..fa2f116a 100644
--- a/examples/src/test/scala/org/parboiled2/examples/CsvParserSpec.scala
+++ b/examples/src/test/scala/org/parboiled2/examples/CsvParserSpec.scala
@@ -17,7 +17,7 @@
 package org.parboiled2.examples
 
 import org.parboiled2.examples.CsvParser.{CsvFile, Record}
-import utest._
+import utest.*
 
 object CsvParserSpec extends TestSuite {
 
diff --git a/examples/src/test/scala/org/parboiled2/examples/JsonParserSpec.scala b/examples/src/test/scala/org/parboiled2/examples/JsonParserSpec.scala
index 67e8cba7..48e81332 100644
--- a/examples/src/test/scala/org/parboiled2/examples/JsonParserSpec.scala
+++ b/examples/src/test/scala/org/parboiled2/examples/JsonParserSpec.scala
@@ -17,9 +17,9 @@
 package org.parboiled2.examples
 
 import scala.util.{Failure, Success}
-import utest._
-import spray.json.{JsonParser => _, _}
-import org.parboiled2._
+import utest.*
+import spray.json.{JsonParser as _, *}
+import org.parboiled2.*
 
 object JsonParserSpec extends TestSuite {
 
diff --git a/parboiled-core/src/main/scala-3/org/parboiled2/ParserMacros.scala b/parboiled-core/src/main/scala-3/org/parboiled2/ParserMacros.scala
index 95613039..1a8a6311 100644
--- a/parboiled-core/src/main/scala-3/org/parboiled2/ParserMacros.scala
+++ b/parboiled-core/src/main/scala-3/org/parboiled2/ParserMacros.scala
@@ -44,8 +44,8 @@ private[parboiled2] trait RuleRunnable {
 }
 
 object ParserMacros {
-  import scala.quoted._
-  import scala.compiletime._
+  import scala.quoted.*
+  import scala.compiletime.*
 
   // TODO: the `R` type parameter is a workaround for https://github.com/lampepfl/dotty/issues/13376
   // Discussion at https://github.com/sirthias/parboiled2/pull/274#issuecomment-904926294
diff --git a/parboiled-core/src/main/scala-3/org/parboiled2/support/HListable.scala b/parboiled-core/src/main/scala-3/org/parboiled2/support/HListable.scala
index 9c87432c..c30b1628 100644
--- a/parboiled-core/src/main/scala-3/org/parboiled2/support/HListable.scala
+++ b/parboiled-core/src/main/scala-3/org/parboiled2/support/HListable.scala
@@ -16,7 +16,7 @@
 
 package org.parboiled2.support
 
-import org.parboiled2.support.hlist._
+import org.parboiled2.support.hlist.*
 
 trait HListable[T] {
   type Out <: HList
diff --git a/parboiled-core/src/main/scala-3/org/parboiled2/support/OpTreeContext.scala b/parboiled-core/src/main/scala-3/org/parboiled2/support/OpTreeContext.scala
index 30654eda..dc4db467 100644
--- a/parboiled-core/src/main/scala-3/org/parboiled2/support/OpTreeContext.scala
+++ b/parboiled-core/src/main/scala-3/org/parboiled2/support/OpTreeContext.scala
@@ -16,10 +16,10 @@
 
 package org.parboiled2.support
 
-import org.parboiled2._
+import org.parboiled2.*
 import org.parboiled2.support.hlist.HList
 
-import scala.quoted._
+import scala.quoted.*
 import scala.annotation.tailrec
 
 class OpTreeContext(parser: Expr[Parser])(using Quotes) {
@@ -502,7 +502,7 @@ class OpTreeContext(parser: Expr[Parser])(using Quotes) {
   }
   private case class DropAction(tpe: Type[?]) extends OpTree {
     def render(wrapped: Boolean): Expr[Boolean] = {
-      import support.hlist._
+      import support.hlist.*
       val body =
         tpe match {
           case '[Unit] => '{}
@@ -578,7 +578,7 @@ class OpTreeContext(parser: Expr[Parser])(using Quotes) {
               try $parser.__registerMismatch()
               catch {
                 case org.parboiled2.Parser.StartTracingException =>
-                  import org.parboiled2.RuleTrace._
+                  import org.parboiled2.RuleTrace.*
                   $parser.__bubbleUp(
                     NonTerminal(org.parboiled2.RuleTrace.StringMatch($stringTree), -${ Expr(ix) }) :: Nil,
                     org.parboiled2.RuleTrace.CharMatch($ch)
@@ -645,7 +645,7 @@ class OpTreeContext(parser: Expr[Parser])(using Quotes) {
               try $parser.__registerMismatch()
               catch {
                 case org.parboiled2.Parser.StartTracingException =>
-                  import org.parboiled2.RuleTrace._
+                  import org.parboiled2.RuleTrace.*
                   $parser.__bubbleUp(
                     NonTerminal(org.parboiled2.RuleTrace.IgnoreCaseString($stringTree), -${ Expr(ix) }) :: Nil,
                     org.parboiled2.RuleTrace.IgnoreCaseChar($ch)
diff --git a/parboiled-core/src/main/scala-3/org/parboiled2/support/TailSwitch.scala b/parboiled-core/src/main/scala-3/org/parboiled2/support/TailSwitch.scala
index f3fa27f0..9a57c42a 100644
--- a/parboiled-core/src/main/scala-3/org/parboiled2/support/TailSwitch.scala
+++ b/parboiled-core/src/main/scala-3/org/parboiled2/support/TailSwitch.scala
@@ -16,7 +16,7 @@
 
 package org.parboiled2.support
 
-import hlist._
+import hlist.*
 
 import scala.annotation.implicitNotFound
 
diff --git a/parboiled-core/src/main/scala/org/parboiled2/CharPredicate.scala b/parboiled-core/src/main/scala/org/parboiled2/CharPredicate.scala
index b97b6126..830edc13 100644
--- a/parboiled-core/src/main/scala/org/parboiled2/CharPredicate.scala
+++ b/parboiled-core/src/main/scala/org/parboiled2/CharPredicate.scala
@@ -20,7 +20,7 @@ import scala.annotation.tailrec
 import scala.collection.immutable.NumericRange
 
 sealed abstract class CharPredicate {
-  import CharPredicate._
+  import CharPredicate.*
   def apply(char: Char): Boolean
 
   /** Determines wether this CharPredicate is an instance of the high-performance,
@@ -251,7 +251,7 @@ object CharPredicate {
   }
 
   class ArrayBased private[CharPredicate] (private val chars: Array[Char]) extends CharPredicate {
-    import java.util.Arrays._
+    import java.util.Arrays.*
     sort(chars)
 
     // TODO: switch to faster binary search algorithm with an adaptive pivot, e.g. http://ochafik.com/blog/?p=106
diff --git a/parboiled-core/src/main/scala/org/parboiled2/CharUtils.scala b/parboiled-core/src/main/scala/org/parboiled2/CharUtils.scala
index 6ab41f2c..e93bea15 100644
--- a/parboiled-core/src/main/scala/org/parboiled2/CharUtils.scala
+++ b/parboiled-core/src/main/scala/org/parboiled2/CharUtils.scala
@@ -16,7 +16,7 @@
 
 package org.parboiled2
 
-import java.lang.{StringBuilder => JStringBuilder}
+import java.lang.StringBuilder as JStringBuilder
 import scala.annotation.tailrec
 
 object CharUtils {
diff --git a/parboiled-core/src/main/scala/org/parboiled2/ErrorFormatter.scala b/parboiled-core/src/main/scala/org/parboiled2/ErrorFormatter.scala
index 8014d5ea..7f3d65e9 100644
--- a/parboiled-core/src/main/scala/org/parboiled2/ErrorFormatter.scala
+++ b/parboiled-core/src/main/scala/org/parboiled2/ErrorFormatter.scala
@@ -17,7 +17,7 @@
 package org.parboiled2
 
 import scala.annotation.tailrec
-import java.lang.{StringBuilder => JStringBuilder}
+import java.lang.StringBuilder as JStringBuilder
 
 /** Abstraction for error formatting logic.
   * Instantiate with a custom configuration or override with custom logic.
@@ -53,7 +53,7 @@ class ErrorFormatter(
     */
   def format(sb: JStringBuilder, error: ParseError, input: ParserInput): JStringBuilder = {
     formatProblem(sb, error, input)
-    import error._
+    import error.*
     if (showExpected) formatExpected(sb, error)
     if (showPosition) sb.append(" (line ").append(position.line).append(", column ").append(position.column).append(')')
     if (showLine) formatErrorLine(sb.append(':').append('\n'), error, input)
@@ -87,7 +87,7 @@ class ErrorFormatter(
     // reaches further than the PEL. In these cases we want to show the complete inner match as "mismatched",
     // not just the piece up to the PEL. This is what this method corrects for.
     error.effectiveTraces.foldLeft(error.principalPosition.index - error.position.index + 1) { (len, trace) =>
-      import RuleTrace._
+      import RuleTrace.*
       trace.terminal match {
         case NotPredicate(_, x) =>
           math.max(trace.prefix.collectFirst { case NonTerminal(Atomic, off) => off + x } getOrElse x, len)
@@ -146,7 +146,7 @@ class ErrorFormatter(
     * the given error's position in the line with a caret.
     */
   def formatErrorLine(sb: JStringBuilder, error: ParseError, input: ParserInput): JStringBuilder = {
-    import error.position._
+    import error.position.*
     val (expandedCol, expandedLine) = expandErrorLineTabs(input getLine line, column)
     sb.append(expandedLine).append('\n')
     for (i <- 1 until expandedCol) sb.append(' ')
@@ -174,11 +174,11 @@ class ErrorFormatter(
   /** Formats a [[Vector]] of [[RuleTrace]] instances into a String.
     */
   def formatTraces(error: ParseError): String = {
-    import error._
+    import error.*
     traces
       .map(formatTrace(_, position.index))
       .mkString(
-        s"${traces.size} rule${(if (traces.size != 1) "s" else "")}" +
+        s"${traces.size} rule${if (traces.size != 1) "s" else ""}" +
           " mismatched at error location:\n  ",
         "\n  ",
         "\n"
@@ -188,7 +188,7 @@ class ErrorFormatter(
   /** Formats a [[RuleTrace]] into a String.
     */
   def formatTrace(trace: RuleTrace, errorIndex: Int): String = {
-    import RuleTrace._
+    import RuleTrace.*
     val sb                                            = new JStringBuilder
     val doSep: String => JStringBuilder               = sb.append
     val dontSep: String => JStringBuilder             = _ => sb
@@ -225,7 +225,7 @@ class ErrorFormatter(
       nonTerminal: RuleTrace.NonTerminal,
       showFrameStartOffset: Boolean = showFrameStartOffset
   ): String = {
-    import RuleTrace._
+    import RuleTrace.*
     import CharUtils.escape
     val keyString = nonTerminal.key match {
       case Action              => "<action>"
@@ -252,7 +252,7 @@ class ErrorFormatter(
   }
 
   def formatTerminal(terminal: RuleTrace.Terminal): String = {
-    import RuleTrace._
+    import RuleTrace.*
     import CharUtils.escape
     terminal match {
       case ANY                                       => "ANY"
diff --git a/parboiled-core/src/main/scala/org/parboiled2/ParseError.scala b/parboiled-core/src/main/scala/org/parboiled2/ParseError.scala
index a8ad003c..3cd1f3ed 100644
--- a/parboiled-core/src/main/scala/org/parboiled2/ParseError.scala
+++ b/parboiled-core/src/main/scala/org/parboiled2/ParseError.scala
@@ -57,7 +57,7 @@ object Position {
 }
 
 case class RuleTrace(prefix: List[RuleTrace.NonTerminal], terminal: RuleTrace.Terminal) {
-  import RuleTrace._
+  import RuleTrace.*
 
   /** Returns a RuleTrace starting with the first [[RuleTrace.Atomic]] element or the first sub-trace whose
     * offset from the reported error index is zero (e.g. the [[RuleTrace.Terminal]]).
diff --git a/parboiled-core/src/main/scala/org/parboiled2/Parser.scala b/parboiled-core/src/main/scala/org/parboiled2/Parser.scala
index 3d5fe1f7..192cb9b3 100644
--- a/parboiled-core/src/main/scala/org/parboiled2/Parser.scala
+++ b/parboiled-core/src/main/scala/org/parboiled2/Parser.scala
@@ -21,12 +21,12 @@ import scala.collection.immutable.VectorBuilder
 import scala.collection.mutable
 import scala.util.{Failure, Success, Try}
 import scala.util.control.{NoStackTrace, NonFatal}
-import org.parboiled2.support.hlist._
-import org.parboiled2.support._
+import org.parboiled2.support.hlist.*
+import org.parboiled2.support.*
 
 abstract class Parser(initialValueStackSize: Int = 16, maxValueStackSize: Int = 1024)
     extends RuleDSL with ParserMacroMethods {
-  import Parser._
+  import Parser.*
 
   require(maxValueStackSize <= 65536, "`maxValueStackSize` > 2^16 is not supported") // due to current snapshot design
 
@@ -354,7 +354,7 @@ abstract class Parser(initialValueStackSize: Int = 16, maxValueStackSize: Int =
         try __registerMismatch()
         catch {
           case Parser.StartTracingException =>
-            import RuleTrace._
+            import RuleTrace.*
             __bubbleUp(NonTerminal(StringMatch(string), -ix) :: Nil, CharMatch(string charAt ix))
         }
     else true
@@ -381,7 +381,7 @@ abstract class Parser(initialValueStackSize: Int = 16, maxValueStackSize: Int =
         try __registerMismatch()
         catch {
           case Parser.StartTracingException =>
-            import RuleTrace._
+            import RuleTrace.*
             __bubbleUp(NonTerminal(IgnoreCaseString(string), -ix) :: Nil, IgnoreCaseChar(string charAt ix))
         }
     else true
diff --git a/parboiled-core/src/main/scala/org/parboiled2/Rule.scala b/parboiled-core/src/main/scala/org/parboiled2/Rule.scala
index a90218e0..4bd1eed3 100644
--- a/parboiled-core/src/main/scala/org/parboiled2/Rule.scala
+++ b/parboiled-core/src/main/scala/org/parboiled2/Rule.scala
@@ -19,7 +19,7 @@ package org.parboiled2
 import scala.annotation.unchecked.uncheckedVariance
 import scala.annotation.compileTimeOnly
 import scala.collection.immutable
-import org.parboiled2.support._
+import org.parboiled2.support.*
 import org.parboiled2.support.hlist.HList
 
 sealed trait RuleX
diff --git a/parboiled-core/src/main/scala/org/parboiled2/RuleDSLActions.scala b/parboiled-core/src/main/scala/org/parboiled2/RuleDSLActions.scala
index 26feff8a..48bd0455 100644
--- a/parboiled-core/src/main/scala/org/parboiled2/RuleDSLActions.scala
+++ b/parboiled-core/src/main/scala/org/parboiled2/RuleDSLActions.scala
@@ -18,8 +18,8 @@ package org.parboiled2
 
 import scala.annotation.compileTimeOnly
 import org.parboiled2.support.hlist.ops.hlist.Prepend
-import org.parboiled2.support._
-import org.parboiled2.support.hlist._
+import org.parboiled2.support.*
+import org.parboiled2.support.hlist.*
 
 trait RuleDSLActions {
 
diff --git a/parboiled-core/src/main/scala/org/parboiled2/RuleDSLBasics.scala b/parboiled-core/src/main/scala/org/parboiled2/RuleDSLBasics.scala
index db5126be..f56f24c0 100644
--- a/parboiled-core/src/main/scala/org/parboiled2/RuleDSLBasics.scala
+++ b/parboiled-core/src/main/scala/org/parboiled2/RuleDSLBasics.scala
@@ -17,7 +17,7 @@
 package org.parboiled2
 
 import scala.annotation.compileTimeOnly
-import org.parboiled2.support._
+import org.parboiled2.support.*
 import org.parboiled2.support.hlist.HList
 
 trait RuleDSLBasics {
diff --git a/parboiled-core/src/main/scala/org/parboiled2/RuleDSLCombinators.scala b/parboiled-core/src/main/scala/org/parboiled2/RuleDSLCombinators.scala
index 0527d18d..8e275cf8 100644
--- a/parboiled-core/src/main/scala/org/parboiled2/RuleDSLCombinators.scala
+++ b/parboiled-core/src/main/scala/org/parboiled2/RuleDSLCombinators.scala
@@ -18,8 +18,8 @@ package org.parboiled2
 
 import scala.annotation.compileTimeOnly
 import scala.collection.immutable
-import org.parboiled2.support._
-import org.parboiled2.support.hlist._
+import org.parboiled2.support.*
+import org.parboiled2.support.hlist.*
 
 trait RuleDSLCombinators {
 
diff --git a/parboiled-core/src/main/scala/org/parboiled2/ValueStack.scala b/parboiled-core/src/main/scala/org/parboiled2/ValueStack.scala
index 6e645d3a..ae3d08ad 100644
--- a/parboiled-core/src/main/scala/org/parboiled2/ValueStack.scala
+++ b/parboiled-core/src/main/scala/org/parboiled2/ValueStack.scala
@@ -17,7 +17,7 @@
 package org.parboiled2
 
 import scala.annotation.tailrec
-import org.parboiled2.support.hlist._
+import org.parboiled2.support.hlist.*
 
 /** A mutable untyped stack of values.
   * In most cases you won't have to access its API directly since parboiled2's DSL
diff --git a/parboiled-core/src/main/scala/org/parboiled2/package.scala b/parboiled-core/src/main/scala/org/parboiled2/package.scala
index 3d1b7325..f0d3acb1 100644
--- a/parboiled-core/src/main/scala/org/parboiled2/package.scala
+++ b/parboiled-core/src/main/scala/org/parboiled2/package.scala
@@ -16,7 +16,7 @@
 
 package org
 
-import org.parboiled2.support.hlist._
+import org.parboiled2.support.hlist.*
 import java.nio.charset.Charset
 
 package object parboiled2 {
diff --git a/parboiled-core/src/main/scala/org/parboiled2/support/ActionOpsSupport.scala b/parboiled-core/src/main/scala/org/parboiled2/support/ActionOpsSupport.scala
index ef76e7d8..7830ed08 100644
--- a/parboiled-core/src/main/scala/org/parboiled2/support/ActionOpsSupport.scala
+++ b/parboiled-core/src/main/scala/org/parboiled2/support/ActionOpsSupport.scala
@@ -16,7 +16,7 @@
 
 package org.parboiled2.support
 
-import org.parboiled2.support.hlist._
+import org.parboiled2.support.hlist.*
 import org.parboiled2.Rule
 import org.parboiled2.support.hlist.ops.hlist.Prepend
 
diff --git a/parboiled-core/src/main/scala/org/parboiled2/support/Lifter.scala b/parboiled-core/src/main/scala/org/parboiled2/support/Lifter.scala
index cdf96894..3eb5a202 100644
--- a/parboiled-core/src/main/scala/org/parboiled2/support/Lifter.scala
+++ b/parboiled-core/src/main/scala/org/parboiled2/support/Lifter.scala
@@ -17,7 +17,7 @@
 package org.parboiled2.support
 
 import scala.annotation.implicitNotFound
-import org.parboiled2.support.hlist._
+import org.parboiled2.support.hlist.*
 
 @implicitNotFound(
   "The `optional`, `zeroOrMore`, `oneOrMore` and `times` modifiers " + "can only be used on rules of type `Rule0`, `Rule1[T]` and `Rule[I, O <: I]`!"
diff --git a/parboiled-core/src/main/scala/org/parboiled2/support/RunResult.scala b/parboiled-core/src/main/scala/org/parboiled2/support/RunResult.scala
index e3a45aea..103477fe 100644
--- a/parboiled-core/src/main/scala/org/parboiled2/support/RunResult.scala
+++ b/parboiled-core/src/main/scala/org/parboiled2/support/RunResult.scala
@@ -16,8 +16,8 @@
 
 package org.parboiled2.support
 
-import org.parboiled2.support.hlist._
-import org.parboiled2._
+import org.parboiled2.support.hlist.*
+import org.parboiled2.*
 
 // phantom type, only used for rule DSL typing
 sealed trait RunResult[T] {
diff --git a/parboiled-core/src/main/scala/org/parboiled2/support/Unpack.scala b/parboiled-core/src/main/scala/org/parboiled2/support/Unpack.scala
index 2bca11b0..dc9c92c6 100644
--- a/parboiled-core/src/main/scala/org/parboiled2/support/Unpack.scala
+++ b/parboiled-core/src/main/scala/org/parboiled2/support/Unpack.scala
@@ -16,7 +16,7 @@
 
 package org.parboiled2.support
 
-import org.parboiled2.support.hlist._
+import org.parboiled2.support.hlist.*
 
 /** "Unpacks" an HList if it has only zero or one element(s).
   *   Out =
diff --git a/parboiled-core/src/test/scala/org/parboiled2/ActionSpec.scala b/parboiled-core/src/test/scala/org/parboiled2/ActionSpec.scala
index be312aa1..5897a164 100644
--- a/parboiled-core/src/test/scala/org/parboiled2/ActionSpec.scala
+++ b/parboiled-core/src/test/scala/org/parboiled2/ActionSpec.scala
@@ -16,8 +16,8 @@
 
 package org.parboiled2
 
-import org.parboiled2.support.hlist._
-import utest._
+import org.parboiled2.support.hlist.*
+import utest.*
 
 object ActionSpec extends TestParserSpec {
 
diff --git a/parboiled-core/src/test/scala/org/parboiled2/BasicSpec.scala b/parboiled-core/src/test/scala/org/parboiled2/BasicSpec.scala
index 26ce07ab..a6691ebc 100644
--- a/parboiled-core/src/test/scala/org/parboiled2/BasicSpec.scala
+++ b/parboiled-core/src/test/scala/org/parboiled2/BasicSpec.scala
@@ -16,7 +16,7 @@
 
 package org.parboiled2
 
-import utest.{TestableString => _, _}
+import utest.{TestableString as _, *}
 
 object BasicSpec extends TestParserSpec {
 
diff --git a/parboiled-core/src/test/scala/org/parboiled2/CalculatorSpec.scala b/parboiled-core/src/test/scala/org/parboiled2/CalculatorSpec.scala
index 91255d88..355f2506 100644
--- a/parboiled-core/src/test/scala/org/parboiled2/CalculatorSpec.scala
+++ b/parboiled-core/src/test/scala/org/parboiled2/CalculatorSpec.scala
@@ -16,7 +16,7 @@
 
 package org.parboiled2
 
-import utest._
+import utest.*
 
 object CalculatorSpec extends TestParserSpec {
 
diff --git a/parboiled-core/src/test/scala/org/parboiled2/CharPredicateSpec.scala b/parboiled-core/src/test/scala/org/parboiled2/CharPredicateSpec.scala
index bbe1c9cd..03f9985c 100644
--- a/parboiled-core/src/test/scala/org/parboiled2/CharPredicateSpec.scala
+++ b/parboiled-core/src/test/scala/org/parboiled2/CharPredicateSpec.scala
@@ -16,7 +16,7 @@
 
 package org.parboiled2
 
-import utest._
+import utest.*
 
 object CharPredicateSpec extends TestSuite {
 
diff --git a/parboiled-core/src/test/scala/org/parboiled2/CharUtilsSpec.scala b/parboiled-core/src/test/scala/org/parboiled2/CharUtilsSpec.scala
index 41f53bd5..3e360b2c 100644
--- a/parboiled-core/src/test/scala/org/parboiled2/CharUtilsSpec.scala
+++ b/parboiled-core/src/test/scala/org/parboiled2/CharUtilsSpec.scala
@@ -19,7 +19,7 @@ package org.parboiled2
 import org.scalacheck.{Gen, Prop, Test}
 import org.scalacheck.util.Pretty
 import org.scalacheck.Prop.forAll
-import utest._
+import utest.*
 
 object CharUtilsSpec extends TestSuite with UTestScalaCheck {
 
diff --git a/parboiled-core/src/test/scala/org/parboiled2/CombinatorSpec.scala b/parboiled-core/src/test/scala/org/parboiled2/CombinatorSpec.scala
index 612e8716..8161ae42 100644
--- a/parboiled-core/src/test/scala/org/parboiled2/CombinatorSpec.scala
+++ b/parboiled-core/src/test/scala/org/parboiled2/CombinatorSpec.scala
@@ -16,7 +16,7 @@
 
 package org.parboiled2
 
-import utest._
+import utest.*
 
 object CombinatorSpec extends TestParserSpec {
 
diff --git a/parboiled-core/src/test/scala/org/parboiled2/CompileDurationTest.scala b/parboiled-core/src/test/scala/org/parboiled2/CompileDurationTest.scala
index 6ea473a1..32efb84a 100644
--- a/parboiled-core/src/test/scala/org/parboiled2/CompileDurationTest.scala
+++ b/parboiled-core/src/test/scala/org/parboiled2/CompileDurationTest.scala
@@ -16,7 +16,7 @@
 
 package org.parboiled2
 
-import utest._
+import utest.*
 
 import org.parboiled2.support.hlist.{::, HNil}
 
diff --git a/parboiled-core/src/test/scala/org/parboiled2/CustomCharAndStringExpansionSpec.scala b/parboiled-core/src/test/scala/org/parboiled2/CustomCharAndStringExpansionSpec.scala
index 7c1b02f8..1f6921a9 100644
--- a/parboiled-core/src/test/scala/org/parboiled2/CustomCharAndStringExpansionSpec.scala
+++ b/parboiled-core/src/test/scala/org/parboiled2/CustomCharAndStringExpansionSpec.scala
@@ -16,7 +16,7 @@
 
 package org.parboiled2
 
-import utest._
+import utest.*
 
 object CustomCharAndStringExpansionSpec extends TestParserSpec {
 
diff --git a/parboiled-core/src/test/scala/org/parboiled2/CutSpec.scala b/parboiled-core/src/test/scala/org/parboiled2/CutSpec.scala
index 97726475..e8be8f3d 100644
--- a/parboiled-core/src/test/scala/org/parboiled2/CutSpec.scala
+++ b/parboiled-core/src/test/scala/org/parboiled2/CutSpec.scala
@@ -16,7 +16,7 @@
 
 package org.parboiled2
 
-import utest._
+import utest.*
 
 object CutSpec extends TestParserSpec {
 
diff --git a/parboiled-core/src/test/scala/org/parboiled2/DSLTest.scala b/parboiled-core/src/test/scala/org/parboiled2/DSLTest.scala
index 046dd5cc..e0e01e01 100644
--- a/parboiled-core/src/test/scala/org/parboiled2/DSLTest.scala
+++ b/parboiled-core/src/test/scala/org/parboiled2/DSLTest.scala
@@ -16,7 +16,7 @@
 
 package org.parboiled2
 
-import org.parboiled2.support.hlist._
+import org.parboiled2.support.hlist.*
 
 //// pure compile-time-only test
 class DSLTest(val input: ParserInput) extends Parser {
diff --git a/parboiled-core/src/test/scala/org/parboiled2/DefaultArgumentsSpec.scala b/parboiled-core/src/test/scala/org/parboiled2/DefaultArgumentsSpec.scala
index cdace0cc..4f2019f3 100644
--- a/parboiled-core/src/test/scala/org/parboiled2/DefaultArgumentsSpec.scala
+++ b/parboiled-core/src/test/scala/org/parboiled2/DefaultArgumentsSpec.scala
@@ -16,7 +16,7 @@
 
 package org.parboiled2
 
-import utest._
+import utest.*
 
 import scala.util.Success
 
diff --git a/parboiled-core/src/test/scala/org/parboiled2/ErrorReportingSpec.scala b/parboiled-core/src/test/scala/org/parboiled2/ErrorReportingSpec.scala
index dd88f8ff..0b114ea0 100644
--- a/parboiled-core/src/test/scala/org/parboiled2/ErrorReportingSpec.scala
+++ b/parboiled-core/src/test/scala/org/parboiled2/ErrorReportingSpec.scala
@@ -16,7 +16,7 @@
 
 package org.parboiled2
 
-import utest._
+import utest.*
 
 object ErrorReportingSpec extends TestParserSpec {
 
diff --git a/parboiled-core/src/test/scala/org/parboiled2/MetaRuleSpec.scala b/parboiled-core/src/test/scala/org/parboiled2/MetaRuleSpec.scala
index 32d61f2f..170ba199 100644
--- a/parboiled-core/src/test/scala/org/parboiled2/MetaRuleSpec.scala
+++ b/parboiled-core/src/test/scala/org/parboiled2/MetaRuleSpec.scala
@@ -16,7 +16,7 @@
 
 package org.parboiled2
 
-import utest._
+import utest.*
 
 object MetaRuleSpec extends TestParserSpec {
 
diff --git a/parboiled-core/src/test/scala/org/parboiled2/ReductionResetSpec.scala b/parboiled-core/src/test/scala/org/parboiled2/ReductionResetSpec.scala
index 90c4134b..58a5c532 100644
--- a/parboiled-core/src/test/scala/org/parboiled2/ReductionResetSpec.scala
+++ b/parboiled-core/src/test/scala/org/parboiled2/ReductionResetSpec.scala
@@ -16,8 +16,8 @@
 
 package org.parboiled2
 
-import utest._
-import org.parboiled2.support.hlist._
+import utest.*
+import org.parboiled2.support.hlist.*
 
 object ReductionResetSpec extends TestParserSpec {
 
diff --git a/parboiled-core/src/test/scala/org/parboiled2/ReductionTypeSpec.scala b/parboiled-core/src/test/scala/org/parboiled2/ReductionTypeSpec.scala
index 9e8f2ceb..2aaa95c0 100644
--- a/parboiled-core/src/test/scala/org/parboiled2/ReductionTypeSpec.scala
+++ b/parboiled-core/src/test/scala/org/parboiled2/ReductionTypeSpec.scala
@@ -17,7 +17,7 @@
 package org.parboiled2
 
 import scala.reflect.ClassTag
-import utest._
+import utest.*
 
 object ReductionTypeSpec extends TestSuite {
 
diff --git a/parboiled-core/src/test/scala/org/parboiled2/RunSubParserSpec.scala b/parboiled-core/src/test/scala/org/parboiled2/RunSubParserSpec.scala
index 368eae6a..7b5841a6 100644
--- a/parboiled-core/src/test/scala/org/parboiled2/RunSubParserSpec.scala
+++ b/parboiled-core/src/test/scala/org/parboiled2/RunSubParserSpec.scala
@@ -16,7 +16,7 @@
 
 package org.parboiled2
 
-import utest._
+import utest.*
 
 object RunSubParserSpec extends TestParserSpec {
 
diff --git a/parboiled-core/src/test/scala/org/parboiled2/RunningSpec.scala b/parboiled-core/src/test/scala/org/parboiled2/RunningSpec.scala
index d8e547fd..e6f2000d 100644
--- a/parboiled-core/src/test/scala/org/parboiled2/RunningSpec.scala
+++ b/parboiled-core/src/test/scala/org/parboiled2/RunningSpec.scala
@@ -17,7 +17,7 @@
 package org.parboiled2
 
 import scala.util.{Success, Try}
-import utest._
+import utest.*
 
 object RunningSpec extends TestSuite {
 
diff --git a/parboiled-core/src/test/scala/org/parboiled2/TailrecSpec.scala b/parboiled-core/src/test/scala/org/parboiled2/TailrecSpec.scala
index ffc5d7ce..f8040dc1 100644
--- a/parboiled-core/src/test/scala/org/parboiled2/TailrecSpec.scala
+++ b/parboiled-core/src/test/scala/org/parboiled2/TailrecSpec.scala
@@ -16,7 +16,7 @@
 
 package org.parboiled2
 
-import utest._
+import utest.*
 
 // test verifying the effectiveness of our workaround for https://github.com/scala/bug/issues/8657
 object TailrecSpec extends TestParserSpec {
diff --git a/parboiled-core/src/test/scala/org/parboiled2/TestParserSpec.scala b/parboiled-core/src/test/scala/org/parboiled2/TestParserSpec.scala
index 7857f643..a25e90a8 100644
--- a/parboiled-core/src/test/scala/org/parboiled2/TestParserSpec.scala
+++ b/parboiled-core/src/test/scala/org/parboiled2/TestParserSpec.scala
@@ -17,8 +17,8 @@
 package org.parboiled2
 
 import org.parboiled2.support.Unpack
-import org.parboiled2.support.hlist._
-import utest._
+import org.parboiled2.support.hlist.*
+import utest.*
 
 abstract class TestParserSpec extends TestSuite {
   type TestParser0             = TestParser[HNil, Unit]
diff --git a/parboiled-core/src/test/scala/org/parboiled2/ValueStackSpec.scala b/parboiled-core/src/test/scala/org/parboiled2/ValueStackSpec.scala
index 27c72497..df0860e6 100644
--- a/parboiled-core/src/test/scala/org/parboiled2/ValueStackSpec.scala
+++ b/parboiled-core/src/test/scala/org/parboiled2/ValueStackSpec.scala
@@ -17,7 +17,7 @@
 package org.parboiled2
 
 import org.parboiled2.support.hlist.{HList, HNil}
-import utest.{intercept, _}
+import utest.{intercept, *}
 
 object ValueStackSpec extends TestSuite {
 
diff --git a/parboiled-core/src/test/scala/org/parboiled2/VarianceSpec.scala b/parboiled-core/src/test/scala/org/parboiled2/VarianceSpec.scala
index efb0c3d7..65e03a85 100644
--- a/parboiled-core/src/test/scala/org/parboiled2/VarianceSpec.scala
+++ b/parboiled-core/src/test/scala/org/parboiled2/VarianceSpec.scala
@@ -16,7 +16,7 @@
 
 package org.parboiled2
 
-import org.parboiled2.support.hlist._
+import org.parboiled2.support.hlist.*
 import utest.{compileError, ArrowAssert}
 
 //// pure compile-time-only test
diff --git a/parboiled-core/src/test/scala/org/parboiled2/nestedpackage/AlienPackageParserSpec.scala b/parboiled-core/src/test/scala/org/parboiled2/nestedpackage/AlienPackageParserSpec.scala
index 7e9d308f..16afe2f1 100644
--- a/parboiled-core/src/test/scala/org/parboiled2/nestedpackage/AlienPackageParserSpec.scala
+++ b/parboiled-core/src/test/scala/org/parboiled2/nestedpackage/AlienPackageParserSpec.scala
@@ -17,7 +17,7 @@
 package org.parboiled2.nestedpackage
 
 import scala.util.Success
-import utest._
+import utest.*
 
 object AlienPackageParserSpec extends TestSuite {
 
diff --git a/parboiled-core/src/test/scala/org/parboiled2/util/Base64Spec.scala b/parboiled-core/src/test/scala/org/parboiled2/util/Base64Spec.scala
index 67c1f7f5..e7f49acb 100644
--- a/parboiled-core/src/test/scala/org/parboiled2/util/Base64Spec.scala
+++ b/parboiled-core/src/test/scala/org/parboiled2/util/Base64Spec.scala
@@ -16,7 +16,7 @@
 
 package org.parboiled2.util
 
-import utest._
+import utest.*
 import java.nio.charset.StandardCharsets
 
 object Base64Spec extends TestSuite {
diff --git a/parboiled/src/main/scala-3/org/parboiled2/DynamicRuleDispatchMacro.scala b/parboiled/src/main/scala-3/org/parboiled2/DynamicRuleDispatchMacro.scala
index f0f76060..f603c5a1 100644
--- a/parboiled/src/main/scala-3/org/parboiled2/DynamicRuleDispatchMacro.scala
+++ b/parboiled/src/main/scala-3/org/parboiled2/DynamicRuleDispatchMacro.scala
@@ -33,11 +33,11 @@ trait DynamicRuleDispatchMacro { self: DynamicRuleDispatch.type =>
   ): (DynamicRuleDispatch[P, L], immutable.Seq[String]) =
     ${ DynamicRuleDispatch.__create[P, L]('ruleNames) }
 
-  import scala.quoted._
+  import scala.quoted.*
   def __create[P <: Parser: Type, L <: HList: Type](
       ruleNames: Expr[Seq[String]]
   )(using Quotes): Expr[(DynamicRuleDispatch[P, L], immutable.Seq[String])] = {
-    import quotes.reflect._
+    import quotes.reflect.*
 
     val names: Seq[String] = ruleNames match {
       case Varargs(Exprs(args)) => args.sorted
diff --git a/parboiled/src/main/scala/org/parboiled2/Base64Parsing.scala b/parboiled/src/main/scala/org/parboiled2/Base64Parsing.scala
index a53a3197..78e4f7a4 100644
--- a/parboiled/src/main/scala/org/parboiled2/Base64Parsing.scala
+++ b/parboiled/src/main/scala/org/parboiled2/Base64Parsing.scala
@@ -21,7 +21,7 @@ import org.parboiled2.util.Base64
 /** Rules for parsing Base-64 encoded strings.
   */
 trait Base64Parsing { this: Parser =>
-  import Base64Parsing._
+  import Base64Parsing.*
 
   /** Parses an RFC4045-encoded string and decodes it onto the value stack.
     */
diff --git a/parboiled/src/test/scala/org/parboiled2/Base64ParsingSpec.scala b/parboiled/src/test/scala/org/parboiled2/Base64ParsingSpec.scala
index 31efb723..d10db3a6 100644
--- a/parboiled/src/test/scala/org/parboiled2/Base64ParsingSpec.scala
+++ b/parboiled/src/test/scala/org/parboiled2/Base64ParsingSpec.scala
@@ -18,8 +18,8 @@ package org.parboiled2
 
 import scala.util.Random
 import org.parboiled2.util.Base64
-import org.parboiled2.support.hlist._
-import utest._
+import org.parboiled2.support.hlist.*
+import utest.*
 
 object Base64ParsingSpec extends TestSuite {
 
diff --git a/parboiled/src/test/scala/org/parboiled2/DynamicRuleDispatchSpec.scala b/parboiled/src/test/scala/org/parboiled2/DynamicRuleDispatchSpec.scala
index 71e5e488..c88d6319 100644
--- a/parboiled/src/test/scala/org/parboiled2/DynamicRuleDispatchSpec.scala
+++ b/parboiled/src/test/scala/org/parboiled2/DynamicRuleDispatchSpec.scala
@@ -17,7 +17,7 @@
 package org.parboiled2
 
 import org.parboiled2.support.hlist.HNil
-import utest._
+import utest.*
 
 object DynamicRuleDispatchSpec extends TestSuite {
 
diff --git a/project/ActionOpsBoilerplate.scala b/project/ActionOpsBoilerplate.scala
index d9cb7174..c3db9354 100644
--- a/project/ActionOpsBoilerplate.scala
+++ b/project/ActionOpsBoilerplate.scala
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import sbt._
+import sbt.*
 
 /** Generate action ops boilerplate for consuming/producing up to 22 values from/to the value stack.
   *