diff --git a/README.md b/README.md
index 4bd0528..cc66e3e 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [tinymist]: https://marketplace.visualstudio.com/items?itemName=myriad-dreamin.tinymist
 [latex-workshop]: https://marketplace.visualstudio.com/items?itemName=James-Yu.latex-workshop
 [CC BY-NC-SA 4.0]: https://creativecommons.org/licenses/by-nc-sa/4.0
-[betalupi.com/handouts]: https://static.betalupi.com/ormc
+[betalupi.com/handouts]: https://betalupi.com/handouts
 [ORMC]: https://circles.math.ucla.edu/circles/
 [Overleaf]: https://overleaf.com
 [Typst.app]: https://typst.app
@@ -26,7 +26,7 @@ By submitting or editing a handout in this repository, you agree to release it u
 
 ## 🛠️ Contributing
 
-If you want to use one of these handouts for a class, see [`betalupi.com/handouts`](https://betalupi.com/handouts). \
+If you want to use one of these handouts for a class, see [betalupi.com/handouts]. \
 You only need to read this section if you want to edit these handouts.
 
 ### Setup
@@ -56,7 +56,7 @@ This repository is organized as follows:
 -   [`./tools`](./tools) contains build scripts, [`./.github`](./.github) configures automation. \
     You can ignore everything in these directories.
 
-All handouts in this repository are based on `ormc_handout.cls` or `handout@0.1.0`.
+All handouts in this repository are based on `handout.cls` or `handout@0.1.0`.
 
 -   If you're using Typst (preferred), read [`docs-typst.md`](./docs-typst.md)
 -   If you're still using LaTeX, read [`docs-latex.md`](./docs-latex.md).
@@ -95,8 +95,8 @@ _(I do not recommend this. The default toolchain makes it easier to share improv
 ### For LaTeX:
 
 1. Get the handout's directory (i.e, download the whole repo as a zip and extract the folder you want.)
-2. Download [`./resources/ormc_handout.cls`](./resources/ormc_handout.cls)
-3. Put this `ormc_handout.cls` in the same directory as the handout.
+2. Download [`./resources/handout.cls`](./resources/handout.cls)
+3. Put this `handout.cls` in the same directory as the handout.
 4. Fix the include path at the top of `main.tex`:
 
 You'll need to replace
@@ -104,7 +104,7 @@ You'll need to replace
 ```latex
 \documentclass[
 	...
-]{../../../lib/tex/ormc_handout}
+]{../../../lib/tex/handout}
 ```
 
 with
@@ -112,11 +112,11 @@ with
 ```latex
 \documentclass[
 	...
-]{ormc_handout}
+]{handout}
 ```
 
 5. Make a new overleaf project with the resulting directory.
-6. **Do not use pdflatex**, it misbehaves with `ormc_handout`. Tell Overleaf to use XeLaTeX.
+6. **Do not use pdflatex**, it misbehaves with `handout`. Tell Overleaf to use XeLaTeX.
 
 ### For Typst:
 
@@ -124,5 +124,5 @@ Out-of-band typst compilation isn't supported. Clone the repository and use vsco
 This is because typst can't import packages from a relative path.
 
 If you _really_ want it, standalone typst compilation _is_ possible. \
-Follow the LaTeX instructions, but fix `handout@0.1.0` instead of `ormc_handout`. \
+Follow the LaTeX instructions, but fix `handout@0.1.0` instead of `handout`. \
 You'll figure it out.
diff --git a/docs-latex.md b/docs-latex.md
index c713def..024ee3a 100644
--- a/docs-latex.md
+++ b/docs-latex.md
@@ -1,23 +1,25 @@
 # LaTeX documentation
 
-All LaTeX handouts are based on [`ormc_handout.cls`](./lib/tex/ormc_handout.cls). \
+All LaTeX handouts are based on [`handout.cls`](./lib/tex/handout.cls). \
 This class is based on `article.cls`, and should work with most LaTeX packages.
 
 The best way to start a new document is to make a copy of an existing one.
-- [Advanced/Cryptography](./src/Advanced/Cryptography) is a good example of a simple handout.
-- [Advanced/DFAs](./src/Advanced/DFAs) is a good example of a handout with graphs.
-- [Advanced/Geometric Optimization](./src/Advanced/Geometric%20Optimization) is a good example of a handout with geometry.
 
+-   [Advanced/Cryptography](./src/Advanced/Cryptography) is a good example of a simple handout.
+-   [Advanced/DFAs](./src/Advanced/DFAs) is a good example of a handout with graphs.
+-   [Advanced/Geometric Optimization](./src/Advanced/Geometric%20Optimization) is a good example of a handout with geometry.
 
 ## Notes
-- Compile your handouts with XeLaTeX. \
-  `pdflatex` is known to misbehave with `ormc_handout.cls`. \
-  This will happen by default if you use vscode. \
-  If you use Overleaf, you'll have to configure it manually (see document settings).
+
+-   Compile your handouts with XeLaTeX. \
+    `pdflatex` is known to misbehave with `handout.cls`. \
+    This will happen by default if you use vscode. \
+    If you use Overleaf, you'll have to configure it manually (see document settings).
 
 ## Document Options
 
 Document options are passed to `\documentclass`, as follows:
+
 ```latex
 \documentclass[
 	% Show solutions is `solutions` is provided,
@@ -37,49 +39,52 @@ Document options are passed to `\documentclass`, as follows:
 	% This should only be used for single-page handouts
 	% (e.g, warm-ups)
 	nopagenumber
-]{ormc_handout}
+]{handout}
 ```
 
 Use `geometry` to change margins and page dimensions. US letter is the default.
 
-
 ## Utilities
-- `\say{text}`: Puts text in quotes, handling details like period spacing. Courtesy of `dirtytalk`.
-- `\note[Type]{text}`: Makes a note.
-- `\hint{text}`: Shorthand for `\note[Hint]{text}`
+
+-   `\say{text}`: Puts text in quotes, handling details like period spacing. Courtesy of `dirtytalk`.
+-   `\note[Type]{text}`: Makes a note.
+-   `\hint{text}`: Shorthand for `\note[Hint]{text}`
 
 ## Sections
 
-The usual LaTeX title-customization techniques *WILL NOT WORK* with this class. \
+The usual LaTeX title-customization techniques _WILL NOT WORK_ with this class. \
 Don't even try to load `titlesec`.
 
-`ormc_handout.cls` supports two levels of sections:
-- `\section`, for large parts of the handout
-- `\definition`, `\theorem`, `\proposition`, `\example`, `\remark`, `\problem`, and `\problempart`
+`handout.cls` supports two levels of sections:
+
+-   `\section`, for large parts of the handout
+-   `\definition`, `\theorem`, `\proposition`, `\example`, `\remark`, `\problem`, and `\problempart`
 
 All these macros have the following syntax: `\problem{title}<label>`
-- `title` is the problem's title, and may be empty.
-- `label` is the problem's label. This is optional. \
-  If a label is provided, this section may be referenced with `\ref{label}`.
+
+-   `title` is the problem's title, and may be empty.
+-   `label` is the problem's label. This is optional. \
+    If a label is provided, this section may be referenced with `\ref{label}`.
 
 Examples:
-- `\problem{}`
-- `\problem{Bonus}`
-- `\problem{}<gcd>`, which may be referenced with `\ref{gcd}`
+
+-   `\problem{}`
+-   `\problem{Bonus}`
+-   `\problem{}<gcd>`, which may be referenced with `\ref{gcd}`
 
 Do **not** use `\begin{problem} ... \end{problem}`. \
 Sections are macros, not environments.
 
 ## Environments:
 
-- `\begin{solution}`: A fancy red for solutions to problems. \
-	This is hidden if the `nosolutions` is provided.
-- `\begin{instrutornote}`: A fancy blue box for instructor notes. \
-	This is hidden if the `nosolutions` is provided.
-- `\begin{examplesolution}`: A fancy gray for sample solutions. \
-	This is never hidden.
+-   `\begin{solution}`: A fancy red for solutions to problems. \
+    This is hidden if the `nosolutions` is provided.
+-   `\begin{instrutornote}`: A fancy blue box for instructor notes. \
+    This is hidden if the `nosolutions` is provided.
+-   `\begin{examplesolution}`: A fancy gray for sample solutions. \
+    This is never hidden.
 
 All the above environments break across pages and may safely be nested.
 
 Each of these environments also provides the `\linehack` macro, which draws a line across the box. \
-This is useful for, say, solutions to multipart problems.
\ No newline at end of file
+This is useful for, say, solutions to multipart problems.
diff --git a/docs-typst.md b/docs-typst.md
index 4dc6a61..304bdab 100644
--- a/docs-typst.md
+++ b/docs-typst.md
@@ -4,23 +4,27 @@ See [typst.app/docs](https://typst.app/docs) for typst's documentation. \
 All typst handouts are based on [`handout@0.1.0`](./lib/typst/local/handout/0.1.0).
 
 The best way to start a new document is to make a copy of an existing one.
-- [Advanced/Tropical Polynomials](./src/Advanced/Tropical%20Polynomials) is a good place to start.
-- [Warm-Ups/Painting](./src/Warm-Ups/Painting) is a good example of tikz-like pictures.
 
+-   [Advanced/Tropical Polynomials](./src/Advanced/Tropical%20Polynomials) is a good place to start.
+-   [Warm-Ups/Painting](./src/Warm-Ups/Painting) is a good example of tikz-like pictures.
 
 ## Notes
-- Typst's equivalent of tikz is cetz ([homepage](https://cetz-package.github.io), [docs](https://cetz-package.github.io/docs/api))
-- Typst handouts are always compiled with solutions. \
-  Handouts without solutions are automatically compiled and published at [betalupi.com/handouts](https://static.betalupi.com/ormc). \
-  If you'd like to compile a student handout manually, run the following command in a handout directory:
+
+-   Typst's equivalent of tikz is cetz ([homepage](https://cetz-package.github.io), [docs](https://cetz-package.github.io/docs/api))
+-   Typst handouts are always compiled with solutions. \
+    Handouts without solutions are automatically compiled and published at [betalupi.com/handouts](https://betalupi.com/handouts). \
+    If you'd like to compile a student handout manually, run the following command in a handout directory:
+
 ```bash
 typst compile main.typ --package-path ../../../lib/typst --input show_solutions=false
 ```
+
 Where `package_path` is a relative path to [./lib/typst](./lib/typst).
 
 ## Document Options
 
 All typst handouts start with the following:
+
 ```typst
 #show: handout.with(
   // Should match `meta.toml`
@@ -38,39 +42,44 @@ All typst handouts start with the following:
 ```
 
 ## Notable commands
-- `#v(1fr)`: Like LaTeX's `\vfill`. Creates whitespace that grows automatically. \
-  `fr` means "fraction". `#v(2fr)` will fill twice as much space as `#v(1fr)` on the same page.
+
+-   `#v(1fr)`: Like LaTeX's `\vfill`. Creates whitespace that grows automatically. \
+    `fr` means "fraction". `#v(2fr)` will fill twice as much space as `#v(1fr)` on the same page.
 
 ## Utilities
-- `#note([content], type: "Note type")`: Makes a note. `type` is optional.
-- `#hint([content])`: Shorthand for `#note([content], type: "Hint")`
-- `#solution([content])`: A pretty box for solutions. Hidden in student handouts.
-- `#examplesolution([content])`: Like `#solution()`, but is never hidden.
-- `#if_solutions([content])`: Shows content only if we are showing solutions.
-- `#if_no_solutions([content])`: Shows content only if we **aren't** showing solutions.
+
+-   `#note([content], type: "Note type")`: Makes a note. `type` is optional.
+-   `#hint([content])`: Shorthand for `#note([content], type: "Hint")`
+-   `#solution([content])`: A pretty box for solutions. Hidden in student handouts.
+-   `#examplesolution([content])`: Like `#solution()`, but is never hidden.
+-   `#if_solutions([content])`: Shows content only if we are showing solutions.
+-   `#if_no_solutions([content])`: Shows content only if we **aren't** showing solutions.
 
 ## Sections
+
 High-level sections are denoted with `=`. \
 Subsections start with `==`, subsubsections with `===`, and so on. \
 **`handout@0.1.0` is only designed to use `=`, subsections might be ugly.**
 
-
 `handout@0.1.0` also provides the following commands:
-- `problem`
-- `definition`
-- `theorem`
-- `example`
-- `remark`
+
+-   `problem`
+-   `definition`
+-   `theorem`
+-   `example`
+-   `remark`
 
 These all have the same syntax: `#problem("title", label: "label")`
-- `title` is the problem's title, and may be omitted.
-- `label` is the problem's label. This is optional. \
-  If a label is provided, this problem can be referenced with `@label`
+
+-   `title` is the problem's title, and may be omitted.
+-   `label` is the problem's label. This is optional. \
+    If a label is provided, this problem can be referenced with `@label`
 
 **Examples:**
-- `#problem()`
-- `#problem("Bonus")`
-- `#problem(label: "gcd")`, which may be referenced with `@gcd`
+
+-   `#problem()`
+-   `#problem("Bonus")`
+-   `#problem(label: "gcd")`, which may be referenced with `@gcd`
 
 ### Complete example:
 
@@ -91,4 +100,4 @@ Consider the polynomial $f(x) = x^3 + 1x^2 + 3x + 6$.
 #problem()
 Recall @imaproblem.
 - use this graph to find the roots of $f$
-```
\ No newline at end of file
+```
diff --git a/lib/tex/ormc_handout.cls b/lib/tex/handout.cls
similarity index 97%
rename from lib/tex/ormc_handout.cls
rename to lib/tex/handout.cls
index 832a81b..44c79a8 100755
--- a/lib/tex/ormc_handout.cls
+++ b/lib/tex/handout.cls
@@ -1,5 +1,5 @@
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{../../../lib/tex/ormc_handout}[2023/05/29 2.0.2 ORMC Handout]
+\ProvidesClass{../../../lib/tex/handout}[2025/03/02 2.0.2 Mark's handout class]
 
 
 
@@ -13,7 +13,7 @@
 \@twocolumnfalse
 \@twosidefalse
 \@mparswitchfalse
-% ORMC-specific
+% Handout-specific
 \newif{\if@solutions} % If false, solutions and instructor notes are hidden.
 \newif{\if@singlenumbering} % If true, the same counter is used for all objects.
 \newif{\if@nopagenumber} % If true, don't number pages.
@@ -25,7 +25,7 @@
 \DeclareOption{10pt}{\renewcommand\@ptsize{0}}
 \DeclareOption{11pt}{\renewcommand\@ptsize{1}}
 \DeclareOption{12pt}{\renewcommand\@ptsize{2}}
-% ORMC-specific options
+% Handout-specific options
 \DeclareOption{solutions}{\@solutionstrue}
 \DeclareOption{nosolutions}{\@solutionsfalse}
 \DeclareOption{multinumbering}{\@singlenumberingfalse}
@@ -37,7 +37,7 @@
 \DeclareOption{showwarning}{\@nowarningfalse}
 \DeclareOption{hidewarning}{\@nowarningtrue}
 \DeclareOption{unfinished}{\@unfinishedtrue}
-\DeclareOption*{\ClassWarning{ormc_handout}{\CurrentOption ignored}}
+\DeclareOption*{\ClassWarning{handout}{\CurrentOption ignored}}
 
 \@unfinishedfalse
 \ExecuteOptions{
@@ -629,12 +629,12 @@
 
 % Keep track of the current background color.
 % Useful for transparent tikz drawings.
-\def\ORMCbgcolor{white}
+\def\bgcolor{white}
 
 % Make a box environment.
 % These can safely be nested.
 % Args: title, back color, frame color.
-\newenvironment{ORMCbox}[3]{
+\newenvironment{hobox}[3]{
 	% \linehack draws a line across a tcolorbox.
 	% tcolorbox only supports two sections, but
 	% this hack allows us to have more.
@@ -653,7 +653,7 @@
 
 	% Keep track of the current background color.
 	% Useful for transparent tikz drawings.
-	\def\ORMCbgcolor{#2}
+	\def\bgcolor{#2}
 
 	\begin{tcolorbox}[
 		enhanced,
@@ -675,21 +675,21 @@
 }
 
 \newenvironment{examplesolution}{
-	\begin{ORMCbox}{Example Solution}{black!10!white}{black!65!white}
+	\begin{hobox}{Example Solution}{black!10!white}{black!65!white}
 } {
-	\end{ORMCbox}
+	\end{hobox}
 }
 
 \if@solutions
 	\newenvironment{solution}{
-		\begin{ORMCbox}{Solution}{ored!10!white}{ored}
+		\begin{hobox}{Solution}{ored!10!white}{ored}
 	} {
-		\end{ORMCbox}
+		\end{hobox}
 	}
 	\newenvironment{instructornote}{
-		\begin{ORMCbox}{Note for Instructors}{ocyan!10!white}{ocyan}
+		\begin{hobox}{Note for Instructors}{ocyan!10!white}{ocyan}
 	} {
-		\end{ORMCbox}
+		\end{hobox}
 	}
 \else
 	\excludecomment{solution}
diff --git a/lib/tex/macros.sty b/lib/tex/macros.sty
index f9a6497..69788f6 100644
--- a/lib/tex/macros.sty
+++ b/lib/tex/macros.sty
@@ -1,5 +1,5 @@
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{../../../lib/tex/macros}[2023/10/16 ORMC Macros]
+\ProvidesPackage{../../../lib/tex/macros}[2025/03/02 Handout macros]
 
 \RequirePackage{hyperref}
 \RequirePackage{pgf}
diff --git a/lib/typst/local/handout/0.1.0/lib.typ b/lib/typst/local/handout/0.1.0/lib.typ
index 43e503e..308d95f 100755
--- a/lib/typst/local/handout/0.1.0/lib.typ
+++ b/lib/typst/local/handout/0.1.0/lib.typ
@@ -48,19 +48,28 @@
   // Text style
   set text(font: "New Computer Modern")
   set par(
-    leading: 0.55em,
-    first-line-indent: 0mm,
-    justify: true,
+    leading: 0.5em,
     spacing: 0.5em,
+
+    first-line-indent: 0mm,
+    hanging-indent: 0mm,
+    justify: true,
   )
 
   //
   // List style
-  show list: set block(spacing: 0.5em, below: 1em)
   set list(
-    tight: false,
-    indent: 5mm,
-    spacing: 3mm,
+    indent: 4mm,
+    body-indent: 1.5mm,
+
+    // Manually set spacing,
+    // `tight` has no effect.
+    spacing: 2mm,
+  )
+  set enum(
+    indent: 4mm,
+    body-indent: 1.5mm,
+    spacing: 2mm,
   )
 
   //
@@ -93,7 +102,9 @@
   // Make handout title
   {
     import "header.typ": make_header, solution_warning
-    import "solution.typ": show_solutions
+    import "solution.typ": solutions_state, reset_solutions
+
+    reset_solutions()
 
     let url = link(
       "https://betalupi.com/handouts",
@@ -108,8 +119,10 @@
       top_right: url,
     )
 
-    if show_solutions {
-      solution_warning()
+    context {
+      if solutions_state.get() {
+        solution_warning()
+      }
     }
   }
 
diff --git a/lib/typst/local/handout/0.1.0/solution.typ b/lib/typst/local/handout/0.1.0/solution.typ
index 2af06c2..97c3f75 100755
--- a/lib/typst/local/handout/0.1.0/solution.typ
+++ b/lib/typst/local/handout/0.1.0/solution.typ
@@ -1,34 +1,63 @@
 #import "misc.typ": ored, oblue
 
+
 /// If false, hide instructor info.
-///
-/// Compile with the following command to hide solutions:
-/// `typst compile main.typ --input show_solutions=false`
+/// If true, show it.
 ///
 /// Solutions are shown by default. This behavior
 /// is less surprising than hiding content by default.
-#let show_solutions = {
+#let solutions_state = state("solutions_state", true)
+
+/// Force solutions to be hidden after this point.
+///
+/// This function produces content that must be
+/// included in the document. If it is not included,
+/// this function will have no effect.
+#let hide_solutions() = {
+  return solutions_state.update(x => false)
+}
+
+/// Force solutions to be shown after this point.
+///
+/// This function produces content that must be
+/// included in the document. If it is not included,
+/// this function will have no effect.
+#let show_solutions() = {
+  return solutions_state.update(x => true)
+}
+
+
+
+/// Reset the solution flag to its default value.
+/// This value is determined by compile flags:
+/// Compile with the following command to hide solutions:
+/// `typst compile main.typ --input show_solutions=false`
+///
+/// Solutions are shown by default.
+///
+/// This function produces content that must be
+/// included in the document. If it is not included,
+/// this function will have no effect.
+#let reset_solutions() = {
   if "show_solutions" in sys.inputs {
-    // Show solutions unless they're explicitly disabled
-    not (
+    if (
       sys.inputs.show_solutions == "false" or sys.inputs.show_solutions == "no"
-    )
-  } else {
-    // Show solutions by default
-    true
+    ) {
+      return solutions_state.update(x => false)
+    }
   }
 }
 
-#let if_solutions(content) = {
-  if show_solutions { content }
+#let if_solutions(content) = context {
+  if solutions_state.get() { content }
 }
 
-#let if_no_solutions(content) = {
-  if not show_solutions { content }
+#let if_no_solutions(content) = context {
+  if not solutions_state.get() { content }
 }
 
-#let if_solutions_else(if_yes, if_no) = {
-  if show_solutions { if_yes } else { if_no }
+#let if_solutions_else(if_yes, if_no) = context {
+  if solutions_state.get() { if_yes } else { if_no }
 }
 
 #let solution(content) = {
diff --git a/src/Advanced/Compression/main.tex b/src/Advanced/Compression/main.tex
index d3d8bd9..e02f0a4 100755
--- a/src/Advanced/Compression/main.tex
+++ b/src/Advanced/Compression/main.tex
@@ -3,7 +3,7 @@
 \documentclass[
 	solutions,
 	singlenumbering
-]{../../../lib/tex/ormc_handout}
+]{../../../lib/tex/handout}
 \usepackage{../../../lib/tex/macros}
 
 \input{tikzset.tex}
diff --git a/src/Advanced/Compression/tikzset.tex b/src/Advanced/Compression/tikzset.tex
index b2aa528..2f6beff 100644
--- a/src/Advanced/Compression/tikzset.tex
+++ b/src/Advanced/Compression/tikzset.tex
@@ -24,7 +24,7 @@
 	label/.style = {
 		rectangle,
 		% For automatic red background in solutions
-		fill = \ORMCbgcolor,
+		fill = \bgcolor,
 		draw = none,
 		rounded corners = 0mm
 	},
@@ -32,7 +32,7 @@
 	% Nodes
 	edg/.style = {
 		midway,
-		fill = \ORMCbgcolor,
+		fill = \bgcolor,
 		text = gray
 	},
 	int/.style = {},
diff --git a/src/Advanced/Continued Fractions/main.tex b/src/Advanced/Continued Fractions/main.tex
index 2002cd1..a4a6456 100755
--- a/src/Advanced/Continued Fractions/main.tex	
+++ b/src/Advanced/Continued Fractions/main.tex	
@@ -5,7 +5,7 @@
 	shortwarning,
 	singlenumbering,
 	unfinished
-]{../../../lib/tex/ormc_handout}
+]{../../../lib/tex/handout}
 \usepackage{../../../lib/tex/macros}
 
 \usepackage{multicol}
diff --git a/src/Advanced/Cryptography/main.tex b/src/Advanced/Cryptography/main.tex
index 3a59153..2037c3c 100755
--- a/src/Advanced/Cryptography/main.tex
+++ b/src/Advanced/Cryptography/main.tex
@@ -4,7 +4,7 @@
 	solutions,
 	singlenumbering,
 	shortwarning
-]{../../../lib/tex/ormc_handout}
+]{../../../lib/tex/handout}
 \usepackage{../../../lib/tex/macros}
 
 \usepackage{multicol}
diff --git a/src/Advanced/DFAs/main.tex b/src/Advanced/DFAs/main.tex
index 8a75b06..44414e1 100755
--- a/src/Advanced/DFAs/main.tex
+++ b/src/Advanced/DFAs/main.tex
@@ -3,7 +3,7 @@
 \documentclass[
 	solutions,
 	singlenumbering
-]{../../../lib/tex/ormc_handout}
+]{../../../lib/tex/handout}
 \usepackage{../../../lib/tex/macros}
 
 \input{tikzset.tex}
diff --git a/src/Advanced/DFAs/tikzset.tex b/src/Advanced/DFAs/tikzset.tex
index 911338c..d189ee5 100644
--- a/src/Advanced/DFAs/tikzset.tex
+++ b/src/Advanced/DFAs/tikzset.tex
@@ -24,7 +24,7 @@
 	label/.style = {
 		rectangle,
 		% For automatic red background in solutions
-		fill = \ORMCbgcolor,
+		fill = \bgcolor,
 		draw = none,
 		rounded corners = 0mm
 	},
diff --git a/src/Advanced/De Bruijn/main.tex b/src/Advanced/De Bruijn/main.tex
index 4dff0e9..de1b98f 100755
--- a/src/Advanced/De Bruijn/main.tex	
+++ b/src/Advanced/De Bruijn/main.tex	
@@ -3,7 +3,7 @@
 \documentclass[
 	solutions,
 	singlenumbering
-]{../../../lib/tex/ormc_handout}
+]{../../../lib/tex/handout}
 \usepackage{../../../lib/tex/macros}
 
 \input{tikzset.tex}
diff --git a/src/Advanced/De Bruijn/tikzset.tex b/src/Advanced/De Bruijn/tikzset.tex
index d83fa32..fbfa93e 100644
--- a/src/Advanced/De Bruijn/tikzset.tex	
+++ b/src/Advanced/De Bruijn/tikzset.tex	
@@ -24,7 +24,7 @@
 	label/.style = {
 		rectangle,
 		% For automatic red background in solutions
-		fill = \ORMCbgcolor,
+		fill = \bgcolor,
 		draw = none,
 		rounded corners = 0mm
 	},
diff --git a/src/Advanced/Definable Sets/main.tex b/src/Advanced/Definable Sets/main.tex
index 7ba8c33..2d7f09a 100755
--- a/src/Advanced/Definable Sets/main.tex	
+++ b/src/Advanced/Definable Sets/main.tex	
@@ -3,7 +3,7 @@
 \documentclass[
 	solutions,
 	singlenumbering
-]{../../../lib/tex/ormc_handout}
+]{../../../lib/tex/handout}
 \usepackage{../../../lib/tex/macros}
 
 
diff --git a/src/Advanced/Error-Correcting Codes/main.tex b/src/Advanced/Error-Correcting Codes/main.tex
index 741fb89..2628c82 100755
--- a/src/Advanced/Error-Correcting Codes/main.tex	
+++ b/src/Advanced/Error-Correcting Codes/main.tex	
@@ -3,7 +3,7 @@
 \documentclass[
 	solutions,
 	singlenumbering
-]{../../../lib/tex/ormc_handout}
+]{../../../lib/tex/handout}
 \usepackage{../../../lib/tex/macros}
 
 
diff --git a/src/Advanced/Esoteric Languages/main.tex b/src/Advanced/Esoteric Languages/main.tex
index 0fa8748..c2e016c 100755
--- a/src/Advanced/Esoteric Languages/main.tex	
+++ b/src/Advanced/Esoteric Languages/main.tex	
@@ -3,7 +3,7 @@
 \documentclass[
 	nosolutions,
 	singlenumbering
-]{../../../lib/tex/ormc_handout}
+]{../../../lib/tex/handout}
 \usepackage{../../../lib/tex/macros}
 
 
diff --git a/src/Advanced/Estimathon/main.tex b/src/Advanced/Estimathon/main.tex
index a8682c7..fd11995 100755
--- a/src/Advanced/Estimathon/main.tex
+++ b/src/Advanced/Estimathon/main.tex
@@ -4,7 +4,7 @@
 	solutions,
 	singlenumbering,
 	nopagenumber
-]{../../../lib/tex/ormc_handout}
+]{../../../lib/tex/handout}
 \usepackage{../../../lib/tex/macros}
 
 \uptitlel{Advanced 2}
diff --git a/src/Advanced/Generating Functions/main.tex b/src/Advanced/Generating Functions/main.tex
index 49a940d..a670fd7 100755
--- a/src/Advanced/Generating Functions/main.tex	
+++ b/src/Advanced/Generating Functions/main.tex	
@@ -3,7 +3,7 @@
 \documentclass[
 	solutions,
 	singlenumbering
-]{../../../lib/tex/ormc_handout}
+]{../../../lib/tex/handout}
 \usepackage{../../../lib/tex/macros}
 
 
diff --git a/src/Advanced/Geometric Optimization/main.tex b/src/Advanced/Geometric Optimization/main.tex
index 8876c3c..dad9850 100755
--- a/src/Advanced/Geometric Optimization/main.tex	
+++ b/src/Advanced/Geometric Optimization/main.tex	
@@ -2,7 +2,7 @@
 % use [solutions] flag to show solutions.
 \documentclass[
 	solutions
-]{../../../lib/tex/ormc_handout}
+]{../../../lib/tex/handout}
 \usepackage{../../../lib/tex/macros}
 
 \uptitlel{Advanced 2}
diff --git a/src/Advanced/Geometry of Masses/main.tex b/src/Advanced/Geometry of Masses/main.tex
index 5971604..7d65025 100755
--- a/src/Advanced/Geometry of Masses/main.tex	
+++ b/src/Advanced/Geometry of Masses/main.tex	
@@ -4,7 +4,7 @@
 	solutions,
 	singlenumbering,
 	shortwarning
-]{../../../lib/tex/ormc_handout}
+]{../../../lib/tex/handout}
 \usepackage{../../../lib/tex/macros}
 
 \usepackage{tikz}
diff --git a/src/Advanced/Graph Algorithms/main.tex b/src/Advanced/Graph Algorithms/main.tex
index 8c80ccb..fe383ce 100755
--- a/src/Advanced/Graph Algorithms/main.tex	
+++ b/src/Advanced/Graph Algorithms/main.tex	
@@ -2,7 +2,7 @@
 % use [solutions] flag to show solutions.
 \documentclass[
 	solutions
-]{../../../lib/tex/ormc_handout}
+]{../../../lib/tex/handout}
 \usepackage{../../../lib/tex/macros}
 
 \input{tikxset}
diff --git a/src/Advanced/Graph Algorithms/tikxset.tex b/src/Advanced/Graph Algorithms/tikxset.tex
index 4991f1d..fc23aa8 100644
--- a/src/Advanced/Graph Algorithms/tikxset.tex	
+++ b/src/Advanced/Graph Algorithms/tikxset.tex	
@@ -22,7 +22,7 @@
 	label/.style = {
 		circle,
 		% For automatic red background in solutions
-		fill = \ORMCbgcolor,
+		fill = \bgcolor,
 		draw = none
 	},
 	%
diff --git a/src/Advanced/Intro to Proofs/main.tex b/src/Advanced/Intro to Proofs/main.tex
index 0519d7f..d8e1a39 100755
--- a/src/Advanced/Intro to Proofs/main.tex	
+++ b/src/Advanced/Intro to Proofs/main.tex	
@@ -3,7 +3,7 @@
 \documentclass[
 	nosolutions,
 	singlenumbering
-]{../../../lib/tex/ormc_handout}
+]{../../../lib/tex/handout}
 \usepackage{../../../lib/tex/macros}
 
 
diff --git a/src/Advanced/Introduction to Quantum/main.tex b/src/Advanced/Introduction to Quantum/main.tex
index 34a3cd3..5dceef8 100755
--- a/src/Advanced/Introduction to Quantum/main.tex	
+++ b/src/Advanced/Introduction to Quantum/main.tex	
@@ -1,7 +1,7 @@
 \documentclass[
 	solutions,
 	singlenumbering
-]{../../../lib/tex/ormc_handout}
+]{../../../lib/tex/handout}
 \usepackage{../../../lib/tex/macros}
 \usepackage{units}
 \input{src/tikzset}
diff --git a/src/Advanced/Introduction to Quantum/src/main.tex b/src/Advanced/Introduction to Quantum/src/main.tex
index d8ddfab..65bd5bf 100755
--- a/src/Advanced/Introduction to Quantum/src/main.tex	
+++ b/src/Advanced/Introduction to Quantum/src/main.tex	
@@ -3,7 +3,7 @@
 \documentclass[
 	solutions,
 	singlenumbering
-]{../../../../lib/tex/ormc_handout}
+]{../../../../lib/tex/handout}
 \usepackage{../../../../lib/tex/macros}
 \usepackage{units}
 \input{tikzset}
diff --git a/src/Advanced/Introduction to Quantum/src/parts/01 bits.tex b/src/Advanced/Introduction to Quantum/src/parts/01 bits.tex
index 6a98c52..c9857b9 100644
--- a/src/Advanced/Introduction to Quantum/src/parts/01 bits.tex	
+++ b/src/Advanced/Introduction to Quantum/src/parts/01 bits.tex	
@@ -462,7 +462,7 @@ Thus,
 \end{equation*}
 
 
-\begin{ORMCbox}{Review: Multiplying Vectors by Matrices}{black!10!white}{black!65!white}
+\begin{hobox}{Review: Multiplying Vectors by Matrices}{black!10!white}{black!65!white}
 	\begin{equation*}
 		Av =
 		\begin{bmatrix}
@@ -480,7 +480,7 @@ Thus,
 	\end{equation*}
 
 	Note that each element of $Av$ is the dot product of a row in $A$ and a column in $v$.
-\end{ORMCbox}
+\end{hobox}
 
 \problem{}
 Compute the following product:
diff --git a/src/Advanced/Introduction to Quantum/src/parts/05 quantum gates.tex b/src/Advanced/Introduction to Quantum/src/parts/05 quantum gates.tex
index ba68291..c4b1dad 100644
--- a/src/Advanced/Introduction to Quantum/src/parts/05 quantum gates.tex	
+++ b/src/Advanced/Introduction to Quantum/src/parts/05 quantum gates.tex	
@@ -154,7 +154,7 @@ The \textit{Hadamard Gate} is given by the following matrix: \par
 \end{equation*}
 \note{Note that we divide by $\sqrt{2}$, since $H$ must be orthonormal.}
 
-\begin{ORMCbox}{Review: Matrix Multiplication}{black!10!white}{black!65!white}
+\begin{hobox}{Review: Matrix Multiplication}{black!10!white}{black!65!white}
 	Matrix multiplication works as follows:
 
 	\begin{equation*}
@@ -196,7 +196,7 @@ The \textit{Hadamard Gate} is given by the following matrix: \par
 
 	This is exactly the first column of the matrix product. \par
 	Also, note that each element of $Ac_0$ is the dot product of a row in $A$ and a column in $c_0$.
-\end{ORMCbox}
+\end{hobox}
 
 
 \problem{}
diff --git a/src/Advanced/Introduction to Quantum/src/tikzset.tex b/src/Advanced/Introduction to Quantum/src/tikzset.tex
index 23a052c..575e051 100644
--- a/src/Advanced/Introduction to Quantum/src/tikzset.tex	
+++ b/src/Advanced/Introduction to Quantum/src/tikzset.tex	
@@ -13,7 +13,7 @@
 		line width = 0.35mm
 	},
 	qubit/.style = {
-		fill = \ORMCbgcolor,
+		fill = \bgcolor,
 		line width = 0.35mm
 	},
 	wire/.style = {
diff --git a/src/Advanced/Lambda Calculus/main.tex b/src/Advanced/Lambda Calculus/main.tex
index 6703558..0532b25 100755
--- a/src/Advanced/Lambda Calculus/main.tex	
+++ b/src/Advanced/Lambda Calculus/main.tex	
@@ -3,7 +3,7 @@
 \documentclass[
 	solutions,
 	singlenumbering
-]{../../../lib/tex/ormc_handout}
+]{../../../lib/tex/handout}
 \usepackage{../../../lib/tex/macros}
 
 
diff --git a/src/Advanced/Lattices/main.tex b/src/Advanced/Lattices/main.tex
index c8d93e4..2761ea7 100755
--- a/src/Advanced/Lattices/main.tex
+++ b/src/Advanced/Lattices/main.tex
@@ -3,7 +3,7 @@
 \documentclass[
 	solutions,
 	singlenumbering
-]{../../../lib/tex/ormc_handout}
+]{../../../lib/tex/handout}
 \usepackage{../../../lib/tex/macros}
 
 \usepackage{ifthen}
diff --git a/src/Advanced/Mock a Mockingbird/main.tex b/src/Advanced/Mock a Mockingbird/main.tex
index f772d2a..1904d20 100755
--- a/src/Advanced/Mock a Mockingbird/main.tex	
+++ b/src/Advanced/Mock a Mockingbird/main.tex	
@@ -3,7 +3,7 @@
 \documentclass[
 	solutions,
 	singlenumbering
-]{../../../lib/tex/ormc_handout}
+]{../../../lib/tex/handout}
 \usepackage{../../../lib/tex/macros}
 
 
diff --git a/src/Advanced/Nonstandard Analysis/main.tex b/src/Advanced/Nonstandard Analysis/main.tex
index 4daa657..fdd5cb3 100755
--- a/src/Advanced/Nonstandard Analysis/main.tex	
+++ b/src/Advanced/Nonstandard Analysis/main.tex	
@@ -3,7 +3,7 @@
 \documentclass[
 	nosolutions,
 	singlenumbering,
-]{../../../lib/tex/ormc_handout}
+]{../../../lib/tex/handout}
 \usepackage{../../../lib/tex/macros}
 \usepackage{units}
 
diff --git a/src/Advanced/Origami/main.tex b/src/Advanced/Origami/main.tex
index 40d925b..b9d0ac0 100755
--- a/src/Advanced/Origami/main.tex
+++ b/src/Advanced/Origami/main.tex
@@ -3,7 +3,7 @@
 \documentclass[
 	solutions,
 	%shortwarning
-]{../../../lib/tex/ormc_handout}
+]{../../../lib/tex/handout}
 \usepackage{../../../lib/tex/macros}
 
 \graphicspath{ {./images/} }
diff --git a/src/Advanced/Pidgeonhole Problems/main.tex b/src/Advanced/Pidgeonhole Problems/main.tex
index a7069d1..a7ce452 100755
--- a/src/Advanced/Pidgeonhole Problems/main.tex	
+++ b/src/Advanced/Pidgeonhole Problems/main.tex	
@@ -2,7 +2,7 @@
 % use [solutions] flag to show solutions.
 \documentclass[
 	solutions
-]{../../../lib/tex/ormc_handout}
+]{../../../lib/tex/handout}
 \usepackage{../../../lib/tex/macros}
 
 \usepackage{amsmath}
diff --git a/src/Advanced/Random Walks/main.tex b/src/Advanced/Random Walks/main.tex
index 1c03ca6..6f84c56 100755
--- a/src/Advanced/Random Walks/main.tex	
+++ b/src/Advanced/Random Walks/main.tex	
@@ -3,7 +3,7 @@
 \documentclass[
 	solutions,
 	singlenumbering
-]{../../../lib/tex/ormc_handout}
+]{../../../lib/tex/handout}
 \usepackage{../../../lib/tex/macros}
 
 \input{tikxset.tex}
diff --git a/src/Advanced/Random Walks/tikxset.tex b/src/Advanced/Random Walks/tikxset.tex
index 0b504d6..8889085 100644
--- a/src/Advanced/Random Walks/tikxset.tex	
+++ b/src/Advanced/Random Walks/tikxset.tex	
@@ -24,7 +24,7 @@
 	label/.style = {
 		rectangle,
 		% For automatic red background in solutions
-		fill = \ORMCbgcolor,
+		fill = \bgcolor,
 		draw = none,
 		rounded corners = 0mm
 	},
diff --git a/src/Advanced/Relativity/main.tex b/src/Advanced/Relativity/main.tex
index 94626cb..84dd303 100644
--- a/src/Advanced/Relativity/main.tex
+++ b/src/Advanced/Relativity/main.tex
@@ -4,7 +4,7 @@
 	solutions,
 	singlenumbering,
 	shortwarning
-]{../../../lib/tex/ormc_handout}
+]{../../../lib/tex/handout}
 \usepackage{../../../lib/tex/macros}
 \input{diagram}
 
diff --git a/src/Advanced/Retrograde Analysis/main.tex b/src/Advanced/Retrograde Analysis/main.tex
index e01ac25..bc5d7dc 100755
--- a/src/Advanced/Retrograde Analysis/main.tex	
+++ b/src/Advanced/Retrograde Analysis/main.tex	
@@ -3,7 +3,7 @@
 \documentclass[
 	solutions,
 	shortwarning
-]{../../../lib/tex/ormc_handout}
+]{../../../lib/tex/handout}
 \usepackage{../../../lib/tex/macros}
 
 \usepackage{chessfss}
diff --git a/src/Advanced/Size of Sets/main.tex b/src/Advanced/Size of Sets/main.tex
index 777c212..7e04be1 100755
--- a/src/Advanced/Size of Sets/main.tex	
+++ b/src/Advanced/Size of Sets/main.tex	
@@ -3,7 +3,7 @@
 \documentclass[
 	solutions,
 	singlenumbering
-]{../../../lib/tex/ormc_handout}
+]{../../../lib/tex/handout}
 \usepackage{../../../lib/tex/macros}
 
 
diff --git a/src/Advanced/Stopping Problems/main.tex b/src/Advanced/Stopping Problems/main.tex
index fdc85c0..f0d1c5d 100755
--- a/src/Advanced/Stopping Problems/main.tex	
+++ b/src/Advanced/Stopping Problems/main.tex	
@@ -3,7 +3,7 @@
 \documentclass[
 	solutions,
 	singlenumbering
-]{../../../lib/tex/ormc_handout}
+]{../../../lib/tex/handout}
 \usepackage{../../../lib/tex/macros}
 
 \usepackage{units}
diff --git a/src/Advanced/Symmetric Groups/main.tex b/src/Advanced/Symmetric Groups/main.tex
index d11dcfe..44b4ed3 100755
--- a/src/Advanced/Symmetric Groups/main.tex	
+++ b/src/Advanced/Symmetric Groups/main.tex	
@@ -3,7 +3,7 @@
 \documentclass[
 	solutions,
 	singlenumbering
-]{../../../lib/tex/ormc_handout}
+]{../../../lib/tex/handout}
 \usepackage{../../../lib/tex/macros}
 \usetikzlibrary{calc}
 
diff --git a/src/Intermediate/An Introduction to Graph Theory/main.tex b/src/Intermediate/An Introduction to Graph Theory/main.tex
index 84c1ce3..e7755a9 100755
--- a/src/Intermediate/An Introduction to Graph Theory/main.tex	
+++ b/src/Intermediate/An Introduction to Graph Theory/main.tex	
@@ -3,7 +3,7 @@
 \documentclass[
 	solutions,
 	singlenumbering
-]{../../../lib/tex/ormc_handout}
+]{../../../lib/tex/handout}
 \usepackage{../../../lib/tex/macros}
 
 
diff --git a/src/Intermediate/An Introduction to Graph Theory/tikxset.tex b/src/Intermediate/An Introduction to Graph Theory/tikxset.tex
index c567ce2..b5cdc64 100644
--- a/src/Intermediate/An Introduction to Graph Theory/tikxset.tex	
+++ b/src/Intermediate/An Introduction to Graph Theory/tikxset.tex	
@@ -24,7 +24,7 @@
 	label/.style = {
 		rectangle,
 		% For automatic red background in solutions
-		fill = \ORMCbgcolor,
+		fill = \bgcolor,
 		draw = none,
 		rounded corners = 0mm
 	},
diff --git a/src/Intermediate/Combinatorics/main.tex b/src/Intermediate/Combinatorics/main.tex
index fd09188..cda1113 100755
--- a/src/Intermediate/Combinatorics/main.tex
+++ b/src/Intermediate/Combinatorics/main.tex
@@ -2,7 +2,7 @@
 % use [solutions] flag to show solutions.
 \documentclass[
 	solutions
-]{../../../lib/tex/ormc_handout}
+]{../../../lib/tex/handout}
 \usepackage{../../../lib/tex/macros}
 
 
diff --git a/src/Intermediate/Instant Insanity/main.tex b/src/Intermediate/Instant Insanity/main.tex
index 3ae53c7..608ea32 100755
--- a/src/Intermediate/Instant Insanity/main.tex	
+++ b/src/Intermediate/Instant Insanity/main.tex	
@@ -2,7 +2,7 @@
 % use [solutions] flag to show solutions.
 \documentclass[
 	solutions
-]{../../../lib/tex/ormc_handout}
+]{../../../lib/tex/handout}
 \usepackage{../../../lib/tex/macros}
 
 
diff --git a/src/Intermediate/Newton's Laws/main.tex b/src/Intermediate/Newton's Laws/main.tex
index ee9dda9..8dfbf5f 100755
--- a/src/Intermediate/Newton's Laws/main.tex	
+++ b/src/Intermediate/Newton's Laws/main.tex	
@@ -2,7 +2,7 @@
 % use [solutions] flag to show solutions.
 \documentclass[
 	solutions
-]{../../../lib/tex/ormc_handout}
+]{../../../lib/tex/handout}
 \usepackage{../../../lib/tex/macros}
 
 
diff --git a/src/Intermediate/Probability/main.tex b/src/Intermediate/Probability/main.tex
index a7deb79..deb24f6 100755
--- a/src/Intermediate/Probability/main.tex
+++ b/src/Intermediate/Probability/main.tex
@@ -1,6 +1,6 @@
 % use [nosolutions] flag to hide solutions.
 % use [solutions] flag to show solutions.
-\documentclass[solutions]{../../../lib/tex/ormc_handout}
+\documentclass[solutions]{../../../lib/tex/handout}
 \usepackage{../../../lib/tex/macros}
 
 
diff --git a/src/Intermediate/Proof Techniques/main.tex b/src/Intermediate/Proof Techniques/main.tex
index 50161c1..8f186c1 100755
--- a/src/Intermediate/Proof Techniques/main.tex	
+++ b/src/Intermediate/Proof Techniques/main.tex	
@@ -3,7 +3,7 @@
 \documentclass[
 	solutions,
 	singlenumbering
-]{../../../lib/tex/ormc_handout}
+]{../../../lib/tex/handout}
 \usepackage{../../../lib/tex/macros}
 
 \usepackage{units}
diff --git a/src/Intermediate/Proof Techniques/parts/2 induction.tex b/src/Intermediate/Proof Techniques/parts/2 induction.tex
index 0528787..3c35f85 100644
--- a/src/Intermediate/Proof Techniques/parts/2 induction.tex	
+++ b/src/Intermediate/Proof Techniques/parts/2 induction.tex	
@@ -190,7 +190,7 @@ For example, see the proof of the statement in \ref{binomsum} on the next page.
 \pagebreak
 
 
-\begin{ORMCbox}{Alternative Proof}{ogrape!10!white}{ogrape}
+\begin{hobox}{Alternative Proof}{ogrape!10!white}{ogrape}
 	Consider the following problem: \par
 	How many ways are there to write a number $x$ as an ordered sum of positive integers? \par
 	\note{
@@ -234,7 +234,7 @@ For example, see the proof of the statement in \ref{binomsum} on the next page.
 	We've found that the number of ways to split $x$ can be written as either
 	$\sum_{n = 1}^{x-1} \binom{x-1}{n}$ or $2^{x-1}$,
 	and therefore $\sum_{n = 1}^{x-1} \binom{x-1}{n} = 2^{x-1}$.
-\end{ORMCbox}
+\end{hobox}
 
 
 \pagebreak
\ No newline at end of file
diff --git a/src/Intermediate/Slide Rules/main.tex b/src/Intermediate/Slide Rules/main.tex
index 2ea33da..c075f04 100755
--- a/src/Intermediate/Slide Rules/main.tex	
+++ b/src/Intermediate/Slide Rules/main.tex	
@@ -2,7 +2,7 @@
 % use [solutions] flag to show solutions.
 \documentclass[
 	solutions
-]{../../../lib/tex/ormc_handout}
+]{../../../lib/tex/handout}
 \usepackage{../../../lib/tex/macros}
 
 
diff --git a/src/Intermediate/Vectors 1/main.tex b/src/Intermediate/Vectors 1/main.tex
index f112369..11be4dd 100755
--- a/src/Intermediate/Vectors 1/main.tex	
+++ b/src/Intermediate/Vectors 1/main.tex	
@@ -1,6 +1,6 @@
 % use [nosolutions] flag to hide solutions.
 % use [solutions] flag to show solutions.
-\documentclass[solutions]{../../../lib/tex/ormc_handout}
+\documentclass[solutions]{../../../lib/tex/handout}
 \usepackage{adjustbox}
 \usepackage{../../../lib/tex/macros}
 
diff --git a/src/Intermediate/Vectors 2/main.tex b/src/Intermediate/Vectors 2/main.tex
index 55c3755..44a7024 100755
--- a/src/Intermediate/Vectors 2/main.tex	
+++ b/src/Intermediate/Vectors 2/main.tex	
@@ -1,6 +1,6 @@
 % use [nosolutions] flag to hide solutions.
 % use [solutions] flag to show solutions.
-\documentclass[solutions]{../../../lib/tex/ormc_handout}
+\documentclass[solutions]{../../../lib/tex/handout}
 \usepackage{../../../lib/tex/macros}
 
 
diff --git a/src/Warm-Ups/Flip-Flops/main.tex b/src/Warm-Ups/Flip-Flops/main.tex
index f201103..3b1ec93 100755
--- a/src/Warm-Ups/Flip-Flops/main.tex
+++ b/src/Warm-Ups/Flip-Flops/main.tex
@@ -3,7 +3,7 @@
 	shortwarning,
 	singlenumbering,
 	nopagenumber
-]{../../../lib/tex/ormc_handout}
+]{../../../lib/tex/handout}
 \usepackage{../../../lib/tex/macros}
 \geometry{top = 20mm}
 
diff --git a/src/Warm-Ups/Ivan the Electrician/main.tex b/src/Warm-Ups/Ivan the Electrician/main.tex
index 1aabec0..13afebd 100755
--- a/src/Warm-Ups/Ivan the Electrician/main.tex	
+++ b/src/Warm-Ups/Ivan the Electrician/main.tex	
@@ -3,7 +3,7 @@
 	hidewarning,
 	singlenumbering,
 	nopagenumber
-]{../../../lib/tex/ormc_handout}
+]{../../../lib/tex/handout}
 \usepackage{../../../lib/tex/macros}
 
 
diff --git a/src/Warm-Ups/Jump Chess/main.tex b/src/Warm-Ups/Jump Chess/main.tex
index c1d3658..33e1782 100755
--- a/src/Warm-Ups/Jump Chess/main.tex	
+++ b/src/Warm-Ups/Jump Chess/main.tex	
@@ -3,7 +3,7 @@
 	hidewarning,
 	singlenumbering,
 	nopagenumber
-]{../../../lib/tex/ormc_handout}
+]{../../../lib/tex/handout}
 \usepackage{../../../lib/tex/macros}
 
 
diff --git a/src/Warm-Ups/Rootbound/main.tex b/src/Warm-Ups/Rootbound/main.tex
index 185dadf..9b5bcf9 100755
--- a/src/Warm-Ups/Rootbound/main.tex
+++ b/src/Warm-Ups/Rootbound/main.tex
@@ -3,7 +3,7 @@
 	hidewarning,
 	singlenumbering,
 	nopagenumber
-]{../../../lib/tex/ormc_handout}
+]{../../../lib/tex/handout}
 \usepackage{../../../lib/tex/macros}
 
 \def\utri#1#2{
@@ -102,7 +102,7 @@
 
 	\vfill
 
-	\begin{ORMCbox}{Notes}{ogrape!10!white}{ogrape}
+	\begin{hobox}{Notes}{ogrape!10!white}{ogrape}
 		\begin{itemize}
 			\item
 			Each player needs to make multiple groups before the first player's second turn. \par
@@ -111,7 +111,7 @@
 
 			\item Groups are easiest to secure near the corners or along the edges. Play there first. \par
 		\end{itemize}
-	\end{ORMCbox}
+	\end{hobox}
 
 
 
diff --git a/src/Warm-Ups/Slide Rules/main.tex b/src/Warm-Ups/Slide Rules/main.tex
index f2f5471..687cb54 100755
--- a/src/Warm-Ups/Slide Rules/main.tex	
+++ b/src/Warm-Ups/Slide Rules/main.tex	
@@ -3,7 +3,7 @@
 \documentclass[
 	solutions,
 	shortwarning
-]{../../../lib/tex/ormc_handout}
+]{../../../lib/tex/handout}
 \usepackage{../../../lib/tex/macros}