diff --git a/eeschema/lib_bezier.cpp b/eeschema/lib_bezier.cpp
index 4dae020f16..33859cbe57 100644
--- a/eeschema/lib_bezier.cpp
+++ b/eeschema/lib_bezier.cpp
@@ -207,7 +207,15 @@ void LIB_BEZIER::Plot( PLOTTER* aPlotter, const wxPoint& aOffset, bool aFill,
 
 int LIB_BEZIER::GetPenSize() const
 {
-    return m_Width;
+    if( m_Width )
+        return m_Width;
+
+#if 1
+    // Temporary code not using RENDER_SETTINGS
+    return DEFAULT_LINE_THICKNESS * IU_PER_MILS;
+#else
+    // JEY TODO: requires RENDER_SETTINGS
+#endif
 }
 
 
diff --git a/eeschema/lib_circle.cpp b/eeschema/lib_circle.cpp
index a81086febc..f442045383 100644
--- a/eeschema/lib_circle.cpp
+++ b/eeschema/lib_circle.cpp
@@ -194,7 +194,15 @@ void LIB_CIRCLE::Plot( PLOTTER* aPlotter, const wxPoint& aOffset, bool aFill,
 
 int LIB_CIRCLE::GetPenSize() const
 {
-    return m_Width;
+    if( m_Width )
+        return m_Width;
+
+#if 1
+    // Temporary code not using RENDER_SETTINGS
+    return DEFAULT_LINE_THICKNESS * IU_PER_MILS;
+#else
+    // JEY TODO: requires RENDER_SETTINGS
+#endif
 }
 
 
diff --git a/eeschema/lib_field.cpp b/eeschema/lib_field.cpp
index d20689e55c..5fe601a762 100644
--- a/eeschema/lib_field.cpp
+++ b/eeschema/lib_field.cpp
@@ -101,7 +101,14 @@ void LIB_FIELD::Init( int id )
 
 int LIB_FIELD::GetPenSize() const
 {
+#if 1
+    // Temporary code not using RENDER_SETTINGS
+    int textThickness = DEFAULT_LINE_THICKNESS * IU_PER_MILS;
+    textThickness = Clamp_Text_PenSize( textThickness, GetTextSize(), IsBold() );
+    return textThickness;
+#else
     return GetEffectiveTextPenWidth( nullptr );  // JEY TODO: requires RENDER_SETTINGS
+#endif
 }
 
 
diff --git a/eeschema/lib_pin.cpp b/eeschema/lib_pin.cpp
index c36d929419..099de9c491 100644
--- a/eeschema/lib_pin.cpp
+++ b/eeschema/lib_pin.cpp
@@ -539,7 +539,15 @@ bool LIB_PIN::HitTest( const wxPoint& aPosition, int aAccuracy ) const
 
 int LIB_PIN::GetPenSize() const
 {
-    return m_width;
+    if( m_width )
+        return m_width;
+
+#if 1
+    // Temporary code not using RENDER_SETTINGS
+    return DEFAULT_LINE_THICKNESS * IU_PER_MILS;
+#else
+    // JEY TODO: requires RENDER_SETTINGS
+#endif
 }
 
 
diff --git a/eeschema/lib_polyline.cpp b/eeschema/lib_polyline.cpp
index 019af7345a..95d5fd33de 100644
--- a/eeschema/lib_polyline.cpp
+++ b/eeschema/lib_polyline.cpp
@@ -198,7 +198,15 @@ void LIB_POLYLINE::RemoveCorner( int aIdx )
 
 int LIB_POLYLINE::GetPenSize() const
 {
-    return m_Width;
+    if( m_Width )
+        return m_Width;
+
+#if 1
+    // Temporary code not using RENDER_SETTINGS
+    return DEFAULT_LINE_THICKNESS * IU_PER_MILS;
+#else
+    // JEY TODO: requires RENDER_SETTINGS
+#endif
 }
 
 
diff --git a/eeschema/lib_rectangle.cpp b/eeschema/lib_rectangle.cpp
index 089ef0bcbb..2d9987f18e 100644
--- a/eeschema/lib_rectangle.cpp
+++ b/eeschema/lib_rectangle.cpp
@@ -159,7 +159,15 @@ void LIB_RECTANGLE::Plot( PLOTTER* aPlotter, const wxPoint& aOffset, bool aFill,
 
 int LIB_RECTANGLE::GetPenSize() const
 {
-    return m_Width;
+    if( m_Width )
+        return m_Width;
+
+#if 1
+    // Temporary code not using RENDER_SETTINGS
+    return DEFAULT_LINE_THICKNESS * IU_PER_MILS;
+#else
+    // JEY TODO: requires RENDER_SETTINGS
+#endif
 }
 
 
diff --git a/eeschema/lib_text.cpp b/eeschema/lib_text.cpp
index cf0ee0bc5e..dc2acf5da0 100644
--- a/eeschema/lib_text.cpp
+++ b/eeschema/lib_text.cpp
@@ -300,7 +300,14 @@ void LIB_TEXT::Plot( PLOTTER* plotter, const wxPoint& offset, bool fill,
 
 int LIB_TEXT::GetPenSize() const
 {
-    return GetEffectiveTextPenWidth( nullptr ); // JEY TODO: requires RENDER_SETTINGS
+#if 1
+    // Temporary code not using RENDER_SETTINGS
+    int textThickness = DEFAULT_LINE_THICKNESS * IU_PER_MILS;
+    textThickness = Clamp_Text_PenSize( textThickness, GetTextSize(), IsBold() );
+    return textThickness;
+#else
+    return GetEffectiveTextPenWidth( nullptr );  // JEY TODO: requires RENDER_SETTINGS
+#endif
 }
 
 
diff --git a/eeschema/sch_bus_entry.cpp b/eeschema/sch_bus_entry.cpp
index 9d54856d9f..65caec41ed 100644
--- a/eeschema/sch_bus_entry.cpp
+++ b/eeschema/sch_bus_entry.cpp
@@ -128,13 +128,23 @@ const EDA_RECT SCH_BUS_ENTRY_BASE::GetBoundingBox() const
 
 int SCH_BUS_WIRE_ENTRY::GetPenSize() const
 {
-    return 0;   // use default wire thickness
+#if 1
+    // Temporary code not using RENDER_SETTINGS
+    return DEFAULT_WIRE_THICKNESS * IU_PER_MILS;
+#else
+    // JEY TODO: requires RENDER_SETTINGS
+#endif
 }
 
 
 int SCH_BUS_BUS_ENTRY::GetPenSize() const
 {
-    return 0;   // use default bus thickness
+#if 1
+    // Temporary code not using RENDER_SETTINGS
+    return DEFAULT_BUS_THICKNESS * IU_PER_MILS;
+#else
+    // JEY TODO: requires RENDER_SETTINGS
+#endif
 }
 
 
diff --git a/eeschema/sch_field.cpp b/eeschema/sch_field.cpp
index 9a0bb31f71..90608f034e 100644
--- a/eeschema/sch_field.cpp
+++ b/eeschema/sch_field.cpp
@@ -131,7 +131,14 @@ wxString SCH_FIELD::GetShownText( int aDepth ) const
 
 int SCH_FIELD::GetPenSize() const
 {
+#if 1
+    // Temporary code not using RENDER_SETTINGS
+    int textThickness = DEFAULT_LINE_THICKNESS * IU_PER_MILS;
+    textThickness = Clamp_Text_PenSize( textThickness, GetTextSize(), IsBold() );
+    return textThickness;
+#else
     return GetEffectiveTextPenWidth( nullptr );  // JEY TODO: requires RENDER_SETTINGS
+#endif
 }
 
 
diff --git a/eeschema/sch_line.cpp b/eeschema/sch_line.cpp
index 72f2ee188c..b8abaa1e67 100644
--- a/eeschema/sch_line.cpp
+++ b/eeschema/sch_line.cpp
@@ -291,7 +291,22 @@ void SCH_LINE::SetLineWidth( const int aSize )
 
 int SCH_LINE::GetPenSize() const
 {
-    return m_size;
+    if( m_size )
+        return m_size;
+
+#if 1
+    // Temporary code not using RENDER_SETTINGS
+    int thickness = DEFAULT_LINE_THICKNESS * IU_PER_MILS;
+
+    if( GetLayer() == LAYER_BUS )
+        thickness = DEFAULT_BUS_THICKNESS * IU_PER_MILS;
+    else if( GetLayer() == LAYER_WIRE )
+        thickness = DEFAULT_WIRE_THICKNESS * IU_PER_MILS;
+
+    return thickness;
+#else
+    // JEY TODO: requires RENDER_SETTINGS
+#endif
 }
 
 
diff --git a/eeschema/sch_no_connect.cpp b/eeschema/sch_no_connect.cpp
index ef638efbb7..1620da0a89 100644
--- a/eeschema/sch_no_connect.cpp
+++ b/eeschema/sch_no_connect.cpp
@@ -97,7 +97,13 @@ void SCH_NO_CONNECT::GetEndPoints( std::vector< DANGLING_END_ITEM >& aItemList )
 
 int SCH_NO_CONNECT::GetPenSize() const
 {
-    return 0;   // use default pen size
+#if 1
+    // Temporary code not using RENDER_SETTINGS
+    int thickness = DEFAULT_LINE_THICKNESS * IU_PER_MILS;
+    return thickness;
+#else
+    // JEY TODO: requires RENDER_SETTINGS
+#endif
 }
 
 
diff --git a/eeschema/sch_text.cpp b/eeschema/sch_text.cpp
index 7b19598d80..91fd19f4d7 100644
--- a/eeschema/sch_text.cpp
+++ b/eeschema/sch_text.cpp
@@ -282,7 +282,14 @@ bool SCH_TEXT::operator<( const SCH_ITEM& aItem ) const
 
 int SCH_TEXT::GetPenSize() const
 {
-    return GetEffectiveTextPenWidth( nullptr );     // JEY TODO: requires RENDER_SETTINGS
+#if 1
+    // Temporary code not using RENDER_SETTINGS
+    int textThickness = DEFAULT_LINE_THICKNESS * IU_PER_MILS;
+    textThickness = Clamp_Text_PenSize( textThickness, GetTextSize(), IsBold() );
+    return textThickness;
+#else
+    return GetEffectiveTextPenWidth( nullptr );  // JEY TODO: requires RENDER_SETTINGS
+#endif
 }
 
 
@@ -570,7 +577,7 @@ void SCH_TEXT::Plot( PLOTTER* aPlotter )
 {
     static std::vector<wxPoint> Poly;
     COLOR4D color = aPlotter->ColorSettings()->GetColor( GetLayer() );
-    int penWidth = GetEffectiveTextPenWidth( nullptr );
+    int penWidth = GetPenSize();
 
     aPlotter->SetCurrentLineWidth( penWidth );