diff --git a/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/GoToMemberWindow.java b/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/GoToMemberWindow.java
index 6f5c9db2..eabf5a95 100644
--- a/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/GoToMemberWindow.java
+++ b/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/GoToMemberWindow.java
@@ -184,7 +184,7 @@ else if (treeBorder instanceof EmptyBorder &&
 	/**
 	 * Listens for events in this window.
 	 */
-	private class Listener extends MouseAdapter implements WindowFocusListener,
+	private final class Listener extends MouseAdapter implements WindowFocusListener,
 			ComponentListener, DocumentListener, ActionListener, KeyListener {
 
 		@Override
@@ -283,7 +283,7 @@ public void windowLostFocus(WindowEvent e) {
 	/**
 	 * The border for the filtering text field.
 	 */
-	private static class TextFieldBorder implements Border {
+	private static final class TextFieldBorder implements Border {
 
 		@Override
 		public Insets getBorderInsets(Component c) {
diff --git a/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/SourceTreeNode.java b/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/SourceTreeNode.java
index 3e81e7e9..4afe130b 100644
--- a/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/SourceTreeNode.java
+++ b/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/SourceTreeNode.java
@@ -71,7 +71,7 @@ public SourceTreeNode(Object userObject, boolean sorted) {
 	@Override
 	public void add(MutableTreeNode child) {
 		//super.add(child);
-		if(child!=null && child.getParent()==this) {
+		if (child!=null && child.getParent()==this) {
 			insert(child, super.getChildCount() - 1);
 		}
 		else {
diff --git a/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/java/ClassCompletion.java b/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/java/ClassCompletion.java
index d297363f..c5cba360 100644
--- a/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/java/ClassCompletion.java
+++ b/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/java/ClassCompletion.java
@@ -53,7 +53,7 @@ public int compareTo(Completion c2) {
 			return 0;
 		}
 		// Check for classes with same name, but in different packages
-		else if(c2.toString().equalsIgnoreCase(toString())) {
+		else if (c2.toString().equalsIgnoreCase(toString())) {
 			if (c2 instanceof ClassCompletion) {
 				ClassCompletion cc2 = (ClassCompletion)c2;
 				return getClassName(true).compareTo(cc2.getClassName(true));
diff --git a/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/java/JavaCompletionProvider.java b/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/java/JavaCompletionProvider.java
index a7fef232..e7126c87 100644
--- a/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/java/JavaCompletionProvider.java
+++ b/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/java/JavaCompletionProvider.java
@@ -160,7 +160,7 @@ public boolean removeJar(File jar) {
 
 	private void setCommentCompletions(ShorthandCompletionCache shorthandCache) {
 		AbstractCompletionProvider provider = shorthandCache.getCommentProvider();
-		if(provider != null) {
+		if (provider != null) {
 			for (Completion c : shorthandCache.getCommentCompletions()) {
 				provider.addCompletion(c);
 			}
diff --git a/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/java/SourceCompletionProvider.java b/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/java/SourceCompletionProvider.java
index 572ddc55..2dfdbc2b 100644
--- a/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/java/SourceCompletionProvider.java
+++ b/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/java/SourceCompletionProvider.java
@@ -242,7 +242,7 @@ else if (!type.isBasicType()) {
 	 * @param set The set to add to.
 	 */
 	private void addShorthandCompletions(Set<Completion> set) {
-		if(shorthandCache != null) {
+		if (shorthandCache != null) {
 			set.addAll(shorthandCache.getShorthandCompletions());
 		}
 	}
diff --git a/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/java/Util.java b/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/java/Util.java
index f7bd4dd3..30814ecf 100644
--- a/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/java/Util.java
+++ b/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/java/Util.java
@@ -595,7 +595,7 @@ public static CompilationUnit getCompilationUnitFromDisk(
 		lastCUClassFileParam = cf;
 		CompilationUnit cu = null;
 
-		if(loc != null) {
+		if (loc != null) {
 			try {
 				cu = loc.getCompilationUnit(cf);
 			} catch (IOException ioe) {
diff --git a/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/java/buildpath/Jdk9LibraryInfo.java b/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/java/buildpath/Jdk9LibraryInfo.java
index 74e34550..eb6cab42 100644
--- a/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/java/buildpath/Jdk9LibraryInfo.java
+++ b/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/java/buildpath/Jdk9LibraryInfo.java
@@ -57,7 +57,7 @@ public Jdk9LibraryInfo(File[] jmodFiles, SourceLocation sourceLoc) {
 
 	@Override
 	public void bulkClassFileCreationEnd() {
-		for( JarFile bulkCreateJar: bulkCreateJmods) {
+		for (JarFile bulkCreateJar: bulkCreateJmods) {
 			try {
 				bulkCreateJar.close();
 			} catch (IOException ioe) {
@@ -71,7 +71,7 @@ public void bulkClassFileCreationEnd() {
 	@Override
 	public void bulkClassFileCreationStart() {
 		bulkCreateJmods = new JarFile[jmodFiles.length];
-		for(int i = 0; i< jmodFiles.length; i++) {
+		for (int i = 0; i < jmodFiles.length; i++) {
 			File jarFile = jmodFiles[i];
 			try {
 				bulkCreateJmods[i] = new JarFile(jarFile);
@@ -105,10 +105,10 @@ public int compareTo(LibraryInfo info) {
 
 	@Override
 	public ClassFile createClassFile(String entryName) throws IOException {
-		for(File jarFile: jmodFiles) {
+		for (File jarFile: jmodFiles) {
 			try (JarFile jar = new JarFile(jarFile)) {
 				ClassFile c = createClassFileImpl(jar, entryName);
-				if(c!=null) {
+				if (c!=null) {
 					return c;
 				}
 			}
@@ -120,9 +120,9 @@ public ClassFile createClassFile(String entryName) throws IOException {
 
 	@Override
 	public ClassFile createClassFileBulk(String entryName) throws IOException {
-		for( JarFile bulkCreateJar: bulkCreateJmods) {
+		for (JarFile bulkCreateJar: bulkCreateJmods) {
 			ClassFile c = createClassFileImpl(bulkCreateJar, entryName);
-			if(c!=null) {
+			if (c!=null) {
 				return c;
 			}
 		}
@@ -153,14 +153,14 @@ private static ClassFile createClassFileImpl(JarFile jar,
 	public PackageMapNode createPackageMap() throws IOException {
 		PackageMapNode root = new PackageMapNode();
 
-		for( File jarFile: jmodFiles) {
+		for (File jarFile: jmodFiles) {
 			try (JarFile jar = new JarFile(jarFile)) {
 
 				Enumeration<JarEntry> e = jar.entries();
 				while (e.hasMoreElements()) {
 					ZipEntry entry = e.nextElement();
 					String entryName = entry.getName();
-					if(entryName.startsWith("classes/")) {
+					if (entryName.startsWith("classes/")) {
 						entryName = entryName.substring(8);
 						if (entryName.endsWith(".class")) {
 							root.add(entryName);
@@ -191,7 +191,7 @@ public String getLocationAsString() {
 	@Override
 	public int hashCodeImpl() {
 		int h = 0;
-		for( File jarFile: jmodFiles) {
+		for (File jarFile: jmodFiles) {
 			h += jarFile.hashCode();
 		}
 		return h;
@@ -204,7 +204,7 @@ public int hashCodeImpl() {
 	 * @param jmodFiles The jar files location.  This cannot be <code>null</code>.
 	 */
 	private void setJmodFiles(File[] jmodFiles) {
-		for( File jarFile: jmodFiles) {
+		for (File jarFile: jmodFiles) {
 			if (jarFile==null || !jarFile.exists()) {
 				String name = jarFile==null ? "null" : jarFile.getAbsolutePath();
 				throw new IllegalArgumentException("Jar does not exist: " + name);
diff --git a/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/java/buildpath/LibraryInfo.java b/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/java/buildpath/LibraryInfo.java
index 8698ecba..f58d1660 100644
--- a/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/java/buildpath/LibraryInfo.java
+++ b/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/java/buildpath/LibraryInfo.java
@@ -11,7 +11,6 @@
 package org.fife.rsta.ac.java.buildpath;
 
 import java.io.File;
-import java.io.FileFilter;
 import java.io.IOException;
 
 import org.fife.rsta.ac.java.JarManager;
@@ -172,23 +171,22 @@ public boolean equals(Object o) {
 	 * @see #getMainJreJarInfo()
 	 */
 	public static LibraryInfo getJreJarInfo(File jreHome) {
-		// Check if the Jre is made of modules
+
+		// Check if the JRE is made of modules (Java 9+)
 		File mods = new File(jreHome,"jmods");
-		if(mods.isDirectory()) {
-			File[] files = mods.listFiles( new FileFilter() {
-				@Override
-				public boolean accept(File pathname) {
-					if(pathname.isFile()) {
-						String name = pathname.getName();
-						return name.endsWith(".jmod") && (name.startsWith("java.") || name.startsWith("jdk."));
-					}
-					return false;
+		if (mods.isDirectory()) {
+			File[] files = mods.listFiles(pathname -> {
+				if (pathname.isFile()) {
+					String name = pathname.getName();
+					return name.endsWith(".jmod") &&
+						(name.startsWith("java.") || name.startsWith("jdk."));
 				}
+				return false;
 			});
 
 			LibraryInfo info = new Jdk9LibraryInfo(files);
-			File sourceZip = new File(jreHome,"lib"+File.separator+"src.zip");
-			if (sourceZip.isFile()) { // Make sure our last guess actually exists
+			File sourceZip = new File(jreHome,"lib/src.zip");
+			if (sourceZip.isFile()) {
 				info.setSourceLocation(new ZipSourceLocation(sourceZip));
 			}
 
diff --git a/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/java/classreader/FieldInfo.java b/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/java/classreader/FieldInfo.java
index 216fd3da..0a5c88c3 100644
--- a/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/java/classreader/FieldInfo.java
+++ b/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/java/classreader/FieldInfo.java
@@ -196,7 +196,7 @@ public String getTypeString(boolean qualified) {
 			case 'L':
 				String clazz = descriptor.substring(braceCount+1,
 													descriptor.length()-1);
-				if(qualified) {
+				if (qualified) {
 					clazz = clazz.replace('/', '.');
 				}
 				else {
diff --git a/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/java/classreader/MethodInfo.java b/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/java/classreader/MethodInfo.java
index ce1617c2..e9dec79f 100644
--- a/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/java/classreader/MethodInfo.java
+++ b/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/java/classreader/MethodInfo.java
@@ -444,7 +444,7 @@ public String getReturnTypeString(boolean fullyQualified) {
 			}
 		}
 		if (!fullyQualified) {
-			if(returnType != null && returnType.contains(".")) {
+			if (returnType != null && returnType.contains(".")) {
 				return returnType.substring(returnType.lastIndexOf(".") +1);
 			}
 		}
diff --git a/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/java/classreader/attributes/Signature.java b/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/java/classreader/attributes/Signature.java
index 0d404bf0..dd0edf6b 100644
--- a/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/java/classreader/attributes/Signature.java
+++ b/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/java/classreader/attributes/Signature.java
@@ -151,7 +151,7 @@ public List<String> getMethodParamTypes(MethodInfo mi, ClassFile cf,
 					parseParamDescriptor(paramDescriptors, cf, additionalTypeArgs,
 							mi, "Error parsing method signature for ", res, qualified);
 					paramTypeList.add(res.type);
-					if(paramDescriptors.length()>res.pos) {
+					if (paramDescriptors.length()>res.pos) {
 						paramDescriptors = paramDescriptors.substring(res.pos);
 					} else {
 						break;
@@ -353,7 +353,7 @@ private ParamDescriptorResult parseParamDescriptor(String str,
 							parseParamDescriptor(paramDescriptors, cf, additionalTypeArgs,
 									mi, "Error parsing method signature for ", res2, qualified);
 							paramTypeList.add(res2.type);
-							if(paramDescriptors.length()>res2.pos) {
+							if (paramDescriptors.length()>res2.pos) {
 								paramDescriptors = paramDescriptors.substring(res2.pos);
 							} else {
 								break;
@@ -428,7 +428,7 @@ public String toString() {
 	}
 
 
-	private static class ParamDescriptorResult {
+	private static final class ParamDescriptorResult {
 
 		private String type;
 		private int pos;
diff --git a/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/java/rjc/ast/CompilationUnit.java b/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/java/rjc/ast/CompilationUnit.java
index 31f2121e..5bb51f43 100644
--- a/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/java/rjc/ast/CompilationUnit.java
+++ b/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/java/rjc/ast/CompilationUnit.java
@@ -306,7 +306,7 @@ public void setPackage(Package pkg) {
 	/**
 	 * An offset that always returns 0.
 	 */
-	private static class ZeroOffset implements Offset {
+	private static final class ZeroOffset implements Offset {
 
 		@Override
 		public int getOffset() {
diff --git a/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/java/tree/JavaOutlineTree.java b/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/java/tree/JavaOutlineTree.java
index 26a6e2c0..bffa404c 100644
--- a/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/java/tree/JavaOutlineTree.java
+++ b/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/java/tree/JavaOutlineTree.java
@@ -362,7 +362,7 @@ public void updateUI() {
 	 * Listens for events this tree is interested in (events in the associated
 	 * editor, for example), as well as events in this tree.
 	 */
-	private class Listener implements PropertyChangeListener,
+	private final class Listener implements PropertyChangeListener,
 							TreeSelectionListener {
 
 		/**
diff --git a/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/perl/PerlCompletionProvider.java b/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/perl/PerlCompletionProvider.java
index 4d605f84..71800afd 100644
--- a/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/perl/PerlCompletionProvider.java
+++ b/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/perl/PerlCompletionProvider.java
@@ -189,7 +189,7 @@ private SortedSet<Completion> getVariableCompletions(JTextComponent comp) {
 	 * A comparator that compares the input text of two {@link Completion}s
 	 * lexicographically, ignoring case.
 	 */
-	private static class CaseInsensitiveComparator
+	private static final class CaseInsensitiveComparator
 			implements Comparator<Completion>, Serializable {
 
 		@Override
diff --git a/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/xml/tree/XmlOutlineTree.java b/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/xml/tree/XmlOutlineTree.java
index d77dbdcb..e1d680c9 100644
--- a/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/xml/tree/XmlOutlineTree.java
+++ b/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/xml/tree/XmlOutlineTree.java
@@ -219,7 +219,7 @@ public void updateUI() {
 	 * Listens for events this tree is interested in (events in the associated
 	 * editor, for example), as well as events in this tree.
 	 */
-	private class XmlEditorListener implements PropertyChangeListener,
+	private final class XmlEditorListener implements PropertyChangeListener,
 							TreeSelectionListener {
 
 		/**
diff --git a/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/xml/tree/XmlTreeCellRenderer.java b/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/xml/tree/XmlTreeCellRenderer.java
index 160452d5..1304674e 100644
--- a/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/xml/tree/XmlTreeCellRenderer.java
+++ b/RSTALanguageSupport/src/main/java/org/fife/rsta/ac/xml/tree/XmlTreeCellRenderer.java
@@ -92,7 +92,7 @@ public void updateUI() {
 	 * much faster (~ 4x faster), but still doesn't eliminate the issue for
 	 * huge trees.
 	 */
-	private static class XmlTreeCellUI extends BasicLabelUI {
+	private static final class XmlTreeCellUI extends BasicLabelUI {
 
 		@Override
 		protected void installDefaults(JLabel label) {
diff --git a/RSTALanguageSupportDemo/src/main/java/org/fife/rsta/ac/demo/AboutDialog.java b/RSTALanguageSupportDemo/src/main/java/org/fife/rsta/ac/demo/AboutDialog.java
index 01062d5a..d847ac5f 100644
--- a/RSTALanguageSupportDemo/src/main/java/org/fife/rsta/ac/demo/AboutDialog.java
+++ b/RSTALanguageSupportDemo/src/main/java/org/fife/rsta/ac/demo/AboutDialog.java
@@ -250,7 +250,7 @@ private static void makeSpringCompactGrid(Container parent, int rows,
 	/**
 	 * The border of the "top section" of the About dialog.
 	 */
-	private static class TopBorder extends AbstractBorder {
+	private static final class TopBorder extends AbstractBorder {
 
 		@Override
 		public Insets getBorderInsets(Component c) {
diff --git a/build.gradle b/build.gradle
index 31dfbb84..808cacd6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -35,7 +35,7 @@ subprojects {
 //    apply plugin: 'com.github.spotbugs'
 
     checkstyle {
-        toolVersion = '9.3'
+        toolVersion = '10.25.0'
         configDirectory = file("$rootProject.projectDir/config/checkstyle")
     }
 
diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
index d686ec78..18e79bae 100644
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -25,6 +25,7 @@
   Most Checks are configurable, be sure to consult the documentation.
 
   To completely disable a check, just comment it out or delete it from the file.
+  To suppress certain violations please review suppression filters.
 
   Finally, it is worth reading the documentation.
 
@@ -82,11 +83,19 @@
 		<property name="maximum" value="0"/>
 		<property name="message" value="Line has trailing spaces."/>
 	</module>
+<!--
+	<module name="RegexpSingleline">
+		<property name="format" value="(?&lt;!//)\s*System\.(?:out|err)\.println\("/>
+		<property name="minimum" value="0"/>
+		<property name="maximum" value="0"/>
+		<property name="message" value="Do not use System.out.println or System.err.println"/>
+	</module>
+-->
 
-	<!-- Checks for Headers                                -->
-	<!-- See http://checkstyle.sf.net/config_header.html   -->
+	<!-- Checks for Headers                                               -->
+	<!-- See https://checkstyle.sourceforge.io/checks/header/index.html   -->
 	<!-- <module name="Header"> -->
-	<!--   <property name="headerFile" value="${checkstyle.header.file}"/> -->
+	<!--   <property name="headerFile" value="${config_loc}/javaHeader.txt"/> -->
 	<!--   <property name="fileExtensions" value="java"/> -->
 	<!-- </module> -->
 
@@ -96,9 +105,9 @@
 		<!-- https://stackoverflow.com/questions/5761188/checkstyle-suppressioncommentfilter-not-ignoring-specified-rule/5764666#5764666 -->
 		<module name="SuppressWarningsHolder" />
 
-		<!-- Checks for Javadoc comments.                              -->
-		<!-- See https://checkstyle.sourceforge.io/config_javadoc.html -->
-		<!--<module name="JavadocMethod"/> This is just too whiny for now. -->
+		<!-- Checks for Javadoc comments.                                    -->
+		<!-- See https://checkstyle.sourceforge.io/checks/javadoc/index.html -->
+		<!--<module name="JavadocMethod"/> This is just too whiny for now.   -->
 		<module name="JavadocType"/>
 		<!--
         <module name="JavadocVariable">
@@ -126,8 +135,8 @@
 
 		<module name="JavadocContentLocationCheck"/>
 
-		<!-- Checks for Naming Conventions.                           -->
-		<!-- See https://checkstyle.sourceforge.io/config_naming.html -->
+		<!-- Checks for Naming Conventions.                                 -->
+		<!-- See https://checkstyle.sourceforge.io/checks/naming/index.html -->
 		<module name="ConstantName"/>
 		<module name="LocalFinalVariableName"/>
 		<module name="LocalVariableName"/>
@@ -138,15 +147,15 @@
 		<module name="StaticVariableName"/>
 		<module name="TypeName"/>
 
-		<!-- Checks for annotations.                                      -->
-		<!-- See https://checkstyle.sourceforge.io/config_annotation.html -->
+		<!-- Checks for annotations.                                            -->
+		<!-- See https://checkstyle.sourceforge.io/checks/annotation/index.html -->
 		<module name="AnnotationLocation"/>
 		<module name="AnnotationUseStyle"/>
 		<module name="MissingDeprecated"/>
 		<module name="MissingOverride"/>
 
-		<!-- Checks for imports                              -->
-		<!-- See https://checkstyle.sourceforge.io/config_imports.html -->
+		<!-- Checks for imports                                              -->
+		<!-- See https://checkstyle.sourceforge.io/checks/imports/index.html -->
 		<!--<module name="AvoidStarImport"/>-->
 		<module name="IllegalImport"/> <!-- defaults to sun.* packages -->
 		<module name="RedundantImport"/>
@@ -164,8 +173,8 @@
 		</module>
 
 
-		<!-- Checks for whitespace                                        -->
-		<!-- See https://checkstyle.sourceforge.io/config_whitespace.html -->
+		<!-- Checks for whitespace                                              -->
+		<!-- See https://checkstyle.sourceforge.io/checks/whitespace/index.html -->
 		<module name="EmptyForIteratorPad"/>
 		<module name="GenericWhitespace"/>
 		<module name="MethodParamPad"/>
@@ -176,11 +185,25 @@
 		</module>
 		<module name="ParenPad"/>
 		<module name="TypecastParenPad"/>
-		<!--<module name="WhitespaceAround"/>-->
+		<module name="WhitespaceAfter">
+			<!-- TODO: Add COMMA and possibly SEMI, but it'll be a big diff -->
+			<property name="tokens" value="LITERAL_IF, LITERAL_ELSE, LITERAL_WHILE, LITERAL_DO, LITERAL_FOR,
+                LITERAL_FINALLY, LITERAL_CATCH, DO_WHILE, LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_TRY,
+                LITERAL_CASE, LAMBDA, LITERAL_WHEN"/>
+		</module>
+		<module name="WhitespaceAround">
+			<property name="allowEmptyConstructors" value="true"/>
+			<property name="allowEmptyMethods" value="true"/>
+			<property name="allowEmptyTypes" value="true"/>
+			<!-- Don't check around boolean comparators as old code didn't follow this convention for them. -->
+			<property name="tokens" value="LCURLY, LITERAL_IF, LITERAL_ELSE, LITERAL_WHILE, LITERAL_DO, LITERAL_FOR,
+                LITERAL_FINALLY, LITERAL_CATCH, DO_WHILE, LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_TRY,
+                LAMBDA, LITERAL_WHEN"/>
+		</module>
 
 
-		<!-- Modifier Checks                                            -->
-		<!-- See https://checkstyle.sourceforge.io/config_modifier.html -->
+		<!-- Modifier Checks                                                  -->
+		<!-- See https://checkstyle.sourceforge.io/checks/modifier/index.html -->
 		<module name="ModifierOrder"/>
 		<module name="RedundantModifier"/>
 
@@ -195,11 +218,11 @@
 		</module>
 		<module name="RightCurly"> <!-- Right curlies should be alone in if/else -->
 			<property name="option" value="alone"/>
-			<property name="tokens" value="LITERAL_ELSE, METHOD_DEF"/>
+			<property name="tokens" value="CLASS_DEF, ENUM_DEF, LITERAL_ELSE, LITERAL_SWITCH, METHOD_DEF"/>
 		</module>
 
-		<!-- Checks for common coding problems                        -->
-		<!-- See https://checkstyle.sourceforge.io/config_coding.html -->
+		<!-- Checks for common coding problems                              -->
+		<!-- See https://checkstyle.sourceforge.io/checks/coding/index.html -->
 		<!--<module name="AvoidInlineConditionals"/>-->
 		<!--<module name="EmptyStatement"/> Removed to allow "while (doSomething());" -->
 		<module name="EqualsAvoidNull"/>
@@ -222,14 +245,14 @@
 		<module name="SimplifyBooleanExpression"/>
 		<module name="SimplifyBooleanReturn"/>
 		<!--		<module name="UnnecessaryParentheses"/>-->
-		<module name="UnnecessarySemicolonAfterTypeMemberDeclaration"/>
 		<module name="UnnecessarySemicolonAfterOuterTypeDeclaration"/>
+		<module name="UnnecessarySemicolonAfterTypeMemberDeclaration"/>
 		<module name="UnnecessarySemicolonInEnumeration"/>
 		<module name="UnnecessarySemicolonInTryWithResources"/>
 		<module name="UnusedLocalVariable"/>
 
-		<!-- Checks for class design                                  -->
-		<!-- See https://checkstyle.sourceforge.io/config_design.html -->
+		<!-- Checks for class design                                        -->
+		<!-- See https://checkstyle.sourceforge.io/checks/design/index.html -->
 		<!--<module name="DesignForExtension"/>-->
 		<module name="FinalClass"/>
 		<module name="HideUtilityClassConstructor"/>
@@ -240,8 +263,8 @@
 		</module>
 
 
-		<!-- Miscellaneous other checks.                            -->
-		<!-- See https://checkstyle.sourceforge.io/config_misc.html -->
+		<!-- Miscellaneous other checks.                                  -->
+		<!-- See https://checkstyle.sourceforge.io/checks/misc/index.html -->
 		<module name="ArrayTypeStyle"/>
 		<module name="AvoidEscapedUnicodeCharacters"/>
 		<module name="CommentsIndentation"/>