diff --git a/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorFilterPanel.java b/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorFilterPanel.java
index 49674d686..0d485528a 100644
--- a/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorFilterPanel.java
+++ b/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorFilterPanel.java
@@ -1,5 +1,6 @@
 package net.sf.openrocket.gui.dialogs.motor.thrustcurve;
 
+import java.awt.Color;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.ArrayList;
@@ -16,6 +17,7 @@ import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JSpinner;
+import javax.swing.border.Border;
 import javax.swing.border.TitledBorder;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
@@ -144,26 +146,25 @@ public abstract class MotorFilterPanel extends JPanel {
 
 		// Manufacturer selection
 		JPanel sub = new JPanel(new MigLayout("fill"));
-		TitledBorder border = BorderFactory.createTitledBorder(trans.get("TCurveMotorCol.MANUFACTURER"));
+		Border templateBorder = GUIUtil.getUITheme().getBorder();
+		TitledBorder border = BorderFactory.createTitledBorder(templateBorder);
+		border.setTitle(trans.get("TCurveMotorCol.MANUFACTURER"));
 		GUIUtil.changeFontStyle(border, Font.BOLD);
 		sub.setBorder(border);
 
 		this.setBorder(BorderFactory.createEmptyBorder(1, 1, 1, 1));
 
-		List<Manufacturer> manufacturers = new ArrayList<Manufacturer>();
-		for (Manufacturer m : allManufacturers) {
-			manufacturers.add(m);
-		}
+        List<Manufacturer> manufacturers = new ArrayList<>(allManufacturers);
 
-		Collections.sort(manufacturers, new Comparator<Manufacturer>() {
-			@Override
-			public int compare(Manufacturer o1, Manufacturer o2) {
-				return o1.getSimpleName().compareTo( o2.getSimpleName());
-			}
+		manufacturers.sort(new Comparator<Manufacturer>() {
+            @Override
+            public int compare(Manufacturer o1, Manufacturer o2) {
+                return o1.getSimpleName().compareTo(o2.getSimpleName());
+            }
 
-		});
+        });
 
-		manufacturerCheckList = new CheckList.Builder().<Manufacturer>build();
+		manufacturerCheckList = new CheckList.Builder().build();
 		manufacturerCheckList.setData(manufacturers);
 
 		manufacturerCheckList.setUncheckedItems(unselectedManusFromPreferences);
@@ -213,7 +214,8 @@ public abstract class MotorFilterPanel extends JPanel {
 		// Total Impulse selection
 		{
 			sub = new JPanel(new MigLayout("fill"));
-			border = BorderFactory.createTitledBorder(trans.get("TCurveMotorCol.TOTAL_IMPULSE"));
+			border = BorderFactory.createTitledBorder(templateBorder);
+			border.setTitle(trans.get("TCurveMotorCol.TOTAL_IMPULSE"));
 			GUIUtil.changeFontStyle(border, Font.BOLD);
 			sub.setBorder(border);
 
@@ -240,7 +242,8 @@ public abstract class MotorFilterPanel extends JPanel {
 
 		// Motor Dimensions
 		sub = new JPanel(new MigLayout("fill"));
-		TitledBorder diameterTitleBorder = BorderFactory.createTitledBorder(trans.get("TCMotorSelPan.MotorSize"));
+		TitledBorder diameterTitleBorder = BorderFactory.createTitledBorder(templateBorder);
+		diameterTitleBorder.setTitle(trans.get("TCMotorSelPan.MotorSize"));
 		GUIUtil.changeFontStyle(diameterTitleBorder, Font.BOLD);
 		sub.setBorder(diameterTitleBorder);
 
diff --git a/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorInformationPanel.java b/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorInformationPanel.java
index de63acf0e..741b61ecd 100644
--- a/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorInformationPanel.java
+++ b/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorInformationPanel.java
@@ -159,6 +159,7 @@ class MotorInformationPanel extends JPanel {
 
 
 			comment = new JTextArea(5, 5);
+			comment.setBorder(GUIUtil.getUITheme().getBorder());
 			GUIUtil.changeFontSize(comment, -2);
 			withCommentFont = comment.getFont();
 			noCommentFont = withCommentFont.deriveFont(Font.ITALIC);
diff --git a/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java b/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java
index eebbbe927..1d2bebe7b 100644
--- a/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java
+++ b/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java
@@ -332,11 +332,10 @@ public class ThrustCurveMotorSelectionPanel extends JPanel implements MotorSelec
 
 		// Number of motors
 		{
-			nrOfMotorsLabel = new JLabel();
+			nrOfMotorsLabel = new StyledLabel(-2f, StyledLabel.Style.ITALIC);
 			nrOfMotorsLabel.setToolTipText(trans.get("TCMotorSelPan.lbl.ttip.nrOfMotors"));
 			updateNrOfMotors();
 			nrOfMotorsLabel.setForeground(Color.darkGray);
-			nrOfMotorsLabel.setFont(new Font(Font.SANS_SERIF, Font.ITALIC, 11));
 			panel.add(nrOfMotorsLabel, "gapleft para, spanx, wrap");
 			sorter.addRowSorterListener(new RowSorterListener() {
 				@Override