diff --git a/src/main/java/net/rptools/maptool/client/AppPreferences.java b/src/main/java/net/rptools/maptool/client/AppPreferences.java
index b42ea6471e..c50ca19f71 100644
--- a/src/main/java/net/rptools/maptool/client/AppPreferences.java
+++ b/src/main/java/net/rptools/maptool/client/AppPreferences.java
@@ -29,38 +29,131 @@
 import net.rptools.maptool.client.walker.WalkerMetric;
 import net.rptools.maptool.language.I18N;
 import net.rptools.maptool.model.GridFactory;
+import net.rptools.maptool.model.Label;
 import net.rptools.maptool.model.Token;
 import net.rptools.maptool.model.Zone;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
+/** The AppPreferences class is used for managing the preferences of the application. */
 public class AppPreferences {
 
+  /**
+   * The log variable represents a logger object used for logging messages in the AppPreferences
+   * class. It is a private static final variable of type Logger. The logger object is obtained
+   * using the getLogger method from the LogManager class, specifying the AppPreferences class as
+   * the logging context.
+   */
   private static final Logger log = LogManager.getLogger(AppPreferences.class);
+
+  /**
+   * This private static variable represents the user preferences node for the application. It is an
+   * instance of the Preferences class, which provides a way to store and retrieve user preferences
+   * using a hierarchical tree of preference nodes, starting from the user root node.
+   *
+   * <p>The preferences are stored under a specific node path derived from the application name
+   * using the AppConstants.APP_NAME constant.
+   *
+   * <p>This variable is used to access and modify user preferences throughout the application.
+   */
   private static Preferences prefs = Preferences.userRoot().node(AppConstants.APP_NAME + "/prefs");
 
+  /** Holds the render quality preference setting for the application. */
   private static RenderQuality renderQuality;
 
+  /**
+   * Defines the key constant for retrieving asset roots.
+   *
+   * <p>This constant is used to define the key for accessing asset roots in a configuration file or
+   * a data source. Asset roots represent the directories or paths where application assets are
+   * stored.
+   *
+   * <p>The asset roots can be used to locate and load files, images, or other resources required by
+   * the application at runtime. By convention, the asset root directories are organized in a
+   * structured manner to facilitate easy retrieval of assets.
+   */
   private static final String KEY_ASSET_ROOTS = "assetRoots";
+
+  /**
+   * The constant representing the key for the save directory.
+   *
+   * <p>This key is used to access and store the value of the save directory. The value associated
+   * with this key should be a string representing the directory path.
+   */
   private static final String KEY_SAVE_DIR = "saveDir";
+
+  /**
+   * The constant representing the key for saving token directory. This constant is used to retrieve
+   * the directory path where token information will be exported.
+   */
   private static final String KEY_SAVE_TOKEN_DIR = "saveTokenDir";
+
+  /**
+   * The variable to store the key for saving the map directory.
+   *
+   * <p>This variable is used to configure the directory where the map will be export.
+   */
   private static final String KEY_SAVE_MAP_DIR = "saveMapDir";
+
+  /**
+   * The key for the load directory.
+   *
+   * <p>This constant represents the key used to specify the last directory used for loading files
+   * so that subsequent dialogs will be opened with the same path.
+   *
+   * <p>The value should be a String representing the directory path.
+   */
   private static final String KEY_LOAD_DIR = "loadDir";
+
+  /**
+   * The configuration key for specifying the directory path where the last add-on was loaded from,
+   * so that subsequent dialogs will be opened with the same path.
+   *
+   * <p>The value should be a String representing the directory path.
+   */
   private static final String KEY_ADD_ON_LOAD_DIR = "addOnLoadDir";
+
+  /** Represents the key used to access the most recently used campaigns for the menu option. */
   private static final String KEY_MRU_CAMPAIGNS = "mruCampaigns";
+
+  /** Represents the key used to save the paint textures to the preferences. */
   private static final String KEY_SAVED_PAINT_TEXTURES = "savedTextures";
 
+  /**
+   * Represents the key used to determine if the user should be prompted to save the campaign on
+   * quit.
+   */
   private static final String KEY_SAVE_REMINDER = "autoSaveReminder";
+
+  /**
+   * The default value for the {@code KEY_SAVE_REMINDER} key.
+   *
+   * @see #KEY_SAVE_REMINDER
+   */
   private static final boolean DEFAULT_SAVE_REMINDER = true;
 
+  /**
+   * Represents the key for the method used to determine which name of the token (Player/GM) the
+   * number is appended to.
+   */
   private static final String KEY_TOKEN_NUMBER_DISPLAY = "tokenNumberDisplayg";
+
+  /**
+   * The default value for the {@code KEY_TOKEN_NUMBER_DISPLAY} preference option,.
+   *
+   * @see #KEY_TOKEN_NUMBER_DISPLAY
+   */
   private static final String DEFAULT_TOKEN_NUMBER_DISPLAY = Token.NUM_ON_NAME;
 
+  /** Represents the key used to retrieve the number of minutes between auto saves. */
   private static final String KEY_AUTO_SAVE_INCREMENT = "autoSaveIncrement";
-  private static final int DEFAULT_AUTO_SAVE_INCREMENT = 5; // Minutes
 
-  // private static final String KEY_ENABLE_MAP_EXPORT_IMPORT = "enableMapExportImport";
-  // private static final boolean DEFAULT_ENABLE_MAP_EXPORT_IMPORT = false;
+  /**
+   * The default value for the {@code KEY_AUTO_SAVE_INCREMENT} preference option.
+   *
+   * @see #KEY_AUTO_SAVE_INCREMENT
+   */
+  private static final int DEFAULT_AUTO_SAVE_INCREMENT = 5; // Minutes
 
   private static final String KEY_CHAT_AUTOSAVE_TIME = "chatAutosaveTime";
   private static final int DEFAULT_CHAT_AUTOSAVE_TIME = 0; // Minutes; zero=disabled
@@ -449,6 +542,128 @@ public static int getFogOverlayOpacity() {
   private static final String KEY_PLAY_STREAMS = "playStreams";
   private static final boolean DEFAULT_PLAY_STREAMS = true;
 
+  /**
+   * The key for retrieving the background color of NPC map labels. The value of this key is used to
+   * store and retrieve background color information for NPC map The background color is used to
+   * style the text of the map labels for Non-Player Characters (NPCs). labels. The value associated
+   * with this key should be a valid color value.
+   */
+  private static final String KEY_NPC_MAP_LABEL_BG_COLOR = "npcMapLabelBG";
+
+  /**
+   * Constant variable for the foreground color of NPC map labels. The value represents the key used
+   * to retrieve the color from a map or configuration file. The foreground color is used to style
+   * the text of the map labels for Non-Player Characters (NPCs). This constant is intended to be
+   * used within the context of a software application or system.
+   */
+  private static final String KEY_NPC_MAP_LABEL_FG_COLOR = "npcMapLabelFG";
+
+  /**
+   * Constant variable for the border color of NPC map labels. The value represents the key used to
+   * retrieve the color from a map or configuration file. The foreground color is used to style the
+   * text of the map labels for Non-Player Characters (NPCs). This constant is intended to be used
+   * within the context of a software application or system.
+   */
+  private static final String KEY_NPC_MAP_LABEL_BORDER_COLOR = "mapLabelBorderColor";
+
+  /**
+   * The key for retrieving the background color of PC map labels. The value of this key is used to
+   * store and retrieve background color information for NPC map The background color is used to
+   * style the text of the map labels for Player Characters (PCs) labels. The value associated with
+   * this key should be a valid color value.
+   */
+  private static final String KEY_PC_MAP_LABEL_BG_COLOR = "pcMapLabelBG";
+
+  /**
+   * Constant variable for the foreground color of NPC map labels. The value represents the key used
+   * to retrieve the color from a map or configuration file. The border color is used to style the
+   * text of the map labels for Non Player Characters (NPCs).
+   */
+  private static final String KEY_PC_MAP_LABEL_FG_COLOR = "pcMapLabelFG";
+
+  /**
+   * Constant variable for the foreground color of PC map labels. The value represents the key used
+   * to retrieve the color from a map or configuration file. The border color is used to style the
+   * text of the map labels for Player Characters (PCs).
+   */
+  private static final String KEY_PC_MAP_LABEL_BORDER_COLOR = "pcMapLabelBorderColor";
+
+  /**
+   * This variable represents the key used to store the background color of non-visible token map
+   * labels. The background color is used to style the text of the map labels for tokens that are
+   * not visible to the player. The value associated with this key should be a valid color value.
+   */
+  private static final String KEY_NONVIS_MAP_LABEL_BG_COLOR = "nonVisMapLabelBG";
+
+  /**
+   * This variable represents the key used to store the foreground color of non-visible token map
+   * labels. The foreground color is used to style the text of the map labels for tokens that are
+   * not visible to the player. The value associated with this key should be a valid color value.
+   */
+  private static final String KEY_NONVIS_MAP_LABEL_FG_COLOR = "nonVisMapLabelFG";
+
+  /**
+   * This variable represents the key used to store the border color of non-visible token map
+   * labels. The foreground color is used to style the text of the map labels for tokens that are
+   * not visible to the player. The value associated with this key should be a valid color value.
+   */
+  private static final String KEY_NONVIS_MAP_LABEL_BORDER_COLOR = "nonVisMapLabelBorderColor";
+
+  /**
+   * The KEY_MAP_LABEL_FONT_SIZE constant is used to define the name of the key that represents the
+   * font size of map labels.
+   */
+  private static final String KEY_MAP_LABEL_FONT_SIZE = "mapLabelFontSize";
+
+  /** The configuration key for specifying the width of the border around map labels for tokens. */
+  private static final String KEY_MAP_LABEL_BORDER_WIDTH = "mapLabelBorderWidth";
+
+  /** The configuration key for specifying the arc of the border around map labels for tokens. */
+  private static final String KEY_MAP_LABEL_BORDER_ARC = "mapLabelBorderArc";
+
+  /** The configuration key for specifying the width of the border around map labels for tokens. */
+  private static final String KEY_MAP_LABEL_SHOW_BORDER = "mapLabelShowBorder";
+
+  /** The default background color for the NPC map label. */
+  private static final Color DEFAULT_NPC_MAP_LABEL_BG_COLOR = Color.LIGHT_GRAY;
+
+  /** The default foreground color for NPC map labels. */
+  private static final Color DEFAULT_NPC_MAP_LABEL_FG_COLOR = Color.BLACK;
+
+  /** The default border color for NPC map labels. */
+  private static final Color DEFAULT_NPC_MAP_LABEL_BORDER_COLOR = DEFAULT_NPC_MAP_LABEL_FG_COLOR;
+
+  /** The default background color for the PC map label. */
+  private static final Color DEFAULT_PC_MAP_LABEL_BG_COLOR = Color.WHITE;
+
+  /** The default foreground color for the map labels in the PC map. */
+  private static final Color DEFAULT_PC_MAP_LABEL_FG_COLOR = Color.BLUE;
+
+  /** The default border color for the PC map labels. */
+  private static final Color DEFAULT_PC_MAP_LABEL_BORDER_COLOR = DEFAULT_PC_MAP_LABEL_FG_COLOR;
+
+  /** The default background color for non-visible map labels. */
+  private static final Color DEFAULT_NONVIS_MAP_LABEL_BG_COLOR = Color.BLACK;
+
+  /** The default foreground color for non-visible map labels. */
+  private static final Color DEFAULT_NONVIS_MAP_LABEL_FG_COLOR = Color.WHITE;
+
+  /** The default border color for non-visible map labels. */
+  private static final Color DEFAULT_NONVIS_MAP_LABEL_BORDER_COLOR =
+      DEFAULT_NONVIS_MAP_LABEL_FG_COLOR;
+
+  /** The default font size for map labels. */
+  private static final int DEFAULT_MAP_LABEL_FONT_SIZE = AppStyle.labelFont.getSize();
+
+  /** The default border width for token map labels. */
+  private static final int DEFAULT_MAP_LABEL_BORDER_WIDTH = Label.DEFAULT_LABEL_BORDER_WIDTH;
+
+  /** The default border arc for token map labels. */
+  private static final int DEFAULT_MAP_LABEL_BORDER_ARC = Label.DEFAULT_LABEL_BORDER_ARC;
+
+  /** The default border arc for token map labels. */
+  private static final boolean DEFAULT_MAP_LABEL_SHOW_BORDER = true;
+
   public static void setHaloLineWidth(int size) {
     prefs.putInt(KEY_HALO_LINE_WIDTH, size);
   }
@@ -541,8 +756,6 @@ public static int getHaloLineWidth() {
 
   private static final String KEY_RENDER_QUALITY = "renderScaleQuality";
 
-  private static final RenderQuality DEFAULT_RENDER_QUALITY = RenderQuality.LOW_SCALING;
-
   public enum RenderQuality {
     LOW_SCALING,
     PIXEL_ART_SCALING,
@@ -609,9 +822,9 @@ public static RenderQuality getRenderQuality() {
     if (renderQuality == null) {
       try {
         renderQuality =
-            RenderQuality.valueOf(prefs.get(KEY_RENDER_QUALITY, DEFAULT_RENDER_QUALITY.name()));
+            RenderQuality.valueOf(prefs.get(KEY_RENDER_QUALITY, RenderQuality.LOW_SCALING.name()));
       } catch (Exception e) {
-        renderQuality = DEFAULT_RENDER_QUALITY;
+        renderQuality = RenderQuality.LOW_SCALING;
       }
     }
     return renderQuality;
@@ -1478,4 +1691,254 @@ public static void setTopologyTypes(Zone.TopologyTypeSet types) {
       prefs.put(KEY_TOPOLOGY_TYPES, types.toString());
     }
   }
+
+  /**
+   * Returns the background color to use for NPC Map Labels.
+   *
+   * @return the background color to use for NPC Map Labels.
+   */
+  public static Color getNPCMapLabelBG() {
+    return new Color(
+        prefs.getInt(KEY_NPC_MAP_LABEL_BG_COLOR, DEFAULT_NPC_MAP_LABEL_BG_COLOR.getRGB()), true);
+  }
+
+  /**
+   * Sets the background color to use for NPC Map Labels.
+   *
+   * @param color the background color to use for NPC Map Labels.
+   */
+  public static void setNPCMapLabelBG(Color color) {
+    prefs.putInt(KEY_NPC_MAP_LABEL_BG_COLOR, color.getRGB());
+  }
+
+  /**
+   * Returns the border color to use for PC Map Labels.
+   *
+   * @return the border color to use for PC Map Labels.
+   */
+  public static Color getPCMapLabelBorder() {
+    return new Color(
+        prefs.getInt(KEY_PC_MAP_LABEL_BORDER_COLOR, DEFAULT_PC_MAP_LABEL_BORDER_COLOR.getRGB()),
+        true);
+  }
+
+  /**
+   * Sets the border color to use for PC Map Labels.
+   *
+   * @param color the border color to use for PC Map Labels.
+   */
+  public static void setPCMapLabelBorder(Color color) {
+    prefs.putInt(KEY_PC_MAP_LABEL_BORDER_COLOR, color.getRGB());
+  }
+
+  /**
+   * Returns the foreground color to use for NPC Map Labels.
+   *
+   * @return the foreground color to use for NPC Map Labels.
+   */
+  public static Color getNPCMapLabelFG() {
+    return new Color(
+        prefs.getInt(KEY_NPC_MAP_LABEL_FG_COLOR, DEFAULT_NPC_MAP_LABEL_FG_COLOR.getRGB()), true);
+  }
+
+  /**
+   * Sets the foreground color to use for NPC Map Labels.
+   *
+   * @param color the foreground color to use for NPC Map Labels.
+   */
+  public static void setNPCMapLabelFG(Color color) {
+    prefs.putInt(KEY_NPC_MAP_LABEL_FG_COLOR, color.getRGB());
+  }
+
+  /**
+   * Returns the border color to use for NPC Map Labels.
+   *
+   * @return the border color to use for NPC Map Labels.
+   */
+  public static Color getNPCMapLabelBorder() {
+    return new Color(
+        prefs.getInt(KEY_NPC_MAP_LABEL_BORDER_COLOR, DEFAULT_NPC_MAP_LABEL_BORDER_COLOR.getRGB()),
+        true);
+  }
+
+  /**
+   * Sets the border color to use for NPC Map Labels.
+   *
+   * @param color the border color to use for NPC Map Labels.
+   */
+  public static void setNPCMapLabelBorder(Color color) {
+    prefs.putInt(KEY_NPC_MAP_LABEL_BORDER_COLOR, color.getRGB());
+  }
+
+  /**
+   * Returns the background color to use for PC Map Labels.
+   *
+   * @return the background color to use for PC Map Labels.
+   */
+  public static Color getPCMapLabelBG() {
+    return new Color(
+        prefs.getInt(KEY_PC_MAP_LABEL_BG_COLOR, DEFAULT_PC_MAP_LABEL_BG_COLOR.getRGB()), true);
+  }
+
+  /**
+   * Sets the background color to use for PC Map Labels.
+   *
+   * @param color the background color to use for PC Map Labels.
+   */
+  public static void setPCMapLabelBG(Color color) {
+    prefs.putInt(KEY_PC_MAP_LABEL_BG_COLOR, color.getRGB());
+  }
+
+  /**
+   * Returns the foreground color to use for PC Map Labels.
+   *
+   * @return the foreground color to use for PC Map Labels.
+   */
+  public static Color getPCMapLabelFG() {
+    return new Color(
+        prefs.getInt(KEY_PC_MAP_LABEL_FG_COLOR, DEFAULT_PC_MAP_LABEL_FG_COLOR.getRGB()), true);
+  }
+
+  /**
+   * Sets the foreground color to use for PC Map Labels.
+   *
+   * @param color the foreground color to use for PC Map Labels.
+   */
+  public static void setPCMapLabelFG(Color color) {
+    prefs.putInt(KEY_PC_MAP_LABEL_FG_COLOR, color.getRGB());
+  }
+
+  /**
+   * Returns the background color to use for Non-Visible Token Map Labels.
+   *
+   * @return the background color to use for Non-Visible Token Map Labels.
+   */
+  public static Color getNonVisMapLabelBG() {
+    return new Color(
+        prefs.getInt(KEY_NONVIS_MAP_LABEL_BG_COLOR, DEFAULT_NONVIS_MAP_LABEL_BG_COLOR.getRGB()),
+        true);
+  }
+
+  /**
+   * Sets the background color to use for Non-Visible Token Map Labels.
+   *
+   * @param color the background color to use for Non-Visible Token Map Labels.
+   */
+  public static void setNonVisMapLabelBG(Color color) {
+    prefs.putInt(KEY_NONVIS_MAP_LABEL_BG_COLOR, color.getRGB());
+  }
+
+  /**
+   * Returns the foreground color to use for Non-Visible Token Map Labels.
+   *
+   * @return the foreground color to use for Non-Visible Token Map Labels.
+   */
+  public static Color getNonVisMapLabelFG() {
+    return new Color(
+        prefs.getInt(KEY_NONVIS_MAP_LABEL_FG_COLOR, DEFAULT_NONVIS_MAP_LABEL_FG_COLOR.getRGB()),
+        true);
+  }
+
+  /**
+   * Sets the foreground color to use for Non-Visible Token Map Labels.
+   *
+   * @param color the foreground color to use for Non-Visible Token Map Labels.
+   */
+  public static void setNonVisMapLabelFG(Color color) {
+    prefs.putInt(KEY_NONVIS_MAP_LABEL_FG_COLOR, color.getRGB());
+  }
+
+  /**
+   * Returns the border color to use for Non-Visible Token Map Labels.
+   *
+   * @return the border color to use for Non-Visible Token Map Labels.
+   */
+  public static Color getNonVisMapLabelBorder() {
+    return new Color(
+        prefs.getInt(
+            KEY_NONVIS_MAP_LABEL_BORDER_COLOR, DEFAULT_NONVIS_MAP_LABEL_BORDER_COLOR.getRGB()),
+        true);
+  }
+
+  /**
+   * Sets the border color to use for Non-Visible Token Map Labels.
+   *
+   * @param color the border color to use for Non-Visible Token Map Labels.
+   */
+  public static void setNonVisMapLabelBorder(Color color) {
+    prefs.putInt(KEY_NONVIS_MAP_LABEL_BORDER_COLOR, color.getRGB());
+  }
+
+  /**
+   * Returns the font size to use for Map Token Labels.
+   *
+   * @return the font size to use for Map Token Labels.
+   */
+  public static int getMapLabelFontSize() {
+    return prefs.getInt(KEY_MAP_LABEL_FONT_SIZE, DEFAULT_MAP_LABEL_FONT_SIZE);
+  }
+
+  /**
+   * Sets the font size to use for Map Token Labels.
+   *
+   * @param size the font size to use for Map Token Labels.
+   */
+  public static void setMapLabelFontSize(int size) {
+    prefs.putInt(KEY_MAP_LABEL_FONT_SIZE, size);
+  }
+
+  /**
+   * Gets the width of the border for token map labels.
+   *
+   * @return The width of the border for map labels.
+   */
+  public static int getMapLabelBorderWidth() {
+    return prefs.getInt(KEY_MAP_LABEL_BORDER_WIDTH, DEFAULT_MAP_LABEL_BORDER_WIDTH);
+  }
+
+  /**
+   * Sets the width of the border for token map labels.
+   *
+   * @param width the width of the border in pixels
+   */
+  public static void setMapLabelBorderWidth(int width) {
+    prefs.putInt(KEY_MAP_LABEL_BORDER_WIDTH, width);
+  }
+
+  /**
+   * Returns the value of the preference for the map label border arc.
+   *
+   * @return the value of the preference for the map label border arc
+   */
+  public static int getMapLabelBorderArc() {
+    return prefs.getInt(KEY_MAP_LABEL_BORDER_ARC, DEFAULT_MAP_LABEL_BORDER_ARC);
+  }
+
+  /**
+   * Sets the value of the preference for the map label border arc.
+   *
+   * @param arc the value of the preference for the map label border arc
+   */
+  public static void setMapLabelBorderArc(int arc) {
+    prefs.putInt(KEY_MAP_LABEL_BORDER_ARC, arc);
+  }
+
+  /**
+   * Returns the value of the preference "show map label border". The preference determines whether
+   * the border should be shown around the map label or not.
+   *
+   * @return {@code true} if the map label border should be shown, {@code false} otherwise.
+   */
+  public static boolean getShowMapLabelBorder() {
+    return prefs.getBoolean(KEY_MAP_LABEL_SHOW_BORDER, DEFAULT_MAP_LABEL_SHOW_BORDER);
+  }
+
+  /**
+   * Sets the preference for showing or hiding the border of map labels.
+   *
+   * @param show {@code true} to show the border, {@code false} to hide the border
+   */
+  public static void setShowMapLabelBorder(boolean show) {
+    prefs.putBoolean(KEY_MAP_LABEL_SHOW_BORDER, show);
+  }
 }
diff --git a/src/main/java/net/rptools/maptool/client/swing/label/FlatImageLabel.java b/src/main/java/net/rptools/maptool/client/swing/label/FlatImageLabel.java
new file mode 100644
index 0000000000..8234ddd804
--- /dev/null
+++ b/src/main/java/net/rptools/maptool/client/swing/label/FlatImageLabel.java
@@ -0,0 +1,211 @@
+/*
+ * This software Copyright by the RPTools.net development team, and
+ * licensed under the Affero GPL Version 3 or, at your option, any later
+ * version.
+ *
+ * MapTool Source Code is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License * along with this source Code.  If not, please visit
+ * <http://www.gnu.org/licenses/> and specifically the Affero license
+ * text at <http://www.gnu.org/licenses/agpl.html>.
+ */
+package net.rptools.maptool.client.swing.label;
+
+import java.awt.BasicStroke;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.Graphics2D;
+import java.awt.Rectangle;
+import java.awt.geom.RoundRectangle2D;
+import javax.swing.SwingUtilities;
+
+/**
+ * The FlatImageLabel class represents an image label with customizable properties such as padding,
+ * colors, font, and justification. It can be used to create labels for images in various
+ * containers.
+ */
+public class FlatImageLabel {
+
+  /**
+   * The Justification enum represents the different types of text justification. It can be used to
+   * align text to the left, right, or center of a container.
+   */
+  public enum Justification {
+    /** The text is aligned to the left of the container. */
+    Left,
+    /** The text is aligned to the right of the container. */
+    Right,
+    /** The text is aligned to the center of the container. */
+    Center
+  }
+
+  /**
+   * The padX variable represents the amount of padding to be added horizontally to the text in a
+   * FlatImageLabel object.
+   *
+   * <p>This value is used in the getDimensions() and render() methods of the FlatImageLabel class
+   * to calculate the width and positioning of the rendered text.
+   *
+   * <p>The padding is added on both sides of the text, resulting in a wider width of the label. It
+   * ensures that the text is not rendered too close to the edges of the label, providing better
+   * visual aesthetics.
+   *
+   * <p>The padX value should be a non-negative integer, representing the number of pixels of
+   * padding. A higher value will result in greater horizontal spacing between the text and the
+   * edges of the label.
+   *
+   * @see FlatImageLabel#getDimensions(Graphics2D, String)
+   * @see FlatImageLabel#render(Graphics2D, int, int, String)
+   */
+  private final int padX;
+
+  /**
+   * The private final integer padY represents the vertical padding value for a FlatImageLabel. It
+   * specifies the amount of empty space (in pixels) to be added above and below the text or image
+   * within the label.
+   *
+   * <p>This value is set during the initialization of a FlatImageLabel object, using the padY
+   * parameter of the constructor. Once set, the padY value cannot be changed.
+   *
+   * <p>The padY value should be a non-negative integer, representing the number of pixels of
+   * padding. A higher value will result in greater vertical spacing between the text and the edges
+   * of the label.
+   *
+   * @see FlatImageLabel#getDimensions(Graphics2D, String)
+   * @see FlatImageLabel#render(Graphics2D, int, int, String)
+   */
+  private final int padY;
+
+  /** The background variable represents the color used as the background of a FlatImageLabel. */
+  private final Color background;
+
+  /**
+   * The foreground variable holds the color value for the foreground of a FlatImageLabel object.
+   */
+  private final Color foreground;
+
+  /**
+   * The private final variable 'font' represents the font used for rendering text in the
+   * FlatImageLabel class.
+   */
+  private final Font font;
+
+  /**
+   * The Justification enum represents the different types of text justification. It can be used to
+   * align text to the left, right, or center of a container.
+   */
+  private final Justification justification;
+
+  /** The borderColor variable represents the color used as the border of a FlatImageLabel. */
+  private final Color borderColor;
+
+  /** The borderSize variable represents the size of the border for a FlatImageLabel. */
+  private final int borderWidth;
+
+  /** The borderArc variable represents the size of the border arc for a FlatImageLabel. */
+  private final int borderArc;
+
+  /**
+   * The FlatImageLabel class represents an image label with customizable properties such as
+   * padding, colors, font, and justification. It can be used to create labels for images in various
+   * containers.
+   *
+   * @param padX the horizontal padding value for the label.
+   * @param padY the vertical padding value for the label.
+   * @param foreground the color value for the foreground of the label.
+   * @param background the color value for the background of the label.
+   * @param borderColor the color value for the border of the label.
+   * @param font the font used for rendering text in the label.
+   * @param justification the type of text justification used for the label.
+   * @param borderWidth the size of the border for the label.
+   */
+  public FlatImageLabel(
+      int padX,
+      int padY,
+      Color foreground,
+      Color background,
+      Color borderColor,
+      Font font,
+      Justification justification,
+      int borderWidth,
+      int borderArc) {
+    this.padX = padX;
+    this.padY = padY;
+    this.foreground = foreground;
+    this.background = background;
+    this.font = font;
+    this.justification = justification;
+    this.borderColor = borderColor;
+    this.borderWidth = borderWidth;
+    this.borderArc = borderArc;
+  }
+
+  /**
+   * Calculates the dimensions required to display the given string using the specified graphics
+   * context.
+   *
+   * @param graphics2D the graphics context used for rendering
+   * @param string the string to be displayed
+   * @return the dimensions required to display the string with padding
+   */
+  public Dimension getDimensions(Graphics2D graphics2D, String string) {
+    var g2d = (Graphics2D) graphics2D.create();
+    g2d.setFont(font);
+    var fm = g2d.getFontMetrics();
+    int strWidth = SwingUtilities.computeStringWidth(fm, string);
+    int strHeight = fm.getHeight();
+    return new Dimension(
+        strWidth + padX * 2 + borderWidth * 2, strHeight + padY * 2 + borderWidth * 2);
+  }
+
+  /**
+   * Renders a string with customizable properties such as font, padding, colors, and justification
+   * using the specified graphics context.
+   *
+   * @param graphics2D the graphics context used for rendering
+   * @param x the x-coordinate of the top-left corner of the rendered string
+   * @param y the y-coordinate of the top-left corner of the rendered string
+   * @param string the string to be rendered
+   * @return a Rectangle representing the dimensions and position of the rendered string with
+   *     padding
+   */
+  public Rectangle render(Graphics2D graphics2D, int x, int y, String string) {
+    var g2d = (Graphics2D) graphics2D.create();
+    g2d.setFont(font);
+    var fm = g2d.getFontMetrics();
+    int strWidth = SwingUtilities.computeStringWidth(fm, string);
+    int strHeight = fm.getAscent() - fm.getDescent() - fm.getLeading();
+
+    var dim = getDimensions(g2d, string);
+    int width = (int) dim.getWidth();
+    int height = (int) dim.getHeight();
+
+    var bounds = new Rectangle(x, y, width, height);
+
+    int stringY = y + height / 2 + strHeight / 2;
+    int stringX =
+        switch (justification) {
+          case Left -> x + padY;
+          case Right -> width - strWidth - padX;
+          case Center -> x + padX + (width - strWidth) / 2 - padX;
+        };
+
+    var labelRect = new RoundRectangle2D.Float(x, y, width - 1, height - 1, borderArc, borderArc);
+    g2d.setBackground(background);
+    g2d.setColor(background);
+    g2d.fill(labelRect);
+    g2d.setColor(foreground);
+    g2d.drawString(string, stringX, stringY);
+    if (borderWidth > 0) {
+      g2d.setStroke(new BasicStroke(borderWidth, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND));
+      g2d.setColor(borderColor);
+      g2d.draw(labelRect);
+    }
+
+    return bounds;
+  }
+}
diff --git a/src/main/java/net/rptools/maptool/client/swing/label/FlatImageLabelFactory.java b/src/main/java/net/rptools/maptool/client/swing/label/FlatImageLabelFactory.java
new file mode 100644
index 0000000000..79cfe5f2e3
--- /dev/null
+++ b/src/main/java/net/rptools/maptool/client/swing/label/FlatImageLabelFactory.java
@@ -0,0 +1,129 @@
+/*
+ * This software Copyright by the RPTools.net development team, and
+ * licensed under the Affero GPL Version 3 or, at your option, any later
+ * version.
+ *
+ * MapTool Source Code is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License * along with this source Code.  If not, please visit
+ * <http://www.gnu.org/licenses/> and specifically the Affero license
+ * text at <http://www.gnu.org/licenses/agpl.html>.
+ */
+package net.rptools.maptool.client.swing.label;
+
+import java.awt.Color;
+import net.rptools.maptool.client.AppPreferences;
+import net.rptools.maptool.client.AppStyle;
+import net.rptools.maptool.client.swing.label.FlatImageLabel.Justification;
+import net.rptools.maptool.model.Label;
+import net.rptools.maptool.model.Token;
+import net.rptools.maptool.model.Token.Type;
+
+/**
+ * The FlatImageLabelFactory class is responsible for creating instances of FlatImageLabel objects.
+ * It provides methods to customize the labels based on different parameters.
+ */
+public class FlatImageLabelFactory {
+
+  /** The singleton instance of the FlatImageLabelFactory class for NPC labels */
+  private final FlatImageLabel npcImageLabel;
+
+  /** The singleton instance of the FlatImageLabelFactory class for PC labels */
+  private final FlatImageLabel pcImageLabel;
+
+  /** The singleton instance of the FlatImageLabelFactory class for non-visible token labels */
+  private final FlatImageLabel nonVisibleImageLabel;
+
+  /** Creates a new instance of the FlatImageLabelFactory class. */
+  public FlatImageLabelFactory() {
+    var npcBackground = AppPreferences.getNPCMapLabelBG();
+    var npcForeground = AppPreferences.getNPCMapLabelFG();
+    var npcBorder = AppPreferences.getNPCMapLabelBorder();
+    var pcBackground = AppPreferences.getPCMapLabelBG();
+    var pcForeground = AppPreferences.getPCMapLabelFG();
+    var pcBorder = AppPreferences.getPCMapLabelBorder();
+    var nonVisBackground = AppPreferences.getNonVisMapLabelBG();
+    var nonVisForeground = AppPreferences.getNonVisMapLabelFG();
+    var nonVisBorder = AppPreferences.getNonVisMapLabelBorder();
+    int fontSize = AppPreferences.getMapLabelFontSize();
+    var font = AppStyle.labelFont.deriveFont(AppStyle.labelFont.getStyle(), fontSize);
+    boolean showBorder = AppPreferences.getShowMapLabelBorder();
+    int borderWidth = showBorder ? AppPreferences.getMapLabelBorderWidth() : 0;
+    int borderArc = AppPreferences.getMapLabelBorderArc();
+
+    npcImageLabel =
+        new FlatImageLabel(
+            4,
+            4,
+            npcForeground,
+            npcBackground,
+            npcBorder,
+            font,
+            Justification.Center,
+            borderWidth,
+            borderArc);
+    pcImageLabel =
+        new FlatImageLabel(
+            4,
+            4,
+            pcForeground,
+            pcBackground,
+            pcBorder,
+            font,
+            Justification.Center,
+            borderWidth,
+            borderArc);
+    nonVisibleImageLabel =
+        new FlatImageLabel(
+            4,
+            4,
+            nonVisForeground,
+            nonVisBackground,
+            nonVisBorder,
+            font,
+            Justification.Center,
+            borderWidth,
+            borderArc);
+  }
+
+  /**
+   * Retrieves the appropriate map image label based on the provided token.
+   *
+   * @param token The token representing the entity on the map.
+   * @return The map image label corresponding to the token type, and/or visibility.
+   */
+  public FlatImageLabel getMapImageLabel(Token token) {
+    if (!token.isVisible()) {
+      return nonVisibleImageLabel;
+    } else if (token.getType() == Type.NPC) {
+      return npcImageLabel;
+    } else {
+      return pcImageLabel;
+    }
+  }
+
+  /**
+   * Retrieves the map image label based on the provided label.
+   *
+   * @param label The label containing the properties for the map image label.
+   * @return The map image label with the specified properties.
+   */
+  public FlatImageLabel getMapImageLabel(Label label) {
+    var font = AppStyle.labelFont.deriveFont(AppStyle.labelFont.getStyle(), label.getFontSize());
+    var bg = label.isShowBackground() ? label.getBackgroundColor() : new Color(0, 0, 0, 0);
+    int borderSize = label.isShowBorder() ? label.getBorderWidth() : 0;
+    return new FlatImageLabel(
+        4,
+        4,
+        label.getForegroundColor(),
+        bg,
+        label.getBorderColor(),
+        font,
+        Justification.Center,
+        borderSize,
+        label.getBorderArc());
+  }
+}
diff --git a/src/main/java/net/rptools/maptool/client/tool/texttool/EditLabelDialogView.form b/src/main/java/net/rptools/maptool/client/tool/texttool/EditLabelDialogView.form
index 91025b1402..6c4b9ae292 100644
--- a/src/main/java/net/rptools/maptool/client/tool/texttool/EditLabelDialogView.form
+++ b/src/main/java/net/rptools/maptool/client/tool/texttool/EditLabelDialogView.form
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="net.rptools.maptool.client.tool.texttool.EditLabelDialogView">
-  <grid id="b6ebc" binding="mainPanel" layout-manager="GridLayoutManager" row-count="4" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+  <grid id="b6ebc" binding="mainPanel" layout-manager="GridLayoutManager" row-count="10" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="5" left="5" bottom="5" right="5"/>
     <constraints>
-      <xy x="10" y="10" width="272" height="219"/>
+      <xy x="10" y="10" width="272" height="313"/>
     </constraints>
     <properties/>
     <border type="none"/>
@@ -19,7 +19,7 @@
       </component>
       <component id="12074" class="javax.swing.JLabel">
         <constraints>
-          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+          <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <text resource-bundle="net/rptools/maptool/language/i18n" key="Label.showbackground"/>
@@ -27,7 +27,7 @@
       </component>
       <component id="b87ae" class="javax.swing.JCheckBox">
         <constraints>
-          <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="0" indent="0" use-parent-layout="false"/>
+          <grid row="2" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <name value="@showBackground"/>
@@ -37,7 +37,7 @@
       <grid id="97dca" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
         <margin top="0" left="0" bottom="0" right="0"/>
         <constraints>
-          <grid row="3" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
+          <grid row="9" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
         <border type="none"/>
@@ -66,7 +66,7 @@
       </grid>
       <component id="b0a5" class="javax.swing.JLabel">
         <constraints>
-          <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+          <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <text resource-bundle="net/rptools/maptool/language/i18n" key="Label.foreground"/>
@@ -74,13 +74,112 @@
       </component>
       <component id="76e59" class="net.rptools.maptool.client.swing.ColorWell">
         <constraints>
-          <grid row="2" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="0" indent="0" use-parent-layout="false"/>
+          <grid row="4" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <font swing-font="Panel.font"/>
           <name value="foregroundColor"/>
         </properties>
       </component>
+      <component id="93acf" class="javax.swing.JLabel">
+        <constraints>
+          <grid row="5" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <text resource-bundle="net/rptools/maptool/language/i18n" key="Label.background"/>
+        </properties>
+      </component>
+      <component id="31f49" class="net.rptools.maptool.client.swing.ColorWell">
+        <constraints>
+          <grid row="5" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="0" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <font swing-font="Panel.font"/>
+          <name value="backgroundColor"/>
+        </properties>
+      </component>
+      <component id="eb79b" class="javax.swing.JLabel">
+        <constraints>
+          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <text resource-bundle="net/rptools/maptool/language/i18n" key="Label.fontSize"/>
+        </properties>
+      </component>
+      <component id="9cde4" class="javax.swing.JSpinner" default-binding="true">
+        <constraints>
+          <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="1" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <name value="fontSize"/>
+        </properties>
+      </component>
+      <component id="a5e58" class="javax.swing.JLabel">
+        <constraints>
+          <grid row="6" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <text resource-bundle="net/rptools/maptool/language/i18n" key="Label.border.color"/>
+        </properties>
+      </component>
+      <component id="bf8e2" class="net.rptools.maptool.client.swing.ColorWell" binding="borderColor">
+        <constraints>
+          <grid row="6" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="0" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <font swing-font="Panel.font"/>
+          <name value="borderColor"/>
+        </properties>
+      </component>
+      <component id="6908a" class="javax.swing.JLabel">
+        <constraints>
+          <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <text resource-bundle="net/rptools/maptool/language/i18n" key="Label.showBorder"/>
+        </properties>
+      </component>
+      <component id="e9f11" class="javax.swing.JCheckBox" binding="showBorderCheckBox">
+        <constraints>
+          <grid row="3" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="0" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <name value="@showBorder"/>
+          <text value=""/>
+        </properties>
+      </component>
+      <component id="8b27" class="javax.swing.JLabel">
+        <constraints>
+          <grid row="7" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <text resource-bundle="net/rptools/maptool/language/i18n" key="Label.borderWidth"/>
+        </properties>
+      </component>
+      <component id="631ff" class="javax.swing.JSpinner" binding="borderWidth">
+        <constraints>
+          <grid row="7" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="1" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <name value="borderWidth"/>
+        </properties>
+      </component>
+      <component id="10333" class="javax.swing.JLabel">
+        <constraints>
+          <grid row="8" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <text resource-bundle="net/rptools/maptool/language/i18n" key="Label.borderArc"/>
+        </properties>
+      </component>
+      <component id="2a6a0" class="javax.swing.JSpinner" binding="borderArc">
+        <constraints>
+          <grid row="8" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="1" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <name value="borderArc"/>
+        </properties>
+      </component>
     </children>
   </grid>
 </form>
diff --git a/src/main/java/net/rptools/maptool/client/tool/texttool/EditLabelDialogView.java b/src/main/java/net/rptools/maptool/client/tool/texttool/EditLabelDialogView.java
index 490184addd..43056db8a1 100644
--- a/src/main/java/net/rptools/maptool/client/tool/texttool/EditLabelDialogView.java
+++ b/src/main/java/net/rptools/maptool/client/tool/texttool/EditLabelDialogView.java
@@ -16,10 +16,55 @@
 
 import java.awt.*;
 import javax.swing.*;
+import net.rptools.maptool.client.swing.ColorWell;
 
+/**
+ * The EditLabelDialogView class represents a dialog view for editing a label. It contains
+ * components for specifying label properties such as border color, border width, and border arc.
+ * The dialog view can be accessed by calling the getRootComponent() method, which returns the root
+ * component of the view.
+ */
 public class EditLabelDialogView {
+  /** The main panel for the dialog. */
   private JPanel mainPanel;
 
+  /** Checkbox to determine whether to show the border. */
+  private JCheckBox showBorderCheckBox;
+
+  private ColorWell borderColor;
+
+  /** Spinner for specifying the border width. */
+  private JSpinner borderWidth;
+
+  /** Spinner for specifying the border arc. */
+  private JSpinner borderArc;
+
+  /**
+   * The EditLabelDialogView class represents a dialog view for editing a label. It contains
+   * components for specifying label properties such as border color, border width, and border arc.
+   * The dialog view can be accessed by calling the getRootComponent() method, which returns the
+   * root component of the view.
+   */
+  public EditLabelDialogView() {
+    showBorderCheckBox.addActionListener(
+        e -> {
+          if (showBorderCheckBox.isSelected()) {
+            borderColor.setVisible(true); // disabling a ColorWell does nothing.
+            borderWidth.setEnabled(true);
+            borderArc.setEnabled(true);
+          } else {
+            borderColor.setVisible(false); // disabling a ColorWell does nothing.
+            borderWidth.setEnabled(false);
+            borderArc.setEnabled(false);
+          }
+        });
+  }
+
+  /**
+   * Retrieves the root component of the EditLabelDialogView class.
+   *
+   * @return The root component of the EditLabelDialogView class.
+   */
   public JComponent getRootComponent() {
     return mainPanel;
   }
diff --git a/src/main/java/net/rptools/maptool/client/tool/texttool/TextTool.java b/src/main/java/net/rptools/maptool/client/tool/texttool/TextTool.java
index dc591623c2..2d6eef9a51 100644
--- a/src/main/java/net/rptools/maptool/client/tool/texttool/TextTool.java
+++ b/src/main/java/net/rptools/maptool/client/tool/texttool/TextTool.java
@@ -24,6 +24,7 @@
 import javax.swing.Action;
 import javax.swing.JButton;
 import javax.swing.JDialog;
+import javax.swing.JSpinner;
 import javax.swing.JTextField;
 import javax.swing.KeyStroke;
 import javax.swing.SwingUtilities;
@@ -40,18 +41,31 @@
 import net.rptools.maptool.model.Label;
 import net.rptools.maptool.model.ZonePoint;
 
-/** */
+/**
+ * The TextTool class represents a tool that allows users to add and edit labels in a graphical
+ * editor. It extends the DefaultTool class and implements the ZoneOverlay interface.
+ */
 public class TextTool extends DefaultTool implements ZoneOverlay {
+  /** The serial version UID. */
   private static final long serialVersionUID = -8944323545051996907L;
 
+  /**
+   * Represents the currently selected Label object.
+   *
+   * @see Label
+   */
   private Label selectedLabel;
 
+  /** The horizontal offset for dragging the element. */
   private int dragOffsetX;
+
+  /** The vertical offset of the drag operation. */
   private int dragOffsetY;
+
+  /** Is the Label being dragged. */
   private boolean isDragging;
-  private boolean selectedNewLabel;
 
-  public TextTool() {}
+  private boolean selectedNewLabel;
 
   @Override
   protected void attachTo(ZoneRenderer renderer) {
@@ -76,6 +90,12 @@ public String getInstructions() {
     return "tool.label.instructions";
   }
 
+  /**
+   * Paints the overlay for the given ZoneRenderer using the provided Graphics2D object.
+   *
+   * @param renderer the ZoneRenderer object used to render the zone
+   * @param g the Graphics2D object used for rendering
+   */
   public void paintOverlay(ZoneRenderer renderer, Graphics2D g) {
     if (selectedLabel != null && renderer.getLabelBounds(selectedLabel) != null) {
       AppStyle.selectedBorder.paintWithin(g, renderer.getLabelBounds(selectedLabel));
@@ -182,11 +202,24 @@ public void mouseDragged(MouseEvent e) {
     renderer.repaint();
   }
 
+  /**
+   * The EditLabelDialog class is a dialog box that allows the user to edit a label. It extends the
+   * JDialog class and provides functionality for displaying and interacting with the label editing
+   * panel.
+   */
   public class EditLabelDialog extends JDialog {
+    /** The serial version UID. */
     private static final long serialVersionUID = 7621373725343873527L;
 
+    /** Indicates whether the changes have been accepted. */
     private boolean accepted;
 
+    /**
+     * Constructs a new EditLabelDialog.
+     *
+     * @param label the label to be edited
+     * @since [version number or first version]
+     */
     public EditLabelDialog(Label label) {
       super(MapTool.getFrame(), I18N.getText("tool.label.dialogtitle"), true);
       setDefaultCloseOperation(DISPOSE_ON_CLOSE);
@@ -199,6 +232,11 @@ public EditLabelDialog(Label label) {
       pack();
     }
 
+    /**
+     * Checks if the changes made in the dialog have been accepted.
+     *
+     * @return true if the changes have been accepted, false otherwise
+     */
     public boolean isAccepted() {
       return accepted;
     }
@@ -212,6 +250,11 @@ public void setVisible(boolean b) {
     }
   }
 
+  /**
+   * EditLabelPanel is a GUI panel used for editing label properties. It extends the AbeillePanel
+   * class and provides functionality for binding a Label model, committing changes to the model,
+   * and initializing the user interface components.
+   */
   public class EditLabelPanel extends AbeillePanel<Label> {
     private static final long serialVersionUID = 3307411310513003924L;
 
@@ -230,28 +273,103 @@ public EditLabelPanel(EditLabelDialog dialog) {
 
     @Override
     public void bind(Label model) {
-      getColorWell().setColor(model.getForegroundColor());
+      getForegroundColorWell().setColor(model.getForegroundColor());
+      getBackgroundColorWell().setColor(model.getBackgroundColor());
+      getFontSizeSpinner().setValue(model.getFontSize());
+      getBorderColorWell().setColor(model.getBorderColor());
+      getBorderWidthSpinner().setValue(model.getBorderWidth());
+      getBorderArcSpinner().setValue(model.getBorderArc());
       super.bind(model);
     }
 
     @Override
     public boolean commit() {
-      getModel().setForegroundColor(getColorWell().getColor());
+      getModel().setForegroundColor(getForegroundColorWell().getColor());
+      getModel().setBackgroundColor(getBackgroundColorWell().getColor());
+      getModel().setFontSize(Math.max((Integer) getFontSizeSpinner().getValue(), 6));
+      getModel().setBorderColor(getBorderColorWell().getColor());
+      getModel().setBorderWidth(Math.max((Integer) getBorderWidthSpinner().getValue(), 0));
+      getModel().setBorderArc(Math.max((Integer) getBorderArcSpinner().getValue(), 0));
       return super.commit();
     }
 
-    public ColorWell getColorWell() {
+    /**
+     * Retrieves the foreground color well component.
+     *
+     * @return The foreground color well component.
+     */
+    public ColorWell getForegroundColorWell() {
       return (ColorWell) getComponent("foregroundColor");
     }
 
+    /**
+     * Retrieves the background color well component.
+     *
+     * @return The background color well component.
+     */
+    public ColorWell getBackgroundColorWell() {
+      return (ColorWell) getComponent("backgroundColor");
+    }
+
+    /**
+     * Retrieves the border color well component.
+     *
+     * @return The border color well component.
+     */
+    public ColorWell getBorderColorWell() {
+      return (ColorWell) getComponent("borderColor");
+    }
+
+    /**
+     * Retrieves the border width spinner component from EditLabelPanel.
+     *
+     * @return The border width spinner component.
+     */
+    public JSpinner getBorderWidthSpinner() {
+      return (JSpinner) getComponent("borderWidth");
+    }
+
+    /**
+     * Retrieves the border arc spinner component from EditLabelPanel.
+     *
+     * @return The border arc spinner component.
+     */
+    public JSpinner getBorderArcSpinner() {
+      return (JSpinner) getComponent("borderArc");
+    }
+
+    /**
+     * Retrieves the font size spinner component from EditLabelPanel.
+     *
+     * @return The font size spinner component.
+     */
+    public JSpinner getFontSizeSpinner() {
+      return (JSpinner) getComponent("fontSize");
+    }
+
+    /**
+     * Retrieves the label text field component from EditLabelPanel.
+     *
+     * @return The label text field component.
+     */
     public JTextField getLabelTextField() {
       return (JTextField) getComponent("@label");
     }
 
+    /**
+     * Retrieves the OK button component from EditLabelPanel.
+     *
+     * @return The OK button component.
+     */
     public JButton getOKButton() {
       return (JButton) getComponent("okButton");
     }
 
+    /**
+     * Initializes the OK button by adding an ActionListener that handles the button click event.
+     * Upon clicking the OK button, the dialog's 'accepted' flag is set to true, the commit() method
+     * is called, and the dialog is closed.
+     */
     public void initOKButton() {
       getOKButton()
           .addActionListener(
@@ -262,10 +380,15 @@ public void initOKButton() {
               });
     }
 
+    /**
+     * Initializes the cancel button by adding an ActionListener that handles the button click
+     * event. Upon clicking the cancel button, the dialog is closed.
+     */
     public void initCancelButton() {
       ((JButton) getComponent("cancelButton")).addActionListener(e -> close());
     }
 
+    /** Closes the dialog. */
     private void close() {
       dialog.setVisible(false);
     }
diff --git a/src/main/java/net/rptools/maptool/client/ui/preferencesdialog/PreferencesDialog.java b/src/main/java/net/rptools/maptool/client/ui/preferencesdialog/PreferencesDialog.java
index fcff01d94f..324b26c9d9 100644
--- a/src/main/java/net/rptools/maptool/client/ui/preferencesdialog/PreferencesDialog.java
+++ b/src/main/java/net/rptools/maptool/client/ui/preferencesdialog/PreferencesDialog.java
@@ -68,131 +68,384 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
+/**
+ * Class: PreferencesDialog
+ *
+ * <p>A dialog box to manage user preferences.
+ */
 public class PreferencesDialog extends JDialog {
 
+  /** Logger instance used for logging messages in the PreferencesDialog class. */
   private static final Logger log = LogManager.getLogger(PreferencesDialog.class);
+
+  /**
+   * Represents a tabbed panel in the PreferencesDialog class. This panel is used for displaying and
+   * managing multiple tabs.
+   */
   // Tabbed Panel
   private final JTabbedPane tabbedPane;
+
+  /**
+   * Represents a check box for the preference setting to have fog of war (FOW) enabled on new maps.
+   */
   // Interactions
   private final JCheckBox newMapsHaveFOWCheckBox;
+
+  /** Represents a check box for enabling a warning popup when a token is deleted. */
   private final JCheckBox tokensPopupWarningWhenDeletedCheckBox;
+
+  /** The checkbox used to indicate whether tokens should start snapping to the grid. */
   private final JCheckBox tokensStartSnapToGridCheckBox;
+
+  /**
+   * Represents a checkbox for the preference setting to have tokens snap to the grid while being
+   * dragged.
+   */
   private final JCheckBox tokensSnapWhileDraggingCheckBox;
+
+  /** Represents a checkbox that allows the user to hide the mouse pointer while dragging. */
   private final JCheckBox hideMousePointerWhileDraggingCheckBox;
+
+  /** Represents a checkbox indicating whether to hide the token stack indicator. */
   private final JCheckBox hideTokenStackIndicatorCheckBox;
+
+  /** Represents a checkbox for controlling the visibility of new maps. */
   private final JCheckBox newMapsVisibleCheckBox;
+
+  /** Represents the checkbox for controlling the visibility of new tokens. */
   private final JCheckBox newTokensVisibleCheckBox;
+
+  /** Represents the checkbox for starting tokens with free size. */
   private final JCheckBox tokensStartFreeSizeCheckBox;
+
+  /** The checkbox for new stamps with snap-to-grid enabled. */
   private final JCheckBox stampsStartSnapToGridCheckBox;
+
+  /** The checkbox for new stamps with free size enabled. */
   private final JCheckBox stampsStartFreeSizeCheckBox;
+
+  /** Provides a checkbox for new backgrounds snap-to-grid enabled. */
   private final JCheckBox backgroundsStartSnapToGridCheckBox;
+
+  /** The checkbox for new backgrounds free size enabled. */
   private final JCheckBox backgroundsStartFreeSizeCheckBox;
+
+  /** JComboBox variable used to display duplicate token naming options. */
   private final JComboBox<LocalizedComboItem> duplicateTokenCombo;
+
+  /** JComboBox variable used to display token naming options for imported tokens. */
   private final JComboBox<LocalizedComboItem> tokenNamingCombo;
+
+  /** JComboBox variable used to display token numbering options. */
   private final JComboBox<LocalizedComboItem> showNumberingCombo;
+
+  /** JComboBox variable used to display movement metric options. */
   private final JComboBox<WalkerMetric> movementMetricCombo;
+
+  /** JComboBox variable used to display vision type options. */
   private final JComboBox<Zone.VisionType> visionTypeCombo;
+
+  /** JComboBox variable used to display map sorting options. */
   private final JComboBox<AppPreferences.MapSortType> mapSortType;
+
+  /** Checkbox for displaying or hiding * the statistics sheet on token mouseover. */
   private final JCheckBox showStatSheetCheckBox;
+
+  /** Checkbox for displaying or hiding the token portrait on token mouseover. */
   private final JCheckBox showPortraitCheckBox;
+
+  /** Checkbox for if the modifier key needs to be held down to show the stat sheet. */
   private final JCheckBox showStatSheetModifierCheckBox;
+
+  /** Checkbox for if the facing arrow should be forced to be shown. */
   private final JCheckBox forceFacingArrowCheckBox;
+
+  /** Checkbox for if the map visibility warning should be shown. */
   private final JCheckBox mapVisibilityWarning;
+
+  /** Spinner for the halo line width. */
   private final JSpinner haloLineWidthSpinner;
+
+  /** Spinner for the halo overlay opacity. */
   private final JSpinner haloOverlayOpacitySpinner;
+
+  /** Spinner for the aura overlay opacity. */
   private final JSpinner auraOverlayOpacitySpinner;
+
+  /** Spinner for the light overlay opacity. */
   private final JSpinner lightOverlayOpacitySpinner;
+
+  /** Spinner for the luminosity overlay opacity. */
   private final JSpinner lumensOverlayOpacitySpinner;
+
+  /** Spinner for the luminosity overlay border thickness. */
   private final JSpinner lumensOverlayBorderThicknessSpinner;
+
+  /** Checkbox for if the luminosity overlay should be shown by default. */
   private final JCheckBox lumensOverlayShowByDefaultCheckBox;
+
+  /** Checkbox for if the environmental lights should be shown by default. */
   private final JCheckBox lightsShowByDefaultCheckBox;
+
+  /** Spinner for the fog opacity. */
   private final JSpinner fogOverlayOpacitySpinner;
+
+  /** Checkbox for if the halo color should be used as the vision overlay. */
   private final JCheckBox useHaloColorAsVisionOverlayCheckBox;
+
+  /** Checkbox for if the vision should be auto-revealed on GM move. */
   private final JCheckBox autoRevealVisionOnGMMoveCheckBox;
+
+  /** Checkbox for if smilies should be converted to images in chat. */
   private final JCheckBox showSmiliesCheckBox;
+
+  /** Checkbox for if system sounds should be played. */
   private final JCheckBox playSystemSoundCheckBox;
+
+  /** Checkbox for if audio streams should be played. */
   private final JCheckBox playStreamsCheckBox;
+
+  /** Checkbox for if system sounds should be played only when not focused. */
   private final JCheckBox playSystemSoundOnlyWhenNotFocusedCheckBox;
+
+  /** Checkbox for if Syrinscape integration should be enabled. */
   private final JCheckBox syrinscapeActiveCheckBox;
+
+  /** Checkbox for if token facing is allowed to point to edges of the grid cells. */
   private final JCheckBox facingFaceEdges;
+
+  /** Checkbox for if token facing is allowed to point to vertices of the grid cells. */
   private final JCheckBox facingFaceVertices;
+
+  /** Checkbox for if the avatar should be shown in chat. */
   private final JCheckBox showAvatarInChat;
+
+  /** Checkbox for if new macros should be editable by players by default. */
   private final JCheckBox allowPlayerMacroEditsDefault;
+
+  /** Checkbox for if the details of inline rolls should be shown in tooltips. */
   private final JCheckBox toolTipInlineRolls;
+
+  /** Checkbox for if macro link details should be suppressed in tooltips. */
   private final JCheckBox suppressToolTipsMacroLinks;
-  private final ColorWell trustedOuputForeground;
-  private final ColorWell trustedOuputBackground;
+
+  /** ColorWell for the completed trusted path output foreground color. */
+  private final ColorWell trustedOutputForeground;
+
+  /** ColorWell for the completed trusted path output background color. */
+  private final ColorWell trustedOutputBackground;
+
+  /** Spinner for the chat autosave time. */
   private final JSpinner chatAutosaveTime;
+
+  /** Text field for the chat autosave filename format. */
   private final JTextField chatFilenameFormat;
+
+  /** Spinner for the typing notification duration. */
   private final JSpinner typingNotificationDuration;
+
+  /** ComboBox for the macro editor theme. */
   private final JComboBox<String> macroEditorThemeCombo;
+
+  /** ComboBox for the icon theme. */
   private final JComboBox<String> iconThemeCombo;
+
   // Chat Notification
+  /** ColorWell for the chat notification color. */
   private final ColorWell chatNotificationColor;
+
+  /** Checkbox for if the chat notification background should be shown. */
   private final JCheckBox chatNotificationShowBackground;
+
   // Defaults
+  /** ComboBox for the default grid type to use for new maps. */
   private final JComboBox<LocalizedComboItem> defaultGridTypeCombo;
+
+  /** Text field for the default grid size to use for new maps. */
   private final JTextField defaultGridSizeTextField;
+
+  /** Text field for the default units per cell to use for new maps. */
   private final JTextField defaultUnitsPerCellTextField;
+
+  /** Text field for the default vision distance to use for new maps. */
   private final JTextField defaultVisionDistanceTextField;
+
+  /** Spinner for the stat sheet portrait size. */
   private final JTextField statsheetPortraitSize;
+
+  /** Spinner for the auto-save interval for campaign data. */
   private final JSpinner autoSaveSpinner;
+
+  /** Checkbox for if the save reminder should be shown on exit, new campaign etc. */
   private final JCheckBox saveReminderCheckBox;
+
+  /** Checkbox for if the dialog should be shown on new token creation. */
   private final JCheckBox showDialogOnNewToken;
+
   // Accessibility
+  /** Text field for the chat font size. */
   private final JTextField fontSizeTextField;
+
+  /** Spinner for the initial delay for tooltips. */
   private final JTextField toolTipInitialDelay;
+
+  /** Spinner for the dismiss delay for tooltips. */
   private final JTextField toolTipDismissDelay;
+
   // Application
+  /** Checkbox for if the client should fit the GM view automatically. */
   private final JCheckBox fitGMView;
+
+  /** Checkbox for if the selection should be filled when selecting objects. */
   private final JCheckBox fillSelectionCheckBox;
+
+  /** Text field for the frame rate cap for rendering. */
   private final JTextField frameRateCapTextField;
 
+  /** ComboBox for the render performance optimization level. */
   private final JComboBox<LocalizedComboItem> renderPerformanceComboBox;
+
+  /** Text field for the default username when not logged into a server. */
   private final JTextField defaultUsername;
 
   // private final JCheckBox initEnableServerSyncCheckBox;
+  /** Checkbox for if non-player characters should be hidden when creating a new map. */
   private final JCheckBox hideNPCs;
+
+  /** Checkbox for if owner permissions should be granted when creating a new campaign. */
   private final JCheckBox ownerPermissions;
+
+  /** Checkbox for if movement should be locked in new campaigns. */
   private final JCheckBox lockMovement;
+
+  /** Checkbox for if initiative gain messages should be shown. */
   private final JCheckBox showInitGainMessage;
+
+  /** Text field for the UPnP discovery timeout. */
   private final JTextField upnpDiscoveryTimeoutTextField;
+
+  /** Text field for the file synchronization path. */
   private final JTextField fileSyncPath;
+
+  /** Button for opening the file synchronization path selection dialog. */
   private final JButton fileSyncPathButton;
+
+  /** Checkbox for if macros should be allowed to access external resources. */
   private final JCheckBox allowExternalMacroAccessCheckBox;
 
   // Authentication
+  /** Text area for displaying the public key for authentication. */
   private final JTextArea publicKeyTextArea;
+
+  /** Button for regenerating the public key. */
   private final JButton regeneratePublicKey;
+
+  /** Button for copying the public key to the clipboard. */
   private final JButton copyPublicKey;
 
   // Themes
+  /** List for displaying available themes. */
   private final JList<String> themeList;
+
+  /** Label for displaying the theme image. */
   private final JLabel themeImageLabel;
+
+  /** Label for displaying the theme name. */
   private final JLabel themeNameLabel;
 
+  /** List model for all available themes. */
   private final ListModel<String> allThemesListModel;
 
+  /** List model for light themes. */
   private final ListModel<String> lightThemesListModel;
 
+  /** List model for dark themes. */
   private final ListModel<String> darkThemesListModel;
+
+  /** Combo box for selecting the theme filter. */
   private final JComboBox<LocalizedComboItem> themeFilterCombo;
 
+  /** Checkbox for if the theme should be applied to the chat window. */
   private final JCheckBox useThemeForChat;
 
   // Startup
+  /** Text field for the JVM maximum memory allocation. */
   private final JTextField jvmXmxTextField;
+
+  /** Text field for the JVM initial memory allocation. */
   private final JTextField jvmXmsTextField;
+
+  /** Text field for the JVM thread stack size. */
   private final JTextField jvmXssTextField;
+
+  /** Text field for the data directory. */
   private final JTextField dataDirTextField;
+
+  /** Checkbox for if the JVM should use Direct3D. */
   private final JCheckBox jvmDirect3dCheckbox;
+
+  /** Checkbox for if the JVM should use OpenGL. */
   private final JCheckBox jvmOpenGLCheckbox;
+
+  /** Checkbox for if the JVM should initialize AWT. */
   private final JCheckBox jvmInitAwtCheckbox;
+
+  /** Combo box for selecting the language override for JAM messages. */
   private final JComboBox<String> jamLanguageOverrideComboBox;
+
+  /** Label for displaying startup information. */
   private final JLabel startupInfoLabel;
+
+  /** Flag indicating if JVM values have been changed. */
   private boolean jvmValuesChanged = false;
 
+  /** Flag indicating if theme has been changed. */
   private boolean themeChanged = false;
+
+  // Map Token Labels
+  /** ColorWell for displaying the PC token label foreground color. */
+  private final ColorWell pcTokenLabelFG;
+
+  /** ColorWell for displaying the PC token label background color. */
+  private final ColorWell pcTokenLabelBG;
+
+  /** ColorWell for displaying the NPC token label foreground color. */
+  private final ColorWell npcTokenLabelFG;
+
+  /** ColorWell for displaying the NPC token label background color. */
+  private final ColorWell npcTokenLabelBG;
+
+  /** ColorWell for displaying the non-visibility token label foreground color. */
+  private final ColorWell nonVisTokenLabelFG;
+
+  /** ColorWell for displaying the non-visibility token label background color. */
+  private final ColorWell nonVisTokenLabelBG;
+
+  /** Spinner for setting the token label font size. */
+  private final JSpinner labelFontSizeSpinner;
+
+  /** ColorWell for displaying the token label border color for PCs. */
+  private final ColorWell pcTokenLabelBorderColor;
+
+  /** ColorWell for displaying the token label border color for NPCs. */
+  private final ColorWell npcTokenLabelBorderColor;
+
+  /** ColorWell for displaying the token label border color for non-visible tokens. */
+  private final ColorWell nonVisTokenLabelBorderColor;
+
+  /** Spinner for setting the token label border width. */
+  private final JSpinner labelBorderWidthSpinner;
+
+  /** Spinner for setting the token label border arc. */
+  private final JSpinner labelBorderArcSpinner;
+
+  /** Checkbox for showing the token label border. */
+  private final JCheckBox showLabelBorderCheckBox;
+
+  /**
+   * Array of LocalizedComboItems representing the default grid types for the preferences dialog.
+   * Each item in the array consists of a grid type and its corresponding localized display name.
+   */
   private static final LocalizedComboItem[] defaultGridTypeComboItems = {
     new LocalizedComboItem(GridFactory.SQUARE, "Preferences.combo.maps.grid.square"),
     new LocalizedComboItem(GridFactory.HEX_HORI, "Preferences.combo.maps.grid.hexHori"),
@@ -200,15 +453,33 @@ public class PreferencesDialog extends JDialog {
     new LocalizedComboItem(GridFactory.ISOMETRIC, "Preferences.combo.maps.grid.isometric"),
     new LocalizedComboItem(GridFactory.NONE, "MapPropertiesDialog.image.nogrid")
   };
+
+  /**
+   * Stores the localized combo items for duplicate token preferences.
+   *
+   * @see LocalizedComboItem
+   */
   private static final LocalizedComboItem[] duplicateTokenComboItems = {
     new LocalizedComboItem(Token.NUM_INCREMENT, "Preferences.combo.tokens.duplicate.increment"),
     new LocalizedComboItem(Token.NUM_RANDOM, "Preferences.combo.tokens.duplicate.random"),
   };
+
+  /**
+   * Array of LocalizedComboItem objects for showing numbering options in a combo box.
+   *
+   * @see LocalizedComboItem
+   */
   private static final LocalizedComboItem[] showNumberingComboItems = {
     new LocalizedComboItem(Token.NUM_ON_NAME, "Preferences.combo.tokens.numbering.name"),
     new LocalizedComboItem(Token.NUM_ON_GM, "Preferences.combo.tokens.numbering.gm"),
     new LocalizedComboItem(Token.NUM_ON_BOTH, "Preferences.combo.tokens.numbering.both")
   };
+
+  /**
+   * Array of LocalizedComboItem objects for showing vision type options in a combo box.
+   *
+   * @see LocalizedComboItem
+   */
   private static final LocalizedComboItem[] tokenNamingComboItems = {
     new LocalizedComboItem(Token.NAME_USE_FILENAME, "Preferences.combo.tokens.naming.filename"),
     new LocalizedComboItem(
@@ -216,6 +487,12 @@ public class PreferencesDialog extends JDialog {
         "Preferences.combo.tokens.naming.creature",
         I18N.getString("Token.name.creature"))
   };
+
+  /**
+   * An array of WalkerMetric objects that represent different movement metrics.
+   *
+   * @see WalkerMetric
+   */
   private static final WalkerMetric[] movementMetricComboItems = {
     WalkerMetric.ONE_TWO_ONE,
     WalkerMetric.ONE_ONE_ONE,
@@ -223,6 +500,11 @@ public class PreferencesDialog extends JDialog {
     WalkerMetric.NO_DIAGONALS
   };
 
+  /**
+   * Array of LocalizedComboItem objects for showing render performance options in a combo box.
+   *
+   * @see LocalizedComboItem
+   */
   private static final LocalizedComboItem[] renderPerformanceComboItems = {
     new LocalizedComboItem(RenderQuality.LOW_SCALING.name(), "Preferences.combo.render.low"),
     new LocalizedComboItem(
@@ -230,12 +512,24 @@ public class PreferencesDialog extends JDialog {
     new LocalizedComboItem(RenderQuality.MEDIUM_SCALING.name(), "Preferences.combo.render.medium"),
     new LocalizedComboItem(RenderQuality.HIGH_SCALING.name(), "Preferences.combo.render.high")
   };
+
+  /**
+   * Array of LocalizedComboItem objects for showing theme filter options in a combo box.
+   *
+   * @see LocalizedComboItem
+   */
   private static final LocalizedComboItem[] themeFilterComboItems = {
     new LocalizedComboItem("All", "Preferences.combo.themes.filter.all"),
     new LocalizedComboItem("Dark", "Preferences.combo.themes.filter.dark"),
     new LocalizedComboItem("Light", "Preferences.combo.themes.filter.light")
   };
 
+  /**
+   * The PreferencesDialog class represents a dialog window that allows users to customize their
+   * preferences.
+   *
+   * <p>This dialog window is modal.
+   */
   public PreferencesDialog() {
     super(MapTool.getFrame(), I18N.getString("Label.preferences"), true);
     setDefaultCloseOperation(DISPOSE_ON_CLOSE);
@@ -267,26 +561,7 @@ public PreferencesDialog() {
     getRootPane().setDefaultButton(okButton);
     okButton.addActionListener(
         e -> {
-          // Warn the user that they changed JVM options and need to restart MapTool for
-          // them to take affect.
-          // Also warn user to double check settings...
-          /* This cant happen until jpackager allows startup parameters outside of app
-             see https://github.com/RPTools/maptool/issues/2174
-          if (jvmValuesChanged) {
-            if (!MapTool.confirm("msg.confirm.jvm.options")) {
-              return;
-            }
-          }
-           */
-
           boolean close = true;
-          /* This cant happen until jpackager allows startup parameters outside of app
-             see https://github.com/RPTools/maptool/issues/2174
-          if (jvmValuesChanged) {
-            close = UserJvmOptions.saveAppCfg();
-          }
-           */
-
           if (close) {
             setVisible(false);
             dispose();
@@ -313,14 +588,12 @@ public PreferencesDialog() {
     renderPerformanceComboBox = panel.getComboBox("renderPerformanceComboBox");
 
     defaultUsername = panel.getTextField("defaultUsername");
-    // initEnableServerSyncCheckBox = panel.getCheckBox("initEnableServerSyncCheckBox");
     autoSaveSpinner = panel.getSpinner("autoSaveSpinner");
     duplicateTokenCombo = panel.getComboBox("duplicateTokenCombo");
     tokenNamingCombo = panel.getComboBox("tokenNamingCombo");
     newMapsHaveFOWCheckBox = panel.getCheckBox("newMapsHaveFOWCheckBox");
     tokensPopupWarningWhenDeletedCheckBox =
         panel.getCheckBox("tokensPopupWarningWhenDeletedCheckBox"); // new
-    // JCheckBox();//panel.getCheckBox("testCheckBox");
     tokensStartSnapToGridCheckBox = panel.getCheckBox("tokensStartSnapToGridCheckBox");
     tokensSnapWhileDraggingCheckBox = panel.getCheckBox("tokensSnapWhileDragging");
     hideMousePointerWhileDraggingCheckBox = panel.getCheckBox("hideMousePointerWhileDragging");
@@ -365,8 +638,8 @@ public PreferencesDialog() {
     allowPlayerMacroEditsDefault = panel.getCheckBox("allowPlayerMacroEditsDefault");
     toolTipInlineRolls = panel.getCheckBox("toolTipInlineRolls");
     suppressToolTipsMacroLinks = panel.getCheckBox("suppressToolTipsMacroLinks");
-    trustedOuputForeground = (ColorWell) panel.getComponent("trustedOuputForeground");
-    trustedOuputBackground = (ColorWell) panel.getComponent("trustedOuputBackground");
+    trustedOutputForeground = (ColorWell) panel.getComponent("trustedOuputForeground");
+    trustedOutputBackground = (ColorWell) panel.getComponent("trustedOuputBackground");
     toolTipInitialDelay = panel.getTextField("toolTipInitialDelay");
     toolTipDismissDelay = panel.getTextField("toolTipDismissDelay");
     facingFaceEdges = panel.getCheckBox("facingFaceEdges");
@@ -428,6 +701,67 @@ public PreferencesDialog() {
 
     startupInfoLabel = panel.getLabel("startupInfoLabel");
 
+    pcTokenLabelFG = (ColorWell) panel.getComponent("pcTokenLabelFG");
+    pcTokenLabelFG.setColor(AppPreferences.getPCMapLabelFG());
+    pcTokenLabelBG = (ColorWell) panel.getComponent("pcTokenLabelBG");
+    pcTokenLabelBG.setColor(AppPreferences.getPCMapLabelBG());
+    pcTokenLabelBorderColor = (ColorWell) panel.getComponent("pcTokenLabelBorder");
+    pcTokenLabelBorderColor.setColor(AppPreferences.getPCMapLabelBorder());
+    npcTokenLabelFG = (ColorWell) panel.getComponent("npcTokenLabelFG");
+    npcTokenLabelFG.setColor(AppPreferences.getNPCMapLabelFG());
+    npcTokenLabelBG = (ColorWell) panel.getComponent("npcTokenLabelBG");
+    npcTokenLabelBG.setColor(AppPreferences.getNPCMapLabelBG());
+    npcTokenLabelBorderColor = (ColorWell) panel.getComponent("npcTokenLabelBorder");
+    npcTokenLabelBorderColor.setColor(AppPreferences.getNPCMapLabelBorder());
+    nonVisTokenLabelFG = (ColorWell) panel.getComponent("nonVisTokenLabelFG");
+    nonVisTokenLabelFG.setColor(AppPreferences.getNonVisMapLabelFG());
+    nonVisTokenLabelBG = (ColorWell) panel.getComponent("nonVisTokenLabelBG");
+    nonVisTokenLabelBG.setColor(AppPreferences.getNonVisMapLabelBG());
+    nonVisTokenLabelBorderColor = (ColorWell) panel.getComponent("nonVisTokenLabelBorder");
+    nonVisTokenLabelBorderColor.setColor(AppPreferences.getNonVisMapLabelBorder());
+
+    labelFontSizeSpinner = (JSpinner) panel.getComponent("labelFontSizeSpinner");
+    labelFontSizeSpinner.setValue(AppPreferences.getMapLabelFontSize());
+    labelBorderWidthSpinner = (JSpinner) panel.getComponent("labelBorderWidthSpinner");
+    labelBorderWidthSpinner.setValue(AppPreferences.getMapLabelBorderWidth());
+    labelBorderArcSpinner = (JSpinner) panel.getComponent("labelBorderArcSpinner");
+    labelBorderArcSpinner.setValue(AppPreferences.getMapLabelBorderArc());
+    showLabelBorderCheckBox = (JCheckBox) panel.getComponent("showLabelBorder");
+    showLabelBorderCheckBox.addActionListener(
+        e -> {
+          if (showLabelBorderCheckBox.isSelected()) {
+            pcTokenLabelBorderColor.setVisible(true); // Disabling a color well does not work
+            npcTokenLabelBorderColor.setVisible(true); // Disabling a color well does not work
+            nonVisTokenLabelBorderColor.setVisible(true); // Disabling a color well does not work
+            labelBorderWidthSpinner.setEnabled(true);
+            labelBorderArcSpinner.setEnabled(true);
+            AppPreferences.setShowMapLabelBorder(true);
+          } else {
+            pcTokenLabelBorderColor.setVisible(false); // Disabling a color well does not work
+            npcTokenLabelBorderColor.setVisible(false); // Disabling a color well does not work
+            nonVisTokenLabelBorderColor.setVisible(false); // Disabling a color well does not  work
+            labelBorderWidthSpinner.setEnabled(false);
+            labelBorderArcSpinner.setEnabled(false);
+            AppPreferences.setShowMapLabelBorder(false);
+          }
+        });
+
+    boolean showBorder = AppPreferences.getShowMapLabelBorder();
+    showLabelBorderCheckBox.setSelected(showBorder);
+    if (showBorder) {
+      pcTokenLabelBorderColor.setVisible(true);
+      npcTokenLabelBorderColor.setVisible(true);
+      nonVisTokenLabelBorderColor.setVisible(true);
+      labelBorderWidthSpinner.setEnabled(true);
+      labelBorderArcSpinner.setEnabled(true);
+    } else {
+      pcTokenLabelBorderColor.setVisible(false);
+      npcTokenLabelBorderColor.setVisible(false);
+      nonVisTokenLabelBorderColor.setVisible(false);
+      labelBorderWidthSpinner.setEnabled(false);
+      labelBorderArcSpinner.setEnabled(false);
+    }
+
     {
       final var developerOptionToggles = (JPanel) panel.getComponent("developerOptionToggles");
       final var developerLayout = developerOptionToggles.getLayout();
@@ -540,17 +874,17 @@ protected Integer convertString(String value) throws ParseException {
           MapTool.getFrame().setChatTypingLabelColor(AppPreferences.getChatNotificationColor());
         });
 
-    trustedOuputForeground.addActionListener(
+    trustedOutputForeground.addActionListener(
         e -> {
-          AppPreferences.setTrustedPrefixFG(trustedOuputForeground.getColor());
+          AppPreferences.setTrustedPrefixFG(trustedOutputForeground.getColor());
           MapTool.getFrame()
               .getCommandPanel()
               .setTrustedMacroPrefixColors(
                   AppPreferences.getTrustedPrefixFG(), AppPreferences.getTrustedPrefixBG());
         });
-    trustedOuputBackground.addActionListener(
+    trustedOutputBackground.addActionListener(
         e -> {
-          AppPreferences.setTrustedPrefixBG(trustedOuputBackground.getColor());
+          AppPreferences.setTrustedPrefixBG(trustedOutputBackground.getColor());
           MapTool.getFrame()
               .getCommandPanel()
               .setTrustedMacroPrefixColors(
@@ -856,6 +1190,75 @@ protected Integer convertString(String value) throws ParseException {
               }
             });
 
+    npcTokenLabelBG.addActionListener(
+        e -> {
+          AppPreferences.setNPCMapLabelBG(npcTokenLabelBG.getColor());
+        });
+
+    npcTokenLabelFG.addActionListener(
+        e -> {
+          AppPreferences.setNPCMapLabelFG(npcTokenLabelFG.getColor());
+        });
+
+    pcTokenLabelBG.addActionListener(
+        e -> {
+          AppPreferences.setPCMapLabelBG(pcTokenLabelBG.getColor());
+        });
+
+    pcTokenLabelFG.addActionListener(
+        e -> {
+          AppPreferences.setPCMapLabelFG(pcTokenLabelFG.getColor());
+        });
+
+    nonVisTokenLabelBG.addActionListener(
+        e -> {
+          AppPreferences.setNonVisMapLabelBG(nonVisTokenLabelBG.getColor());
+        });
+
+    nonVisTokenLabelFG.addActionListener(
+        e -> {
+          AppPreferences.setNonVisMapLabelFG(nonVisTokenLabelFG.getColor());
+        });
+
+    labelFontSizeSpinner.addChangeListener(
+        new ChangeListenerProxy() {
+          @Override
+          protected void storeSpinnerValue(int value) {
+            AppPreferences.setMapLabelFontSize(Math.max(value, 0));
+          }
+        });
+
+    pcTokenLabelBorderColor.addActionListener(
+        e -> {
+          AppPreferences.setPCMapLabelBorder(pcTokenLabelBorderColor.getColor());
+        });
+
+    npcTokenLabelBorderColor.addActionListener(
+        e -> {
+          AppPreferences.setNPCMapLabelBorder(npcTokenLabelBorderColor.getColor());
+        });
+
+    nonVisTokenLabelBorderColor.addActionListener(
+        e -> {
+          AppPreferences.setNonVisMapLabelBorder(nonVisTokenLabelBorderColor.getColor());
+        });
+
+    labelBorderWidthSpinner.addChangeListener(
+        new ChangeListenerProxy() {
+          @Override
+          protected void storeSpinnerValue(int value) {
+            AppPreferences.setMapLabelBorderWidth(Math.max(value, 0));
+          }
+        });
+
+    labelBorderArcSpinner.addChangeListener(
+        new ChangeListenerProxy() {
+          @Override
+          protected void storeSpinnerValue(int value) {
+            AppPreferences.setMapLabelBorderArc(Math.max(value, 0));
+          }
+        });
+
     fitGMView.addActionListener(e -> AppPreferences.setFitGMView(fitGMView.isSelected()));
     hideNPCs.addActionListener(e -> AppPreferences.setInitHideNpcs(hideNPCs.isSelected()));
     ownerPermissions.addActionListener(
@@ -1130,6 +1533,10 @@ private void updateFacings() {
     }
   }
 
+  /**
+   * Initializes and sets the initial state of various user preferences in the application. This
+   * method is called during the initialization process.
+   */
   private void setInitialState() {
     showDialogOnNewToken.setSelected(AppPreferences.getShowDialogOnNewToken());
     saveReminderCheckBox.setSelected(AppPreferences.getSaveReminder());
@@ -1196,8 +1603,8 @@ private void setInitialState() {
     allowPlayerMacroEditsDefault.setSelected(AppPreferences.getAllowPlayerMacroEditsDefault());
     toolTipInlineRolls.setSelected(AppPreferences.getUseToolTipForInlineRoll());
     suppressToolTipsMacroLinks.setSelected(AppPreferences.getSuppressToolTipsForMacroLinks());
-    trustedOuputForeground.setColor(AppPreferences.getTrustedPrefixFG());
-    trustedOuputBackground.setColor(AppPreferences.getTrustedPrefixBG());
+    trustedOutputForeground.setColor(AppPreferences.getTrustedPrefixFG());
+    trustedOutputBackground.setColor(AppPreferences.getTrustedPrefixBG());
     toolTipInitialDelay.setText(Integer.toString(AppPreferences.getToolTipInitialDelay()));
     toolTipDismissDelay.setText(Integer.toString(AppPreferences.getToolTipDismissDelay()));
     facingFaceEdges.setSelected(AppPreferences.getFaceEdge());
@@ -1326,12 +1733,25 @@ public void setSelected(boolean b) {
   }
 
   /**
-   * @author frank
+   * Private abstract static class representing a proxy implementation of the DocumentListener
+   * interface. This class is used to handle document changes in a JTextField and update a numeric
+   * value based on the entered text.
+   *
+   * @param <T> The type of numeric value to handle.
    */
   private abstract static class DocumentListenerProxy<T> implements DocumentListener {
 
+    /**
+     * This variable represents a JTextField component to listen for chqnges on.
+     *
+     * @see JTextField
+     */
     JTextField comp;
 
+    /**
+     * A proxy implementation of the DocumentListener interface. This class is used to handle
+     * document changes in a JTextField and update a numeric value based on the entered text.
+     */
     public DocumentListenerProxy(JTextField tf) {
       comp = tf;
     }
@@ -1351,6 +1771,13 @@ public void removeUpdate(DocumentEvent e) {
       updateValue();
     }
 
+    /**
+     * This method is used to update a numeric value based on the text entered in a JTextField
+     * component. It calls the convertString() method to parse the text and convert it into the
+     * appropriate numeric value. The parsed value is then passed to the storeNumericValue() method
+     * to update the numeric value. If the text cannot be parsed, a ParseException is caught and
+     * ignored.
+     */
     protected void updateValue() {
       try {
         storeNumericValue(convertString(comp.getText())); // Localized
@@ -1359,8 +1786,20 @@ protected void updateValue() {
       }
     }
 
+    /**
+     * Converts a string value to a specific type.
+     *
+     * @param value the string value to convert
+     * @return the converted value
+     * @throws ParseException if the string value cannot be converted
+     */
     protected abstract T convertString(String value) throws ParseException;
 
+    /**
+     * This method is used to store a numeric value.
+     *
+     * @param value the numeric value to store
+     */
     protected abstract void storeNumericValue(T value);
   }
 
@@ -1376,6 +1815,12 @@ public void stateChanged(ChangeEvent ce) {
       storeSpinnerValue(value);
     }
 
+    /**
+     * This method is used to store the value of a spinner. It is called when the state of the
+     * spinner changes.
+     *
+     * @param value the new value of the spinner
+     */
     protected abstract void storeSpinnerValue(int value);
   }
 
@@ -1384,23 +1829,52 @@ public void stateChanged(ChangeEvent ce) {
    * corresponding enum.
    */
   private static class LocalizedComboItem {
+    /** Represents the localized display name of a menu item or combo box option. */
     private final String displayName;
+
+    /**
+     * This variable represents a preference value. It stores a string that is used as a preference
+     * value for menu items or combo box options.
+     */
     private final String prefValue;
 
+    /**
+     * Creates a localized combo box item.
+     *
+     * @param prefValue the preference key to store.
+     * @param i18nKey the i18n key to use for the display name.
+     */
     LocalizedComboItem(String prefValue, String i18nKey) {
       this.prefValue = prefValue;
       displayName = I18N.getText(i18nKey);
     }
 
+    /**
+     * Creates a localized combo box item.
+     *
+     * @param prefValue the preference key to store.
+     * @param i18nKey the i18n key to use for the display name.
+     * @param args the arguments to use for the i18n key.
+     */
     LocalizedComboItem(String prefValue, String i18nKey, Object... args) {
       this.prefValue = prefValue;
       displayName = I18N.getText(i18nKey, args);
     }
 
+    /**
+     * Returns the preference key value for this item.
+     *
+     * @return the preference key value for this item.
+     */
     public String getValue() {
       return prefValue;
     }
 
+    /**
+     * Returns the localized display name of the menu item or combo box option.
+     *
+     * @return the localized display name
+     */
     public String toString() {
       return displayName;
     }
diff --git a/src/main/java/net/rptools/maptool/client/ui/preferencesdialog/PreferencesDialogView.form b/src/main/java/net/rptools/maptool/client/ui/preferencesdialog/PreferencesDialogView.form
index 531b826337..be0009cd3a 100644
--- a/src/main/java/net/rptools/maptool/client/ui/preferencesdialog/PreferencesDialogView.form
+++ b/src/main/java/net/rptools/maptool/client/ui/preferencesdialog/PreferencesDialogView.form
@@ -3,7 +3,7 @@
   <grid id="3f87d" binding="mainPanel" layout-manager="GridLayoutManager" row-count="2" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="5" left="5" bottom="5" right="5"/>
     <constraints>
-      <xy x="10" y="10" width="1101" height="751"/>
+      <xy x="10" y="10" width="1027" height="841"/>
     </constraints>
     <properties/>
     <border type="none"/>
@@ -900,13 +900,13 @@
               </grid>
             </children>
           </grid>
-          <grid id="f8e61" layout-manager="GridLayoutManager" row-count="4" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+          <grid id="f8e61" layout-manager="GridLayoutManager" row-count="5" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
             <margin top="5" left="5" bottom="5" right="5"/>
             <constraints>
               <tabbedpane title-resource-bundle="net/rptools/maptool/language/i18n" title-key="Label.accessibility"/>
             </constraints>
             <properties>
-              <visible value="false"/>
+              <visible value="true"/>
             </properties>
             <border type="none"/>
             <children>
@@ -959,7 +959,7 @@
               </component>
               <vspacer id="f517b">
                 <constraints>
-                  <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
+                  <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
                 </constraints>
               </vspacer>
               <hspacer id="20d6e">
@@ -977,6 +977,241 @@
                   <text value=""/>
                 </properties>
               </component>
+              <grid id="85d76" layout-manager="GridLayoutManager" row-count="13" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+                <margin top="0" left="0" bottom="0" right="0"/>
+                <constraints>
+                  <grid row="3" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties/>
+                <border type="none" title-resource-bundle="net/rptools/maptool/language/i18n" title-key="Preferences.label.access.tokenLabel">
+                  <font/>
+                  <title-color color="-13538620"/>
+                </border>
+                <children>
+                  <component id="8e6c3" class="javax.swing.JLabel">
+                    <constraints>
+                      <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                    </constraints>
+                    <properties>
+                      <text resource-bundle="net/rptools/maptool/language/i18n" key="Preferences.label.access.tokenLabel.size"/>
+                    </properties>
+                  </component>
+                  <component id="59257" class="javax.swing.JSpinner" default-binding="true">
+                    <constraints>
+                      <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
+                    </constraints>
+                    <properties>
+                      <name value="labelFontSizeSpinner"/>
+                      <opaque value="false"/>
+                    </properties>
+                  </component>
+                  <component id="4fce9" class="javax.swing.JLabel">
+                    <constraints>
+                      <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                    </constraints>
+                    <properties>
+                      <text resource-bundle="net/rptools/maptool/language/i18n" key="Preferences.label.access.tokenLabel.pcBackground"/>
+                    </properties>
+                  </component>
+                  <component id="f4912" class="javax.swing.JLabel">
+                    <constraints>
+                      <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                    </constraints>
+                    <properties>
+                      <text resource-bundle="net/rptools/maptool/language/i18n" key="Preferences.label.access.tokenLabel.pcForeground"/>
+                    </properties>
+                  </component>
+                  <component id="1c56f" class="javax.swing.JLabel">
+                    <constraints>
+                      <grid row="5" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                    </constraints>
+                    <properties>
+                      <text resource-bundle="net/rptools/maptool/language/i18n" key="Preferences.label.access.tokenLabel.npcBackground"/>
+                    </properties>
+                  </component>
+                  <component id="bf81b" class="javax.swing.JLabel">
+                    <constraints>
+                      <grid row="6" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                    </constraints>
+                    <properties>
+                      <text resource-bundle="net/rptools/maptool/language/i18n" key="Preferences.label.access.tokenLabel.npcForeground"/>
+                    </properties>
+                  </component>
+                  <component id="e7462" class="javax.swing.JLabel">
+                    <constraints>
+                      <grid row="8" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                    </constraints>
+                    <properties>
+                      <text resource-bundle="net/rptools/maptool/language/i18n" key="Preferences.label.access.tokenLabel.nonVisBackground"/>
+                    </properties>
+                  </component>
+                  <component id="f8c81" class="javax.swing.JLabel">
+                    <constraints>
+                      <grid row="9" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                    </constraints>
+                    <properties>
+                      <text resource-bundle="net/rptools/maptool/language/i18n" key="Preferences.label.access.tokenLabel.nonVisForeground"/>
+                    </properties>
+                  </component>
+                  <component id="64fca" class="net.rptools.maptool.client.swing.ColorWell">
+                    <constraints>
+                      <grid row="2" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                    </constraints>
+                    <properties>
+                      <font swing-font="Panel.font"/>
+                      <name value="pcTokenLabelBG"/>
+                    </properties>
+                  </component>
+                  <component id="93ef0" class="net.rptools.maptool.client.swing.ColorWell">
+                    <constraints>
+                      <grid row="3" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                    </constraints>
+                    <properties>
+                      <font swing-font="Panel.font"/>
+                      <name value="pcTokenLabelFG"/>
+                    </properties>
+                  </component>
+                  <component id="bdd65" class="net.rptools.maptool.client.swing.ColorWell">
+                    <constraints>
+                      <grid row="5" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                    </constraints>
+                    <properties>
+                      <font swing-font="Panel.font"/>
+                      <name value="npcTokenLabelBG"/>
+                    </properties>
+                  </component>
+                  <component id="6899a" class="net.rptools.maptool.client.swing.ColorWell">
+                    <constraints>
+                      <grid row="6" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                    </constraints>
+                    <properties>
+                      <font swing-font="Panel.font"/>
+                      <name value="npcTokenLabelFG"/>
+                    </properties>
+                  </component>
+                  <component id="9edc6" class="net.rptools.maptool.client.swing.ColorWell">
+                    <constraints>
+                      <grid row="8" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                    </constraints>
+                    <properties>
+                      <font swing-font="Panel.font"/>
+                      <name value="nonVisTokenLabelBG"/>
+                    </properties>
+                  </component>
+                  <component id="a4ba2" class="net.rptools.maptool.client.swing.ColorWell">
+                    <constraints>
+                      <grid row="9" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                    </constraints>
+                    <properties>
+                      <font swing-font="Panel.font"/>
+                      <name value="nonVisTokenLabelFG"/>
+                    </properties>
+                  </component>
+                  <component id="63dcd" class="javax.swing.JLabel">
+                    <constraints>
+                      <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                    </constraints>
+                    <properties>
+                      <text resource-bundle="net/rptools/maptool/language/i18n" key="Preferences.label.access.tokenLabel.pcBorderColor"/>
+                    </properties>
+                  </component>
+                  <component id="92609" class="net.rptools.maptool.client.swing.ColorWell">
+                    <constraints>
+                      <grid row="4" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                    </constraints>
+                    <properties>
+                      <font swing-font="Panel.font"/>
+                      <name value="pcTokenLabelBorder"/>
+                    </properties>
+                  </component>
+                  <component id="8623a" class="javax.swing.JLabel">
+                    <constraints>
+                      <grid row="7" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                    </constraints>
+                    <properties>
+                      <text resource-bundle="net/rptools/maptool/language/i18n" key="Preferences.label.access.tokenLabel.npcBorderColor"/>
+                    </properties>
+                  </component>
+                  <component id="afcc8" class="net.rptools.maptool.client.swing.ColorWell">
+                    <constraints>
+                      <grid row="7" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                    </constraints>
+                    <properties>
+                      <font swing-font="Panel.font"/>
+                      <name value="npcTokenLabelBorder"/>
+                    </properties>
+                  </component>
+                  <component id="b5320" class="javax.swing.JLabel">
+                    <constraints>
+                      <grid row="10" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                    </constraints>
+                    <properties>
+                      <text resource-bundle="net/rptools/maptool/language/i18n" key="Preferences.label.access.tokenLabel.nonVisBorderColor"/>
+                    </properties>
+                  </component>
+                  <component id="2d517" class="net.rptools.maptool.client.swing.ColorWell">
+                    <constraints>
+                      <grid row="10" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                    </constraints>
+                    <properties>
+                      <font swing-font="Panel.font"/>
+                      <name value="nonVisTokenLabelBorder"/>
+                    </properties>
+                  </component>
+                  <component id="2dbf5" class="javax.swing.JLabel">
+                    <constraints>
+                      <grid row="11" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                    </constraints>
+                    <properties>
+                      <text resource-bundle="net/rptools/maptool/language/i18n" key="Label.borderWidth"/>
+                    </properties>
+                  </component>
+                  <component id="e2578" class="javax.swing.JSpinner" default-binding="true">
+                    <constraints>
+                      <grid row="11" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
+                    </constraints>
+                    <properties>
+                      <name value="labelBorderWidthSpinner"/>
+                      <opaque value="false"/>
+                    </properties>
+                  </component>
+                  <component id="29fc9" class="javax.swing.JLabel">
+                    <constraints>
+                      <grid row="12" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                    </constraints>
+                    <properties>
+                      <text resource-bundle="net/rptools/maptool/language/i18n" key="Preferences.label.access.tokenLabel.borderArc"/>
+                    </properties>
+                  </component>
+                  <component id="24685" class="javax.swing.JSpinner" default-binding="true">
+                    <constraints>
+                      <grid row="12" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
+                    </constraints>
+                    <properties>
+                      <name value="labelBorderArcSpinner"/>
+                      <opaque value="false"/>
+                    </properties>
+                  </component>
+                  <component id="6e64c" class="javax.swing.JLabel">
+                    <constraints>
+                      <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                    </constraints>
+                    <properties>
+                      <text resource-bundle="net/rptools/maptool/language/i18n" key="Label.showBorder"/>
+                    </properties>
+                  </component>
+                  <component id="9b575" class="javax.swing.JCheckBox">
+                    <constraints>
+                      <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                    </constraints>
+                    <properties>
+                      <actionCommand value="New maps have fog of war"/>
+                      <name value="showLabelBorder"/>
+                      <text value=""/>
+                    </properties>
+                  </component>
+                </children>
+              </grid>
             </children>
           </grid>
           <grid id="70c12" layout-manager="GridLayoutManager" row-count="1" column-count="6" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
@@ -989,7 +1224,7 @@
             </properties>
             <border type="none"/>
             <children>
-              <grid id="aba93" layout-manager="GridLayoutManager" row-count="7" column-count="4" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+              <grid id="aba93" layout-manager="GridLayoutManager" row-count="8" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
                 <margin top="0" left="0" bottom="0" right="0"/>
                 <constraints>
                   <grid row="0" column="4" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
@@ -1000,7 +1235,7 @@
                   <grid id="c02b4" layout-manager="GridLayoutManager" row-count="3" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
                     <margin top="0" left="0" bottom="0" right="0"/>
                     <constraints>
-                      <grid row="0" column="0" row-span="1" col-span="4" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="true"/>
+                      <grid row="0" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="true"/>
                     </constraints>
                     <properties/>
                     <border type="none" title-resource-bundle="net/rptools/maptool/language/i18n" title-key="Label.performance">
@@ -1069,7 +1304,7 @@
                   <grid id="91b3d" layout-manager="GridLayoutManager" row-count="4" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
                     <margin top="0" left="0" bottom="0" right="0"/>
                     <constraints>
-                      <grid row="1" column="0" row-span="1" col-span="4" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="true"/>
+                      <grid row="1" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="true"/>
                     </constraints>
                     <properties/>
                     <border type="none" title-resource-bundle="net/rptools/maptool/language/i18n" title-key="Preferences.label.initiative.defaults">
@@ -1159,7 +1394,7 @@
                   <grid id="58760" layout-manager="GridLayoutManager" row-count="2" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
                     <margin top="0" left="0" bottom="0" right="0"/>
                     <constraints>
-                      <grid row="2" column="0" row-span="1" col-span="4" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="true"/>
+                      <grid row="2" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="true"/>
                     </constraints>
                     <properties/>
                     <border type="none" title-resource-bundle="net/rptools/maptool/language/i18n" title-key="Label.client">
@@ -1212,7 +1447,7 @@
                   <grid id="cbd77" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
                     <margin top="0" left="0" bottom="0" right="0"/>
                     <constraints>
-                      <grid row="3" column="0" row-span="1" col-span="4" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="true"/>
+                      <grid row="3" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="true"/>
                     </constraints>
                     <properties/>
                     <border type="none" title-resource-bundle="net/rptools/maptool/language/i18n" title-key="Label.macropanels">
@@ -1245,7 +1480,7 @@
                   <grid id="d929a" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
                     <margin top="0" left="0" bottom="0" right="0"/>
                     <constraints>
-                      <grid row="5" column="0" row-span="1" col-span="4" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="true"/>
+                      <grid row="5" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="true"/>
                     </constraints>
                     <properties/>
                     <border type="none" title-resource-bundle="net/rptools/maptool/language/i18n" title-key="Label.macropermissions">
@@ -1278,7 +1513,7 @@
                   <grid id="8bca9" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
                     <margin top="0" left="0" bottom="0" right="0"/>
                     <constraints>
-                      <grid row="4" column="0" row-span="1" col-span="4" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="true"/>
+                      <grid row="4" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="true"/>
                     </constraints>
                     <properties/>
                     <border type="none" title-resource-bundle="net/rptools/maptool/language/i18n" title-key="Label.upnp">
@@ -1307,10 +1542,20 @@
                       </component>
                     </children>
                   </grid>
-                  <grid id="8f668" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+                  <vspacer id="2d390">
+                    <constraints>
+                      <grid row="7" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
+                    </constraints>
+                  </vspacer>
+                  <vspacer id="eff99">
+                    <constraints>
+                      <grid row="7" column="1" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
+                    </constraints>
+                  </vspacer>
+                  <grid id="7afd" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
                     <margin top="0" left="0" bottom="0" right="0"/>
                     <constraints>
-                      <grid row="6" column="0" row-span="1" col-span="4" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="true"/>
+                      <grid row="6" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="true"/>
                     </constraints>
                     <properties/>
                     <border type="none" title-resource-bundle="net/rptools/maptool/language/i18n" title-key="Preferences.label.installDir">
@@ -1319,17 +1564,22 @@
                       <color color="-6710887"/>
                     </border>
                     <children>
-                      <component id="d8f1a" class="javax.swing.JTextField">
+                      <component id="57d9" class="javax.swing.JTextField" default-binding="true">
                         <constraints>
                           <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
                             <preferred-size width="150" height="-1"/>
                           </grid>
                         </constraints>
                         <properties>
-                          <editable value="false"/>
                           <name value="InstallDirTextField"/>
+                          <requestFocusEnabled value="false"/>
                         </properties>
                       </component>
+                      <vspacer id="f7894">
+                        <constraints>
+                          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
+                        </constraints>
+                      </vspacer>
                     </children>
                   </grid>
                 </children>
@@ -2038,7 +2288,7 @@
               </component>
             </children>
           </grid>
-          <grid id="d083" layout-manager="GridLayoutManager" row-count="7" column-count="5" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+          <grid id="d083" layout-manager="GridLayoutManager" row-count="6" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
             <margin top="5" left="5" bottom="5" right="5"/>
             <constraints>
               <tabbedpane title-resource-bundle="net/rptools/maptool/language/i18n" title-key="Label.startup"/>
@@ -2051,7 +2301,7 @@
               <grid id="1dbec" layout-manager="GridLayoutManager" row-count="3" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
                 <margin top="0" left="0" bottom="0" right="0"/>
                 <constraints>
-                  <grid row="0" column="0" row-span="1" col-span="4" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="true"/>
+                  <grid row="0" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="true"/>
                 </constraints>
                 <properties/>
                 <border type="none" title-resource-bundle="net/rptools/maptool/language/i18n" title-key="Preferences.label.jvm">
@@ -2137,7 +2387,7 @@
               <grid id="7d6e1" layout-manager="GridLayoutManager" row-count="3" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
                 <margin top="0" left="0" bottom="0" right="0"/>
                 <constraints>
-                  <grid row="3" column="0" row-span="1" col-span="4" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="true"/>
+                  <grid row="3" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="true"/>
                 </constraints>
                 <properties/>
                 <border type="none" title-resource-bundle="net/rptools/maptool/language/i18n" title-key="Preferences.label.advanced">
@@ -2205,7 +2455,7 @@
               <grid id="64613" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
                 <margin top="0" left="0" bottom="0" right="0"/>
                 <constraints>
-                  <grid row="1" column="0" row-span="1" col-span="4" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="true"/>
+                  <grid row="1" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="true"/>
                 </constraints>
                 <properties/>
                 <border type="none" title-resource-bundle="net/rptools/maptool/language/i18n" title-key="Preferences.label.language.override">
@@ -2241,7 +2491,7 @@
               <grid id="91892" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
                 <margin top="0" left="0" bottom="0" right="0"/>
                 <constraints>
-                  <grid row="2" column="0" row-span="1" col-span="4" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="true"/>
+                  <grid row="2" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="true"/>
                 </constraints>
                 <properties/>
                 <border type="none" title-resource-bundle="net/rptools/maptool/language/i18n" title-key="Preferences.label.options">
@@ -2277,7 +2527,7 @@
               <grid id="261e4" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
                 <margin top="0" left="0" bottom="0" right="0"/>
                 <constraints>
-                  <grid row="0" column="4" row-span="6" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+                  <grid row="0" column="2" row-span="5" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties/>
                 <border type="none" title-resource-bundle="net/rptools/maptool/language/i18n" title-key="Preferences.startup.label.info">
@@ -2299,12 +2549,12 @@
               </grid>
               <vspacer id="23f1f">
                 <constraints>
-                  <grid row="5" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
+                  <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
                 </constraints>
               </vspacer>
               <vspacer id="9203f">
                 <constraints>
-                  <grid row="6" column="4" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
+                  <grid row="5" column="2" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
                 </constraints>
               </vspacer>
             </children>
@@ -2338,7 +2588,7 @@
                 <children>
                   <component id="bc6ed" class="javax.swing.JLabel" binding="developerTabWarning">
                     <constraints>
-                      <grid row="0" column="0" row-span="1" col-span="4" vsize-policy="3" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                      <grid row="0" column="0" row-span="1" col-span="3" vsize-policy="3" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
                       <gridbag top="6" left="0" bottom="6" right="0" weightx="0.0" weighty="0.0"/>
                     </constraints>
                     <properties>
@@ -2349,7 +2599,7 @@
                   </component>
                   <hspacer id="100b0">
                     <constraints>
-                      <grid row="1" column="3" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+                      <grid row="1" column="2" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                       <gridbag weightx="1.0" weighty="0.0"/>
                     </constraints>
                   </hspacer>
@@ -2366,4 +2616,4 @@
       </vspacer>
     </children>
   </grid>
-</form>
\ No newline at end of file
+</form>
diff --git a/src/main/java/net/rptools/maptool/client/ui/preferencesdialog/PreferencesDialogView.java b/src/main/java/net/rptools/maptool/client/ui/preferencesdialog/PreferencesDialogView.java
index 9939a1b641..ecba6a5486 100644
--- a/src/main/java/net/rptools/maptool/client/ui/preferencesdialog/PreferencesDialogView.java
+++ b/src/main/java/net/rptools/maptool/client/ui/preferencesdialog/PreferencesDialogView.java
@@ -16,9 +16,11 @@
 
 import javax.swing.*;
 
+/**
+ * The PreferencesDialogView class represents the view for a preferences dialog. It provides methods
+ * for accessing the root component of the dialog.
+ */
 public class PreferencesDialogView {
-
-  private JPanel mainPanel;
   private JSpinner spinner1;
   private JCheckBox checkBox1;
   private JCheckBox checkBox2;
@@ -26,6 +28,17 @@ public class PreferencesDialogView {
   private JPanel developerTab;
   private JLabel developerTabWarning;
 
+  /**
+   * The mainPanel variable represents the root component of the preferences dialog view. It is an
+   * instance of JPanel and serves as the main content panel for the dialog.
+   */
+  private JPanel mainPanel;
+
+  /**
+   * Returns the root component of the preferences dialog view.
+   *
+   * @return The root component of the preferences dialog view.
+   */
   public JComponent getRootComponent() {
     return mainPanel;
   }
diff --git a/src/main/java/net/rptools/maptool/client/ui/zone/renderer/ZoneRenderer.java b/src/main/java/net/rptools/maptool/client/ui/zone/renderer/ZoneRenderer.java
index fcba0f8c77..9f029a479a 100644
--- a/src/main/java/net/rptools/maptool/client/ui/zone/renderer/ZoneRenderer.java
+++ b/src/main/java/net/rptools/maptool/client/ui/zone/renderer/ZoneRenderer.java
@@ -43,6 +43,7 @@
 import net.rptools.maptool.client.swing.ImageBorder;
 import net.rptools.maptool.client.swing.ImageLabel;
 import net.rptools.maptool.client.swing.SwingUtil;
+import net.rptools.maptool.client.swing.label.FlatImageLabelFactory;
 import net.rptools.maptool.client.tool.PointerTool;
 import net.rptools.maptool.client.tool.StampTool;
 import net.rptools.maptool.client.tool.Tool;
@@ -1208,37 +1209,18 @@ private void renderLabels(Graphics2D g, PlayerView view) {
     final var timer = CodeTimer.get();
 
     timer.start("labels-1");
+    var labelRenderFactory = new FlatImageLabelFactory();
     labelLocationList.clear();
     for (Label label : zone.getLabels()) {
+      var flabel = labelRenderFactory.getMapImageLabel(label);
       ZonePoint zp = new ZonePoint(label.getX(), label.getY());
       if (!zone.isPointVisible(zp, view)) {
         continue;
       }
       timer.start("labels-1.1");
       ScreenPoint sp = ScreenPoint.fromZonePointRnd(this, zp.x, zp.y);
-      Rectangle bounds = null;
-      if (label.isShowBackground()) {
-        bounds =
-            GraphicsUtil.drawBoxedString(
-                g,
-                label.getLabel(),
-                (int) sp.x,
-                (int) sp.y,
-                SwingUtilities.CENTER,
-                GraphicsUtil.GREY_LABEL,
-                label.getForegroundColor());
-      } else {
-        FontMetrics fm = g.getFontMetrics();
-        int strWidth = SwingUtilities.computeStringWidth(fm, label.getLabel());
-
-        int x = (int) (sp.x - strWidth / 2);
-        int y = (int) (sp.y - fm.getAscent());
-
-        g.setColor(label.getForegroundColor());
-        g.drawString(label.getLabel(), x, (int) sp.y);
-
-        bounds = new Rectangle(x, y, strWidth, fm.getHeight());
-      }
+      var dim = flabel.getDimensions(g, label.getLabel());
+      Rectangle bounds = flabel.render(g, (int) sp.x, (int) sp.y, label.getLabel());
       labelLocationList.add(new LabelLocation(bounds, label));
       timer.stop("labels-1.1");
     }
@@ -2113,6 +2095,7 @@ protected void renderTokens(
     final var timer = CodeTimer.get();
 
     Graphics2D clippedG = g;
+    var imageLabelFactory = new FlatImageLabelFactory();
 
     boolean isGMView = view.isGMView(); // speed things up
 
@@ -2797,54 +2780,32 @@ protected void renderTokens(
           name += " (" + token.getGMName() + ")";
         }
         if (!view.equals(lastView) || !labelRenderingCache.containsKey(tokId)) {
-          // if ((lastView != null && !lastView.equals(view)) ||
-          // !labelRenderingCache.containsKey(tokId)) {
           boolean hasLabel = false;
 
-          // Calculate image dimensions
-          FontMetrics fm = g.getFontMetrics();
-          Font f = g.getFont();
-          int strWidth = SwingUtilities.computeStringWidth(fm, name);
-
-          int width = strWidth + GraphicsUtil.BOX_PADDINGX * 2;
-          int height = fm.getHeight() + GraphicsUtil.BOX_PADDINGY * 2;
-          int labelHeight = height;
+          var flatImgLabel = imageLabelFactory.getMapImageLabel(token);
 
+          var nameDimension = flatImgLabel.getDimensions(g, name);
+          var labelDimension = new Dimension(0, 0);
           // If token has a label (in addition to name).
-          if (token.getLabel() != null && token.getLabel().trim().length() > 0) {
+          if (token.getLabel() != null && !token.getLabel().trim().isEmpty()) {
             hasLabel = true;
-            height = height * 2; // Double the image height for two boxed strings.
-            int labelWidth =
-                SwingUtilities.computeStringWidth(fm, token.getLabel())
-                    + GraphicsUtil.BOX_PADDINGX * 2;
-            width = Math.max(width, labelWidth);
+            labelDimension = flatImgLabel.getDimensions(g, token.getLabel());
           }
-
-          // Set up the image
-          BufferedImage labelRender = new BufferedImage(width, height, Transparency.TRANSLUCENT);
+          int width = (int) Math.max(nameDimension.getWidth(), labelDimension.getWidth());
+          int height = (int) (nameDimension.getHeight() + labelDimension.getHeight()) + 4;
+          var labelRender = new BufferedImage(width, height, Transparency.TRANSLUCENT);
           Graphics2D gLabelRender = labelRender.createGraphics();
-          gLabelRender.setFont(f); // Match font used in the main graphics context.
-          gLabelRender.setRenderingHints(g.getRenderingHints()); // Match rendering style.
+          gLabelRender.setRenderingHints(g.getRenderingHints());
 
           // Draw name and label to image
           if (hasLabel) {
-            GraphicsUtil.drawBoxedString(
+            flatImgLabel.render(
                 gLabelRender,
-                token.getLabel(),
-                width / 2,
-                height - (labelHeight / 2),
-                SwingUtilities.CENTER,
-                background,
-                foreground);
+                (width - labelDimension.width) / 2,
+                nameDimension.height + 4,
+                token.getLabel());
           }
-          GraphicsUtil.drawBoxedString(
-              gLabelRender,
-              name,
-              width / 2,
-              labelHeight / 2,
-              SwingUtilities.CENTER,
-              background,
-              foreground);
+          flatImgLabel.render(gLabelRender, (width - nameDimension.width) / 2, 0, name);
 
           // Add image to cache
           labelRenderingCache.put(tokId, labelRender);
diff --git a/src/main/java/net/rptools/maptool/model/Label.java b/src/main/java/net/rptools/maptool/model/Label.java
index 2187a36f5b..4ff3d6b337 100644
--- a/src/main/java/net/rptools/maptool/model/Label.java
+++ b/src/main/java/net/rptools/maptool/model/Label.java
@@ -17,91 +17,406 @@
 import java.awt.Color;
 import net.rptools.maptool.server.proto.LabelDto;
 
+/**
+ * The Label class represents a label in a graphical user interface. Labels are used to display text
+ * on the screen.
+ *
+ * <p>A label can have various properties such as the text content, position, visibility of the
+ * background and border, and the colors and font size.
+ *
+ * <p>This class provides methods to set and retrieve these properties of a label object.
+ * Additionally, it provides constructors to create label objects with different properties.
+ */
 public class Label {
+
+  /** The default font size for labels. */
+  public static final int DEFAULT_LABEL_FONT_SIZE = 12;
+
+  /** The default background color for labels. */
+  public static final Color DEFAULT_LABEL_BACKGROUND_COLOR = new Color(0.82f, 0.82f, 0.82f, 1.0f);
+
+  /** The default foreground color for labels. */
+  public static final Color DEFAULT_LABEL_FOREGROUND_COLOR = Color.BLACK;
+
+  /** The default border color for labels. */
+  public static final Color DEFAULT_LABEL_BORDER_COLOR = DEFAULT_LABEL_FOREGROUND_COLOR;
+
+  /** The default border width for labels. */
+  public static final int DEFAULT_LABEL_BORDER_WIDTH = 2;
+
+  /** The default border arc for labels. */
+  public static final int DEFAULT_LABEL_BORDER_ARC = 10;
+
+  /**
+   * The unique identifier for a Label object.
+   *
+   * <p>The {@link GUID} object is used to generate a globally unique identifier for each instance
+   * of the Label class. The ID is assigned when a new Label object is created and cannot be
+   * modified afterwards.
+   *
+   * <p>The ID is used to uniquely identify each Label object.
+   *
+   * @see GUID
+   */
   private final GUID id;
+
+  /** The text of the label. The text of the label is the text that is displayed on the map. */
   private String label;
-  private int x, y;
+
+  /** The x coordinate of the label is the x coordinate of the location of the label on the map. */
+  private int x;
+
+  /** The y coordinate of the label is the y coordinate of the location of the label on the map. */
+  private int y;
+
+  /** Whether the background of the label is shown. */
   private boolean showBackground;
-  private int foregroundColor;
 
-  // for serialisation
-  private Label(GUID id, String label, int x, int y, boolean showBackground, int foregroundColor) {
+  /** Whether the border of the label is shown. */
+  private boolean showBorder;
+
+  /** The border arc of the label. */
+  private int borderArc = DEFAULT_LABEL_BORDER_ARC;
+
+  /** The border color of the label. */
+  private int borderColor = DEFAULT_LABEL_BORDER_COLOR.getRGB();
+
+  /** The border width of the label. */
+  private int borderWidth = DEFAULT_LABEL_BORDER_WIDTH;
+
+  /** The foreground color of the label. */
+  private int foregroundColor = DEFAULT_LABEL_FOREGROUND_COLOR.getRGB();
+
+  /** The background color of the label. */
+  private int backgroundColor = DEFAULT_LABEL_BACKGROUND_COLOR.getRGB();
+
+  /** The font size of the label. */
+  private int fontSize = DEFAULT_LABEL_FONT_SIZE;
+
+  /**
+   * Creates a new instance of the {@link Label} class.
+   *
+   * @param id the global unique identifier of the label
+   * @param label the text content of the label
+   * @param x the x-coordinate of the label's position
+   * @param y the y-coordinate of the label's position
+   * @param showBackground indicates whether the label should show the background
+   * @param foregroundColor the color of the label's foreground
+   * @param backgroundColor the color of the label's background
+   * @param showBorder indicates whether the label should show the border
+   * @param borderArc the arc of the label's border
+   * @param fontSize the font size of the label
+   */
+  private Label(
+      GUID id,
+      String label,
+      int x,
+      int y,
+      boolean showBackground,
+      int foregroundColor,
+      int backgroundColor,
+      int borderColor,
+      boolean showBorder,
+      int borderWidth,
+      int borderArc,
+      int fontSize) {
     this.id = id;
     this.label = label;
     this.x = x;
     this.y = y;
     this.showBackground = showBackground;
     this.foregroundColor = foregroundColor;
+    this.backgroundColor = backgroundColor;
+    this.borderColor = borderColor;
+    this.showBorder = showBorder;
+    this.borderWidth = borderWidth;
+    this.borderArc = borderArc;
+    this.fontSize = fontSize;
   }
 
+  /** Creates a new instance of the Label class with an empty string as the label text. */
   public Label() {
     this("");
   }
 
+  /**
+   * Creates a new instance of the Label class with the specified label text.
+   *
+   * @param label the text content of the label
+   */
   public Label(String label) {
     this(label, 0, 0);
   }
 
+  /**
+   * Creates a new instance of the Label class with the specified label text, x-coordinate, and
+   * y-coordinate.
+   *
+   * @param label the text content of the label
+   * @param x the x-coordinate of the label's position
+   * @param y the y-coordinate of the label's position
+   */
   public Label(String label, int x, int y) {
     id = new GUID();
     this.label = label;
     this.x = x;
     this.y = y;
     showBackground = true;
+    showBorder = true;
   }
 
+  /**
+   * Creates a new instance of the Label class by copying the properties from another Label object.
+   *
+   * @param label The Label object to copy from.
+   */
   public Label(Label label) {
-    this(label.label, label.x, label.y);
+    this(
+        label.id,
+        label.label,
+        label.x,
+        label.y,
+        label.showBackground,
+        label.foregroundColor,
+        label.backgroundColor,
+        label.borderColor,
+        label.showBorder,
+        label.borderWidth,
+        label.borderArc,
+        label.fontSize);
   }
 
+  /**
+   * Retrieves the label text of the Label object.
+   *
+   * @return the label text
+   */
   public String getLabel() {
     return label;
   }
 
+  /**
+   * Sets the label text of the Label object.
+   *
+   * @param label the text content of the label
+   */
   public void setLabel(String label) {
     this.label = label;
   }
 
+  /**
+   * Retrieves the global unique identifier (GUID) of the Label object.
+   *
+   * @return the GUID of the Label object
+   */
   public GUID getId() {
     return id;
   }
 
+  /**
+   * Retrieves the x-coordinate of the Label object's position.
+   *
+   * @return the x-coordinate
+   */
   public int getX() {
     return x;
   }
 
+  /**
+   * Sets the x-coordinate of the Label object's position.
+   *
+   * @param x the x-coordinate to set
+   */
   public void setX(int x) {
     this.x = x;
   }
 
+  /**
+   * Retrieves the y-coordinate of the Label object's position.
+   *
+   * @return the y-coordinate
+   */
   public int getY() {
     return y;
   }
 
+  /**
+   * Sets the y-coordinate of the Label object's position.
+   *
+   * @param y the y-coordinate to set
+   */
   public void setY(int y) {
     this.y = y;
   }
 
+  /**
+   * Checks whether the background of the label should be shown.
+   *
+   * @return true if the background should be shown, false otherwise
+   */
   public boolean isShowBackground() {
     return showBackground;
   }
 
+  /**
+   * Sets whether the background of the label should be shown.
+   *
+   * @param showBackground indicates whether the background should be shown
+   */
   public void setShowBackground(boolean showBackground) {
     this.showBackground = showBackground;
   }
 
+  /**
+   * Retrieves the foreground color of the Label object.
+   *
+   * @return the foreground color
+   */
   public Color getForegroundColor() {
-    return new Color(foregroundColor);
+    return new Color(foregroundColor, true);
   }
 
+  /**
+   * Retrieves the background color of the Label object.
+   *
+   * @return the background color
+   */
+  public Color getBackgroundColor() {
+    return new Color(backgroundColor, true);
+  }
+
+  /**
+   * Retrieves the font size of the Label object.
+   *
+   * @return the font size
+   */
+  public int getFontSize() {
+    return fontSize;
+  }
+
+  /**
+   * Retrieves the foreground color value of the Label object.
+   *
+   * @return the foreground color value
+   */
   public int getForegroundColorValue() {
     return foregroundColor;
   }
 
+  /**
+   * Retrieves the background color value of the Label object.
+   *
+   * @return the background color value
+   */
+  public int getBackgroundColorValue() {
+    return backgroundColor;
+  }
+
+  /**
+   * Sets the foreground color of the Label object.
+   *
+   * @param foregroundColor the foreground color to set
+   */
   public void setForegroundColor(Color foregroundColor) {
     this.foregroundColor = foregroundColor.getRGB();
   }
 
+  /**
+   * Sets the background color of the Label object.
+   *
+   * @param backgroundColor the color to set as the background color
+   */
+  public void setBackgroundColor(Color backgroundColor) {
+    this.backgroundColor = backgroundColor.getRGB();
+  }
+
+  /**
+   * Sets the font size of the Label object.
+   *
+   * @param fontSize the font size to set
+   */
+  public void setFontSize(int fontSize) {
+    this.fontSize = fontSize;
+  }
+
+  /**
+   * Retrieves the border color of the Label object.
+   *
+   * @return the border color
+   */
+  public boolean isShowBorder() {
+    return showBorder;
+  }
+
+  /**
+   * Sets whether the border of the Label object should be shown.
+   *
+   * @param showBorder indicates whether the border should be shown
+   */
+  public void setShowBorder(boolean showBorder) {
+    this.showBorder = showBorder;
+  }
+
+  /**
+   * Retrieves the border color of the Label object.
+   *
+   * @return the border color
+   */
+  public Color getBorderColor() {
+    return new Color(borderColor, true);
+  }
+
+  /**
+   * Sets the border color of the Label object.
+   *
+   * @param borderColor the color to set as the border color
+   */
+  public void setBorderColor(Color borderColor) {
+    this.borderColor = borderColor.getRGB();
+  }
+
+  /**
+   * Retrieves the width of the border of the Label object.
+   *
+   * @return the width of the border
+   */
+  public int getBorderWidth() {
+    return borderWidth;
+  }
+
+  /**
+   * Sets the width of the border for the Label object.
+   *
+   * @param borderWidth the width of the border to set
+   */
+  public void setBorderWidth(int borderWidth) {
+    this.borderWidth = borderWidth;
+  }
+
+  /**
+   * Retrieves the arc of the border of the Label object.
+   *
+   * @return the arc of the border
+   */
+  public int getBorderArc() {
+    return borderArc;
+  }
+
+  /**
+   * Sets the arc of the border for the Label object.
+   *
+   * @param borderArc the arc of the border to set
+   */
+  public void setBorderArc(int borderArc) {
+    this.borderArc = borderArc;
+  }
+
+  /**
+   * Creates a new instance of the {@link Label} class based on the provided LabelDto object.
+   *
+   * @param dto the LabelDto object used to create the Label
+   * @return a new instance of the Label class
+   */
   public static Label fromDto(LabelDto dto) {
     return new Label(
         GUID.valueOf(dto.getId()),
@@ -109,9 +424,21 @@ public static Label fromDto(LabelDto dto) {
         dto.getX(),
         dto.getY(),
         dto.getShowBackground(),
-        dto.getForegroundColor());
+        dto.getForegroundColor(),
+        dto.getBackgroundColor(),
+        dto.getBorderColor(),
+        dto.getShowBorder(),
+        dto.getBorderWidth(),
+        dto.getBorderArc(),
+        dto.getFontSize());
   }
 
+  /**
+   * Converts the {@link Label} object to a {@link LabelDto} object.
+   *
+   * @return a new instance of the {@link LabelDto} class with the properties of the {@link Label}
+   *     object.
+   */
   public LabelDto toDto() {
     return LabelDto.newBuilder()
         .setId(id.toString())
@@ -120,6 +447,12 @@ public LabelDto toDto() {
         .setY(y)
         .setShowBackground(showBackground)
         .setForegroundColor(foregroundColor)
+        .setBackgroundColor(backgroundColor)
+        .setFontSize(fontSize)
+        .setBorderColor(borderColor)
+        .setShowBorder(showBorder)
+        .setBorderWidth(borderWidth)
+        .setBorderArc(borderArc)
         .build();
   }
 }
diff --git a/src/main/java/net/rptools/maptool/model/transform/campaign/LabelFontAndBGTransform.java b/src/main/java/net/rptools/maptool/model/transform/campaign/LabelFontAndBGTransform.java
new file mode 100644
index 0000000000..f0098baecb
--- /dev/null
+++ b/src/main/java/net/rptools/maptool/model/transform/campaign/LabelFontAndBGTransform.java
@@ -0,0 +1,61 @@
+/*
+ * This software Copyright by the RPTools.net development team, and
+ * licensed under the Affero GPL Version 3 or, at your option, any later
+ * version.
+ *
+ * MapTool Source Code is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License * along with this source Code.  If not, please visit
+ * <http://www.gnu.org/licenses/> and specifically the Affero license
+ * text at <http://www.gnu.org/licenses/agpl.html>.
+ */
+package net.rptools.maptool.model.transform.campaign;
+
+import java.awt.Color;
+import java.util.regex.Pattern;
+import net.rptools.lib.ModelVersionTransformation;
+import net.rptools.maptool.model.Label;
+
+/**
+ * A class that implements the ModelVersionTransformation interface to transform XML strings by
+ * replacing the end label tag with a new label tag that includes a background color and font size.
+ */
+public class LabelFontAndBGTransform implements ModelVersionTransformation {
+
+  /** The end label tag that we want to replace. */
+  private static final String endLabelTag = "</net.rptools.maptool.model.Label>";
+
+  /** The background color that we want to use for the new label tag. */
+  private static final Color legacyBackgroundColor = new Color(0.82f, 0.82f, 0.82f, 1.0f);
+
+  /** The replacement string that we want to use for the end label tag. */
+  private static final String replacement =
+      "<backgroundColor>"
+          + legacyBackgroundColor.getRGB()
+          + "</backgroundColor>\n"
+          + "<fontSize>"
+          + Label.DEFAULT_LABEL_FONT_SIZE
+          + "</fontSize>\n"
+          + "<borderColor>"
+          + Label.DEFAULT_LABEL_BORDER_COLOR.getRGB()
+          + "</borderColor>\n"
+          + "<borderWidth>"
+          + Label.DEFAULT_LABEL_BORDER_WIDTH
+          + "</borderWidth>\n"
+          + "<borderArc>"
+          + Label.DEFAULT_LABEL_BORDER_ARC
+          + "</borderArc>\n"
+          + "<showBorder>true</showBorder>\n"
+          + endLabelTag;
+
+  /** The pattern that we want to use to match the end label tag. */
+  private static final Pattern pattern = Pattern.compile(endLabelTag, Pattern.DOTALL);
+
+  @Override
+  public String transform(String xml) {
+    return pattern.matcher(xml).replaceAll(replacement);
+  }
+}
diff --git a/src/main/java/net/rptools/maptool/util/PersistenceUtil.java b/src/main/java/net/rptools/maptool/util/PersistenceUtil.java
index 2731c4ca43..21254eb2b4 100644
--- a/src/main/java/net/rptools/maptool/util/PersistenceUtil.java
+++ b/src/main/java/net/rptools/maptool/util/PersistenceUtil.java
@@ -71,6 +71,7 @@
 import net.rptools.maptool.model.library.proto.AddOnLibraryListDto;
 import net.rptools.maptool.model.transform.campaign.AssetNameTransform;
 import net.rptools.maptool.model.transform.campaign.ExportInfoTransform;
+import net.rptools.maptool.model.transform.campaign.LabelFontAndBGTransform;
 import net.rptools.maptool.model.transform.campaign.PCVisionTransform;
 import net.rptools.maptool.model.transform.campaign.TokenPropertyMapTransform;
 import org.apache.commons.io.FileUtils;
@@ -78,42 +79,91 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-/**
- * @author trevor
- */
+/** This class provides utility methods for persistence operations in the application. */
 public class PersistenceUtil {
+  /**
+   * The log variable is an instance of the Logger class provided by the
+   * LogManager.getLogger(PersistenceUtil.class) method. The Logger class is used for logging
+   * purposes and can be used to log debug, info, warning, and error messages.
+   */
   private static final Logger log = LogManager.getLogger(PersistenceUtil.class);
 
+  /** The version property for a persistencd file. */
   public static final String PROP_VERSION = "version"; // $NON-NLS-1$
+
+  /** The campaign version property for a persisted campaign. */
   public static final String PROP_CAMPAIGN_VERSION = "campaignVersion"; // $NON-NLS-1$
+
+  /**
+   * The ASSET_DIR variable represents the directory path where assets are stored within a persisted
+   * file.
+   */
   private static final String ASSET_DIR = "assets/"; // $NON-NLS-1$;
+
+  /**
+   * The HERO_LAB variable represents the directory path where HeroLab assets are stored within a
+   * persisted file.
+   */
   public static final String HERO_LAB = "herolab"; // $NON-NLS-1$
+
+  /**
+   * This variable represents the directory where drop-in library files are stored within a
+   * persisted file.
+   */
   private static final String DROP_IN_LIBRARY_DIR = "libraries/";
 
+  /** The file path for the list of drop-in libraries stored within a persisted campaign file. */
   private static final String DROP_IN_LIBRARY_LIST_FILE = DROP_IN_LIBRARY_DIR + "libraries.json";
 
+  /** The directory path for the drop-in library assets stored within a persisted campaign file. */
   private static final String DROP_IN_LIBRARY_ASSET_DIR = DROP_IN_LIBRARY_DIR + ASSET_DIR;
 
+  /** The directory where game data is stored within a persisted campaign file. */
   private static final String GAME_DATA_DIR = "data/";
 
+  /** Represents the file path of the game data content file within a persisted campaign file. */
   private static final String GAME_DATA_FILE = GAME_DATA_DIR + "game-data.json";
 
-  private static final String CAMPAIGN_VERSION = "1.11.0";
-
-  // Please add a single note regarding why the campaign version number has been updated:
-  // 1.3.70 ownerOnly added to model.Light (not backward compatible)
-  // 1.3.75 model.Token.visibleOnlyToOwner (actually added to b74 but I didn't catch it before
-  // release)
-  // 1.3.83 ExposedAreaData added to tokens in b78 but again not caught until b82 :(
-  // 1.3.85 Added CampaignProperties.hasUsedFogToolbar (old versions could ignore this field, but
-  // how to implement?)
-  // 1.4.0 Added lumens to LightSource class, old versions will not load unless saved as b89
-  // compatible
-  // 1.11.0 Added add-on libraries, if loaded and saved with an older version then add-on
-  //        libraries will be removed.
+  /**
+   * The version number of the campaign.
+   *
+   * <p>The {@code CAMPAIGN_VERSION} variable represents the version number of the campaign. It is a
+   * string value that follows the standard format of major.minor.patch. Each part of the version
+   * number represents a different level of changes and updates in the campaign.
+   *
+   * @since 1.3.70 ownerOnly added to model.Light (not backward compatible)
+   * @since 1.3.75 model.Token.visibleOnlyToOwner (actually added to b74 but I didn't catch it
+   *     before release)
+   * @since 1.3.83 ExposedAreaData added to tokens in b78 but again not caught until b82 :(
+   * @since 1.3.85 Added CampaignProperties.hasUsedFogToolbar
+   * @since 1.4.0 Added lumens to LightSource class, old versions will not load unless saved as b89
+   *     compatible
+   * @since 1.11.0 Added add-on libraries, if loaded and saved with an older version then add-on
+   *     libraries will be removed.
+   * @since 1.15.0 Labels now have background color and font, will default old lables to a similar
+   *     background color to what they had before.
+   */
+  private static final String CAMPAIGN_VERSION = "1.15.0";
 
+  /**
+   * Manager of the versioning of campaign models.
+   *
+   * @see ModelVersionManager
+   */
   private static final ModelVersionManager campaignVersionManager = new ModelVersionManager();
+
+  /**
+   * Manager of the versioning of assets within a campaign.
+   *
+   * @see ModelVersionManager
+   */
   private static final ModelVersionManager assetnameVersionManager = new ModelVersionManager();
+
+  /**
+   * Manages the versioning of the token in the system.
+   *
+   * @see ModelVersionManager
+   */
   private static final ModelVersionManager tokenVersionManager = new ModelVersionManager();
 
   static {
@@ -149,6 +199,8 @@ public class PersistenceUtil {
     campaignVersionManager.registerTransformation("1.3.75", new ExportInfoTransform());
     campaignVersionManager.registerTransformation(
         "1.3.78", new TokenPropertyMapTransform()); // FJE 2010-12-29
+    // Label background color and font
+    campaignVersionManager.registerTransformation("1.15.0", new LabelFontAndBGTransform());
 
     // For a short time, assets were stored separately in files ending with ".dat". As of 1.3.64,
     // they are
@@ -167,12 +219,33 @@ public class PersistenceUtil {
         "1.3.78", new TokenPropertyMapTransform()); // FJE 2010-12-29
   }
 
+  /**
+   * A class representing a game map that can be persisted.
+   *
+   * <p>The PersistedMap class contains information about a map, including the zone, asset map, and
+   * map tool version.
+   */
   public static class PersistedMap {
+    /**
+     * Represents a zone in a game map.
+     *
+     * @see Zone
+     */
     public Zone zone;
+
+    /**
+     * Represents a mapping of MD5Key objects to Asset objects.
+     *
+     * <p>The key of the map is an MD5Key object, which represents the MD5 key for a certain set of
+     * data. The value of the map is an Asset object, which represents an asset in a game map.
+     */
     public Map<MD5Key, Asset> assetMap = new HashMap<MD5Key, Asset>();
+
+    /** Represents the version of the Map Tool being used. */
     public String mapToolVersion;
   }
 
+  /** Class representing a persisted campaign. */
   public static class PersistedCampaign {
     public Campaign campaign;
     public Map<MD5Key, Asset> assetMap = new HashMap<MD5Key, Asset>();
@@ -181,6 +254,13 @@ public static class PersistedCampaign {
     public String mapToolVersion;
   }
 
+  /**
+   * Saves the given Zone object in a file as a persisted map.
+   *
+   * @param z The Zone object to save.
+   * @param mapFile The file to save the map to.
+   * @throws IOException If an error occurs while saving the map.
+   */
   public static void saveMap(Zone z, File mapFile) throws IOException {
     PersistedMap pMap = new PersistedMap();
     pMap.zone = z;
@@ -201,6 +281,14 @@ public static void saveMap(Zone z, File mapFile) throws IOException {
     }
   }
 
+  /**
+   * Loads a persisted map from a file.
+   *
+   * @param mapFile The file to load the map from.
+   * @return The loaded PersistedMap object representing the map, or null if the map file is not
+   *     valid.
+   * @throws IOException If an error occurs while loading the map.
+   */
   public static PersistedMap loadMap(File mapFile) throws IOException {
     PersistedMap persistedMap = null;
 
@@ -270,6 +358,13 @@ private static String fixupZoneName(String n) {
     return n;
   }
 
+  /**
+   * Saves a Campaign to a specified File.
+   *
+   * @param campaign The Campaign to save.
+   * @param campaignFile The File to save the Campaign to.
+   * @throws IOException If an I/O error occurs during the save process.
+   */
   public static void saveCampaign(Campaign campaign, File campaignFile) throws IOException {
     CodeTimer.using(
         "CampaignSave",
@@ -386,10 +481,10 @@ public static void saveCampaign(Campaign campaign, File campaignFile) throws IOE
         });
   }
 
-  /*
-   * A public function because I think it should be called when a campaign is opened as well so if it is opened then closed without saving, there is still a preview created; however, the rendering
-   * of the campaign appears to complete after AppActions.loadCampaign returns, causing the preview to always appear as black if this method is called from within loadCampaign. Either need to find
-   * another place to call saveCampaignThumbnail upon opening, or code to delay it's call until the render is complete. =P
+  /**
+   * Saves a thumbnail image for a campaign.
+   *
+   * @param fileName The file name of the campaign.
    */
   public static void saveCampaignThumbnail(String fileName) {
     BufferedImage screen = MapTool.takeMapScreenShot(new PlayerView(MapTool.getPlayer().getRole()));
@@ -423,6 +518,14 @@ public static File getCampaignThumbnailFile(String fileName) {
     return new File(AppUtil.getAppHome("campaignthumbs"), fileName + ".jpg");
   }
 
+  /**
+   * Loads a campaign from the given campaign file.
+   *
+   * @param campaignFile The campaign file to load.
+   * @return The loaded PersistedCampaign object representing the campaign, or null if the campaign
+   *     file is not valid.
+   * @throws IOException If an I/O error occurs during the loading process.
+   */
   public static PersistedCampaign loadCampaign(File campaignFile) throws IOException {
     PersistedCampaign persistedCampaign = null;
 
@@ -493,6 +596,12 @@ public static PersistedCampaign loadCampaign(File campaignFile) throws IOExcepti
     return persistedCampaign;
   }
 
+  /**
+   * Returns the filename of the thumbnail for the given PackedFile.
+   *
+   * @param pakFile The PackedFile for which to retrieve the thumbnail filename.
+   * @throws IOException If an error occurs while retrieving the thumbnail filename.
+   */
   private static String getThumbFilename(PackedFile pakFile) throws IOException {
     if ((MapTool.getThumbnailSize().width > 50 || MapTool.getThumbnailSize().height > 50)
         && pakFile.hasFile(Token.FILE_THUMBNAIL_LARGE)) return Token.FILE_THUMBNAIL_LARGE;
@@ -515,15 +624,33 @@ public static BufferedImage getTokenThumbnail(File file) throws Exception {
     return thumb;
   }
 
+  /**
+   * Saves the given Token object to a specified File.
+   *
+   * @param token The Token object to save.
+   * @param file The File to save the Token to.
+   * @throws IOException If an I/O error occurs during the save process.
+   */
   public static void saveToken(Token token, File file) throws IOException {
     saveToken(token, file, false);
   }
 
+  /**
+   * Saves the provided Token object to the specified file.
+   *
+   * @param token The Token object to save.
+   * @param file The destination file to save the Token to.
+   * @param doWait If true, wait for the image to load before saving.
+   * @throws IOException If an I/O error occurs during the save process.
+   */
   public static void saveToken(Token token, File file, boolean doWait) throws IOException {
-    // Jamz: Added a "Large Thumbnail" to support larger image grid previews
+    // Added a "Large Thumbnail" to support larger image grid previews
     BufferedImage image = null;
-    if (doWait) image = ImageManager.getImageAndWait(token.getImageAssetId());
-    else image = ImageManager.getImage(token.getImageAssetId());
+    if (doWait) {
+      image = ImageManager.getImageAndWait(token.getImageAssetId());
+    } else {
+      image = ImageManager.getImage(token.getImageAssetId());
+    }
 
     Dimension sz = new Dimension(image.getWidth(), image.getHeight());
     SwingUtil.constrainTo(sz, 50);
@@ -557,6 +684,14 @@ public static void saveToken(Token token, File file, boolean doWait) throws IOEx
     }
   }
 
+  /**
+   * Loads a Token object from the specified File.
+   *
+   * @param file The File from which to load the Token.
+   * @return The loaded Token object, or null if the file is not valid.
+   * @note if there is an error loading the token, the token then a message is displayed to the user
+   *     and null is returned.
+   */
   public static Token loadToken(File file) {
     Token token = null;
     try (PackedFile pakFile = new PackedFile(file)) {
@@ -576,6 +711,13 @@ public static Token loadToken(File file) {
     return token;
   }
 
+  /**
+   * Loads a Token object from the specified URL.
+   *
+   * @param url The URL from which to load the Token.
+   * @return The loaded Token object, or null if the URL is not valid.
+   * @throws IOException If an I/O error occurs during the loading process.
+   */
   public static Token loadToken(URL url) throws IOException {
     // Create a temporary file from the downloaded URL
     File newFile = new File(PackedFile.getTmpDir(), new GUID() + ".url");
@@ -585,6 +727,13 @@ public static Token loadToken(URL url) throws IOException {
     return token;
   }
 
+  /**
+   * Loads assets from a packed file and adds them to the asset manager.
+   *
+   * @param assetIds The collection of MD5 keys representing the assets to be loaded
+   * @param pakFile The packed file containing the assets
+   * @throws IOException If an I/O error occurs while loading the assets
+   */
   private static void loadAssets(Collection<MD5Key> assetIds, PackedFile pakFile)
       throws IOException {
     // Special handling of assets: XML file to describe the Asset, but binary file for the image
@@ -704,6 +853,12 @@ private static void loadAddOnLibraries(PackedFile packedFile) throws IOException
     }
   }
 
+  /**
+   * Saves the add-on libraries to the provided packed file.
+   *
+   * @param packedFile The packed file to save the add-on libraries to.
+   * @throws IOException If an error occurs while saving the add-on libraries.
+   */
   private static void saveAddOnLibraries(PackedFile packedFile) throws IOException {
     // remove all drop-in libraries from the packed file first.
     for (String path : packedFile.getPaths()) {
@@ -728,6 +883,12 @@ private static void saveAddOnLibraries(PackedFile packedFile) throws IOException
     }
   }
 
+  /**
+   * Loads game data from a PackedFile.
+   *
+   * @param packedFile The PackedFile containing the game data to load.
+   * @throws IOException If an I/O error occurs during the loading process.
+   */
   private static void loadGameData(PackedFile packedFile) throws IOException {
 
     if (!packedFile.hasFile(GAME_DATA_FILE)) {
@@ -747,6 +908,12 @@ private static void loadGameData(PackedFile packedFile) throws IOException {
     }
   }
 
+  /**
+   * Saves the game data to the specified packed file.
+   *
+   * @param packedFile The packed file to save the game data to.
+   * @throws IOException If an I/O error occurs while saving the game data.
+   */
   private static void saveGameData(PackedFile packedFile) throws IOException {
     // Remove all the game data from the packed file first.
     for (String path : packedFile.getPaths()) {
@@ -768,6 +935,13 @@ private static void saveGameData(PackedFile packedFile) throws IOException {
     }
   }
 
+  /**
+   * Saves a collection of assets to a specified packed file.
+   *
+   * @param assetIds A collection of MD5Key objects representing the asset IDs to be saved.
+   * @param pakFile The PackedFile object representing the file to save the assets to.
+   * @throws IOException If there is an error writing the assets to the file.
+   */
   private static void saveAssets(Collection<MD5Key> assetIds, PackedFile pakFile)
       throws IOException {
     // Special handling of assets: XML file to describe the Asset, but binary file for the image
@@ -796,20 +970,45 @@ private static void saveAssets(Collection<MD5Key> assetIds, PackedFile pakFile)
     }
   }
 
+  /**
+   * Clears all assets in the given packed file that are located in the asset directory.
+   *
+   * @param pakFile the packed file from which assets will be cleared
+   * @throws IOException if an I/O error occurs
+   */
   private static void clearAssets(PackedFile pakFile) throws IOException {
     for (String path : pakFile.getPaths()) {
-      if (path.startsWith(ASSET_DIR) && !path.equals(ASSET_DIR)) pakFile.removeFile(path);
+      if (path.startsWith(ASSET_DIR) && !path.equals(ASSET_DIR)) {
+        pakFile.removeFile(path);
+      }
     }
   }
 
+  /**
+   * Loads the legacy campaign properties from a file.
+   *
+   * @param file The file containing the legacy campaign properties.
+   * @return The loaded legacy campaign properties.
+   * @throws IOException If an I/O error occurs while reading the file.
+   * @throws FileNotFoundException If the specified file does not exist.
+   */
   public static CampaignProperties loadLegacyCampaignProperties(File file) throws IOException {
-    if (!file.exists()) throw new FileNotFoundException();
+    if (!file.exists()) {
+      throw new FileNotFoundException();
+    }
 
     try (FileInputStream in = new FileInputStream(file)) {
       return loadCampaignProperties(in);
     }
   }
 
+  /**
+   * Loads the CampaignProperties from the given InputStream.
+   *
+   * @param in the InputStream to load the CampaignProperties from
+   * @return the CampaignProperties instance loaded from the InputStream, or null if an error
+   *     occurred
+   */
   public static CampaignProperties loadCampaignProperties(InputStream in) {
     CampaignProperties props = null;
     try {
diff --git a/src/main/proto/data_transfer_objects.proto b/src/main/proto/data_transfer_objects.proto
index e7b74533ed..4b7b41d973 100644
--- a/src/main/proto/data_transfer_objects.proto
+++ b/src/main/proto/data_transfer_objects.proto
@@ -494,6 +494,12 @@ message LabelDto {
   int32 y = 4;
   bool show_background = 5;
   int32 foreground_color = 6;
+  int32 background_color = 7;
+  int32 font_size = 8;
+  int32 border_width = 9;
+  int32 border_color = 10;
+  bool show_border = 11;
+  int32 border_arc = 12;
 }
 
 message DrawnElementListDto {
diff --git a/src/main/resources/net/rptools/maptool/language/i18n.properties b/src/main/resources/net/rptools/maptool/language/i18n.properties
index a7218b0f0d..bbec01dd28 100644
--- a/src/main/resources/net/rptools/maptool/language/i18n.properties
+++ b/src/main/resources/net/rptools/maptool/language/i18n.properties
@@ -189,8 +189,10 @@ Label.image.choose  = Choose Image
 Label.table.import  = Import Table
 Label.table.export  = Export Table
 Label.preview       = Preview
-Label.foreground    = Foreground:
-Label.showbackground = Show Background:
+Label.background    = Background
+Label.foreground    = Foreground
+Label.showbackground = Show Background
+Label.fontSize      = Font Size
 Label.layers        = Layers:
 Label.view.current  = Current View
 Label.host          = Host:
@@ -606,6 +608,15 @@ Preferences.label.access.delay.dismiss            = ToolTip Dismiss Delay
 Preferences.label.access.delay.dismiss.tooltip    = The amount of time (in milliseconds) the tooltip will remain before being removed.
 Preferences.label.access.size                     = Chat Font Size
 Preferences.label.access.size.tooltip             = Point size for all chat window text (both input and output).
+Preferences.label.access.tokenLabel               = Token Name Label (On Map)
+Preferences.label.access.tokenLabel.size          = Font Size
+Preferences.label.access.tokenLabel.pcBackground  = PC Background
+Preferences.label.access.tokenLabel.pcForeground  = PC Foreground
+Preferences.label.access.tokenLabel.npcBackground = NPC Background
+Preferences.label.access.tokenLabel.npcForeground = NPC Foreground
+Preferences.label.access.tokenLabel.nonVisBackground = Non Visible Background
+Preferences.label.access.tokenLabel.nonVisForeground = Non Visible Foreground
+
 Preferences.label.sound.system                    = Play system sounds
 Preferences.label.sound.system.tooltip            = Turn this off to prevent all sounds from within MapTool.  Needed for some Java implementations as too many sounds queued up can crash the JVM.
 Preferences.label.sound.stream                    = Play clips and streams
@@ -3167,4 +3178,13 @@ advanced.roll.propertyNotNumber            = Property {0} is not a number.
 advanced.roll.noTokenInContext             = No token in context.
 advanced.roll.inputNotNumber               = Input {0} is not a number.
 Preferences.label.tokens.stack.hide=Hide Token stack indicator
-Preferences.label.tokens.stack.hide.tooltip=Token Layer stack inidicator will be hidden
\ No newline at end of file
+Preferences.label.tokens.stack.hide.tooltip=Token Layer stack inidicator will be hidden
+Label.border.color=Border Color
+Label.showBorder=Show Border
+Label.borderWidth=Border Width
+Label.borderArc=Border Arc
+Preferences.label.access.tokenLabel.pcBorderColor=PC Border Color
+Preferences.label.access.tokenLabel.npcBorderColor=NPC Border Color
+Preferences.label.access.tokenLabel.nonVisBorderColor=Non Visible Border Color
+Preferences.label.access.tokenLabel.borderSize=Border Size
+Preferences.label.access.tokenLabel.borderArc=Border Arc
\ No newline at end of file