diff --git a/A320-main.xml b/A320-main.xml
index 59e89881..e711fd50 100644
--- a/A320-main.xml
+++ b/A320-main.xml
@@ -122,10 +122,10 @@
                 <path>Aircraft/A320Family/Systems/libraries.xml</path>
             </autopilot>
 			<autopilot n="8">
-				<path>Systems/fl2070_sound.xml</path>
+				<path>Aircraft/A320Family/Systems/fl2070_sound.xml</path>
 			</autopilot>
 			<property-rule n="100">
-				<path>Systems/pfd.xml</path>
+				<path>Aircraft/A320Family/Systems/pfd.xml</path>
 			</property-rule>
 		</systems>
 
diff --git a/Models/Instruments/PFD/res/horizon.png b/Models/Instruments/PFD/res/horizon.png
index dca0df76..8673f73f 100644
Binary files a/Models/Instruments/PFD/res/horizon.png and b/Models/Instruments/PFD/res/horizon.png differ
diff --git a/Models/Instruments/PFD/res/horizonhdg.png b/Models/Instruments/PFD/res/horizonhdg.png
new file mode 100644
index 00000000..9b887e90
Binary files /dev/null and b/Models/Instruments/PFD/res/horizonhdg.png differ
diff --git a/Models/Engines/NEO/res/PW_PurePower_1100G.xcf b/Paintkit/a32x-neopw-painkit.xcf
similarity index 100%
rename from Models/Engines/NEO/res/PW_PurePower_1100G.xcf
rename to Paintkit/a32x-neopw-painkit.xcf
diff --git a/Systems/it-fbw.xml b/Systems/it-fbw.xml
index 90efd0bc..2eadb23c 100644
--- a/Systems/it-fbw.xml
+++ b/Systems/it-fbw.xml
@@ -170,6 +170,21 @@
 				</sum>
             </expression>
 		</input>
+		<input>
+			<condition>
+				<or>
+					<equals>
+						<property>/it-autoflight/output/ap1</property>
+						<value>1</value>
+					</equals>
+					<equals>
+						<property>/it-autoflight/output/ap2</property>
+						<value>1</value>
+					</equals>
+				</or>
+			</condition>
+			<property>/it-autoflight/internal/elevator-cmd</property>
+		</input>
 		<input>/controls/flight/elevator</input>
 		<output>/controls/flight/elevator-input</output>
 		<max-rate-of-change>2.0</max-rate-of-change>
diff --git a/Systems/pfd.xml b/Systems/pfd.xml
index 39dddb00..37b40043 100644
--- a/Systems/pfd.xml
+++ b/Systems/pfd.xml
@@ -277,20 +277,66 @@
         <name>Ground Horizon</name>
         <type>gain</type>
         <gain>1</gain>
-        <update-interval-secs type="double">0.05</update-interval-secs>
+        <update-interval-secs type="double">0.01</update-interval-secs>
         <input>
+			<condition>
+				<and>
+					<equals>
+						<property>/gear/gear[1]/wow</property>
+						<value>0</value>
+					</equals>
+					<equals>
+						<property>/gear/gear[2]/wow</property>
+						<value>0</value>
+					</equals>
+				</and>
+			</condition>
 			<expression>
-				<sum>
-					<property>/orientation/pitch-deg</property>
+				<dif>
 					<table>
 						<property>/position/gear-agl-ft</property> 
-						<entry><ind>  2</ind><dep> 0</dep></entry>
-						<entry><ind>150</ind><dep>16</dep></entry>
+						<entry><ind>  1</ind><dep>  0</dep></entry>
+						<entry><ind>150</ind><dep> 16</dep></entry>
 					</table>
-				</sum>
+					<table>
+						<property>/orientation/pitch-deg</property>
+						<entry><ind> 0</ind><dep>  0</dep></entry>
+						<entry><ind>16</ind><dep>-16</dep></entry>
+					</table>
+				</dif>
+			</expression>
+		</input>
+        <input>
+			<condition>
+				<or>
+					<equals>
+						<property>/gear/gear[1]/wow</property>
+						<value>1</value>
+					</equals>
+					<equals>
+						<property>/gear/gear[2]/wow</property>
+						<value>1</value>
+					</equals>
+				</or>
+			</condition>
+			<expression>
+				<dif>
+					<table>
+						<property>/position/gear-agl-ft</property> 
+						<entry><ind>  1</ind><dep>  0</dep></entry>
+						<entry><ind>150</ind><dep> 16</dep></entry>
+					</table>
+					<table>
+						<property>/orientation/pitch-deg</property>
+						<entry><ind>-16</ind><dep> 16</dep></entry>
+						<entry><ind>  0</ind><dep>  0</dep></entry>
+						<entry><ind> 16</ind><dep>-16</dep></entry>
+					</table>
+				</dif>
 			</expression>
 		</input>
 		<output>/instrumentation/pfd/horizon-ground</output>
+		<min>-16</min>
 		<max>16</max>
     </filter>