diff --git a/commonincludes.def b/commonincludes.def
index 69e8558..cad1c99 100644
--- a/commonincludes.def
+++ b/commonincludes.def
@@ -60,6 +60,8 @@
 
 \RequirePackage{tikz}
 
+\RequirePackage{underscore}
+
 \RequirePackage{wrapstuff}
 
 % Color import and definition
diff --git a/packages/Fonts.sty b/packages/Fonts.sty
index ec36f68..ec79a68 100644
--- a/packages/Fonts.sty
+++ b/packages/Fonts.sty
@@ -32,7 +32,7 @@
 
 	luaotfload.add_fallback(
 		"RobotoMono", {
-			"NotoMono:mode=harf;",
+			"NotoMono-Medium:mode=harf;",
 			"NotoSansSymbols-SemiBold:mode=harf;",
 			"NotoSansSymbols2:mode=harf;",
 			"NotoEmoji:mode=harf;",
@@ -74,9 +74,9 @@
 % Monospace font: Roboto Mono
 \setmonofont{RobotoMono}[
 	Extension		= .ttf,
-	UprightFont		= *-Regular,
+	UprightFont		= *-Medium,
 	BoldFont		= *-Bold,
-	ItalicFont		= *-Italic,
+	ItalicFont		= *-MediumItalic,
 	BoldItalicFont	= *-BoldItalic,
 	RawFeature		= {fallback=RobotoMono},
 ]
diff --git a/packages/Marginalia.sty b/packages/Marginalia.sty
index fc86ad2..d5b7b66 100644
--- a/packages/Marginalia.sty
+++ b/packages/Marginalia.sty
@@ -30,35 +30,39 @@
 }
 
 % Put a glossary definition in a margin paragraph.
-\NewDocumentCommand{\@MarginDef}{O{} m m}{%
+\NewDocumentCommand{\@MarginDef}{O{} m m}{
 	\index{\glsentryname{#2}}% Add a reference to this in the index.
 	\strong{#3{#2}}% This is the text that appears on the page.
-	\marginalia[#1]{%
-		\MarginHyperSetup%
+	\marginalia[#1]{
+		\MarginHyperSetup
 		\strong{\Glsentryname{#2}:}% Create the title of the margin note.
 		\enspace\glsdesc*{#2}% Create the text of the margin note.
-	}%
+	}
 }
-\NewDocumentCommand{\MarginDef}{O{} m}{%
-	\@MarginDef[#1]{#2}{\gls}%
+\NewDocumentCommand{\MarginDef}{O{} m}{
+	\@MarginDef[#1]{#2}{\gls}
 }
-\NewDocumentCommand{\MarginDefCap}{O{} m}{%
-	\@MarginDef[#1]{#2}{\Gls}%
+\NewDocumentCommand{\MarginDefCap}{O{} m}{
+	\@MarginDef[#1]{#2}{\Gls}
 }
-\NewDocumentCommand{\MarginDefPl}{O{} m}{%
-	\@MarginDef[#1]{#2}{\glspl}%
+\NewDocumentCommand{\MarginDefPl}{O{} m}{
+	\@MarginDef[#1]{#2}{\glspl}
 }
-\NewDocumentCommand{\MarginDefCapPl}{O{} m}{%
-	\@MarginDef[#1]{#2}{\Glspl}%
+\NewDocumentCommand{\MarginDefCapPl}{O{} m}{
+	\@MarginDef[#1]{#2}{\Glspl}
+}
+
+\NewDocumentCommand{\lastfootnotemark}{}{
+	\footnotemark[\value{footnote}]
 }
 
 % Put a footnote in a margin paragraph.
-\NewDocumentCommand{\MarginNote}{O{} +m}{%
-	\footnotemark%
-	\marginalia[#1]{%
-		\MarginHyperSetup%
-		\footnotemark[\value{footnote}]#2%
-	}%
+\NewDocumentCommand{\MarginNote}{O{} +m}{
+	\footnotemark
+	\marginalia[#1]{
+		\MarginHyperSetup
+		\footnotemark[\value{footnote}]#2
+	}
 }
 
 % Wrapper for \marginalia with some improvements.