diff --git a/src/main/java/org/fife/rsta/ac/LanguageSupportFactory.java b/src/main/java/org/fife/rsta/ac/LanguageSupportFactory.java
index c110eb24..d3a321d0 100644
--- a/src/main/java/org/fife/rsta/ac/LanguageSupportFactory.java
+++ b/src/main/java/org/fife/rsta/ac/LanguageSupportFactory.java
@@ -14,227 +14,178 @@
 import java.beans.PropertyChangeListener;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.ServiceLoader;
 
 import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
 import org.fife.ui.rsyntaxtextarea.SyntaxConstants;
 
-
 /**
- * Provides language support (code completion, etc.) for programming
- * languages in RSyntaxTextArea.  Different languages may  have varying
- * levels of "support."
+ * Provides language support (code completion, etc.) for programming languages
+ * in RSyntaxTextArea. Different languages may have varying levels of "support."
  *
  * @author Robert Futrell
  * @version 1.0
  */
-public class LanguageSupportFactory implements PropertyChangeListener {
-
-	private static final LanguageSupportFactory INSTANCE =
-										new LanguageSupportFactory();
-
-	/**
-	 * Maps styles to class-names-for-language-supports; this way we can lazily
-	 * create the <code>LanguageSupports</code> when necessary.
-	 */
-	private Map<String, String> styleToSupportClass;
-
-	/**
-	 * Maps syntax styles to language supports for them.
-	 */
-	private Map<String, LanguageSupport> styleToSupport;
-
-
-	/**
-	 * Client property set on RSyntaxTextAreas that points to the current
-	 * language support for that text area.
-	 */
-	private static final String LANGUAGE_SUPPORT_PROPERTY =
-									"org.fife.rsta.ac.LanguageSupport";
-
-
-	/**
-	 * Constructor.
-	 */
-	private LanguageSupportFactory() {
-		createSupportMap();
-	}
-
-
-	/**
-	 * Adds language support for a language.  This is a hook for applications
-	 * using this library to add language support for custom languages.
-	 *
-	 * @param style The language to add support for.  This should be one of
-	 *        the values defined in {@link SyntaxConstants}.  Any previous
-	 *        language support for this language is removed. 
-	 * @param lsClassName The class name of the <code>LanguageSupport</code>.
-	 */
-	public void addLanguageSupport(String style, String lsClassName) {
-		styleToSupportClass.put(style,  lsClassName);
-	}
-
-
-	/**
-	 * Creates the mapping of syntax styles to language supports.
-	 */
-	private void createSupportMap() {
-
-		styleToSupport = new HashMap<String, LanguageSupport>();
-		styleToSupportClass = new HashMap<String, String>();
-
-		String prefix = "org.fife.rsta.ac.";
-
-		addLanguageSupport(SyntaxConstants.SYNTAX_STYLE_C,
-				prefix + "c.CLanguageSupport");
-		addLanguageSupport(SyntaxConstants.SYNTAX_STYLE_CSS,
-				prefix + "css.CssLanguageSupport");
-		addLanguageSupport(SyntaxConstants.SYNTAX_STYLE_GROOVY,
-				prefix + "groovy.GroovyLanguageSupport");
-		addLanguageSupport(SyntaxConstants.SYNTAX_STYLE_HTML,
-				prefix + "html.HtmlLanguageSupport");
-		addLanguageSupport(SyntaxConstants.SYNTAX_STYLE_JAVA,
-				prefix + "java.JavaLanguageSupport");
-		addLanguageSupport(SyntaxConstants.SYNTAX_STYLE_JAVASCRIPT,
-				prefix + "js.JavaScriptLanguageSupport");
-		addLanguageSupport(SyntaxConstants.SYNTAX_STYLE_JSP,
-				prefix + "jsp.JspLanguageSupport");
-		addLanguageSupport(SyntaxConstants.SYNTAX_STYLE_LESS,
-				prefix + "less.LessLanguageSupport");
-		addLanguageSupport(SyntaxConstants.SYNTAX_STYLE_PERL,
-				prefix + "perl.PerlLanguageSupport");
-		addLanguageSupport(SyntaxConstants.SYNTAX_STYLE_PHP,
-				prefix + "php.PhpLanguageSupport");
-		addLanguageSupport(SyntaxConstants.SYNTAX_STYLE_TYPESCRIPT,
-				prefix + "ts.TypeScriptLanguageSupport");
-		addLanguageSupport(SyntaxConstants.SYNTAX_STYLE_UNIX_SHELL,
-				prefix + "sh.ShellLanguageSupport");
-		addLanguageSupport(SyntaxConstants.SYNTAX_STYLE_XML,
-				prefix + "xml.XmlLanguageSupport");
-
-	}
-
-
-	/**
-	 * Returns the singleton instance of this class.
-	 *
-	 * @return The singleton instance.
-	 */
-	public static LanguageSupportFactory get() {
-		return INSTANCE;
-	}
-
-
-	/**
-	 * Returns the language support for a programming language.
-	 *
-	 * @param style The language.  This should be one of the constants defined
-	 *        in {@link SyntaxConstants}.
-	 * @return The language support, or <code>null</code> if none is registered
-	 *         for the language specified.
-	 */
-	public LanguageSupport getSupportFor(String style) {
-
-		LanguageSupport support = styleToSupport.get(style);
-
-		if (support==null) {
-			String supportClazz = styleToSupportClass.get(style);
-			if (supportClazz!=null) {
-				try {
-					Class<?> clazz = Class.forName(supportClazz);
-					support = (LanguageSupport)clazz.newInstance();
-				} catch (RuntimeException re) { // FindBugs
-					throw re;
-				} catch (Exception e) {
-					e.printStackTrace();
-				}
-				styleToSupport.put(style, support);
-				// Always remove from classes to load, so we don't try again
-				styleToSupportClass.remove(style);
-			}
-		}
-
-		return support;
-
-	}
-
-
-	/**
-	 * Installs language support on an RSTA depending on its syntax style.
-	 *
-	 * @param textArea The text area to install language support on.
-	 * @see #uninstallSupport(RSyntaxTextArea)
-	 */
-	private void installSupport(RSyntaxTextArea textArea) {
-		String style = textArea.getSyntaxEditingStyle();
-		LanguageSupport support = getSupportFor(style);
-		if (support!=null) {
-			support.install(textArea);
-		}
-		textArea.putClientProperty(LANGUAGE_SUPPORT_PROPERTY, support);
-	}
-
-
-	/**
-	 * Listens for RSyntaxTextAreas to change what language they're
-	 * highlighting, so language support can be updated appropriately.
-	 *
-	 * @param e The event.
-	 */
-	@Override
-	public void propertyChange(PropertyChangeEvent e) {
-
-		RSyntaxTextArea source = (RSyntaxTextArea)e.getSource();
-		String name = e.getPropertyName();
-		if (RSyntaxTextArea.SYNTAX_STYLE_PROPERTY.equals(name)) {
-			uninstallSupport(source);
-			installSupport(source);
-		}
-
-	}
-
-
-	/**
-	 * Registers an RSyntaxTextArea to receive language support.  The text area
-	 * will get support for the currently highlighted language, and if it
-	 * changes what language it is highlighting, the support will change as
-	 * appropriate.
-	 *
-	 * @param textArea The text area to register.
-	 */
-	public void register(RSyntaxTextArea textArea) {
-		installSupport(textArea);
-		textArea.addPropertyChangeListener(
-				RSyntaxTextArea.SYNTAX_STYLE_PROPERTY, this);
-	}
-
-
-	/**
-	 * Uninstalls the language support on an RSyntaxTextArea, if any.
-	 *
-	 * @param textArea The text area.
-	 * @see #installSupport(RSyntaxTextArea)
-	 */
-	private void uninstallSupport(RSyntaxTextArea textArea) {
-		LanguageSupport support = (LanguageSupport)textArea.getClientProperty(
-												LANGUAGE_SUPPORT_PROPERTY);
-		if (support!=null) {
-			support.uninstall(textArea);
-		}
-	}
-
-
-	/**
-	 * Un-registers an RSyntaxTextArea.  This removes any language support
-	 * on it.
-	 *
-	 * @param textArea The text area.
-	 * @see #register(RSyntaxTextArea)
-	 */
-	public void unregister(RSyntaxTextArea textArea) {
-		uninstallSupport(textArea);
-		textArea.removePropertyChangeListener(
-				RSyntaxTextArea.SYNTAX_STYLE_PROPERTY, this);
-	}
-
-
-}
\ No newline at end of file
+public final class LanguageSupportFactory implements PropertyChangeListener {
+
+    private static final LanguageSupportFactory INSTANCE
+            = new LanguageSupportFactory();
+
+    /**
+     * Maps styles to class-names-for-language-supports; this way we can lazily
+     * create the <code>LanguageSupports</code> when necessary.
+     */
+    private final Map<String, String> styleToSupportClass;
+
+    /**
+     * Maps syntax styles to language supports for them.
+     */
+    private final Map<String, LanguageSupport> styleToSupport;
+
+    /**
+     * Client property set on RSyntaxTextAreas that points to the current
+     * language support for that text area.
+     */
+    private static final String LANGUAGE_SUPPORT_PROPERTY
+            = "org.fife.rsta.ac.LanguageSupport";
+
+    /**
+     * Constructor.
+     */
+    private LanguageSupportFactory() {
+        styleToSupport = new HashMap<String, LanguageSupport>();
+        styleToSupportClass = new HashMap<String, String>();
+        ServiceLoader<LanguageSupportRegistration> s = ServiceLoader.load(LanguageSupportRegistration.class);
+        for(LanguageSupportRegistration l : s) {
+            addLanguageSupport(l.getLanguage(), l.getLanguageSupportType());
+        }
+    }
+
+    /**
+     * Adds language support for a language. This is a hook for applications
+     * using this library to add language support for custom languages.
+     *
+     * @param style The language to add support for. This should be one of the
+     * values defined in {@link SyntaxConstants}. Any previous language support
+     * for this language is removed.
+     * @param lsClassName The class name of the <code>LanguageSupport</code>.
+     */
+    public void addLanguageSupport(String style, String lsClassName) {
+        styleToSupportClass.put(style, lsClassName);
+    }
+
+    /**
+     * Returns the singleton instance of this class.
+     *
+     * @return The singleton instance.
+     */
+    public static LanguageSupportFactory get() {
+        return INSTANCE;
+    }
+
+    /**
+     * Returns the language support for a programming language.
+     *
+     * @param style The language. This should be one of the constants defined in
+     * {@link SyntaxConstants}.
+     * @return The language support, or <code>null</code> if none is registered
+     * for the language specified.
+     */
+    public LanguageSupport getSupportFor(String style) {
+
+        LanguageSupport support = styleToSupport.get(style);
+
+        if (support == null) {
+            String supportClazz = styleToSupportClass.get(style);
+            if (supportClazz != null) {
+                try {
+                    Class<?> clazz = Class.forName(supportClazz);
+                    support = (LanguageSupport) clazz.newInstance();
+                } catch (RuntimeException re) { // FindBugs
+                    throw re;
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+                styleToSupport.put(style, support);
+                // Always remove from classes to load, so we don't try again
+                styleToSupportClass.remove(style);
+            }
+        }
+
+        return support;
+
+    }
+
+    /**
+     * Installs language support on an RSTA depending on its syntax style.
+     *
+     * @param textArea The text area to install language support on.
+     * @see #uninstallSupport(RSyntaxTextArea)
+     */
+    private void installSupport(RSyntaxTextArea textArea) {
+        String style = textArea.getSyntaxEditingStyle();
+        LanguageSupport support = getSupportFor(style);
+        if (support != null) {
+            support.install(textArea);
+        }
+        textArea.putClientProperty(LANGUAGE_SUPPORT_PROPERTY, support);
+    }
+
+    /**
+     * Listens for RSyntaxTextAreas to change what language they're
+     * highlighting, so language support can be updated appropriately.
+     *
+     * @param e The event.
+     */
+    public void propertyChange(PropertyChangeEvent e) {
+
+        RSyntaxTextArea source = (RSyntaxTextArea) e.getSource();
+        String name = e.getPropertyName();
+        if (RSyntaxTextArea.SYNTAX_STYLE_PROPERTY.equals(name)) {
+            uninstallSupport(source);
+            installSupport(source);
+        }
+
+    }
+
+    /**
+     * Registers an RSyntaxTextArea to receive language support. The text area
+     * will get support for the currently highlighted language, and if it
+     * changes what language it is highlighting, the support will change as
+     * appropriate.
+     *
+     * @param textArea The text area to register.
+     */
+    public void register(RSyntaxTextArea textArea) {
+        installSupport(textArea);
+        textArea.addPropertyChangeListener(
+                RSyntaxTextArea.SYNTAX_STYLE_PROPERTY, this);
+    }
+
+    /**
+     * Uninstalls the language support on an RSyntaxTextArea, if any.
+     *
+     * @param textArea The text area.
+     * @see #installSupport(RSyntaxTextArea)
+     */
+    private void uninstallSupport(RSyntaxTextArea textArea) {
+        LanguageSupport support = (LanguageSupport) textArea.getClientProperty(
+                LANGUAGE_SUPPORT_PROPERTY);
+        if (support != null) {
+            support.uninstall(textArea);
+        }
+    }
+
+    /**
+     * Un-registers an RSyntaxTextArea. This removes any language support on it.
+     *
+     * @param textArea The text area.
+     * @see #register(RSyntaxTextArea)
+     */
+    public void unregister(RSyntaxTextArea textArea) {
+        uninstallSupport(textArea);
+        textArea.removePropertyChangeListener(
+                RSyntaxTextArea.SYNTAX_STYLE_PROPERTY, this);
+    }
+
+}
diff --git a/src/main/java/org/fife/rsta/ac/LanguageSupportRegistration.java b/src/main/java/org/fife/rsta/ac/LanguageSupportRegistration.java
new file mode 100644
index 00000000..2d128c18
--- /dev/null
+++ b/src/main/java/org/fife/rsta/ac/LanguageSupportRegistration.java
@@ -0,0 +1,22 @@
+/*
+ * 01/12/2017
+ *
+ * Copyright (C) 2017 Robert Futrell
+ * robert_futrell at users.sourceforge.net
+ * http://fifesoft.com/rsyntaxtextarea
+ *
+ * This library is distributed under a modified BSD license.  See the included
+ * RSTALanguageSupport.License.txt file for details.
+ */
+package org.fife.rsta.ac;
+
+/**
+ *
+ * @author matta
+ */
+public interface LanguageSupportRegistration {
+
+    String getLanguage();
+
+    String getLanguageSupportType();
+}
diff --git a/src/main/java/org/fife/rsta/ac/c/CLanguageRegistration.java b/src/main/java/org/fife/rsta/ac/c/CLanguageRegistration.java
new file mode 100644
index 00000000..5e2c4ce3
--- /dev/null
+++ b/src/main/java/org/fife/rsta/ac/c/CLanguageRegistration.java
@@ -0,0 +1,32 @@
+/*
+ * 01/12/2017
+ *
+ * Copyright (C) 2017 Robert Futrell
+ * robert_futrell at users.sourceforge.net
+ * http://fifesoft.com/rsyntaxtextarea
+ *
+ * This library is distributed under a modified BSD license.  See the included
+ * RSTALanguageSupport.License.txt file for details.
+ */
+package org.fife.rsta.ac.c;
+
+import org.fife.rsta.ac.LanguageSupportRegistration;
+import org.fife.ui.rsyntaxtextarea.modes.CTokenRegistration;
+
+/**
+ *
+ * @author matta
+ */
+public class CLanguageRegistration implements LanguageSupportRegistration {
+
+    @Override
+    public String getLanguage() {
+        return CTokenRegistration.SYNTAX_STYLE;
+    }
+
+    @Override
+    public String getLanguageSupportType() {
+        return CLanguageSupport.class.getName();
+    }
+
+}
diff --git a/src/main/java/org/fife/rsta/ac/css/CssLanguageRegistration.java b/src/main/java/org/fife/rsta/ac/css/CssLanguageRegistration.java
new file mode 100644
index 00000000..4a59b73d
--- /dev/null
+++ b/src/main/java/org/fife/rsta/ac/css/CssLanguageRegistration.java
@@ -0,0 +1,32 @@
+/*
+ * 01/12/2017
+ *
+ * Copyright (C) 2017 Robert Futrell
+ * robert_futrell at users.sourceforge.net
+ * http://fifesoft.com/rsyntaxtextarea
+ *
+ * This library is distributed under a modified BSD license.  See the included
+ * RSTALanguageSupport.License.txt file for details.
+ */
+package org.fife.rsta.ac.css;
+
+import org.fife.rsta.ac.LanguageSupportRegistration;
+import org.fife.ui.rsyntaxtextarea.modes.CSSTokenRegistration;
+
+/**
+ *
+ * @author matta
+ */
+public class CssLanguageRegistration implements LanguageSupportRegistration {
+
+    @Override
+    public String getLanguage() {
+        return CSSTokenRegistration.SYNTAX_STYLE;
+    }
+
+    @Override
+    public String getLanguageSupportType() {
+        return CssLanguageSupport.class.getName();
+    }
+
+}
diff --git a/src/main/java/org/fife/rsta/ac/demo/DemoRootPane.java b/src/main/java/org/fife/rsta/ac/demo/DemoRootPane.java
index 3863dae5..3a0faee0 100644
--- a/src/main/java/org/fife/rsta/ac/demo/DemoRootPane.java
+++ b/src/main/java/org/fife/rsta/ac/demo/DemoRootPane.java
@@ -33,6 +33,20 @@
 import org.fife.ui.rsyntaxtextarea.ErrorStrip;
 import org.fife.ui.rsyntaxtextarea.SyntaxConstants;
 import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
+import static org.fife.ui.rsyntaxtextarea.SyntaxConstants.SYNTAX_STYLE_C;
+import static org.fife.ui.rsyntaxtextarea.SyntaxConstants.SYNTAX_STYLE_CSS;
+import static org.fife.ui.rsyntaxtextarea.SyntaxConstants.SYNTAX_STYLE_GROOVY;
+import static org.fife.ui.rsyntaxtextarea.SyntaxConstants.SYNTAX_STYLE_HTML;
+import static org.fife.ui.rsyntaxtextarea.SyntaxConstants.SYNTAX_STYLE_JAVA;
+import static org.fife.ui.rsyntaxtextarea.SyntaxConstants.SYNTAX_STYLE_JAVASCRIPT;
+import static org.fife.ui.rsyntaxtextarea.SyntaxConstants.SYNTAX_STYLE_JSP;
+import static org.fife.ui.rsyntaxtextarea.SyntaxConstants.SYNTAX_STYLE_LESS;
+import static org.fife.ui.rsyntaxtextarea.SyntaxConstants.SYNTAX_STYLE_PERL;
+import static org.fife.ui.rsyntaxtextarea.SyntaxConstants.SYNTAX_STYLE_PHP;
+import static org.fife.ui.rsyntaxtextarea.SyntaxConstants.SYNTAX_STYLE_UNIX_SHELL;
+import static org.fife.ui.rsyntaxtextarea.SyntaxConstants.SYNTAX_STYLE_XML;
+import org.fife.ui.rsyntaxtextarea.TokenMakerFactory;
+import org.fife.ui.rsyntaxtextarea.modes.TypeScriptTokenRegistration;
 import org.fife.ui.rtextarea.RTextScrollPane;
 
 
@@ -44,259 +58,261 @@
  * @version 1.0
  */
 class DemoRootPane extends JRootPane implements HyperlinkListener,
-							SyntaxConstants, Actions {
-
-	private JScrollPane treeSP;
-	private AbstractSourceTree tree;
-	private RTextScrollPane scrollPane;
-	private RSyntaxTextArea textArea;
-
-
-	public DemoRootPane() {
-
-		LanguageSupportFactory lsf = LanguageSupportFactory.get();
-		LanguageSupport support = lsf.getSupportFor(SYNTAX_STYLE_JAVA);
-		JavaLanguageSupport jls = (JavaLanguageSupport)support;
-		// TODO: This API will change!  It will be easier to do per-editor
-		// changes to the build path.
-		try {
-			jls.getJarManager().addCurrentJreClassFileSource();
-			//jsls.getJarManager().addClassFileSource(ji);
-		} catch (IOException ioe) {
-			ioe.printStackTrace();
-		}
-		
-		// Dummy tree keeps JViewport's "background" looking right initially
-		JTree dummy = new JTree((TreeNode)null);
-		treeSP = new JScrollPane(dummy);
-
-		textArea = createTextArea();
-		setText("CExample.txt", SYNTAX_STYLE_C);
-		scrollPane = new RTextScrollPane(textArea, true);
-		scrollPane.setIconRowHeaderEnabled(true);
-		scrollPane.getGutter().setBookmarkingEnabled(true);
-
-		final JSplitPane sp = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT,
-										treeSP, scrollPane);
-		SwingUtilities.invokeLater(new Runnable() {
-			@Override
-			public void run() {
-				sp.setDividerLocation(0.25);
-			}
-		});
-		sp.setContinuousLayout(true);
-//		setContentPane(sp);
-
-		setJMenuBar(createMenuBar());
-
-		ErrorStrip errorStrip = new ErrorStrip(textArea);
+                            SyntaxConstants, Actions {
+
+    private JScrollPane treeSP;
+    private AbstractSourceTree tree;
+    private RTextScrollPane scrollPane;
+    private RSyntaxTextArea textArea;
+
+
+    public DemoRootPane() {
+
+        LanguageSupportFactory lsf = LanguageSupportFactory.get();
+        LanguageSupport support = lsf.getSupportFor(SYNTAX_STYLE_JAVA);
+        JavaLanguageSupport jls = (JavaLanguageSupport)support;
+        // TODO: This API will change!  It will be easier to do per-editor
+        // changes to the build path.
+        try {
+            jls.getJarManager().addCurrentJreClassFileSource();
+            //jsls.getJarManager().addClassFileSource(ji);
+        } catch (IOException ioe) {
+            ioe.printStackTrace();
+        }
+        
+        // Dummy tree keeps JViewport's "background" looking right initially
+        JTree dummy = new JTree((TreeNode)null);
+        treeSP = new JScrollPane(dummy);
+
+        textArea = createTextArea();
+        setText("CExample.txt", SYNTAX_STYLE_C);
+        scrollPane = new RTextScrollPane(textArea, true);
+        scrollPane.setIconRowHeaderEnabled(true);
+        scrollPane.getGutter().setBookmarkingEnabled(true);
+
+        final JSplitPane sp = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT,
+                                        treeSP, scrollPane);
+        SwingUtilities.invokeLater(new Runnable() {
+            @Override
+            public void run() {
+                sp.setDividerLocation(0.25);
+            }
+        });
+        sp.setContinuousLayout(true);
+//      setContentPane(sp);
+
+        setJMenuBar(createMenuBar());
+
+        ErrorStrip errorStrip = new ErrorStrip(textArea);
 //errorStrip.setBackground(java.awt.Color.blue);
 JPanel cp = new JPanel(new BorderLayout());
 cp.add(sp);
 cp.add(errorStrip, BorderLayout.LINE_END);
 setContentPane(cp);
-	}
-
-
-	private void addItem(Action a, ButtonGroup bg, JMenu menu) {
-		JRadioButtonMenuItem item = new JRadioButtonMenuItem(a);
-		bg.add(item);
-		menu.add(item);
-	}
-
-
-	private JMenuBar createMenuBar() {
-
-		JMenuBar mb = new JMenuBar();
-
-		JMenu menu = new JMenu("File");
-		menu.add(new JMenuItem(new OpenAction(this)));
-		menu.addSeparator();
-		menu.add(new JMenuItem(new ExitAction()));
-		mb.add(menu);
-
-		menu = new JMenu("Language");
-		ButtonGroup bg = new ButtonGroup();
-		addItem(new StyleAction(this, "C",          "CExample.txt",      SYNTAX_STYLE_C), bg, menu);
-		addItem(new StyleAction(this, "CSS",        "CssExample.txt",    SYNTAX_STYLE_CSS), bg, menu);
-		addItem(new StyleAction(this, "Groovy",     "GroovyExample.txt", SYNTAX_STYLE_GROOVY), bg, menu);
-		addItem(new StyleAction(this, "Java",       "JavaExample.txt",   SYNTAX_STYLE_JAVA), bg, menu);
-		addItem(new StyleAction(this, "JavaScript", "JSExample.txt",     SYNTAX_STYLE_JAVASCRIPT), bg, menu);
-		addItem(new StyleAction(this, "JSP",        "JspExample.txt",    SYNTAX_STYLE_JSP), bg, menu);
-		addItem(new StyleAction(this, "Less",       "LessExample.txt",   SYNTAX_STYLE_LESS), bg, menu);
-		addItem(new StyleAction(this, "Perl",       "PerlExample.txt",   SYNTAX_STYLE_PERL), bg, menu);
-		addItem(new StyleAction(this, "HTML",       "HtmlExample.txt",   SYNTAX_STYLE_HTML), bg, menu);
-		addItem(new StyleAction(this, "PHP",        "PhpExample.txt",    SYNTAX_STYLE_PHP), bg, menu);
-		addItem(new StyleAction(this, "sh",         "ShellExample.txt",  SYNTAX_STYLE_UNIX_SHELL), bg, menu);
-		addItem(new StyleAction(this, "TypeScript", "TypeScriptExample.txt",  SYNTAX_STYLE_TYPESCRIPT), bg, menu);
-		addItem(new StyleAction(this, "XML",        "XMLExample.txt",    SYNTAX_STYLE_XML), bg, menu);
-		menu.getItem(0).setSelected(true);
-		mb.add(menu);
-
-		menu = new JMenu("LookAndFeel");
-		bg = new ButtonGroup();
-		LookAndFeelInfo[] infos = UIManager.getInstalledLookAndFeels();
-		for (int i=0; i<infos.length; i++) {
-			addItem(new LookAndFeelAction(this, infos[i]), bg, menu);
-		}
-		mb.add(menu);
-
-		menu = new JMenu("View");
-		menu.add(new JCheckBoxMenuItem(new ToggleLayeredHighlightsAction(this)));
-		mb.add(menu);
-		
-		menu = new JMenu("Help");
-		menu.add(new JMenuItem(new AboutAction(this)));
-		mb.add(menu);
-
-		return mb;
-
-	}
-
-
-	/**
-	 * Creates the text area for this application.
-	 *
-	 * @return The text area.
-	 */
-	private RSyntaxTextArea createTextArea() {
-		RSyntaxTextArea textArea = new RSyntaxTextArea(25, 80);
-		LanguageSupportFactory.get().register(textArea);
-		textArea.setCaretPosition(0);
-		textArea.addHyperlinkListener(this);
-		textArea.requestFocusInWindow();
-		textArea.setMarkOccurrences(true);
-		textArea.setCodeFoldingEnabled(true);
-		textArea.setTabsEmulated(true);
-		textArea.setTabSize(3);
+    }
+
+
+    private void addItem(Action a, ButtonGroup bg, JMenu menu) {
+        JRadioButtonMenuItem item = new JRadioButtonMenuItem(a);
+        bg.add(item);
+        menu.add(item);
+    }
+
+
+    private JMenuBar createMenuBar() {
+
+        JMenuBar mb = new JMenuBar();
+
+        JMenu menu = new JMenu("File");
+        menu.add(new JMenuItem(new OpenAction(this)));
+        menu.addSeparator();
+        menu.add(new JMenuItem(new ExitAction()));
+        mb.add(menu);
+
+        menu = new JMenu("Language");
+        ButtonGroup bg = new ButtonGroup();
+                TokenMakerFactory defaultInstance = TokenMakerFactory.getDefaultInstance();
+        addItem(new StyleAction(this, "C",          "CExample.txt",      SYNTAX_STYLE_C), bg, menu);
+        addItem(new StyleAction(this, "CSS",        "CssExample.txt",    SYNTAX_STYLE_CSS), bg, menu);
+        addItem(new StyleAction(this, "Groovy",     "GroovyExample.txt", SYNTAX_STYLE_GROOVY), bg, menu);
+        addItem(new StyleAction(this, "Java",       "JavaExample.txt",   SYNTAX_STYLE_JAVA), bg, menu);
+        addItem(new StyleAction(this, "JavaScript", "JSExample.txt",     SYNTAX_STYLE_JAVASCRIPT), bg, menu);
+        addItem(new StyleAction(this, "JSP",        "JspExample.txt",    SYNTAX_STYLE_JSP), bg, menu);
+        addItem(new StyleAction(this, "Less",       "LessExample.txt",   SYNTAX_STYLE_LESS), bg, menu);
+        addItem(new StyleAction(this, "Perl",       "PerlExample.txt",   SYNTAX_STYLE_PERL), bg, menu);
+        addItem(new StyleAction(this, "HTML",       "HtmlExample.txt",   SYNTAX_STYLE_HTML), bg, menu);
+        addItem(new StyleAction(this, "PHP",        "PhpExample.txt",    SYNTAX_STYLE_PHP), bg, menu);
+        addItem(new StyleAction(this, "sh",         "ShellExample.txt",  SYNTAX_STYLE_UNIX_SHELL), bg, menu);
+        addItem(new StyleAction(this, "TypeScript", "TypeScriptExample.txt",  TypeScriptTokenRegistration.SYNTAX_STYLE), bg, menu);
+        addItem(new StyleAction(this, "XML",        "XMLExample.txt",    SYNTAX_STYLE_XML), bg, menu);
+
+        menu.getItem(0).setSelected(true);
+        mb.add(menu);
+
+        menu = new JMenu("LookAndFeel");
+        bg = new ButtonGroup();
+        LookAndFeelInfo[] infos = UIManager.getInstalledLookAndFeels();
+        for (int i=0; i<infos.length; i++) {
+            addItem(new LookAndFeelAction(this, infos[i]), bg, menu);
+        }
+        mb.add(menu);
+
+        menu = new JMenu("View");
+        menu.add(new JCheckBoxMenuItem(new ToggleLayeredHighlightsAction(this)));
+        mb.add(menu);
+        
+        menu = new JMenu("Help");
+        menu.add(new JMenuItem(new AboutAction(this)));
+        mb.add(menu);
+
+        return mb;
+
+    }
+
+
+    /**
+     * Creates the text area for this application.
+     *
+     * @return The text area.
+     */
+    private RSyntaxTextArea createTextArea() {
+        RSyntaxTextArea textArea = new RSyntaxTextArea(25, 80);
+        LanguageSupportFactory.get().register(textArea);
+        textArea.setCaretPosition(0);
+        textArea.addHyperlinkListener(this);
+        textArea.requestFocusInWindow();
+        textArea.setMarkOccurrences(true);
+        textArea.setCodeFoldingEnabled(true);
+        textArea.setTabsEmulated(true);
+        textArea.setTabSize(3);
 //textArea.setBackground(new java.awt.Color(224, 255, 224));
 //textArea.setUseSelectedTextColor(true);
 //textArea.setLineWrap(true);
-		ToolTipManager.sharedInstance().registerComponent(textArea);
-		return textArea;
-	}
-
-
-	/**
-	 * Focuses the text area.
-	 */
-	void focusTextArea() {
-		textArea.requestFocusInWindow();
-	}
-
-
-	RSyntaxTextArea getTextArea() {
-		return textArea;
-	}
-
-
-	/**
-	 * Called when a hyperlink is clicked in the text area.
-	 *
-	 * @param e The event.
-	 */
-	@Override
-	public void hyperlinkUpdate(HyperlinkEvent e) {
-		if (e.getEventType()==HyperlinkEvent.EventType.ACTIVATED) {
-			URL url = e.getURL();
-			if (url==null) {
-				UIManager.getLookAndFeel().provideErrorFeedback(null);
-			}
-			else {
-				JOptionPane.showMessageDialog(this,
-									"URL clicked:\n" + url.toString());
-			}
-		}
-	}
-
-
-	/**
-	 * Opens a file in the editor (as opposed to one of the pre-defined
-	 * code examples).
-	 *
-	 * @param file The file to open.
-	 */
-	public void openFile(File file) {
-		try {
-			BufferedReader r = new BufferedReader(new FileReader(file));
-			textArea.read(r, null);
-			textArea.setCaretPosition(0);
-			r.close();
-		} catch (IOException ioe) {
-			ioe.printStackTrace();
-			UIManager.getLookAndFeel().provideErrorFeedback(this);
-			return;
-		}
-	}
-
-
-	/**
-	 * Displays a tree view of the current source code, if available for the
-	 * current programming language.
-	 */
-	private void refreshSourceTree() {
-
-		if (tree!=null) {
-			tree.uninstall();
-		}
-
-		String language = textArea.getSyntaxEditingStyle();
-		if (SyntaxConstants.SYNTAX_STYLE_JAVA.equals(language)) {
-			tree = new JavaOutlineTree();
-		}
-		else if (SyntaxConstants.SYNTAX_STYLE_JAVASCRIPT.equals(language)) {
-			tree = new JavaScriptOutlineTree();
-		}
-		else if (SyntaxConstants.SYNTAX_STYLE_XML.equals(language)) {
-			tree = new XmlOutlineTree();
-		}
-		else {
-			tree = null;
-		}
-
-		if (tree!=null) {
-			tree.listenTo(textArea);
-			treeSP.setViewportView(tree);
-		}
-		else {
-			JTree dummy = new JTree((TreeNode)null);
-			treeSP.setViewportView(dummy);
-		}
-		treeSP.revalidate();
-
-	}
-
-
-	/**
-	 * Sets the content in the text area to that in the specified resource.
-	 *
-	 * @param resource The resource to load.
-	 * @param style The syntax style to use when highlighting the text.
-	 */
-	void setText(String resource, String style) {
-
-		textArea.setSyntaxEditingStyle(style);
-
-		ClassLoader cl = getClass().getClassLoader();
-		BufferedReader r = null;
-		try {
-
-			r = new BufferedReader(new InputStreamReader(
-					cl.getResourceAsStream("examples/" + resource), "UTF-8"));
-			textArea.read(r, null);
-			r.close();
-			textArea.setCaretPosition(0);
-			textArea.discardAllEdits();
-
-			refreshSourceTree();
-
-		} catch (RuntimeException re) {
-			throw re; // FindBugs
-		} catch (Exception e) {
-			textArea.setText("Type here to see syntax highlighting");
-		}
-
-	}
+        ToolTipManager.sharedInstance().registerComponent(textArea);
+        return textArea;
+    }
+
+
+    /**
+     * Focuses the text area.
+     */
+    void focusTextArea() {
+        textArea.requestFocusInWindow();
+    }
+
+
+    RSyntaxTextArea getTextArea() {
+        return textArea;
+    }
+
+
+    /**
+     * Called when a hyperlink is clicked in the text area.
+     *
+     * @param e The event.
+     */
+    @Override
+    public void hyperlinkUpdate(HyperlinkEvent e) {
+        if (e.getEventType()==HyperlinkEvent.EventType.ACTIVATED) {
+            URL url = e.getURL();
+            if (url==null) {
+                UIManager.getLookAndFeel().provideErrorFeedback(null);
+            }
+            else {
+                JOptionPane.showMessageDialog(this,
+                                    "URL clicked:\n" + url.toString());
+            }
+        }
+    }
+
+
+    /**
+     * Opens a file in the editor (as opposed to one of the pre-defined
+     * code examples).
+     *
+     * @param file The file to open.
+     */
+    public void openFile(File file) {
+        try {
+            BufferedReader r = new BufferedReader(new FileReader(file));
+            textArea.read(r, null);
+            textArea.setCaretPosition(0);
+            r.close();
+        } catch (IOException ioe) {
+            ioe.printStackTrace();
+            UIManager.getLookAndFeel().provideErrorFeedback(this);
+            return;
+        }
+    }
+
+
+    /**
+     * Displays a tree view of the current source code, if available for the
+     * current programming language.
+     */
+    private void refreshSourceTree() {
+
+        if (tree!=null) {
+            tree.uninstall();
+        }
+
+        String language = textArea.getSyntaxEditingStyle();
+        if (SyntaxConstants.SYNTAX_STYLE_JAVA.equals(language)) {
+            tree = new JavaOutlineTree();
+        }
+        else if (SyntaxConstants.SYNTAX_STYLE_JAVASCRIPT.equals(language)) {
+            tree = new JavaScriptOutlineTree();
+        }
+        else if (SyntaxConstants.SYNTAX_STYLE_XML.equals(language)) {
+            tree = new XmlOutlineTree();
+        }
+        else {
+            tree = null;
+        }
+
+        if (tree!=null) {
+            tree.listenTo(textArea);
+            treeSP.setViewportView(tree);
+        }
+        else {
+            JTree dummy = new JTree((TreeNode)null);
+            treeSP.setViewportView(dummy);
+        }
+        treeSP.revalidate();
+
+    }
+
+
+    /**
+     * Sets the content in the text area to that in the specified resource.
+     *
+     * @param resource The resource to load.
+     * @param style The syntax style to use when highlighting the text.
+     */
+    void setText(String resource, String style) {
+
+        textArea.setSyntaxEditingStyle(style);
+
+        ClassLoader cl = getClass().getClassLoader();
+        BufferedReader r = null;
+        try {
+
+            r = new BufferedReader(new InputStreamReader(
+                    cl.getResourceAsStream("examples/" + resource), "UTF-8"));
+            textArea.read(r, null);
+            r.close();
+            textArea.setCaretPosition(0);
+            textArea.discardAllEdits();
+
+            refreshSourceTree();
+
+        } catch (RuntimeException re) {
+            throw re; // FindBugs
+        } catch (Exception e) {
+            textArea.setText("Type here to see syntax highlighting");
+        }
+
+    }
 
 
 }
\ No newline at end of file
diff --git a/src/main/java/org/fife/rsta/ac/groovy/GroovyLanguageRegistration.java b/src/main/java/org/fife/rsta/ac/groovy/GroovyLanguageRegistration.java
new file mode 100644
index 00000000..af85e82d
--- /dev/null
+++ b/src/main/java/org/fife/rsta/ac/groovy/GroovyLanguageRegistration.java
@@ -0,0 +1,32 @@
+/*
+ * 01/12/2017
+ *
+ * Copyright (C) 2017 Robert Futrell
+ * robert_futrell at users.sourceforge.net
+ * http://fifesoft.com/rsyntaxtextarea
+ *
+ * This library is distributed under a modified BSD license.  See the included
+ * RSTALanguageSupport.License.txt file for details.
+ */
+package org.fife.rsta.ac.groovy;
+
+import org.fife.rsta.ac.LanguageSupportRegistration;
+import org.fife.ui.rsyntaxtextarea.modes.GroovyTokenRegistration;
+
+/**
+ *
+ * @author matta
+ */
+public class GroovyLanguageRegistration implements LanguageSupportRegistration {
+
+    @Override
+    public String getLanguage() {
+        return GroovyTokenRegistration.SYNTAX_STYLE;
+    }
+
+    @Override
+    public String getLanguageSupportType() {
+        return GroovyLanguageSupport.class.getName();
+    }
+
+}
diff --git a/src/main/java/org/fife/rsta/ac/html/HtmlLanguageRegistration.java b/src/main/java/org/fife/rsta/ac/html/HtmlLanguageRegistration.java
new file mode 100644
index 00000000..83999af2
--- /dev/null
+++ b/src/main/java/org/fife/rsta/ac/html/HtmlLanguageRegistration.java
@@ -0,0 +1,32 @@
+/*
+ * 01/12/2017
+ *
+ * Copyright (C) 2017 Robert Futrell
+ * robert_futrell at users.sourceforge.net
+ * http://fifesoft.com/rsyntaxtextarea
+ *
+ * This library is distributed under a modified BSD license.  See the included
+ * RSTALanguageSupport.License.txt file for details.
+ */
+package org.fife.rsta.ac.html;
+
+import org.fife.rsta.ac.LanguageSupportRegistration;
+import org.fife.ui.rsyntaxtextarea.modes.HTMLTokenRegistration;
+
+/**
+ *
+ * @author matta
+ */
+public class HtmlLanguageRegistration implements LanguageSupportRegistration {
+
+    @Override
+    public String getLanguage() {
+        return HTMLTokenRegistration.SYNTAX_STYLE;
+    }
+
+    @Override
+    public String getLanguageSupportType() {
+        return HtmlLanguageSupport.class.getName();
+    }
+
+}
diff --git a/src/main/java/org/fife/rsta/ac/java/JavaLanguageRegistration.java b/src/main/java/org/fife/rsta/ac/java/JavaLanguageRegistration.java
new file mode 100644
index 00000000..8b466da0
--- /dev/null
+++ b/src/main/java/org/fife/rsta/ac/java/JavaLanguageRegistration.java
@@ -0,0 +1,32 @@
+/*
+ * 01/12/2017
+ *
+ * Copyright (C) 2017 Robert Futrell
+ * robert_futrell at users.sourceforge.net
+ * http://fifesoft.com/rsyntaxtextarea
+ *
+ * This library is distributed under a modified BSD license.  See the included
+ * RSTALanguageSupport.License.txt file for details.
+ */
+package org.fife.rsta.ac.java;
+
+import org.fife.rsta.ac.LanguageSupportRegistration;
+import org.fife.ui.rsyntaxtextarea.modes.JavaTokenRegistration;
+
+/**
+ *
+ * @author matta
+ */
+public class JavaLanguageRegistration implements LanguageSupportRegistration {
+
+    @Override
+    public String getLanguage() {
+        return JavaTokenRegistration.SYNTAX_STYLE;
+    }
+
+    @Override
+    public String getLanguageSupportType() {
+        return JavaLanguageSupport.class.getName();
+    }
+
+}
diff --git a/src/main/java/org/fife/rsta/ac/js/JavaScriptLanguageRegistration.java b/src/main/java/org/fife/rsta/ac/js/JavaScriptLanguageRegistration.java
new file mode 100644
index 00000000..8c4efe97
--- /dev/null
+++ b/src/main/java/org/fife/rsta/ac/js/JavaScriptLanguageRegistration.java
@@ -0,0 +1,32 @@
+/*
+ * 01/12/2017
+ *
+ * Copyright (C) 2017 Robert Futrell
+ * robert_futrell at users.sourceforge.net
+ * http://fifesoft.com/rsyntaxtextarea
+ *
+ * This library is distributed under a modified BSD license.  See the included
+ * RSTALanguageSupport.License.txt file for details.
+ */
+package org.fife.rsta.ac.js;
+
+import org.fife.rsta.ac.LanguageSupportRegistration;
+import org.fife.ui.rsyntaxtextarea.modes.JavaScriptTokenRegistration;
+
+/**
+ *
+ * @author matta
+ */
+public class JavaScriptLanguageRegistration implements LanguageSupportRegistration {
+
+    @Override
+    public String getLanguage() {
+        return JavaScriptTokenRegistration.SYNTAX_STYLE;
+    }
+
+    @Override
+    public String getLanguageSupportType() {
+        return JavaScriptLanguageSupport.class.getName();
+    }
+
+}
diff --git a/src/main/java/org/fife/rsta/ac/jsp/JspLanguageRegistration.java b/src/main/java/org/fife/rsta/ac/jsp/JspLanguageRegistration.java
new file mode 100644
index 00000000..9963bd5f
--- /dev/null
+++ b/src/main/java/org/fife/rsta/ac/jsp/JspLanguageRegistration.java
@@ -0,0 +1,32 @@
+/*
+ * 01/12/2017
+ *
+ * Copyright (C) 2017 Robert Futrell
+ * robert_futrell at users.sourceforge.net
+ * http://fifesoft.com/rsyntaxtextarea
+ *
+ * This library is distributed under a modified BSD license.  See the included
+ * RSTALanguageSupport.License.txt file for details.
+ */
+package org.fife.rsta.ac.jsp;
+
+import org.fife.rsta.ac.LanguageSupportRegistration;
+import org.fife.ui.rsyntaxtextarea.modes.JSPTokenRegistration;
+
+/**
+ *
+ * @author matta
+ */
+public class JspLanguageRegistration implements LanguageSupportRegistration {
+
+    @Override
+    public String getLanguage() {
+        return JSPTokenRegistration.SYNTAX_STYLE;
+    }
+
+    @Override
+    public String getLanguageSupportType() {
+        return JspLanguageSupport.class.getName();
+    }
+
+}
diff --git a/src/main/java/org/fife/rsta/ac/less/LessLanguageRegistration.java b/src/main/java/org/fife/rsta/ac/less/LessLanguageRegistration.java
new file mode 100644
index 00000000..b46b774d
--- /dev/null
+++ b/src/main/java/org/fife/rsta/ac/less/LessLanguageRegistration.java
@@ -0,0 +1,32 @@
+/*
+ * 01/12/2017
+ *
+ * Copyright (C) 2017 Robert Futrell
+ * robert_futrell at users.sourceforge.net
+ * http://fifesoft.com/rsyntaxtextarea
+ *
+ * This library is distributed under a modified BSD license.  See the included
+ * RSTALanguageSupport.License.txt file for details.
+ */
+package org.fife.rsta.ac.less;
+
+import org.fife.rsta.ac.LanguageSupportRegistration;
+import org.fife.ui.rsyntaxtextarea.modes.LessTokenRegistration;
+
+/**
+ *
+ * @author matta
+ */
+public class LessLanguageRegistration implements LanguageSupportRegistration {
+
+    @Override
+    public String getLanguage() {
+        return LessTokenRegistration.SYNTAX_STYLE;
+    }
+
+    @Override
+    public String getLanguageSupportType() {
+        return LessLanguageSupport.class.getName();
+    }
+
+}
diff --git a/src/main/java/org/fife/rsta/ac/perl/PerlLanguageRegistration.java b/src/main/java/org/fife/rsta/ac/perl/PerlLanguageRegistration.java
new file mode 100644
index 00000000..cc3d1a5e
--- /dev/null
+++ b/src/main/java/org/fife/rsta/ac/perl/PerlLanguageRegistration.java
@@ -0,0 +1,32 @@
+/*
+ * 01/12/2017
+ *
+ * Copyright (C) 2017 Robert Futrell
+ * robert_futrell at users.sourceforge.net
+ * http://fifesoft.com/rsyntaxtextarea
+ *
+ * This library is distributed under a modified BSD license.  See the included
+ * RSTALanguageSupport.License.txt file for details.
+ */
+package org.fife.rsta.ac.perl;
+
+import org.fife.rsta.ac.LanguageSupportRegistration;
+import org.fife.ui.rsyntaxtextarea.modes.PerlTokenRegistration;
+
+/**
+ *
+ * @author matta
+ */
+public class PerlLanguageRegistration implements LanguageSupportRegistration {
+
+    @Override
+    public String getLanguage() {
+        return PerlTokenRegistration.SYNTAX_STYLE;
+    }
+
+    @Override
+    public String getLanguageSupportType() {
+        return PerlLanguageSupport.class.getName();
+    }
+
+}
diff --git a/src/main/java/org/fife/rsta/ac/php/PhpLanguageRegistration.java b/src/main/java/org/fife/rsta/ac/php/PhpLanguageRegistration.java
new file mode 100644
index 00000000..cd94364f
--- /dev/null
+++ b/src/main/java/org/fife/rsta/ac/php/PhpLanguageRegistration.java
@@ -0,0 +1,32 @@
+/*
+ * 01/12/2017
+ *
+ * Copyright (C) 2017 Robert Futrell
+ * robert_futrell at users.sourceforge.net
+ * http://fifesoft.com/rsyntaxtextarea
+ *
+ * This library is distributed under a modified BSD license.  See the included
+ * RSTALanguageSupport.License.txt file for details.
+ */
+package org.fife.rsta.ac.php;
+
+import org.fife.rsta.ac.LanguageSupportRegistration;
+import org.fife.ui.rsyntaxtextarea.modes.PHPTokenRegistration;
+
+/**
+ *
+ * @author matta
+ */
+public class PhpLanguageRegistration implements LanguageSupportRegistration {
+
+    @Override
+    public String getLanguage() {
+        return PHPTokenRegistration.SYNTAX_STYLE;
+    }
+
+    @Override
+    public String getLanguageSupportType() {
+        return PhpLanguageSupport.class.getName();
+    }
+
+}
diff --git a/src/main/java/org/fife/rsta/ac/sh/ShellLanguageRegistration.java b/src/main/java/org/fife/rsta/ac/sh/ShellLanguageRegistration.java
new file mode 100644
index 00000000..38ffc7bf
--- /dev/null
+++ b/src/main/java/org/fife/rsta/ac/sh/ShellLanguageRegistration.java
@@ -0,0 +1,32 @@
+/*
+ * 01/12/2017
+ *
+ * Copyright (C) 2017 Robert Futrell
+ * robert_futrell at users.sourceforge.net
+ * http://fifesoft.com/rsyntaxtextarea
+ *
+ * This library is distributed under a modified BSD license.  See the included
+ * RSTALanguageSupport.License.txt file for details.
+ */
+package org.fife.rsta.ac.sh;
+
+import org.fife.rsta.ac.LanguageSupportRegistration;
+import org.fife.ui.rsyntaxtextarea.modes.UnixShellTokenRegistration;
+
+/**
+ *
+ * @author matta
+ */
+public class ShellLanguageRegistration implements LanguageSupportRegistration {
+
+    @Override
+    public String getLanguage() {
+        return UnixShellTokenRegistration.SYNTAX_STYLE;
+    }
+
+    @Override
+    public String getLanguageSupportType() {
+        return ShellLanguageSupport.class.getName();
+    }
+
+}
diff --git a/src/main/java/org/fife/rsta/ac/xml/XmlLanguageRegistration.java b/src/main/java/org/fife/rsta/ac/xml/XmlLanguageRegistration.java
new file mode 100644
index 00000000..8ef89df5
--- /dev/null
+++ b/src/main/java/org/fife/rsta/ac/xml/XmlLanguageRegistration.java
@@ -0,0 +1,32 @@
+/*
+ * 01/12/2017
+ *
+ * Copyright (C) 2017 Robert Futrell
+ * robert_futrell at users.sourceforge.net
+ * http://fifesoft.com/rsyntaxtextarea
+ *
+ * This library is distributed under a modified BSD license.  See the included
+ * RSTALanguageSupport.License.txt file for details.
+ */
+package org.fife.rsta.ac.xml;
+
+import org.fife.rsta.ac.LanguageSupportRegistration;
+import org.fife.ui.rsyntaxtextarea.modes.XMLTokenRegistration;
+
+/**
+ *
+ * @author matta
+ */
+public class XmlLanguageRegistration implements LanguageSupportRegistration {
+
+    @Override
+    public String getLanguage() {
+        return XMLTokenRegistration.SYNTAX_STYLE;
+    }
+
+    @Override
+    public String getLanguageSupportType() {
+        return XmlLanguageSupport.class.getName();
+    }
+
+}
diff --git a/src/main/resources/META-INF/services/org.fife.rsta.ac.LanguageSupportRegistration b/src/main/resources/META-INF/services/org.fife.rsta.ac.LanguageSupportRegistration
new file mode 100644
index 00000000..1ed18b59
--- /dev/null
+++ b/src/main/resources/META-INF/services/org.fife.rsta.ac.LanguageSupportRegistration
@@ -0,0 +1,12 @@
+org.fife.rsta.ac.css.CssLanguageRegistration
+org.fife.rsta.ac.xml.XmlLanguageRegistration
+org.fife.rsta.ac.groovy.GroovyLanguageRegistration
+org.fife.rsta.ac.jsp.JspLanguageRegistration
+org.fife.rsta.ac.less.LessLanguageRegistration
+org.fife.rsta.ac.js.JavaScriptLanguageRegistration
+org.fife.rsta.ac.c.CLanguageRegistration
+org.fife.rsta.ac.html.HtmlLanguageRegistration
+org.fife.rsta.ac.php.PhpLanguageRegistration
+org.fife.rsta.ac.perl.PerlLanguageRegistration
+org.fife.rsta.ac.sh.ShellLanguageRegistration
+org.fife.rsta.ac.java.JavaLanguageRegistration
\ No newline at end of file