diff --git a/richtextfx-demos/src/main/java/org/fxmisc/richtext/demo/richtext/RichText.java b/richtextfx-demos/src/main/java/org/fxmisc/richtext/demo/richtext/RichText.java
index 3cec92be8..9e1041828 100644
--- a/richtextfx-demos/src/main/java/org/fxmisc/richtext/demo/richtext/RichText.java
+++ b/richtextfx-demos/src/main/java/org/fxmisc/richtext/demo/richtext/RichText.java
@@ -46,15 +46,15 @@ public static void main(String[] args) {
         launch(args);
     }
 
-    private final StyledTextArea<TextStyle, ParStyle> area =
-            AreaFactory.<TextStyle, ParStyle>styledTextArea(
-                    TextStyle.EMPTY.updateFontSize(12).updateFontFamily("Serif").updateTextColor(Color.BLACK),
-                    ( text, style) -> text.setStyle(style.toCss()),
+    private final StyledTextArea<ParStyle, TextStyle> area =
+            AreaFactory.<ParStyle, TextStyle>styledTextArea(
                     ParStyle.EMPTY,
-                    ( paragraph, style) -> paragraph.setStyle(style.toCss()));
+                    ( paragraph, style) -> paragraph.setStyle(style.toCss()),
+                    TextStyle.EMPTY.updateFontSize(12).updateFontFamily("Serif").updateTextColor(Color.BLACK),
+                    ( text, style) -> text.setStyle(style.toCss()));
     {
         area.setWrapText(true);
-        area.setStyleCodecs(TextStyle.CODEC, ParStyle.CODEC);
+        area.setStyleCodecs(ParStyle.CODEC, TextStyle.CODEC);
     }
 
     private final SuspendableNo updatingToolbar = new SuspendableNo();
@@ -150,7 +150,7 @@ protected boolean computeValue() {
 
                 int startPar = area.offsetToPosition(selection.getStart(), Forward).getMajor();
                 int endPar = area.offsetToPosition(selection.getEnd(), Backward).getMajor();
-                List<Paragraph<TextStyle, ParStyle>> pars = area.getParagraphs().subList(startPar, endPar + 1);
+                List<Paragraph<ParStyle, TextStyle>> pars = area.getParagraphs().subList(startPar, endPar + 1);
 
                 @SuppressWarnings("unchecked")
                 Optional<TextAlignment>[] alignments = pars.stream().map(p -> p.getParagraphStyle().alignment).distinct().toArray(Optional[]::new);
@@ -237,7 +237,7 @@ protected boolean computeValue() {
                 paragraphBackgroundPicker);
         panel2.getChildren().addAll(sizeCombo, familyCombo, textColorPicker, backgroundColorPicker);
 
-        VirtualizedScrollPane<StyledTextArea<TextStyle, ParStyle>> vsPane = new VirtualizedScrollPane<>(area);
+        VirtualizedScrollPane<StyledTextArea<ParStyle, TextStyle>> vsPane = new VirtualizedScrollPane<>(area);
         VBox vbox = new VBox();
         VBox.setVgrow(vsPane, Priority.ALWAYS);
         vbox.getChildren().addAll(panel1, panel2, vsPane);
@@ -331,7 +331,7 @@ private void updateParagraphStyleInSelection(Function<ParStyle, ParStyle> update
         int startPar = area.offsetToPosition(selection.getStart(), Forward).getMajor();
         int endPar = area.offsetToPosition(selection.getEnd(), Backward).getMajor();
         for(int i = startPar; i <= endPar; ++i) {
-            Paragraph<TextStyle, ParStyle> paragraph = area.getParagraph(i);
+            Paragraph<ParStyle, TextStyle> paragraph = area.getParagraph(i);
             area.setParagraphStyle(i, updater.apply(paragraph.getParagraphStyle()));
         }
     }
diff --git a/richtextfx/src/main/java/org/fxmisc/richtext/AreaFactory.java b/richtextfx/src/main/java/org/fxmisc/richtext/AreaFactory.java
index f92183c03..c8b1900ed 100644
--- a/richtextfx/src/main/java/org/fxmisc/richtext/AreaFactory.java
+++ b/richtextfx/src/main/java/org/fxmisc/richtext/AreaFactory.java
@@ -20,59 +20,59 @@ public class AreaFactory {
      * ********************************************************************** */
 
     // StyledTextArea 1
-    public static <S, PS> StyledTextArea<S, PS> styledTextArea(
-            S initialStyle, BiConsumer<? super TextExt, S> applyStyle,
-            PS initialParagraphStyle, BiConsumer<TextFlow, PS> applyParagraphStyle
+    public static <PS, S> StyledTextArea<PS, S> styledTextArea(
+            PS initialParagraphStyle, BiConsumer<TextFlow, PS> applyParagraphStyle,
+            S initialStyle, BiConsumer<? super TextExt, S> applyStyle
     ) {
-        return new StyledTextArea<S, PS>(
-                initialStyle, applyStyle,
+        return new StyledTextArea<PS, S>(
                 initialParagraphStyle, applyParagraphStyle,
+                initialStyle, applyStyle,
                 true);
     }
 
     // Embeds StyledTextArea 1
-    public static <S, PS>VirtualizedScrollPane<StyledTextArea<S, PS>> embeddedStyledTextArea(
-            S initialStyle, BiConsumer<? super TextExt, S> applyStyle,
-            PS initialParagraphStyle, BiConsumer<TextFlow, PS> applyParagraphStyle
+    public static <PS, S>VirtualizedScrollPane<StyledTextArea<PS, S>> embeddedStyledTextArea(
+            PS initialParagraphStyle, BiConsumer<TextFlow, PS> applyParagraphStyle,
+            S initialStyle, BiConsumer<? super TextExt, S> applyStyle
     ) {
-        return new VirtualizedScrollPane<>(styledTextArea(initialStyle, applyStyle, initialParagraphStyle, applyParagraphStyle));
+        return new VirtualizedScrollPane<>(styledTextArea(initialParagraphStyle, applyParagraphStyle, initialStyle, applyStyle));
     }
 
     // StyledTextArea 2
-    public static <S, PS> StyledTextArea<S, PS> styledTextArea(
-            S initialStyle, BiConsumer<? super TextExt, S> applyStyle,
+    public static <PS, S> StyledTextArea<PS, S> styledTextArea(
             PS initialParagraphStyle, BiConsumer<TextFlow, PS> applyParagraphStyle,
+            S initialStyle, BiConsumer<? super TextExt, S> applyStyle,
             boolean preserveStyle
     ) {
-        return new StyledTextArea<S, PS>(
-                initialStyle, applyStyle,
+        return new StyledTextArea<PS, S>(
                 initialParagraphStyle, applyParagraphStyle,
+                initialStyle, applyStyle,
                 preserveStyle);
     }
 
     // Embeds StyledTextArea 2
-    public static <S, PS>VirtualizedScrollPane<StyledTextArea<S, PS>> embeddedStyledTextArea(
-            S initialStyle, BiConsumer<? super TextExt, S> applyStyle,
-            PS initialParagraphStyle, BiConsumer<TextFlow, PS> applyParagraphStyle, boolean preserveStyle
+    public static <PS, S>VirtualizedScrollPane<StyledTextArea<PS, S>> embeddedStyledTextArea(
+            PS initialParagraphStyle, BiConsumer<TextFlow, PS> applyParagraphStyle,
+            S initialStyle, BiConsumer<? super TextExt, S> applyStyle, boolean preserveStyle
     ) {
-        return new VirtualizedScrollPane<>(styledTextArea(initialStyle, applyStyle, initialParagraphStyle, applyParagraphStyle, preserveStyle));
+        return new VirtualizedScrollPane<>(styledTextArea(initialParagraphStyle, applyParagraphStyle, initialStyle, applyStyle, preserveStyle));
     }
 
     // Clones StyledTextArea
-    public static <S, PS> StyledTextArea<S, PS> cloneStyleTextArea(StyledTextArea<S, PS> area) {
-        return new StyledTextArea<S, PS>(area.getInitialStyle(), area.getApplyStyle(),
-                area.getInitialParagraphStyle(), area.getApplyParagraphStyle(),
+    public static <PS, S> StyledTextArea<PS, S> cloneStyleTextArea(StyledTextArea<PS, S> area) {
+        return new StyledTextArea<PS, S>(area.getInitialParagraphStyle(), area.getApplyParagraphStyle(),
+                area.getInitialStyle(), area.getApplyStyle(),
                 area.getModel().getContent(), area.isPreserveStyle());
     }
 
     // Embeds cloned StyledTextArea
-    public static <S, PS>VirtualizedScrollPane<StyledTextArea<S, PS>> embeddedClonedStyledTextArea(StyledTextArea<S, PS> area) {
+    public static <PS, S>VirtualizedScrollPane<StyledTextArea<PS, S>> embeddedClonedStyledTextArea(StyledTextArea<PS, S> area) {
         return new VirtualizedScrollPane<>(cloneStyleTextArea(area));
     }
 
     // Embeds a cloned StyledTextArea from an embedded StyledTextArea
-    public static <S, PS>VirtualizedScrollPane<StyledTextArea<S, PS>> embeddedClonedStyledTextArea(
-            VirtualizedScrollPane<StyledTextArea<S, PS>> virtualizedScrollPaneWithArea
+    public static <PS, S>VirtualizedScrollPane<StyledTextArea<PS, S>> embeddedClonedStyledTextArea(
+            VirtualizedScrollPane<StyledTextArea<PS, S>> virtualizedScrollPaneWithArea
     ) {
         return embeddedClonedStyledTextArea(virtualizedScrollPaneWithArea.getContent());
     }
diff --git a/richtextfx/src/main/java/org/fxmisc/richtext/ClipboardActions.java b/richtextfx/src/main/java/org/fxmisc/richtext/ClipboardActions.java
index 9bff6956f..74e44cd31 100644
--- a/richtextfx/src/main/java/org/fxmisc/richtext/ClipboardActions.java
+++ b/richtextfx/src/main/java/org/fxmisc/richtext/ClipboardActions.java
@@ -19,9 +19,9 @@
 /**
  * Clipboard actions for {@link TextEditingArea}.
  */
-public interface ClipboardActions<S, PS> extends EditActions<S, PS> {
+public interface ClipboardActions<PS, S> extends EditActions<PS, S> {
 
-    Optional<Tuple2<Codec<S>, Codec<PS>>> getStyleCodecs();
+    Optional<Tuple2<Codec<PS>, Codec<S>>> getStyleCodecs();
 
     /**
      * Transfers the currently selected text to the clipboard,
@@ -45,9 +45,9 @@ default void copy() {
             content.putString(getSelectedText());
 
             getStyleCodecs().ifPresent(codecs -> {
-                Codec<StyledDocument<S, PS>> codec = ReadOnlyStyledDocument.codec(codecs._1, codecs._2);
+                Codec<StyledDocument<PS, S>> codec = ReadOnlyStyledDocument.codec(codecs._1, codecs._2);
                 DataFormat format = dataFormat(codec.getName());
-                StyledDocument<S, PS> doc = subDocument(selection.getStart(), selection.getEnd());
+                StyledDocument<PS, S> doc = subDocument(selection.getStart(), selection.getEnd());
                 ByteArrayOutputStream os = new ByteArrayOutputStream();
                 DataOutputStream dos = new DataOutputStream(os);
                 try {
@@ -72,14 +72,14 @@ default void paste() {
         Clipboard clipboard = Clipboard.getSystemClipboard();
 
         if(getStyleCodecs().isPresent()) {
-            Tuple2<Codec<S>, Codec<PS>> codecs = getStyleCodecs().get();
-            Codec<StyledDocument<S, PS>> codec = ReadOnlyStyledDocument.codec(codecs._1, codecs._2);
+            Tuple2<Codec<PS>, Codec<S>> codecs = getStyleCodecs().get();
+            Codec<StyledDocument<PS, S>> codec = ReadOnlyStyledDocument.codec(codecs._1, codecs._2);
             DataFormat format = dataFormat(codec.getName());
             if(clipboard.hasContent(format)) {
                 byte[] bytes = (byte[]) clipboard.getContent(format);
                 ByteArrayInputStream is = new ByteArrayInputStream(bytes);
                 DataInputStream dis = new DataInputStream(is);
-                StyledDocument<S, PS> doc = null;
+                StyledDocument<PS, S> doc = null;
                 try {
                     doc = codec.decode(dis);
                 } catch (IOException e) {
diff --git a/richtextfx/src/main/java/org/fxmisc/richtext/EditActions.java b/richtextfx/src/main/java/org/fxmisc/richtext/EditActions.java
index e97d501a6..f26270a13 100644
--- a/richtextfx/src/main/java/org/fxmisc/richtext/EditActions.java
+++ b/richtextfx/src/main/java/org/fxmisc/richtext/EditActions.java
@@ -5,7 +5,7 @@
 /**
  * Extended edit actions for {@link TextEditingArea}.
  */
-public interface EditActions<S, PS> extends TextEditingArea<S, PS> {
+public interface EditActions<PS, S> extends TextEditingArea<PS, S> {
 
     /**
      * Appends the given text to the end of the text content.
@@ -17,7 +17,7 @@ default void appendText(String text) {
     /**
      * Appends the given rich-text content to the end of this text-editing area.
      */
-    default void append(StyledDocument<S, PS> document) {
+    default void append(StyledDocument<PS, S> document) {
         insert(getLength(), document);
     }
 
@@ -37,7 +37,7 @@ default void insertText(int index, String text) {
      * @param index The location to insert the text.
      * @param document The rich-text content to insert.
      */
-    default void insert(int index, StyledDocument<S, PS> document) {
+    default void insert(int index, StyledDocument<PS, S> document) {
         replace(index, index, document);
     }
 
@@ -105,7 +105,7 @@ default void replaceText(String replacement) {
     /**
      * Replaces the entire content with the given rich-text content.
      */
-    default void replace(StyledDocument<S, PS> replacement) {
+    default void replace(StyledDocument<PS, S> replacement) {
         replace(0, getLength(), replacement);
     }
 
@@ -125,7 +125,7 @@ default void replaceSelection(String replacement) {
      * caret position. If there was a selection, then the selection is cleared
      * and the given replacement text is inserted.
      */
-    default void replaceSelection(StyledDocument<S, PS> replacement) {
+    default void replaceSelection(StyledDocument<PS, S> replacement) {
         replace(getSelection(), replacement);
     }
 
@@ -136,7 +136,7 @@ default void moveSelectedText(int pos) {
             // no move, just position the caret
             selectRange(pos, pos);
         } else {
-            StyledDocument<S, PS> text = this.subDocument(sel.getStart(), sel.getEnd());
+            StyledDocument<PS, S> text = this.subDocument(sel.getStart(), sel.getEnd());
             if(pos > sel.getEnd())
                 pos -= sel.getLength();
             deleteText(sel);
diff --git a/richtextfx/src/main/java/org/fxmisc/richtext/EditableStyledDocument.java b/richtextfx/src/main/java/org/fxmisc/richtext/EditableStyledDocument.java
index 4cf72ceed..95709cd45 100644
--- a/richtextfx/src/main/java/org/fxmisc/richtext/EditableStyledDocument.java
+++ b/richtextfx/src/main/java/org/fxmisc/richtext/EditableStyledDocument.java
@@ -30,7 +30,7 @@
  * on styled text, but not worrying about additional aspects such as
  * caret or selection.
  */
-final class EditableStyledDocument<S, PS> extends StyledDocumentBase<S, PS, ObservableList<Paragraph<S, PS>>> {
+final class EditableStyledDocument<PS, S> extends StyledDocumentBase<PS, S, ObservableList<Paragraph<PS, S>>> {
 
     /* ********************************************************************** *
      *                                                                        *
@@ -63,14 +63,14 @@ final class EditableStyledDocument<S, PS> extends StyledDocumentBase<S, PS, Obse
      * Unmodifiable observable list of styled paragraphs of this document.
      */
     @Override
-    public ObservableList<Paragraph<S, PS>> getParagraphs() {
+    public ObservableList<Paragraph<PS, S>> getParagraphs() {
         return FXCollections.unmodifiableObservableList(paragraphs);
     }
 
     /**
      * Read-only snapshot of the current state of this document.
      */
-    public ReadOnlyStyledDocument<S, PS> snapshot() {
+    public ReadOnlyStyledDocument<PS, S> snapshot() {
         return new ReadOnlyStyledDocument<>(paragraphs, ParagraphsPolicy.COPY);
     }
 
@@ -104,22 +104,22 @@ public ReadOnlyStyledDocument<S, PS> snapshot() {
 
     private final EventSource<String> insertedText = new EventSource<>();
 
-    private final EventSource<StyledDocument<S, PS>> insertedDocument = new EventSource<>();
+    private final EventSource<StyledDocument<PS, S>> insertedDocument = new EventSource<>();
     private final EventSource<Void> styleChangeDone = new EventSource<>();
 
     private final EventStream<PlainTextChange> plainTextChanges;
     public EventStream<PlainTextChange> plainTextChanges() { return plainTextChanges; }
 
-    private final EventStream<RichTextChange<S, PS>> richChanges;
-    public EventStream<RichTextChange<S, PS>> richChanges() { return richChanges; }
+    private final EventStream<RichTextChange<PS, S>> richChanges;
+    public EventStream<RichTextChange<PS, S>> richChanges() { return richChanges; }
 
     {
         EventStream<String> removedText = EventStreams.zip(textChangePosition, textRemovalEnd).map(t2 -> t2.map((a, b) -> getText(a, b)));
         EventStream<Integer> changePosition = EventStreams.merge(textChangePosition, styleChangePosition);
         EventStream<Integer> removalEnd = EventStreams.merge(textRemovalEnd, styleChangeEnd);
-        EventStream<StyledDocument<S, PS>> removedDocument = EventStreams.zip(changePosition, removalEnd).map(t2 -> t2.map((a, b) -> subSequence(a, b)));
+        EventStream<StyledDocument<PS, S>> removedDocument = EventStreams.zip(changePosition, removalEnd).map(t2 -> t2.map((a, b) -> subSequence(a, b)));
         EventStream<Integer> insertionEnd = styleChangeEnd.emitOn(styleChangeDone);
-        EventStream<StyledDocument<S, PS>> insertedDocument = EventStreams.merge(
+        EventStream<StyledDocument<PS, S>> insertedDocument = EventStreams.merge(
                 this.insertedDocument,
                 changePosition.emitBothOnEach(insertionEnd).map(t2 -> t2.map((a, b) -> subSequence(a, b))));
 
@@ -140,12 +140,12 @@ public ReadOnlyStyledDocument<S, PS> snapshot() {
      * ********************************************************************** */
 
     @SuppressWarnings("unchecked")
-    EditableStyledDocument(Paragraph<S, PS> initialParagraph) {
+    EditableStyledDocument(Paragraph<PS, S> initialParagraph) {
         super(FXCollections.observableArrayList(initialParagraph));
 
     }
 
-    EditableStyledDocument(S initialStyle, PS initialParagraphStyle) {
+    EditableStyledDocument(PS initialParagraphStyle, S initialStyle) {
         this(new Paragraph<>(initialParagraphStyle, "", initialStyle));
     }
 
@@ -164,12 +164,12 @@ public ReadOnlyStyledDocument<S, PS> snapshot() {
      * {@code start} in the current document.
      */
     public void replaceText(int start, int end, String text) {
-        StyledDocument<S, PS> doc = ReadOnlyStyledDocument.fromString(
-                text, getStyleAtPosition(start), getParagraphStyleAtPosition(start));
+        StyledDocument<PS, S> doc = ReadOnlyStyledDocument.fromString(
+                text, getParagraphStyleAtPosition(start), getStyleAtPosition(start));
         replace(start, end, doc);
     }
 
-    public void replace(int start, int end, StyledDocument<S, PS> replacement) {
+    public void replace(int start, int end, StyledDocument<PS, S> replacement) {
         ensureValidRange(start, end);
 
         textChangePosition.push(start);
@@ -183,12 +183,12 @@ public void replace(int start, int end, StyledDocument<S, PS> replacement) {
         int lastParTo = end2D.getMinor();
 
         // Get the leftovers after cutting out the deletion
-        Paragraph<S, PS> firstPar = paragraphs.get(firstParIdx).trim(firstParFrom);
-        Paragraph<S, PS> lastPar = paragraphs.get(lastParIdx).subSequence(lastParTo);
+        Paragraph<PS, S> firstPar = paragraphs.get(firstParIdx).trim(firstParFrom);
+        Paragraph<PS, S> lastPar = paragraphs.get(lastParIdx).subSequence(lastParTo);
 
-        List<Paragraph<S, PS>> replacementPars = replacement.getParagraphs();
+        List<Paragraph<PS, S>> replacementPars = replacement.getParagraphs();
 
-        List<Paragraph<S, PS>> newPars = join(firstPar, replacementPars, lastPar);
+        List<Paragraph<PS, S>> newPars = join(firstPar, replacementPars, lastPar);
         setAll(firstParIdx, lastParIdx + 1, newPars);
 
         // update length, invalidate text
@@ -203,7 +203,7 @@ public void replace(int start, int end, StyledDocument<S, PS> replacement) {
 
         // complete the change events
         insertedText.push(replacement.getText());
-        StyledDocument<S, PS> doc =
+        StyledDocument<PS, S> doc =
                 replacement instanceof ReadOnlyStyledDocument
                 ? replacement
                 : new ReadOnlyStyledDocument<>(replacement.getParagraphs(), COPY);
@@ -224,22 +224,22 @@ public void setStyle(int from, int to, S style) {
             int lastParTo = end.getMinor();
 
             if(firstParIdx == lastParIdx) {
-                Paragraph<S, PS> p = paragraphs.get(firstParIdx);
+                Paragraph<PS, S> p = paragraphs.get(firstParIdx);
                 p = p.restyle(firstParFrom, lastParTo, style);
                 paragraphs.set(firstParIdx, p);
             } else {
                 int affectedPars = lastParIdx - firstParIdx + 1;
-                List<Paragraph<S, PS>> restyledPars = new ArrayList<>(affectedPars);
+                List<Paragraph<PS, S>> restyledPars = new ArrayList<>(affectedPars);
 
-                Paragraph<S, PS> firstPar = paragraphs.get(firstParIdx);
+                Paragraph<PS, S> firstPar = paragraphs.get(firstParIdx);
                 restyledPars.add(firstPar.restyle(firstParFrom, firstPar.length(), style));
 
                 for(int i = firstParIdx + 1; i < lastParIdx; ++i) {
-                    Paragraph<S, PS> p = paragraphs.get(i);
+                    Paragraph<PS, S> p = paragraphs.get(i);
                     restyledPars.add(p.restyle(style));
                 }
 
-                Paragraph<S, PS> lastPar = paragraphs.get(lastParIdx);
+                Paragraph<PS, S> lastPar = paragraphs.get(lastParIdx);
                 restyledPars.add(lastPar.restyle(0, lastParTo, style));
 
                 setAll(firstParIdx, lastParIdx + 1, restyledPars);
@@ -248,7 +248,7 @@ public void setStyle(int from, int to, S style) {
     }
 
     public void setStyle(int paragraph, S style) {
-        Paragraph<S, PS> p = paragraphs.get(paragraph);
+        Paragraph<PS, S> p = paragraphs.get(paragraph);
         int start = position(paragraph, 0).toOffset();
         int end = start + p.length();
 
@@ -265,7 +265,7 @@ public void setStyle(int paragraph, int fromCol, int toCol, S style) {
         int end = parOffset + toCol;
 
         try(Guard commitOnClose = beginStyleChange(start, end)) {
-            Paragraph<S, PS> p = paragraphs.get(paragraph);
+            Paragraph<PS, S> p = paragraphs.get(paragraph);
             p = p.restyle(fromCol, toCol, style);
             paragraphs.set(paragraph, p);
         }
@@ -296,23 +296,23 @@ public void setStyleSpans(int from, StyleSpans<? extends S> styleSpans) {
             int lastParTo = end.getMinor();
 
             if(firstParIdx == lastParIdx) {
-                Paragraph<S, PS> p = paragraphs.get(firstParIdx);
-                Paragraph<S, PS> q = p.restyle(firstParFrom, styleSpans);
+                Paragraph<PS, S> p = paragraphs.get(firstParIdx);
+                Paragraph<PS, S> q = p.restyle(firstParFrom, styleSpans);
                 if(q != p) {
                     paragraphs.set(firstParIdx, q);
                 }
             } else {
-                Paragraph<S, PS> firstPar = paragraphs.get(firstParIdx);
+                Paragraph<PS, S> firstPar = paragraphs.get(firstParIdx);
                 Position spansFrom = styleSpans.position(0, 0);
                 Position spansTo = spansFrom.offsetBy(firstPar.length() - firstParFrom, Backward);
-                Paragraph<S, PS> q = firstPar.restyle(firstParFrom, styleSpans.subView(spansFrom, spansTo));
+                Paragraph<PS, S> q = firstPar.restyle(firstParFrom, styleSpans.subView(spansFrom, spansTo));
                 if(q != firstPar) {
                     paragraphs.set(firstParIdx, q);
                 }
                 spansFrom = spansTo.offsetBy(1, Forward); // skip the newline
 
                 for(int i = firstParIdx + 1; i < lastParIdx; ++i) {
-                    Paragraph<S, PS> par = paragraphs.get(i);
+                    Paragraph<PS, S> par = paragraphs.get(i);
                     spansTo = spansFrom.offsetBy(par.length(), Backward);
                     q = par.restyle(0, styleSpans.subView(spansFrom, spansTo));
                     if(q != par) {
@@ -321,7 +321,7 @@ public void setStyleSpans(int from, StyleSpans<? extends S> styleSpans) {
                     spansFrom = spansTo.offsetBy(1, Forward); // skip the newline
                 }
 
-                Paragraph<S, PS> lastPar = paragraphs.get(lastParIdx);
+                Paragraph<PS, S> lastPar = paragraphs.get(lastParIdx);
                 spansTo = spansFrom.offsetBy(lastParTo, Backward);
                 q = lastPar.restyle(0, styleSpans.subView(spansFrom, spansTo));
                 if(q != lastPar) {
@@ -339,8 +339,8 @@ public void setStyleSpans(int paragraph, int from, StyleSpans<? extends S> style
         int end = start + len;
 
         try(Guard commitOnClose = beginStyleChange(start, end)) {
-            Paragraph<S, PS> p = paragraphs.get(paragraph);
-            Paragraph<S, PS> q = p.restyle(from, styleSpans);
+            Paragraph<PS, S> p = paragraphs.get(paragraph);
+            Paragraph<PS, S> q = p.restyle(from, styleSpans);
             if(q != p) {
                 paragraphs.set(paragraph, q);
             }
@@ -349,13 +349,13 @@ public void setStyleSpans(int paragraph, int from, StyleSpans<? extends S> style
 
     public void setParagraphStyle(int parIdx, PS style) {
         ensureValidParagraphIndex(parIdx);
-        Paragraph<S, PS> par = paragraphs.get(parIdx);
+        Paragraph<PS, S> par = paragraphs.get(parIdx);
         int len = par.length();
         int start = position(parIdx, 0).toOffset();
         int end = start + len;
 
         try(Guard commitOnClose = beginStyleChange(start, end)) {
-            Paragraph<S, PS> q = par.setParagraphStyle(style);
+            Paragraph<PS, S> q = par.setParagraphStyle(style);
             paragraphs.set(parIdx, q);
         }
     }
@@ -390,7 +390,7 @@ private int fullLength(int par) {
     }
 
     private int terminatorLengthToSkip(Position pos) {
-        Paragraph<S, PS> par = paragraphs.get(pos.getMajor());
+        Paragraph<PS, S> par = paragraphs.get(pos.getMajor());
         int skipSum = 0;
         while(pos.getMinor() == par.length() && pos.getMajor() < paragraphs.size() - 1) {
             skipSum += 1;
@@ -418,14 +418,14 @@ private Guard beginStyleChange(int start, int end) {
         return () -> styleChangeDone.push(null);
     }
 
-    private List<Paragraph<S, PS>> join(Paragraph<S, PS> first, List<Paragraph<S, PS>> middle, Paragraph<S, PS> last) {
+    private List<Paragraph<PS, S>> join(Paragraph<PS, S> first, List<Paragraph<PS, S>> middle, Paragraph<PS, S> last) {
         int m = middle.size();
         if(m == 0) {
             return Arrays.asList(first.concat(last));
         } else if(m == 1) {
             return Arrays.asList(first.concat(middle.get(0)).concat(last));
         } else {
-            List<Paragraph<S, PS>> res = new ArrayList<>(middle.size());
+            List<Paragraph<PS, S>> res = new ArrayList<>(middle.size());
             res.add(first.concat(middle.get(0)));
             res.addAll(middle.subList(1, m - 1));
             res.add(middle.get(m-1).concat(last));
@@ -435,7 +435,7 @@ private List<Paragraph<S, PS>> join(Paragraph<S, PS> first, List<Paragraph<S, PS
 
     // TODO: Replace with ObservableList.setAll(from, to, col) when implemented.
     // See https://javafx-jira.kenai.com/browse/RT-32655.
-    private void setAll(int startIdx, int endIdx, Collection<Paragraph<S, PS>> pars) {
+    private void setAll(int startIdx, int endIdx, Collection<Paragraph<PS, S>> pars) {
         if(startIdx > 0 || endIdx < paragraphs.size()) {
             paragraphs.subList(startIdx, endIdx).clear(); // note that paragraphs remains non-empty at all times
             paragraphs.addAll(startIdx, pars);
diff --git a/richtextfx/src/main/java/org/fxmisc/richtext/InlineCssTextArea.java b/richtextfx/src/main/java/org/fxmisc/richtext/InlineCssTextArea.java
index 69842c793..793069b8c 100644
--- a/richtextfx/src/main/java/org/fxmisc/richtext/InlineCssTextArea.java
+++ b/richtextfx/src/main/java/org/fxmisc/richtext/InlineCssTextArea.java
@@ -1,5 +1,6 @@
 package org.fxmisc.richtext;
 
+
 /**
  * Text area that uses inline css to define style of text segments and paragraph segments.
  */
@@ -11,8 +12,8 @@ public InlineCssTextArea() {
 
     public InlineCssTextArea(EditableStyledDocument<String, String> document) {
         super(
-                "", (text, style) -> text.setStyle(style),
                 "", (paragraph, style) -> paragraph.setStyle(style),
+                "", (text, style) -> text.setStyle(style),
                 document,
                 true
         );
diff --git a/richtextfx/src/main/java/org/fxmisc/richtext/InlineStyleTextArea.java b/richtextfx/src/main/java/org/fxmisc/richtext/InlineStyleTextArea.java
index 9d74a4696..f243c0e07 100644
--- a/richtextfx/src/main/java/org/fxmisc/richtext/InlineStyleTextArea.java
+++ b/richtextfx/src/main/java/org/fxmisc/richtext/InlineStyleTextArea.java
@@ -10,7 +10,7 @@
  * @deprecated
  */
 @Deprecated
-public class InlineStyleTextArea<S, PS> extends StyledTextArea<S, PS> {
+public class InlineStyleTextArea<PS, S> extends StyledTextArea<PS, S> {
 
     /**
      *
@@ -19,11 +19,10 @@ public class InlineStyleTextArea<S, PS> extends StyledTextArea<S, PS> {
      * @param styleToCss function that converts an instance of {@code S}
      *     to a CSS string.
      */
-    public  InlineStyleTextArea(S initialStyle, Function<S, String> styleToCss, PS initialParagraphStyle, Function<PS, String> paragraphStyleToCss) {
-        super(initialStyle,
-                (text, style) -> text.setStyle(styleToCss.apply(style)),
-                initialParagraphStyle,
-                (paragraph, style) -> paragraph.setStyle(paragraphStyleToCss.apply(style)));
+    public InlineStyleTextArea(PS initialParagraphStyle, Function<PS, String> paragraphStyleToCss, S initialStyle, Function<S, String> styleToCss) {
+        super(initialParagraphStyle, (paragraph, style) -> paragraph.setStyle(paragraphStyleToCss.apply(style)),
+                initialStyle, (text, style) -> text.setStyle(styleToCss.apply(style))
+        );
     }
 
 }
diff --git a/richtextfx/src/main/java/org/fxmisc/richtext/NavigationActions.java b/richtextfx/src/main/java/org/fxmisc/richtext/NavigationActions.java
index 4d2061891..980ee6947 100644
--- a/richtextfx/src/main/java/org/fxmisc/richtext/NavigationActions.java
+++ b/richtextfx/src/main/java/org/fxmisc/richtext/NavigationActions.java
@@ -7,7 +7,7 @@
 /**
  * Navigation actions for {@link TextEditingArea}.
  */
-public interface NavigationActions<S, PS> extends TextEditingArea<S, PS> {
+public interface NavigationActions<PS, S> extends TextEditingArea<PS, S> {
 
     /**
      * Indicates how to treat selection when caret is moved.
diff --git a/richtextfx/src/main/java/org/fxmisc/richtext/Paragraph.java b/richtextfx/src/main/java/org/fxmisc/richtext/Paragraph.java
index 66852f57b..80eb47123 100644
--- a/richtextfx/src/main/java/org/fxmisc/richtext/Paragraph.java
+++ b/richtextfx/src/main/java/org/fxmisc/richtext/Paragraph.java
@@ -11,7 +11,7 @@
 
 import org.fxmisc.richtext.TwoDimensional.Position;
 
-public final class Paragraph<S, PS> {
+public final class Paragraph<PS, S> {
 
     @SafeVarargs
     private static <T> List<T> list(T head, T... tail) {
@@ -75,7 +75,7 @@ public String substring(int from) {
         return getText().substring(from);
     }
 
-    public Paragraph<S, PS> concat(Paragraph<S, PS> p) {
+    public Paragraph<PS, S> concat(Paragraph<PS, S> p) {
         if(p.length() == 0) {
             return this;
         }
@@ -101,7 +101,7 @@ public Paragraph<S, PS> concat(Paragraph<S, PS> p) {
         }
     }
 
-    public Paragraph<S, PS> append(String str) {
+    public Paragraph<PS, S> append(String str) {
         if(str.length() == 0) {
             return this;
         }
@@ -112,7 +112,7 @@ public Paragraph<S, PS> append(String str) {
         return new Paragraph<>(paragraphStyle, segs);
     }
 
-    public Paragraph<S, PS> insert(int offset, CharSequence str) {
+    public Paragraph<PS, S> insert(int offset, CharSequence str) {
         if(offset < 0 || offset > length()) {
             throw new IndexOutOfBoundsException(String.valueOf(offset));
         }
@@ -127,11 +127,11 @@ public Paragraph<S, PS> insert(int offset, CharSequence str) {
         return new Paragraph<>(paragraphStyle, segs);
     }
 
-    public Paragraph<S, PS> subSequence(int start, int end) {
+    public Paragraph<PS, S> subSequence(int start, int end) {
         return trim(end).subSequence(start);
     }
 
-    public Paragraph<S, PS> trim(int length) {
+    public Paragraph<PS, S> trim(int length) {
         if(length >= length()) {
             return this;
         } else {
@@ -144,7 +144,7 @@ public Paragraph<S, PS> trim(int length) {
         }
     }
 
-    public Paragraph<S, PS> subSequence(int start) {
+    public Paragraph<PS, S> subSequence(int start) {
         if(start < 0) {
             throw new IllegalArgumentException("start must not be negative (was: " + start + ")");
         } else if(start == 0) {
@@ -161,34 +161,34 @@ public Paragraph<S, PS> subSequence(int start) {
         }
     }
 
-    public Paragraph<S, PS> delete(int start, int end) {
+    public Paragraph<PS, S> delete(int start, int end) {
         return trim(start).concat(subSequence(end));
     }
 
-    public Paragraph<S, PS> restyle(S style) {
+    public Paragraph<PS, S> restyle(S style) {
         return new Paragraph<>(paragraphStyle, getText(), style);
     }
 
-    public Paragraph<S, PS> restyle(int from, int to, S style) {
+    public Paragraph<PS, S> restyle(int from, int to, S style) {
         if(from >= length()) {
             return this;
         } else {
             to = Math.min(to, length());
-            Paragraph<S, PS> left = subSequence(0, from);
-            Paragraph<S, PS> middle = new Paragraph<>(paragraphStyle, substring(from, to), style);
-            Paragraph<S, PS> right = subSequence(to);
+            Paragraph<PS, S> left = subSequence(0, from);
+            Paragraph<PS, S> middle = new Paragraph<>(paragraphStyle, substring(from, to), style);
+            Paragraph<PS, S> right = subSequence(to);
             return left.concat(middle).concat(right);
         }
     }
 
-    public Paragraph<S, PS> restyle(int from, StyleSpans<? extends S> styleSpans) {
+    public Paragraph<PS, S> restyle(int from, StyleSpans<? extends S> styleSpans) {
         int len = styleSpans.length();
         if(styleSpans.equals(getStyleSpans(from, from + len))) {
             return this;
         }
 
-        Paragraph<S, PS> left = trim(from);
-        Paragraph<S, PS> right = subSequence(from + len);
+        Paragraph<PS, S> left = trim(from);
+        Paragraph<PS, S> right = subSequence(from + len);
 
         String middleString = substring(from, from + len);
         List<StyledText<S>> middleSegs = new ArrayList<>(styleSpans.getSpanCount());
@@ -199,12 +199,12 @@ public Paragraph<S, PS> restyle(int from, StyleSpans<? extends S> styleSpans) {
             middleSegs.add(new StyledText<>(text, span.getStyle()));
             offset = end;
         }
-        Paragraph<S, PS> middle = new Paragraph<>(paragraphStyle, middleSegs);
+        Paragraph<PS, S> middle = new Paragraph<>(paragraphStyle, middleSegs);
 
         return left.concat(middle).concat(right);
     }
 
-    public Paragraph<S, PS> setParagraphStyle(PS paragraphStyle) {
+    public Paragraph<PS, S> setParagraphStyle(PS paragraphStyle) {
         return new Paragraph<>(paragraphStyle, segments);
     }
 
diff --git a/richtextfx/src/main/java/org/fxmisc/richtext/ParagraphBox.java b/richtextfx/src/main/java/org/fxmisc/richtext/ParagraphBox.java
index 6e31a4395..bcf0aa450 100644
--- a/richtextfx/src/main/java/org/fxmisc/richtext/ParagraphBox.java
+++ b/richtextfx/src/main/java/org/fxmisc/richtext/ParagraphBox.java
@@ -31,7 +31,7 @@
 import org.reactfx.value.Val;
 import org.reactfx.value.Var;
 
-class ParagraphBox<S, PS> extends Region {
+class ParagraphBox<PS, S> extends Region {
 
     /**
      * An opaque class representing horizontal caret offset.
@@ -46,7 +46,7 @@ private CaretOffsetX(double value) {
         }
     }
 
-    private final ParagraphText<S, PS> text;
+    private final ParagraphText<PS, S> text;
 
     private final ObjectProperty<IntFunction<? extends Node>> graphicFactory
             = new SimpleObjectProperty<>(null);
@@ -69,7 +69,7 @@ public ObjectProperty<IntFunction<? extends Node>> graphicFactoryProperty() {
     public void setIndex(int index) { this.index.setValue(index); }
     public int getIndex() { return index.getValue(); }
 
-    ParagraphBox(Paragraph<S, PS> par, BiConsumer<? super TextExt, S> applyStyle, BiConsumer<TextFlow, PS> applyParagraphStyle) {
+    ParagraphBox(Paragraph<PS, S> par, BiConsumer<TextFlow, PS> applyParagraphStyle, BiConsumer<? super TextExt, S> applyStyle) {
         this.getStyleClass().add("paragraph-box");
         this.text = new ParagraphText<>(par, applyStyle);
         applyParagraphStyle.accept(this.text, par.getParagraphStyle());
@@ -107,7 +107,7 @@ public String toString() {
 
     public Property<IndexRange> selectionProperty() { return text.selectionProperty(); }
 
-    Paragraph<S, PS> getParagraph() {
+    Paragraph<PS, S> getParagraph() {
         return text.getParagraph();
     }
 
diff --git a/richtextfx/src/main/java/org/fxmisc/richtext/ParagraphText.java b/richtextfx/src/main/java/org/fxmisc/richtext/ParagraphText.java
index 76e536842..a0305e508 100644
--- a/richtextfx/src/main/java/org/fxmisc/richtext/ParagraphText.java
+++ b/richtextfx/src/main/java/org/fxmisc/richtext/ParagraphText.java
@@ -20,7 +20,7 @@
 import org.reactfx.value.Val;
 import org.reactfx.value.Var;
 
-class ParagraphText<S, PS> extends TextFlowExt {
+class ParagraphText<PS, S> extends TextFlowExt {
 
     // FIXME: changing it currently has not effect, because
     // Text.impl_selectionFillProperty().set(newFill) doesn't work
@@ -39,7 +39,7 @@ public ObjectProperty<Paint> highlightTextFillProperty() {
     public ObjectProperty<IndexRange> selectionProperty() { return selection; }
     public void setSelection(IndexRange sel) { selection.set(sel); }
 
-    private final Paragraph<S, PS> paragraph;
+    private final Paragraph<PS, S> paragraph;
 
     private final Path caretShape = new Path();
     private final Path selectionShape = new Path();
@@ -53,7 +53,7 @@ public ObjectProperty<Paint> highlightTextFillProperty() {
         caretShape.visibleProperty().bind(caretVisible);
     }
 
-    public ParagraphText(Paragraph<S, PS> par, BiConsumer<? super TextExt, S> applyStyle) {
+    public ParagraphText(Paragraph<PS, S> par, BiConsumer<? super TextExt, S> applyStyle) {
         this.paragraph = par;
 
         getStyleClass().add("paragraph-text");
@@ -118,7 +118,7 @@ public ParagraphText(Paragraph<S, PS> par, BiConsumer<? super TextExt, S> applyS
         }
     }
 
-    public Paragraph<S, PS> getParagraph() {
+    public Paragraph<PS, S> getParagraph() {
         return paragraph;
     }
 
diff --git a/richtextfx/src/main/java/org/fxmisc/richtext/ReadOnlyStyledDocument.java b/richtextfx/src/main/java/org/fxmisc/richtext/ReadOnlyStyledDocument.java
index b539a9e8b..53dccf09a 100644
--- a/richtextfx/src/main/java/org/fxmisc/richtext/ReadOnlyStyledDocument.java
+++ b/richtextfx/src/main/java/org/fxmisc/richtext/ReadOnlyStyledDocument.java
@@ -11,16 +11,16 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-public class ReadOnlyStyledDocument<S, PS> extends StyledDocumentBase<S, PS, List<Paragraph<S, PS>>> {
+public class ReadOnlyStyledDocument<PS, S> extends StyledDocumentBase<PS, S, List<Paragraph<PS, S>>> {
 
     private static final Pattern LINE_TERMINATOR = Pattern.compile("\r\n|\r|\n");
 
-    public static <S, PS> ReadOnlyStyledDocument<S, PS> fromString(String str, S style, PS paragraphStyle) {
+    public static <PS, S> ReadOnlyStyledDocument<PS, S> fromString(String str, PS paragraphStyle, S style) {
         Matcher m = LINE_TERMINATOR.matcher(str);
 
         int n = 1;
         while(m.find()) ++n;
-        List<Paragraph<S, PS>> res = new ArrayList<>(n);
+        List<Paragraph<PS, S>> res = new ArrayList<>(n);
 
         int start = 0;
         m.reset();
@@ -40,9 +40,9 @@ enum ParagraphsPolicy {
         COPY,
     }
 
-    static <S, PS> Codec<StyledDocument<S, PS>> codec(Codec<S> tCodec, Codec<PS> pCodec) {
-        return new Codec<StyledDocument<S, PS>>() {
-            private final Codec<List<Paragraph<S, PS>>> codec = Codec.listCodec(paragraphCodec(tCodec, pCodec));
+    static <PS, S> Codec<StyledDocument<PS, S>> codec(Codec<PS> pCodec, Codec<S> tCodec) {
+        return new Codec<StyledDocument<PS, S>>() {
+            private final Codec<List<Paragraph<PS, S>>> codec = Codec.listCodec(paragraphCodec(pCodec, tCodec));
 
             @Override
             public String getName() {
@@ -50,12 +50,12 @@ public String getName() {
             }
 
             @Override
-            public void encode(DataOutputStream os, StyledDocument<S, PS> doc) throws IOException {
+            public void encode(DataOutputStream os, StyledDocument<PS, S> doc) throws IOException {
                 codec.encode(os, doc.getParagraphs());
             }
 
             @Override
-            public StyledDocument<S, PS> decode(DataInputStream is) throws IOException {
+            public StyledDocument<PS, S> decode(DataInputStream is) throws IOException {
                 return new ReadOnlyStyledDocument<>(
                         codec.decode(is),
                         ParagraphsPolicy.ADOPT);
@@ -64,8 +64,8 @@ public StyledDocument<S, PS> decode(DataInputStream is) throws IOException {
         };
     }
 
-    private static <S, PS> Codec<Paragraph<S, PS>> paragraphCodec(Codec<S> tCodec, Codec<PS> pCodec) {
-        return new Codec<Paragraph<S, PS>>() {
+    private static <PS, S> Codec<Paragraph<PS, S>> paragraphCodec(Codec<PS> pCodec, Codec<S> tCodec) {
+        return new Codec<Paragraph<PS, S>>() {
             private final Codec<List<StyledText<S>>> segmentsCodec = Codec.listCodec(styledTextCodec(tCodec));
 
             @Override
@@ -74,13 +74,13 @@ public String getName() {
             }
 
             @Override
-            public void encode(DataOutputStream os, Paragraph<S, PS> p) throws IOException {
+            public void encode(DataOutputStream os, Paragraph<PS, S> p) throws IOException {
                 pCodec.encode(os, p.getParagraphStyle());
                 segmentsCodec.encode(os, p.getSegments());
             }
 
             @Override
-            public Paragraph<S, PS> decode(DataInputStream is) throws IOException {
+            public Paragraph<PS, S> decode(DataInputStream is) throws IOException {
                 PS paragraphStyle = pCodec.decode(is);
                 List<StyledText<S>> segments = segmentsCodec.decode(is);
                 return new Paragraph<>(paragraphStyle, segments);
@@ -117,7 +117,7 @@ public StyledText<S> decode(DataInputStream is) throws IOException {
 
     private String text = null;
 
-    ReadOnlyStyledDocument(List<Paragraph<S, PS>> paragraphs, ParagraphsPolicy policy) {
+    ReadOnlyStyledDocument(List<Paragraph<PS, S>> paragraphs, ParagraphsPolicy policy) {
         super(policy == ParagraphsPolicy.ADOPT ? paragraphs : new ArrayList<>(paragraphs));
     }
 
@@ -138,7 +138,7 @@ public String getText() {
     }
 
     @Override
-    public List<Paragraph<S, PS>> getParagraphs() {
+    public List<Paragraph<PS, S>> getParagraphs() {
         return Collections.unmodifiableList(paragraphs);
     }
 
diff --git a/richtextfx/src/main/java/org/fxmisc/richtext/RichTextChange.java b/richtextfx/src/main/java/org/fxmisc/richtext/RichTextChange.java
index 977f89c73..9413115ff 100644
--- a/richtextfx/src/main/java/org/fxmisc/richtext/RichTextChange.java
+++ b/richtextfx/src/main/java/org/fxmisc/richtext/RichTextChange.java
@@ -1,8 +1,8 @@
 package org.fxmisc.richtext;
 
-public class RichTextChange<S, PS> extends TextChange<StyledDocument<S, PS>, RichTextChange<S, PS>> {
+public class RichTextChange<PS, S> extends TextChange<StyledDocument<PS, S>, RichTextChange<PS, S>> {
 
-    public RichTextChange(int position, StyledDocument<S, PS> removed, StyledDocument<S, PS> inserted) {
+    public RichTextChange(int position, StyledDocument<PS, S> removed, StyledDocument<PS, S> inserted) {
         super(position, removed, inserted);
     }
 
@@ -17,17 +17,17 @@ protected int insertedLength() {
     }
 
     @Override
-    protected final StyledDocument<S, PS> concat(StyledDocument<S, PS> a, StyledDocument<S, PS> b) {
+    protected final StyledDocument<PS, S> concat(StyledDocument<PS, S> a, StyledDocument<PS, S> b) {
         return a.concat(b);
     }
 
     @Override
-    protected final StyledDocument<S, PS> sub(StyledDocument<S, PS> doc, int from, int to) {
+    protected final StyledDocument<PS, S> sub(StyledDocument<PS, S> doc, int from, int to) {
         return doc.subSequence(from, to);
     }
 
     @Override
-    protected final RichTextChange<S, PS> create(int position, StyledDocument<S, PS> removed, StyledDocument<S, PS> inserted) {
+    protected final RichTextChange<PS, S> create(int position, StyledDocument<PS, S> removed, StyledDocument<PS, S> inserted) {
         return new RichTextChange<>(position, removed, inserted);
     }
 
diff --git a/richtextfx/src/main/java/org/fxmisc/richtext/StyleClassedTextArea.java b/richtextfx/src/main/java/org/fxmisc/richtext/StyleClassedTextArea.java
index 4738fbc77..f4f556538 100644
--- a/richtextfx/src/main/java/org/fxmisc/richtext/StyleClassedTextArea.java
+++ b/richtextfx/src/main/java/org/fxmisc/richtext/StyleClassedTextArea.java
@@ -12,9 +12,9 @@ public class StyleClassedTextArea extends StyledTextArea<Collection<String>, Col
 
     public StyleClassedTextArea(EditableStyledDocument<Collection<String>, Collection<String>> document, boolean preserveStyle) {
         super(Collections.<String>emptyList(),
-                (text, styleClasses) -> text.getStyleClass().addAll(styleClasses),
-                Collections.<String>emptyList(),
                 (paragraph, styleClasses) -> paragraph.getStyleClass().addAll(styleClasses),
+                Collections.<String>emptyList(),
+                (text, styleClasses) -> text.getStyleClass().addAll(styleClasses),
                 document, preserveStyle
         );
 
diff --git a/richtextfx/src/main/java/org/fxmisc/richtext/StyledDocument.java b/richtextfx/src/main/java/org/fxmisc/richtext/StyledDocument.java
index 9a86b2dc9..c1b16e6b2 100644
--- a/richtextfx/src/main/java/org/fxmisc/richtext/StyledDocument.java
+++ b/richtextfx/src/main/java/org/fxmisc/richtext/StyledDocument.java
@@ -4,25 +4,24 @@
 
 import javafx.scene.control.IndexRange;
 
-public interface StyledDocument<S, PS> extends TwoDimensional {
+public interface StyledDocument<PS, S> extends TwoDimensional {
     int length();
 
     String getText();
     String getText(int start, int end);
     String getText(IndexRange range);
 
-    StyledDocument<S, PS> subSequence(int start, int end);
-    StyledDocument<S, PS> subSequence(IndexRange range);
-    StyledDocument<S, PS> subDocument(int paragraphIndex);
+    StyledDocument<PS, S> subSequence(int start, int end);
+    StyledDocument<PS, S> subSequence(IndexRange range);
+    StyledDocument<PS, S> subDocument(int paragraphIndex);
 
-    StyledDocument<S, PS> concat(StyledDocument<S, PS> latter);
+    StyledDocument<PS, S> concat(StyledDocument<PS, S> latter);
 
     S getStyleOfChar(int index);
     S getStyleOfChar(int paragraph, int column);
 
     S getStyleAtPosition(int position);
     S getStyleAtPosition(int paragraph, int position);
-    PS getParagraphStyleAtPosition(int position);
 
     IndexRange getStyleRangeAtPosition(int position);
     IndexRange getStyleRangeAtPosition(int paragraph, int position);
@@ -31,5 +30,5 @@ public interface StyledDocument<S, PS> extends TwoDimensional {
     StyleSpans<S> getStyleSpans(int paragraph);
     StyleSpans<S> getStyleSpans(int paragraph, int from, int to);
 
-    List<Paragraph<S, PS>> getParagraphs();
+    List<Paragraph<PS, S>> getParagraphs();
 }
diff --git a/richtextfx/src/main/java/org/fxmisc/richtext/StyledDocumentBase.java b/richtextfx/src/main/java/org/fxmisc/richtext/StyledDocumentBase.java
index eabd51817..bea744993 100644
--- a/richtextfx/src/main/java/org/fxmisc/richtext/StyledDocumentBase.java
+++ b/richtextfx/src/main/java/org/fxmisc/richtext/StyledDocumentBase.java
@@ -11,8 +11,8 @@
 
 import javafx.scene.control.IndexRange;
 
-abstract class StyledDocumentBase<S, PS, L extends List<Paragraph<S, PS>>>
-implements StyledDocument<S, PS> {
+abstract class StyledDocumentBase<PS, S, L extends List<Paragraph<PS, S>>>
+implements StyledDocument<PS, S> {
 
     protected final L paragraphs;
     protected final TwoLevelNavigator navigator;
@@ -70,31 +70,31 @@ public char charAt(int index) {
     }
 
     @Override
-    public StyledDocument<S, PS> subSequence(IndexRange range) {
+    public StyledDocument<PS, S> subSequence(IndexRange range) {
         return subSequence(range.getStart(), range.getEnd());
     }
 
     @Override
-    public StyledDocument<S, PS> subSequence(int start, int end) {
+    public StyledDocument<PS, S> subSequence(int start, int end) {
         return sub(
                 start, end,
                 p -> p,
                 (p, a, b) -> p.subSequence(a, b),
-                (List<Paragraph<S, PS>> pars) -> new ReadOnlyStyledDocument<>(pars, ADOPT));
+                (List<Paragraph<PS, S>> pars) -> new ReadOnlyStyledDocument<>(pars, ADOPT));
     }
 
     @Override
-    public StyledDocument<S, PS> subDocument(int paragraphIndex) {
+    public StyledDocument<PS, S> subDocument(int paragraphIndex) {
         return new ReadOnlyStyledDocument<>(Arrays.asList(paragraphs.get(paragraphIndex)), ADOPT);
     }
 
     @Override
-    public final StyledDocument<S, PS> concat(StyledDocument<S, PS> that) {
-        List<Paragraph<S, PS>> pars1 = this.getParagraphs();
-        List<Paragraph<S, PS>> pars2 = that.getParagraphs();
+    public final StyledDocument<PS, S> concat(StyledDocument<PS, S> that) {
+        List<Paragraph<PS, S>> pars1 = this.getParagraphs();
+        List<Paragraph<PS, S>> pars2 = that.getParagraphs();
         int n1 = pars1.size();
         int n2 = pars2.size();
-        List<Paragraph<S, PS>> pars = new ArrayList<>(n1 + n2 - 1);
+        List<Paragraph<PS, S>> pars = new ArrayList<>(n1 + n2 - 1);
         pars.addAll(pars1.subList(0, n1 - 1));
         pars.add(pars1.get(n1 - 1).concat(pars2.get(0)));
         pars.addAll(pars2.subList(1, n2));
@@ -125,10 +125,9 @@ public S getStyleAtPosition(int paragraph, int position) {
         return paragraphs.get(paragraph).getStyleAtPosition(position);
     }
 
-    @Override
     public PS getParagraphStyleAtPosition(int position) {
         Position pos = offsetToPosition(position, Forward);
-        Paragraph<S, PS> par = paragraphs.get(pos.getMajor());
+        Paragraph<PS, S> par = paragraphs.get(pos.getMajor());
         return par.getParagraphStyle();
     }
 
@@ -158,18 +157,18 @@ public StyleSpans<S> getStyleSpans(int from, int to) {
         List<StyleSpans<S>> subSpans = new ArrayList<>(affectedPars);
 
         if(startParIdx == endParIdx) {
-            Paragraph<S, PS> par = paragraphs.get(startParIdx);
+            Paragraph<PS, S> par = paragraphs.get(startParIdx);
             subSpans.add(par.getStyleSpans(start.getMinor(), end.getMinor()));
         } else {
-            Paragraph<S, PS> startPar = paragraphs.get(startParIdx);
+            Paragraph<PS, S> startPar = paragraphs.get(startParIdx);
             subSpans.add(startPar.getStyleSpans(start.getMinor(), startPar.length() + 1));
 
             for(int i = startParIdx + 1; i < endParIdx; ++i) {
-                Paragraph<S, PS> par = paragraphs.get(i);
+                Paragraph<PS, S> par = paragraphs.get(i);
                 subSpans.add(par.getStyleSpans(0, par.length() + 1));
             }
 
-            Paragraph<S, PS> endPar = paragraphs.get(endParIdx);
+            Paragraph<PS, S> endPar = paragraphs.get(endParIdx);
             subSpans.add(endPar.getStyleSpans(0, end.getMinor()));
         }
 
@@ -234,8 +233,8 @@ private interface SubMap<A, B> {
      */
     private <P, R> R sub(
             int start, int end,
-            Function<Paragraph<S, PS>, P> map,
-            SubMap<Paragraph<S, PS>, P> subMap,
+            Function<Paragraph<PS, S>, P> map,
+            SubMap<Paragraph<PS, S>, P> subMap,
             Function<List<P>, R> combine) {
 
         Position start2D = navigator.offsetToPosition(start, Forward);
@@ -252,7 +251,7 @@ private <P, R> R sub(
         if(p1 == p2) {
             pars.add(subMap.subrange(paragraphs.get(p1), col1, col2));
         } else {
-            Paragraph<S, PS> par1 = paragraphs.get(p1);
+            Paragraph<PS, S> par1 = paragraphs.get(p1);
             pars.add(subMap.subrange(par1, col1, par1.length()));
 
             for(int i = p1 + 1; i < p2; ++i) {
diff --git a/richtextfx/src/main/java/org/fxmisc/richtext/StyledTextArea.java b/richtextfx/src/main/java/org/fxmisc/richtext/StyledTextArea.java
index 5f133003f..c9da7d1e5 100644
--- a/richtextfx/src/main/java/org/fxmisc/richtext/StyledTextArea.java
+++ b/richtextfx/src/main/java/org/fxmisc/richtext/StyledTextArea.java
@@ -104,12 +104,12 @@
  *
  * @param <S> type of style that can be applied to text.
  */
-public class StyledTextArea<S, PS> extends Region
+public class StyledTextArea<PS, S> extends Region
         implements
-        TextEditingArea<S, PS>,
-        EditActions<S, PS>,
-        ClipboardActions<S, PS>,
-        NavigationActions<S, PS>,
+        TextEditingArea<PS, S>,
+        EditActions<PS, S>,
+        ClipboardActions<PS, S>,
+        NavigationActions<PS, S>,
         UndoActions,
         TwoDimensional,
         Virtualized {
@@ -268,16 +268,16 @@ public class StyledTextArea<S, PS> extends Region
     public void setUseInitialStyleForInsertion(boolean value) { model.setUseInitialStyleForInsertion(value); }
     public boolean getUseInitialStyleForInsertion() { return model.getUseInitialStyleForInsertion(); }
 
-    private Optional<Tuple2<Codec<S>, Codec<PS>>> styleCodecs = Optional.empty();
+    private Optional<Tuple2<Codec<PS>, Codec<S>>> styleCodecs = Optional.empty();
     /**
      * Sets codecs to encode/decode style information to/from binary format.
      * Providing codecs enables clipboard actions to retain the style information.
      */
-    public void setStyleCodecs(Codec<S> textStyleCodec, Codec<PS> paragraphStyleCodec) {
-        styleCodecs = Optional.of(t(textStyleCodec, paragraphStyleCodec));
+    public void setStyleCodecs(Codec<PS> paragraphStyleCodec, Codec<S> textStyleCodec) {
+        styleCodecs = Optional.of(t(paragraphStyleCodec, textStyleCodec));
     }
     @Override
-    public Optional<Tuple2<Codec<S>, Codec<PS>>> getStyleCodecs() {
+    public Optional<Tuple2<Codec<PS>, Codec<S>>> getStyleCodecs() {
         return styleCodecs;
     }
 
@@ -317,7 +317,7 @@ public Optional<Tuple2<Codec<S>, Codec<PS>>> getStyleCodecs() {
     @Override public final ObservableValue<String> textProperty() { return model.textProperty(); }
 
     // rich text
-    @Override public final StyledDocument<S, PS> getDocument() { return model.getDocument(); };
+    @Override public final StyledDocument<PS, S> getDocument() { return model.getDocument(); };
 
     // length
     @Override public final int getLength() { return model.getLength(); }
@@ -348,7 +348,7 @@ public Optional<Tuple2<Codec<S>, Codec<PS>>> getStyleCodecs() {
     @Override public final ObservableValue<Integer> caretColumnProperty() { return model.caretColumnProperty(); }
 
     // paragraphs
-    @Override public ObservableList<Paragraph<S, PS>> getParagraphs() { return model.getParagraphs(); }
+    @Override public ObservableList<Paragraph<PS, S>> getParagraphs() { return model.getParagraphs(); }
 
     // beingUpdated
     public ObservableBooleanValue beingUpdatedProperty() { return model.beingUpdatedProperty(); }
@@ -384,7 +384,7 @@ public Optional<Tuple2<Codec<S>, Codec<PS>>> getStyleCodecs() {
     @Override public final EventStream<PlainTextChange> plainTextChanges() { return model.plainTextChanges(); }
 
     // rich text changes
-    @Override public final EventStream<RichTextChange<S, PS>> richChanges() { return model.richChanges(); }
+    @Override public final EventStream<RichTextChange<PS, S>> richChanges() { return model.richChanges(); }
 
     /* ********************************************************************** *
      *                                                                        *
@@ -400,7 +400,7 @@ public Optional<Tuple2<Codec<S>, Codec<PS>>> getStyleCodecs() {
 
     private final Val<UnaryOperator<Point2D>> _popupAnchorAdjustment;
 
-    private final VirtualFlow<Paragraph<S, PS>, Cell<Paragraph<S, PS>, ParagraphBox<S, PS>>> virtualFlow;
+    private final VirtualFlow<Paragraph<PS, S>, Cell<Paragraph<PS, S>, ParagraphBox<PS, S>>> virtualFlow;
 
     // used for two-level navigation, where on the higher level are
     // paragraphs and on the lower level are lines within a paragraph
@@ -411,12 +411,12 @@ public Optional<Tuple2<Codec<S>, Codec<PS>>> getStyleCodecs() {
     /**
      * model
      */
-    private final StyledTextAreaModel<S, PS> model;
+    private final StyledTextAreaModel<PS, S> model;
 
     /**
      * @return this area's {@link StyledTextAreaModel}
      */
-    protected final StyledTextAreaModel<S, PS> getModel() {
+    protected final StyledTextAreaModel<PS, S> getModel() {
         return model;
     }
 
@@ -469,18 +469,18 @@ protected final StyledTextAreaModel<S, PS> getModel() {
      * a style, applies the style to the paragraph node. This function is
      * used by the default skin to apply style to paragraph nodes.
      */
-    public StyledTextArea(S initialStyle, BiConsumer<? super TextExt, S> applyStyle,
-                          PS initialParagraphStyle, BiConsumer<TextFlow, PS> applyParagraphStyle
+    public StyledTextArea(PS initialParagraphStyle, BiConsumer<TextFlow, PS> applyParagraphStyle,
+                          S initialStyle, BiConsumer<? super TextExt, S> applyStyle
     ) {
-        this(initialStyle, applyStyle, initialParagraphStyle, applyParagraphStyle, true);
+        this(initialParagraphStyle, applyParagraphStyle, initialStyle, applyStyle, true);
     }
 
-    public <C> StyledTextArea(S initialStyle, BiConsumer<? super TextExt, S> applyStyle,
-                              PS initialParagraphStyle, BiConsumer<TextFlow, PS> applyParagraphStyle,
+    public <C> StyledTextArea(PS initialParagraphStyle, BiConsumer<TextFlow, PS> applyParagraphStyle,
+                              S initialStyle, BiConsumer<? super TextExt, S> applyStyle,
                               boolean preserveStyle
     ) {
-        this(initialStyle, applyStyle, initialParagraphStyle, applyParagraphStyle,
-                new EditableStyledDocument<S, PS>(initialStyle, initialParagraphStyle), preserveStyle);
+        this(initialParagraphStyle, applyParagraphStyle, initialStyle, applyStyle,
+                new EditableStyledDocument<PS, S>(initialParagraphStyle, initialStyle), preserveStyle);
     }
 
     /**
@@ -488,19 +488,19 @@ public <C> StyledTextArea(S initialStyle, BiConsumer<? super TextExt, S> applySt
      * this constructor can be used to create another {@code StyledTextArea} object that
      * shares the same {@link EditableStyledDocument}.
      */
-    public StyledTextArea(S initialStyle, BiConsumer<? super TextExt, S> applyStyle,
-                          PS initialParagraphStyle, BiConsumer<TextFlow, PS> applyParagraphStyle,
-                          EditableStyledDocument<S, PS> document
+    public StyledTextArea(PS initialParagraphStyle, BiConsumer<TextFlow, PS> applyParagraphStyle,
+                          S initialStyle, BiConsumer<? super TextExt, S> applyStyle,
+                          EditableStyledDocument<PS, S> document
     ) {
-        this(initialStyle, applyStyle, initialParagraphStyle, applyParagraphStyle, document, true);
+        this(initialParagraphStyle, applyParagraphStyle, initialStyle, applyStyle, document, true);
 
     }
 
-    public StyledTextArea(S initialStyle, BiConsumer<? super TextExt, S> applyStyle,
-                          PS initialParagraphStyle, BiConsumer<TextFlow, PS> applyParagraphStyle,
-                          EditableStyledDocument<S, PS> document, boolean preserveStyle
+    public StyledTextArea(PS initialParagraphStyle, BiConsumer<TextFlow, PS> applyParagraphStyle,
+                          S initialStyle, BiConsumer<? super TextExt, S> applyStyle,
+                          EditableStyledDocument<PS, S> document, boolean preserveStyle
     ) {
-        this.model = new StyledTextAreaModel<S, PS>(initialStyle, initialParagraphStyle, document, preserveStyle);
+        this.model = new StyledTextAreaModel<PS, S>(initialParagraphStyle, initialStyle, document, preserveStyle);
         this.applyStyle = applyStyle;
         this.applyParagraphStyle = applyParagraphStyle;
 
@@ -512,13 +512,13 @@ public StyledTextArea(S initialStyle, BiConsumer<? super TextExt, S> applyStyle,
 
         // keeps track of currently used non-empty cells
         @SuppressWarnings("unchecked")
-        ObservableSet<ParagraphBox<S, PS>> nonEmptyCells = FXCollections.observableSet();
+        ObservableSet<ParagraphBox<PS, S>> nonEmptyCells = FXCollections.observableSet();
 
         // Initialize content
         virtualFlow = VirtualFlow.createVertical(
                 getParagraphs(),
                 par -> {
-                    Cell<Paragraph<S, PS>, ParagraphBox<S, PS>> cell = createCell(
+                    Cell<Paragraph<PS, S>, ParagraphBox<PS, S>> cell = createCell(
                             par,
                             applyStyle,
                             initialParagraphStyle,
@@ -613,13 +613,13 @@ ParagraphBox.CaretOffsetX getCaretOffsetX() {
 
     CharacterHit hit(ParagraphBox.CaretOffsetX x, TwoDimensional.Position targetLine) {
         int parIdx = targetLine.getMajor();
-        ParagraphBox<S, PS> cell = virtualFlow.getCell(parIdx).getNode();
+        ParagraphBox<PS, S> cell = virtualFlow.getCell(parIdx).getNode();
         CharacterHit parHit = cell.hitTextLine(x, targetLine.getMinor());
         return parHit.offset(getParagraphOffset(parIdx));
     }
 
     CharacterHit hit(ParagraphBox.CaretOffsetX x, double y) {
-        VirtualFlowHit<Cell<Paragraph<S, PS>, ParagraphBox<S, PS>>> hit = virtualFlow.hit(0.0, y);
+        VirtualFlowHit<Cell<Paragraph<PS, S>, ParagraphBox<PS, S>>> hit = virtualFlow.hit(0.0, y);
         if(hit.isBeforeCells()) {
             return CharacterHit.insertionAt(0);
         } else if(hit.isAfterCells()) {
@@ -627,7 +627,7 @@ CharacterHit hit(ParagraphBox.CaretOffsetX x, double y) {
         } else {
             int parIdx = hit.getCellIndex();
             int parOffset = getParagraphOffset(parIdx);
-            ParagraphBox<S, PS> cell = hit.getCell().getNode();
+            ParagraphBox<PS, S> cell = hit.getCell().getNode();
             Point2D cellOffset = hit.getCellOffset();
             CharacterHit parHit = cell.hitText(x, cellOffset.getY());
             return parHit.offset(parOffset);
@@ -651,7 +651,7 @@ CharacterHit hit(ParagraphBox.CaretOffsetX x, double y) {
      * @param y
      */
     public CharacterHit hit(double x, double y) {
-        VirtualFlowHit<Cell<Paragraph<S, PS>, ParagraphBox<S, PS>>> hit = virtualFlow.hit(x, y);
+        VirtualFlowHit<Cell<Paragraph<PS, S>, ParagraphBox<PS, S>>> hit = virtualFlow.hit(x, y);
         if(hit.isBeforeCells()) {
             return CharacterHit.insertionAt(0);
         } else if(hit.isAfterCells()) {
@@ -659,7 +659,7 @@ public CharacterHit hit(double x, double y) {
         } else {
             int parIdx = hit.getCellIndex();
             int parOffset = getParagraphOffset(parIdx);
-            ParagraphBox<S, PS> cell = hit.getCell().getNode();
+            ParagraphBox<PS, S> cell = hit.getCell().getNode();
             Point2D cellOffset = hit.getCellOffset();
             CharacterHit parHit = cell.hit(cellOffset);
             return parHit.offset(parOffset);
@@ -676,7 +676,7 @@ public CharacterHit hit(double x, double y) {
      */
     TwoDimensional.Position currentLine() {
         int parIdx = getCurrentParagraph();
-        Cell<Paragraph<S, PS>, ParagraphBox<S, PS>> cell = virtualFlow.getCell(parIdx);
+        Cell<Paragraph<PS, S>, ParagraphBox<PS, S>> cell = virtualFlow.getCell(parIdx);
         int lineIdx = cell.getNode().getCurrentLineIndex();
         return _position(parIdx, lineIdx);
     }
@@ -695,17 +695,17 @@ public String getText(int paragraph) {
         return model.getText(paragraph);
     }
 
-    public Paragraph<S, PS> getParagraph(int index) {
+    public Paragraph<PS, S> getParagraph(int index) {
         return model.getParagraph(index);
     }
 
     @Override
-    public StyledDocument<S, PS> subDocument(int start, int end) {
+    public StyledDocument<PS, S> subDocument(int start, int end) {
         return model.subDocument(start, end);
     }
 
     @Override
-    public StyledDocument<S, PS> subDocument(int paragraphIndex) {
+    public StyledDocument<PS, S> subDocument(int paragraphIndex) {
         return model.subDocument(paragraphIndex);
     }
 
@@ -845,7 +845,7 @@ void show(double y) {
 
     void showCaretAtBottom() {
         int parIdx = getCurrentParagraph();
-        Cell<Paragraph<S, PS>, ParagraphBox<S, PS>> cell = virtualFlow.getCell(parIdx);
+        Cell<Paragraph<PS, S>, ParagraphBox<PS, S>> cell = virtualFlow.getCell(parIdx);
         Bounds caretBounds = cell.getNode().getCaretBounds();
         double y = caretBounds.getMaxY();
         virtualFlow.showAtOffset(parIdx, getViewportHeight() - y);
@@ -853,7 +853,7 @@ void showCaretAtBottom() {
 
     void showCaretAtTop() {
         int parIdx = getCurrentParagraph();
-        Cell<Paragraph<S, PS>, ParagraphBox<S, PS>> cell = virtualFlow.getCell(parIdx);
+        Cell<Paragraph<PS, S>, ParagraphBox<PS, S>> cell = virtualFlow.getCell(parIdx);
         Bounds caretBounds = cell.getNode().getCaretBounds();
         double y = caretBounds.getMinY();
         virtualFlow.showAtOffset(parIdx, -y);
@@ -866,7 +866,7 @@ void requestFollowCaret() {
 
     private void followCaret() {
         int parIdx = getCurrentParagraph();
-        Cell<Paragraph<S, PS>, ParagraphBox<S, PS>> cell = virtualFlow.getCell(parIdx);
+        Cell<Paragraph<PS, S>, ParagraphBox<PS, S>> cell = virtualFlow.getCell(parIdx);
         Bounds caretBounds = cell.getNode().getCaretBounds();
         double graphicWidth = cell.getNode().getGraphicPrefWidth();
         Bounds region = extendLeft(caretBounds, graphicWidth);
@@ -964,7 +964,7 @@ public void replaceText(int start, int end, String text) {
     }
 
     @Override
-    public void replace(int start, int end, StyledDocument<S, PS> replacement) {
+    public void replace(int start, int end, StyledDocument<PS, S> replacement) {
         model.replace(start, end, replacement);
     }
 
@@ -1020,13 +1020,13 @@ protected void layoutChildren() {
      *                                                                        *
      * ********************************************************************** */
 
-    private Cell<Paragraph<S, PS>, ParagraphBox<S, PS>> createCell(
-            Paragraph<S, PS> paragraph,
+    private Cell<Paragraph<PS, S>, ParagraphBox<PS, S>> createCell(
+            Paragraph<PS, S> paragraph,
             BiConsumer<? super TextExt, S> applyStyle,
             PS initialParagraphStyle,
             BiConsumer<TextFlow, PS> applyParagraphStyle) {
 
-        ParagraphBox<S, PS> box = new ParagraphBox<>(paragraph, applyStyle, applyParagraphStyle);
+        ParagraphBox<PS, S> box = new ParagraphBox<>(paragraph, applyParagraphStyle, applyStyle);
 
         box.highlightFillProperty().bind(highlightFill);
         box.highlightTextFillProperty().bind(highlightTextFill);
@@ -1058,9 +1058,9 @@ private Cell<Paragraph<S, PS>, ParagraphBox<S, PS>> createCell(
         }, selectionProperty(), box.indexProperty());
         box.selectionProperty().bind(cellSelection);
 
-        return new Cell<Paragraph<S, PS>, ParagraphBox<S, PS>>() {
+        return new Cell<Paragraph<PS, S>, ParagraphBox<PS, S>>() {
             @Override
-            public ParagraphBox<S, PS> getNode() {
+            public ParagraphBox<PS, S> getNode() {
                 return box;
             }
 
@@ -1086,11 +1086,11 @@ public void dispose() {
         };
     }
 
-    private ParagraphBox<S, PS> getCell(int index) {
+    private ParagraphBox<PS, S> getCell(int index) {
         return virtualFlow.getCell(index).getNode();
     }
 
-    private EventStream<MouseOverTextEvent> mouseOverTextEvents(ObservableSet<ParagraphBox<S, PS>> cells, Duration delay) {
+    private EventStream<MouseOverTextEvent> mouseOverTextEvents(ObservableSet<ParagraphBox<PS, S>> cells, Duration delay) {
         return merge(cells, c -> c.stationaryIndices(delay).map(e -> e.unify(
                 l -> l.map((pos, charIdx) -> MouseOverTextEvent.beginAt(c.localToScreen(pos), getParagraphOffset(c.getIndex()) + charIdx)),
                 r -> MouseOverTextEvent.end())));
diff --git a/richtextfx/src/main/java/org/fxmisc/richtext/StyledTextAreaModel.java b/richtextfx/src/main/java/org/fxmisc/richtext/StyledTextAreaModel.java
index 99575a482..d890b5b50 100644
--- a/richtextfx/src/main/java/org/fxmisc/richtext/StyledTextAreaModel.java
+++ b/richtextfx/src/main/java/org/fxmisc/richtext/StyledTextAreaModel.java
@@ -34,11 +34,11 @@
  * @param <S> type of style that can be applied to text.
  * @param <PS> type of style that can be applied to Paragraph
  */
-public class StyledTextAreaModel<S, PS>
+public class StyledTextAreaModel<PS, S>
         implements
-        TextEditingArea<S, PS>,
-        EditActions<S, PS>,
-        NavigationActions<S, PS>,
+        TextEditingArea<PS, S>,
+        EditActions<PS, S>,
+        NavigationActions<PS, S>,
         UndoActions,
         TwoDimensional {
 
@@ -105,7 +105,7 @@ private static int clamp(int min, int val, int max) {
     @Override public final ObservableValue<String> textProperty() { return text; }
 
     // rich text
-    @Override public final StyledDocument<S, PS> getDocument() { return content.snapshot(); };
+    @Override public final StyledDocument<PS, S> getDocument() { return content.snapshot(); };
 
     // length
     private final SuspendableVal<Integer> length;
@@ -145,8 +145,8 @@ private static int clamp(int min, int val, int max) {
     @Override public final ObservableValue<Integer> caretColumnProperty() { return caretColumn; }
 
     // paragraphs
-    private final SuspendableList<Paragraph<S, PS>> paragraphs;
-    @Override public ObservableList<Paragraph<S, PS>> getParagraphs() { return paragraphs; }
+    private final SuspendableList<Paragraph<PS, S>> paragraphs;
+    @Override public ObservableList<Paragraph<PS, S>> getParagraphs() { return paragraphs; }
 
     // beingUpdated
     private final SuspendableNo beingUpdated = new SuspendableNo();
@@ -165,9 +165,9 @@ private static int clamp(int min, int val, int max) {
     public final EventStream<PlainTextChange> plainTextChanges() { return plainTextChanges; }
 
     // rich text changes
-    private final SuspendableEventStream<RichTextChange<S, PS>> richTextChanges;
+    private final SuspendableEventStream<RichTextChange<PS, S>> richTextChanges;
     @Override
-    public final EventStream<RichTextChange<S, PS>> richChanges() { return richTextChanges; }
+    public final EventStream<RichTextChange<PS, S>> richChanges() { return richTextChanges; }
 
     /* ********************************************************************** *
      *                                                                        *
@@ -183,14 +183,14 @@ private static int clamp(int min, int val, int max) {
     /**
      * content model
      */
-    private final EditableStyledDocument<S, PS> content;
+    private final EditableStyledDocument<PS, S> content;
 
     /**
      * Usually used to create another area (View) that shares
      * the same document (Model).
      * @return this area's {@link EditableStyledDocument}
      */
-    protected final EditableStyledDocument<S, PS> getContent() { return content; }
+    protected final EditableStyledDocument<PS, S> getContent() { return content; }
 
     /**
      * Style used by default when no other style is provided.
@@ -229,14 +229,14 @@ private static int clamp(int min, int val, int max) {
      * @param initialParagraphStyle style to use in places where no other style is
      * specified (yet).
      */
-    public StyledTextAreaModel(S initialStyle, PS initialParagraphStyle) {
-        this(initialStyle, initialParagraphStyle, true);
+    public StyledTextAreaModel(PS initialParagraphStyle, S initialStyle) {
+        this(initialParagraphStyle, initialStyle, true);
     }
 
-    public <C> StyledTextAreaModel(S initialStyle, PS initialParagraphStyle, boolean preserveStyle
+    public <C> StyledTextAreaModel(PS initialParagraphStyle, S initialStyle, boolean preserveStyle
     ) {
-        this(initialStyle, initialParagraphStyle,
-                new EditableStyledDocument<S, PS>(initialStyle, initialParagraphStyle), preserveStyle);
+        this(initialParagraphStyle, initialStyle,
+                new EditableStyledDocument<PS, S>(initialParagraphStyle, initialStyle), preserveStyle);
     }
 
     /**
@@ -244,14 +244,14 @@ public <C> StyledTextAreaModel(S initialStyle, PS initialParagraphStyle, boolean
      * this constructor can be used to create another {@code StyledTextArea} object that
      * shares the same {@link EditableStyledDocument}.
      */
-    public StyledTextAreaModel(S initialStyle, PS initialParagraphStyle,
-                               EditableStyledDocument<S, PS> document
+    public StyledTextAreaModel(PS initialParagraphStyle, S initialStyle,
+                               EditableStyledDocument<PS, S> document
     ) {
-        this(initialStyle, initialParagraphStyle, document, true);
+        this(initialParagraphStyle, initialStyle, document, true);
     }
 
-    public StyledTextAreaModel(S initialStyle, PS initialParagraphStyle,
-                               EditableStyledDocument<S, PS> document, boolean preserveStyle
+    public StyledTextAreaModel(PS initialParagraphStyle, S initialStyle,
+                               EditableStyledDocument<PS, S> document, boolean preserveStyle
     ) {
         this.initialStyle = initialStyle;
         this.initialParagraphStyle = initialParagraphStyle;
@@ -379,17 +379,17 @@ public String getText(int paragraph) {
         return paragraphs.get(paragraph).getText();
     }
 
-    public Paragraph<S, PS> getParagraph(int index) {
+    public Paragraph<PS, S> getParagraph(int index) {
         return paragraphs.get(index);
     }
 
     @Override
-    public StyledDocument<S, PS> subDocument(int start, int end) {
+    public StyledDocument<PS, S> subDocument(int start, int end) {
         return content.subSequence(start, end);
     }
 
     @Override
-    public StyledDocument<S, PS> subDocument(int paragraphIndex) {
+    public StyledDocument<PS, S> subDocument(int paragraphIndex) {
         return content.subDocument(paragraphIndex);
     }
 
@@ -630,13 +630,13 @@ public void clearParagraphStyle(int paragraph) {
 
     @Override
     public void replaceText(int start, int end, String text) {
-        StyledDocument<S, PS> doc = ReadOnlyStyledDocument.fromString(
-                text, getStyleForInsertionAt(start), getParagraphStyleForInsertionAt(start));
+        StyledDocument<PS, S> doc = ReadOnlyStyledDocument.fromString(
+                text, getParagraphStyleForInsertionAt(start), getStyleForInsertionAt(start));
         replace(start, end, doc);
     }
 
     @Override
-    public void replace(int start, int end, StyledDocument<S, PS> replacement) {
+    public void replace(int start, int end, StyledDocument<PS, S> replacement) {
         try (Guard g = content.beingUpdatedProperty().suspend()) {
             start = clamp(0, start, getLength());
             end = clamp(0, end, getLength());
@@ -714,8 +714,8 @@ private UndoManager createPlainUndoManager(UndoManagerFactory factory) {
     }
 
     private UndoManager createRichUndoManager(UndoManagerFactory factory) {
-        Consumer<RichTextChange<S, PS>> apply = change -> replace(change.getPosition(), change.getPosition() + change.getRemoved().length(), change.getInserted());
-        BiFunction<RichTextChange<S, PS>, RichTextChange<S, PS>, Optional<RichTextChange<S, PS>>> merge = (change1, change2) -> change1.mergeWith(change2);
+        Consumer<RichTextChange<PS, S>> apply = change -> replace(change.getPosition(), change.getPosition() + change.getRemoved().length(), change.getInserted());
+        BiFunction<RichTextChange<PS, S>, RichTextChange<PS, S>, Optional<RichTextChange<PS, S>>> merge = (change1, change2) -> change1.mergeWith(change2);
         return factory.create(richChanges(), RichTextChange::invert, apply, merge);
     }
 
diff --git a/richtextfx/src/main/java/org/fxmisc/richtext/TextEditingArea.java b/richtextfx/src/main/java/org/fxmisc/richtext/TextEditingArea.java
index fd0e6e2ef..cedee7e97 100644
--- a/richtextfx/src/main/java/org/fxmisc/richtext/TextEditingArea.java
+++ b/richtextfx/src/main/java/org/fxmisc/richtext/TextEditingArea.java
@@ -14,7 +14,7 @@
  *
  * @param <S> type of style that can be applied to text.
  */
-public interface TextEditingArea<S, PS> {
+public interface TextEditingArea<PS, S> {
 
     /*******************
      *                 *
@@ -39,7 +39,7 @@ public interface TextEditingArea<S, PS> {
      * The returned document is immutable, it does not reflect
      * subsequent edits of this text-editing area.
      */
-    StyledDocument<S, PS> getDocument();
+    StyledDocument<PS, S> getDocument();
 
     /**
      * The current position of the caret, as a character offset in the text.
@@ -90,7 +90,7 @@ public interface TextEditingArea<S, PS> {
     /**
      * Unmodifiable observable list of paragraphs in this text area.
      */
-    ObservableList<Paragraph<S, PS>> getParagraphs();
+    ObservableList<Paragraph<PS, S>> getParagraphs();
 
 
     /*********************
@@ -107,7 +107,7 @@ public interface TextEditingArea<S, PS> {
     /**
      * Stream of rich text changes.
      */
-    EventStream<RichTextChange<S, PS>> richChanges();
+    EventStream<RichTextChange<PS, S>> richChanges();
 
 
     /***************
@@ -129,12 +129,12 @@ public interface TextEditingArea<S, PS> {
     /**
      * Returns rich-text content of the given paragraph.
      */
-    StyledDocument<S, PS> subDocument(int paragraphIndex);
+    StyledDocument<PS, S> subDocument(int paragraphIndex);
 
     /**
      * Returns rich-text content of the given character range.
      */
-    StyledDocument<S, PS> subDocument(int start, int end);
+    StyledDocument<PS, S> subDocument(int start, int end);
 
     /***************
      *             *
@@ -163,7 +163,7 @@ public interface TextEditingArea<S, PS> {
     /**
      * Replaces a range of characters with the given rich-text document.
      */
-    void replace(int start, int end, StyledDocument<S, PS> replacement);
+    void replace(int start, int end, StyledDocument<PS, S> replacement);
 
     /**
      * Replaces a range of characters with the given text.
@@ -182,7 +182,7 @@ default void replaceText(IndexRange range, String text) {
      * Equivalent to
      * {@code replace(range.getStart(), range.getEnd(), replacement)}.
      */
-    default void replace(IndexRange range, StyledDocument<S, PS> replacement) {
+    default void replace(IndexRange range, StyledDocument<PS, S> replacement) {
         replace(range.getStart(), range.getEnd(), replacement);
     }
 
diff --git a/richtextfx/src/test/java/org/fxmisc/richtext/ParagraphTest.java b/richtextfx/src/test/java/org/fxmisc/richtext/ParagraphTest.java
index 85cd6fe81..11e3dce5c 100644
--- a/richtextfx/src/test/java/org/fxmisc/richtext/ParagraphTest.java
+++ b/richtextfx/src/test/java/org/fxmisc/richtext/ParagraphTest.java
@@ -11,10 +11,10 @@ public class ParagraphTest {
     // This relates to merging text changes and issue #216.
     @Test
     public void concatEmptyParagraphsTest() {
-        Paragraph<Boolean, Void> p1 = new Paragraph<>(null, "", true);
-        Paragraph<Boolean, Void> p2 = new Paragraph<>(null, "", false);
+        Paragraph<Void, Boolean> p1 = new Paragraph<>(null, "", true);
+        Paragraph<Void, Boolean> p2 = new Paragraph<>(null, "", false);
 
-        Paragraph<Boolean, Void> p = p1.concat(p2);
+        Paragraph<Void, Boolean> p = p1.concat(p2);
 
         assertEquals(Boolean.TRUE, p.getStyleAtPosition(0));
     }
diff --git a/richtextfx/src/test/java/org/fxmisc/richtext/StyledTextAreaModelTest.java b/richtextfx/src/test/java/org/fxmisc/richtext/StyledTextAreaModelTest.java
index 867f9e2a8..8b66e10d2 100644
--- a/richtextfx/src/test/java/org/fxmisc/richtext/StyledTextAreaModelTest.java
+++ b/richtextfx/src/test/java/org/fxmisc/richtext/StyledTextAreaModelTest.java
@@ -31,8 +31,8 @@ public void testUndoWithWinNewlines() {
     public void testForBug216() {
         // set up area with some styled text content
         boolean initialStyle = false;
-        StyledTextAreaModel<Boolean, String> model = new StyledTextAreaModel<>(
-                initialStyle, "", new EditableStyledDocument<>(initialStyle, ""), true);
+        StyledTextAreaModel<String, Boolean> model = new StyledTextAreaModel<>(
+                "", initialStyle, new EditableStyledDocument<>("", initialStyle), true);
         model.replaceText("testtest");
         model.setStyle(0, 8, true);