diff --git a/src/main/java/org/fenix/llanfair/SerializationUtils.java b/src/main/java/org/fenix/llanfair/SerializationUtils.java
index 1274bfd..118cb77 100644
--- a/src/main/java/org/fenix/llanfair/SerializationUtils.java
+++ b/src/main/java/org/fenix/llanfair/SerializationUtils.java
@@ -7,9 +7,13 @@ import com.thoughtworks.xstream.converters.MarshallingContext;
 import com.thoughtworks.xstream.converters.UnmarshallingContext;
 import com.thoughtworks.xstream.io.HierarchicalStreamReader;
 import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
+import org.fenix.llanfair.config.Accuracy;
+import org.fenix.llanfair.config.Compare;
+import org.fenix.llanfair.config.Merge;
 import org.fenix.utils.config.Configuration;
 
 import javax.swing.*;
+import java.awt.*;
 import java.io.*;
 import java.util.Base64;
 
@@ -24,6 +28,11 @@ public class SerializationUtils {
 		xml.alias("Config", Configuration.class);
 		xml.alias("Segment", Segment.class);
 
+		xml.alias("CompareMethod", Compare.class);
+		xml.alias("TimeAccuracy", Accuracy.class);
+		xml.alias("Merge", Merge.class);
+
+		xml.registerConverter(new FontConverter());
 		xml.registerConverter(new ImageIconConverter());
 	}
 
@@ -75,4 +84,42 @@ public class SerializationUtils {
 			return type.equals(ImageIcon.class);
 		}
 	}
+
+	public static class FontConverter implements Converter {
+		@Override
+		public void marshal(Object source, HierarchicalStreamWriter writer, MarshallingContext context) {
+			Font font = (Font)source;
+			writer.startNode("Font");
+			writer.startNode("family");
+			writer.setValue(font.getFamily());
+			writer.endNode();
+			writer.startNode("size");
+			writer.setValue("" + font.getSize());
+			writer.endNode();
+			writer.endNode();
+		}
+
+		@Override
+		public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext context) {
+			String family = null;
+			int size = 0;
+			reader.moveDown();
+			while (reader.hasMoreChildren()) {
+				reader.moveDown();
+				if (reader.getNodeName().equals("family"))
+					family = reader.getValue();
+				else if (reader.getNodeName().equals("size"))
+					size = Integer.parseInt(reader.getValue());
+				reader.moveUp();
+			}
+			reader.moveUp();
+
+			return new Font(family, Font.PLAIN, size);
+		}
+
+		@Override
+		public boolean canConvert(Class type) {
+			return type.equals(Font.class);
+		}
+	}
 }
diff --git a/src/main/java/org/fenix/utils/config/Configuration.java b/src/main/java/org/fenix/utils/config/Configuration.java
index aae2410..c97eb5a 100644
--- a/src/main/java/org/fenix/utils/config/Configuration.java
+++ b/src/main/java/org/fenix/utils/config/Configuration.java
@@ -7,6 +7,8 @@ package org.fenix.utils.config;
 
 import com.thoughtworks.xstream.XStream;
 import com.thoughtworks.xstream.io.xml.DomDriver;
+import org.fenix.llanfair.SerializationUtils;
+
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeSupport;
 import java.io.File;
@@ -159,6 +161,7 @@ public class Configuration implements Serializable {
 
 	public void serialize() {
 		XStream xstream = new XStream(new DomDriver());
+		SerializationUtils.customize(xstream);
 		String xmlOutput = xstream.toXML(this);
 		FileWriter stream = null;
 
@@ -179,6 +182,7 @@ public class Configuration implements Serializable {
 
 	private static Configuration deserialize(File path) {
 		XStream xstream = new XStream(new DomDriver());
+		SerializationUtils.customize(xstream);
 		Configuration input = (Configuration)xstream.fromXML(path);
 		input.setPath(path);
 		return input;