diff --git a/docs/getting-started/hello-world/index.md b/docs/getting-started/hello-world/index.md
index 9f288c7f4..fbc4257a3 100644
--- a/docs/getting-started/hello-world/index.md
+++ b/docs/getting-started/hello-world/index.md
@@ -78,9 +78,9 @@ For more information, please run `scala run --help` or consult the [online docum
 In a scala-cli project with multiple `.scala` files, shared `given` declarations (such as compiler options) must appear in exactly one file. Place them in your `project.scala` file to avoid duplicate definition errors.
 
 ```scala title="project.scala"
-//> using scala 3.8.1
-//> using dep io.github.dfianthdl::dfhdl::0.17.0
-//> using plugin io.github.dfianthdl:::dfhdl-plugin:0.17.0
+//> using scala 3.8.3
+//> using dep io.github.dfianthdl::dfhdl::0.18.0
+//> using plugin io.github.dfianthdl:::dfhdl-plugin:0.18.0
 
 import dfhdl.*
 given options.CompilerOptions.Backend = _.verilog
diff --git a/docs/getting-started/hello-world/scala-project/project.scala b/docs/getting-started/hello-world/scala-project/project.scala
index 67f2847ce..a6f716bb9 100644
--- a/docs/getting-started/hello-world/scala-project/project.scala
+++ b/docs/getting-started/hello-world/scala-project/project.scala
@@ -1,3 +1,3 @@
-//> using scala 3.8.1
-//> using dep io.github.dfianthdl::dfhdl::0.17.0
-//> using plugin io.github.dfianthdl:::dfhdl-plugin:0.17.0
+//> using scala 3.8.3
+//> using dep io.github.dfianthdl::dfhdl::0.18.0
+//> using plugin io.github.dfianthdl:::dfhdl-plugin:0.18.0
diff --git a/docs/getting-started/hello-world/scala-single-file/Counter8.scala b/docs/getting-started/hello-world/scala-single-file/Counter8.scala
index 638471dd3..a595ef4dc 100644
--- a/docs/getting-started/hello-world/scala-single-file/Counter8.scala
+++ b/docs/getting-started/hello-world/scala-single-file/Counter8.scala
@@ -1,6 +1,6 @@
-//> using scala 3.8.1
-//> using dep io.github.dfianthdl::dfhdl::0.17.0
-//> using plugin io.github.dfianthdl:::dfhdl-plugin:0.17.0
+//> using scala 3.8.3
+//> using dep io.github.dfianthdl::dfhdl::0.18.0
+//> using plugin io.github.dfianthdl:::dfhdl-plugin:0.18.0
 
 import dfhdl.* //import all the DFHDL goodness
 
diff --git a/docs/getting-started/initial-setup/index.md b/docs/getting-started/initial-setup/index.md
index acc854783..4cb7b7ff1 100755
--- a/docs/getting-started/initial-setup/index.md
+++ b/docs/getting-started/initial-setup/index.md
@@ -1,12 +1,12 @@
 # Initial Setup {#getting-started}
 
-DFHDL is a domain specific language (DSL) library written in the [Scala programming language](https://www.scala-lang.org){target="_blank"} (Scala 3.8.1), and as such it lets you utilize the entire Scala ecosystem, including IDEs, various tools, and other libraries. 
+DFHDL is a domain specific language (DSL) library written in the [Scala programming language](https://www.scala-lang.org){target="_blank"} (Scala 3.8.3), and as such it lets you utilize the entire Scala ecosystem, including IDEs, various tools, and other libraries. 
 
 Is your system already fit for Scala development? [Jump to the DFHDL hello-world section][hello-world]
 
 ## Installing Scala and Other Dependencies
 
-We recommend directly installing Scala 3.8.1 (no need to install either [Coursier](https://get-coursier.io/){target="_blank"}, [Scala CLI](https://scala-cli.virtuslab.org/){target="_blank"}, or [sbt](https://www.scala-sbt.org/){target="_blank"}):
+We recommend directly installing Scala 3.8.3 (no need to install either [Coursier](https://get-coursier.io/){target="_blank"}, [Scala CLI](https://scala-cli.virtuslab.org/){target="_blank"}, or [sbt](https://www.scala-sbt.org/){target="_blank"}):
 
 <div class="grid cards" markdown>
 
@@ -18,7 +18,7 @@ We recommend directly installing Scala 3.8.1 (no need to install either [Coursie
     Run the following in Windows command or powershell:
 
     ```{.cmd .copy linenums="0"}
-    choco install scala --version=3.8.1 
+    choco install scala --version=3.8.3 
     ```
     ///
 
@@ -30,7 +30,7 @@ We recommend directly installing Scala 3.8.1 (no need to install either [Coursie
     Run the following in your shell:
 
     ```{.sh-session .copy linenums="0"}
-    sdk install scala 3.8.1 
+    sdk install scala 3.8.3 
     ```
     ///
 
diff --git a/docs/javascripts/scastie.js b/docs/javascripts/scastie.js
index 890397b3e..0fc35cd4f 100755
--- a/docs/javascripts/scastie.js
+++ b/docs/javascripts/scastie.js
@@ -1,5 +1,5 @@
-let dfhdlVersion = "0.17.0";
-let scalaVersion = "3.8.1";
+let dfhdlVersion = "0.18.0";
+let scalaVersion = "3.8.3";
 
 function buildSbtConfig(mainClass) {
   let config = `
diff --git a/docs/transitioning/from-verilog/index.md b/docs/transitioning/from-verilog/index.md
index bac712ce1..4f012353f 100644
--- a/docs/transitioning/from-verilog/index.md
+++ b/docs/transitioning/from-verilog/index.md
@@ -49,42 +49,6 @@ end AndGate
 </div>
 ///
 
-/// admonition | `@top` Annotation
-    type: verilog
-The `@top` annotation marks a design as a compilation entry point. The compiler generates a `main` method that elaborates, compiles, and emits HDL output for that design. In a typical design flow, only the testbench or top-level wrapper carries `@top`, and sub-modules are elaborated transitively.
-
-When translating and verifying modules one at a time (bottom-up), you may need to compile each module independently. In that case, every module being compiled must have `@top` so the compiler can generate an entry point for it. `@top`-annotated designs require **all** parameters to have default values.
-
-When a `@top`-annotated design is instantiated as a child of another design, the annotation has no effect. So the question is not whether `@top` causes harm, but whether it is practical: requiring default values for all parameters is annoying for reusable internal components and is not recommended. Mark only the designs you actually need to compile standalone.
-
-<div class="grid" markdown>
-
-```sv linenums="0" title="Verilog"
-module lfsr #(
-  parameter LEN = 8
-)(
-  input  clk,
-  output [LEN-1:0] data
-);
-  // ...
-endmodule
-```
-
-```scala linenums="0" title="DFHDL"
-class lfsr(
-  val LEN: Int <> CONST = 8
-) extends EDDesign:
-  val clk  = Bit      <> IN
-  val data = Bits(LEN) <> OUT
-  // ...
-end lfsr
-```
-
-</div>
-
-Without `@top`, running the compiled output fails with `ClassNotFoundException: top_<ModuleName>`. See [Design Hierarchy][design-hierarchy] for full details on `@top` and `@top(false)`.
-///
-
 /// admonition | Parameter Declarations
     type: verilog
 <div class="grid" markdown>
diff --git a/docs/user-guide/design-hierarchy/index.md b/docs/user-guide/design-hierarchy/index.md
index 64e141bb9..d5623107a 100644
--- a/docs/user-guide/design-hierarchy/index.md
+++ b/docs/user-guide/design-hierarchy/index.md
@@ -13,7 +13,6 @@ DFHDL supports composable design hierarchies through design class instantiation
 * _design member_ - Any DFHDL object instantiated within a design (the design *contains* or *owns* all its members).
 * _child design/component_ - A design instance that is owned by another design.
 * _top design_ - The highest-level design in the hierarchy (not contained by any other design), also known as the *top-level design*.
-* _top-app design_ - A `@top` annotated *top design* that generates a main entry point with the default application.
 
 ///
 
@@ -97,7 +96,6 @@ A DFHDL design declaration follows standard [Scala class](https://docs.scala-lan
 
 ```scala linenums="0" title="Design declaration syntax"
 /** _documentation_ */
-@top(genMain) //required only for top-level designs
 [_modifiers_] class _name_(_params_) extends XXDesign:
   _contents_
 end _name_ //optional `end` marker
@@ -111,16 +109,12 @@ end _name_ //optional `end` marker
 
 * __`_contents_`__ - The design interface (ports/interfaces/domains) and functionality (variables, functions, child designs, processes, etc.), based on the selected design domain's semantics.
 
-* __`@top(genMain)`__ - A required annotation for top-level designs (designs not instantiated within another design). The annotation has an optional `#!scala val genMain: Boolean = true` parameter:
-    - When `genMain = true`, the design becomes a top-app design where all parameters must have default values, and a main Scala entry point named `top__name_` is generated
-    - When `genMain = false`, the annotation only provides a default top-level context for the design
-
 * __`_documentation_`__ - Design documentation in [Scaladoc format](https://docs.scala-lang.org/style/scaladoc.html){target="_blank"}. This documentation is preserved throughout compilation and included in the generated backend code.
 
 * __`_modifiers_`__ - Optional Scala modifiers. See [Design Class Modifier Rules][design-class-modifier-rules] for details.
 
 ### `LeftShift2` example {#LeftShift2}
-/// admonition | Basic top-app design example: a two-bits left shifter
+/// admonition | Basic top design example: a two-bits left shifter
     type: example
 The DFHDL code below implements a two-bit left shifter design named `LeftShift2`. The design:
 
@@ -164,12 +158,12 @@ children = [
 
 </div>
 
-Since this design is annotated with `@top`, it is a top-app design that generates an executable Scala program. This program compiles the design and generates backend code (Verilog or VHDL). The backend can be configured through:
+This top design generates an executable Scala program. This program compiles the design and generates backend code (Verilog or VHDL). The backend can be configured through:
 
 - Command-line arguments when running the program
 - Implicit backend settings in the code (as shown in this example)
 
-The `@top` annotation captures any [implicit/given](https://docs.scala-lang.org/scala3/book/ca-context-parameters.html#given-instances-implicit-definitions-in-scala-2){target="_blank"} options within its scope and provides them as defaults when no CLI arguments are specified.
+The design captures any [implicit/given](https://docs.scala-lang.org/scala3/book/ca-context-parameters.html#given-instances-implicit-definitions-in-scala-2){target="_blank"} options within its scope and provides them as defaults when no CLI arguments are specified.
 
 /// tab | Generated Verilog
 ```verilog
@@ -230,14 +224,14 @@ The DFHDL design parameter block follows standard Scala syntax, accepting a comm
 * __`_name_`__ - The parameter name. For DFHDL parameters, this name is:
     - Preserved throughout compilation
     - Used in the generated backend code
-    - Available through the CLI for top-app designs
+    - Available through the CLI for top designs
 
-* __`_default_`__ - Optional default value. Required for all parameters in top-app designs. See [Design Parameter Default Value Rules][design-parameter-default-value-rules] for details.
+* __`_default_`__ - Optional default value.
 
 * __`_access_`__ - Optional [Scala access modifier](https://docs.scala-lang.org/scala3/book/domain-modeling-oop.html#access-modifiers){target="_blank"}. Usually `#!scala val` to make the parameter public. See [Design Parameter Access Rules][design-parameter-access-rules] for details.
 
 #### `LeftShiftBasic` example {#LeftShiftBasic}
-/// admonition | Scala-parameterized top-app design example: a basic left shifter
+/// admonition | Scala-parameterized top design example: a basic left shifter
     type: example
 The DFHDL code below implements a basic left shifter design named `LeftShiftBasic`. This design is similar to the earlier example of [`LeftShift2`][LeftShift2], except here the design has the shift value as an input, and its input and output port widths are set according to the Scala parameter `width`.
 
@@ -297,7 +291,7 @@ children = [
 The basic code shifter above did not generate the `width` parameter in the Verilog and VHDL backend code. The following example shows how to preserve the `width` parameter:
 
 #### `LeftShiftGen` example {#LeftShiftGen}
-/// admonition | DFHDL-parameterized top-app design example: a generic left shifter
+/// admonition | DFHDL-parameterized top design example: a generic left shifter
     type: example
 The DFHDL code below implements a generic left shifter design named `LeftShiftGen`. This design is similar to the earlier example of [`LeftShiftBasic`][LeftShiftBasic], except here the `width` parameter is now a DFHDL parameter, as indicated by its `Int <> CONST` type. This enables the DFHDL compiler to preserve the parameter name and directly use it in the generated backend code where applicable.
 
@@ -356,13 +350,13 @@ children = [
 
 #### Design Parameter Type Rules
 - Any pure Scala parameter or DFHDL parameter types are acceptable.
-- Top-app design parameters that can be modified from the CLI must be one of:
+- Top design parameters that can be modified from the CLI must be one of:
     - Pure Scala Types: `#!scala String`, `#!scala Boolean`, `#!scala Int`, and `#!scala Double`
-    - DFHDL Types: `#!scala Int <> CONST`, `#!scala Bit <> CONST`, and `#!scala Boolean <> CONST`
+    - DFHDL Types: `#!scala String <> CONST`, `#!scala Int <> CONST`, `#!scala Bit <> CONST`, and `#!scala Boolean <> CONST`, `#!scala Bits[W] <> CONST`, `#!scala UInt[W] <> CONST`, `#!scala SInt[W] <> CONST`, where `W` is a literal integer.
 
-/// admonition | Top-app design with accepted and ignored CLI arguments example
+/// admonition | Top design with accepted and ignored CLI arguments example
     type: example
-In this example, the top-app supported parameters `pureIntArg` and `dfhdlIntArg` are preserved to be modifiable from the CLI, while `ignored` and `dfhdlIgnored` keep their default values.
+In this example, the top supported parameters `pureIntArg` and `dfhdlIntArg` are preserved to be modifiable from the CLI, while `ignored` and `dfhdlIgnored` keep their default values.
 
 ```scala title="DFHDL code"
 import dfhdl.*
@@ -387,7 +381,7 @@ Usage: sbt runMain "top_Foo [design-args] <mode> [options]"
     type: dfhdl
 ```scastie
 import dfhdl.*
-//this option forces the top-app
+//this option forces the top application
 //to run help mode by default
 given options.AppOptions.AppMode = 
   options.AppOptions.AppMode.help
diff --git a/docs/user-guide/type-system/index.md b/docs/user-guide/type-system/index.md
index dddc3ce94..43cec862f 100755
--- a/docs/user-guide/type-system/index.md
+++ b/docs/user-guide/type-system/index.md
@@ -2486,10 +2486,10 @@ class Foo(
 
 /// details | Runnable example
     type: dfhdl
-```scastie
+```scastie main="main"
 import dfhdl.*
 
-@top(false) class Foo(
+class Foo(
     val arg: Boolean <> CONST
 ) extends DFDesign:
   val o = Bit <> OUT
diff --git a/lib/src/main/scala/dfhdl/lib/arith/constdiv/PrimeDiv.scala b/lib/src/main/scala/dfhdl/lib/arith/constdiv/PrimeDiv.scala
index 7f07b30b6..be342baed 100644
--- a/lib/src/main/scala/dfhdl/lib/arith/constdiv/PrimeDiv.scala
+++ b/lib/src/main/scala/dfhdl/lib/arith/constdiv/PrimeDiv.scala
@@ -18,7 +18,7 @@ class PrimeDiv(
   remainder.din := underflow.sel(primeDivisor, diff.resize(clog2(primeDivisor)))
 end PrimeDiv
 
-@top class PrimeDiv5 extends RTDesign:
+class PrimeDiv5 extends RTDesign:
   val dividend  = UInt(4) <> VAR.REG init 0
   val primeDiv5 = PrimeDiv(5)
   primeDiv5.dividend <> dividend