diff --git a/Settings/General.txt b/Settings/General.txt
index 76e507a..4eedfd5 100644
--- a/Settings/General.txt
+++ b/Settings/General.txt
@@ -1,89 +1,127 @@
-STUP
-m_Visible:0
-m_X:80
-m_Y:100
-m_LineNumber:6
-m_Resizable:0
-m_OrderingColumn:1
-m_HeaderOnly:0
-m_Column:TIME:5:1:98:0:0:1::::1:0.0
-m_Column:TOBT:5:1:97:0:0:1::::1:0.0
-m_Column:SLOT:5:1:99:0:0:1::::1:0.0
-m_Column:CALLSIGN:9:0:9:8:0:1::::0:0.0
-m_Column:ATYP:4:1:16:0:0:1::::1:0.0
-m_Column:RUNW:4:1:47:19:19:1::::1:0.0
-m_Column:ADES:4:1:17:7:0:1::::1:0.0
-m_Column:SID:9:0:56:17:17:1::::1:0.0
-m_Column:CFL:4:1:20:11:0:1::::1:0.0
-m_Column:ASSR:5:1:60:31:31:1::::1:0.0
-m_Column:E:1:1:58:27:0:1::::1:0.0
-m_Column:STS:4:1:59:46:46:1::::1:0.0
-END
-TAXIOUT
-m_Visible:0
-m_X:48
-m_Y:270
-m_LineNumber:6
-m_Resizable:0
-m_OrderingColumn:1
-m_HeaderOnly:0
-m_Column:DSQ:3:1:57:0:0:1::::1:0.0
-m_Column:SLOT:5:1:99:0:0:1::::1:0.0
-m_Column:CALLSIGN:9:0:9:8:0:1::::0:0.0
-m_Column:RUNW:4:1:47:19:19:1::::1:0.0
-m_Column:ATYP:4:1:16:0:0:1::::1:0.0
-m_Column:ADES:4:1:17:7:0:1::::1:0.0
-m_Column:SID:9:0:56:17:17:1::::1:0.0
-m_Column:CFL:4:1:20:11:0:1::::1:0.0
-m_Column:ASSR:5:1:60:31:31:1::::1:0.0
-m_Column:E:1:1:58:27:0:1::::1:0.0
-m_Column:TTOT:5:1:108:0:0:1::::1:0.0
-m_Column:STS:4:1:59:46:46:1::::1:0.0
-END
-TAKEOFF
-m_Visible:0
-m_X:747
-m_Y:164
-m_LineNumber:6
-m_Resizable:0
-m_OrderingColumn:1
-m_HeaderOnly:0
-m_Column:DSQ:3:1:57:0:0:1::::1:0.0
-m_Column:SLOT:5:1:99:0:0:1::::1:0.0
-m_Column:RUNW:4:1:47:19:19:1::::1:0.0
-m_Column:CALLSIGN:9:0:9:8:0:1::::0:0.0
-m_Column:ATYP:4:1:16:0:0:1::::1:0.0
-m_Column:SID:9:0:56:17:17:1::::1:0.0
-m_Column:CFL:4:1:20:11:0:1::::1:0.0
-m_Column:ASSR:5:1:60:31:31:1::::1:0.0
-m_Column:E:1:1:58:27:0:1::::1:0.0
-m_Column:TTOT:5:1:108:0:0:1::::1:0.0
-m_Column:STS:4:1:59:46:46:1::::1:0.0
-END
-ADCS
-m_Visible:0
-m_X:123
-m_Y:136
-m_LineNumber:6
-m_Resizable:0
-m_OrderingColumn:1
-m_HeaderOnly:0
-m_Column:RUNW:4:1:47:19:19:1::::1:0.0
-m_Column:CALLSIGN:9:0:9:8:0:1::::0:0.0
-m_Column:ATYP:4:1:16:0:0:1::::1:0.0
-m_Column:COPX:5:0:51:21:21:1::::1:0.0
-m_Column:STS:4:1:59:46:46:1::::1:0.0
-END
-TAXIIN
-m_Visible:0
-m_X:121
-m_Y:185
-m_LineNumber:6
-m_Resizable:0
-m_OrderingColumn:1
-m_HeaderOnly:0
-m_Column:CALLSIGN:9:0:9:8:0:1::::0:0.0
-m_Column:STN:4:1:19:29:0:1::::1:0.0
-m_Column:ATYP:4:1:16:0:0:1::::1:0.0
-m_Column:STS:4:1:59:46:46:1::::1:0.0
-END
+m_PlaySounds:1
+m_AssumeSlowAcAsStandby:0
+m_ShowAirspaceLines:1
+m_ShowRouteFixName:1
+m_ShowRouteETA:1
+m_ShowCalculatedHeading:1
+m_ShowSimulatedData:1
+m_TransitionAltitude:9843
+m_AllowConcernedACTagDown:1
+m_CenterlineDme:0.0
+m_CenterlineLength:40.0
+m_CenterlineTickDme:10.0
+m_CenterlineTickInterval:2.0
+m_CenterlineTickLength:0.5
+m_CenterlineMarkerLength:1.0
+m_CenterlineMarkerInterval:10.0
+m_CenterlineVectorDme:25.0
+m_CenterlineVectorLength:6.0
+m_CenterlineVectorAngle:30.0
+m_CenterlineVectorBase:10.0
+m_STCA_LowShow:1
+m_STCA_LowVertical:800
+m_STCA_LowHorizontal:4.0
+m_STCA_LowBottom:2500
+m_STCA_HighShow:1
+m_STCA_HighVertical:800
+m_STCA_HighHorizontal:6.0
+m_STCA_HighBottom:18000
+m_ExtendedCenterlinActiveArr:1
+m_UseHoveringTagForKeys:1
+m_AutoMessageForTextAircraft:1
+m_ShowRouteWhenAccepting:1
+m_AllowAssumedACTagDown:0
+m_InhibitAutoPushOnHandoff:0
+m_RandomSquawks:1
+m_VFRSquawks:7000
+m_WhoIsOnlineURL:http://vatsim.metacraft.com/vatsim-data.txt
+m_AutoLoadMetarForActiveAirports:1
+m_LockShowRouteWhenAccepting:0
+m_VoiceAtisBuilderUrl:https://atis.vatprc.net/parser.php?arr=$arrrwy($atisairport)&dep=$deprwy($atisairport)&apptype=ILS&info=$atiscode&metar=$metar($atisairport)
+m_DoNotUseAcceptedColor:0
+m_DoNotUseRefusedColor:0
+SET_TransparentAcListBackground:1
+m_PutIncomingCoordinationToFirst:0
+m_AutoProxyMode:0
+m_TransparentAcListSelectedBackground:0
+m_TransparentDetailedTagBackground:0
+m_TransparentDetailedTagSelectedItemBackground:1
+m_AllowDirectBeyondCOPX:0
+m_ShowAtisLetterInMETAR:1
+m_ShowCLAMWarnings:1
+m_ShowRAMWarning:1
+m_MagneticNorthUp:1
+m_ShowAForAltitudes:1
+m_Show500ForNonVisual:1
+SET_SetActiveAptBySectors:0
+SET_CapitalizeFPAndScratch:0
+m_SET_WTC_Light:L
+SET_WTC_Medium:M
+SET_WTC_Heavy:H
+SET_WTC_A380:J
+m_RotateRouteTexts:1
+m_NeverCloseFreqChat:1
+m_KeepScratchPadAfterDirect:1
+m_HiliteASELAircraft:0
+m_EnableVoiceRecognition:0
+m_VoiceRecognitionStyle:2
+m_SModeTransponders:IEFGRWQ
+m_CorrelationMode:0
+m_CorrelationDistance:30
+m_SimulateRadars:0
+m_AllowCorrelatedTAGDown:1
+m_ShowDetailedOverUntagged:0
+m_ShowRectAroundFPTrack:1
+m_ShowRectAroundASEL:0
+m_VatsimStatusURL:http://status.vatsim.net/
+m_OverrideWhoIsOnlineURL:0
+m_ShowVFRFlightPlanTrack:0
+m_ShowIFRFlightPlanTrack:1
+m__AutoStartFlightPlanTracks:1
+m_UnicomFrequency:122.8
+m_MessageInfoLevel:1
+m_MessageWarningLevel:2
+m_MessageErrorLevel:4
+m_PointOutLevel:4
+m_HandoffRequestLevel:4
+m_CoordinationRequestLevel:4
+m_HandoffAcceptLevel:0
+m_HandoffRefuseLevel:2
+m_CoordinationAcceptLevel:0
+m_CoordinationRefuseLevel:2
+m_ServerMessageLevel:2
+m_AtcMessageLevel:2
+m_BroadcastMessageLevel:2
+m_SupMessageLevel:4
+m_AtisMessageLevel:0
+m_PrivateMessageLevel:4
+m_FreqMessageLevel:4
+m_MericUnits:1
+m_ShowCorrelatedInFpList:0
+m_ShowUncorrelatedInFpList:1
+m_ShowVFRInFpList:1
+m_ShowIFRInFpList:1
+m_ShowConcernedInFpList:1
+m_ShowUnconcernedInFpList:0
+m_ZoomCenterUnderMouse:1
+m_AseURL:http://www.craig-phillips.co.uk/ase/repository/
+m_STCA_LowPreWarnTime:150
+m_STCA_LowWarnTime:150
+m_HighPreWarnTime:240
+m_STCA_HighWarnTime:240
+m_STCA_ShowCFL:1
+m_STCA_PlaySoundOnCFL:0
+m_STCA_PlaySoundOnTrackedOnly:1
+m_AutoCorrelateDisabledSQs:1200,2000,2200,7000,7700,7600,7500
+m_DontAutoCorrelateDuplicated:1
+m_AcceptPilotSquawkForCorrelation:1
+m_MTCA_Floor:10000
+m_MTCA_AltitudeDifference:2000
+m_MTCA_Distance:20.0
+m_UseIsectForScratchPad:1
+m_RotateRadarTargetSymbol:0
+m_RotateFlightPlanTrackSymbol:0
+m_RubberHeadingRounding:5
+SqawkForSModeTransponder:
+m_TransparentTagBackground:1
+m_UseArrDepTagBgColor:0
diff --git a/Settings/General_Eurocat.txt b/Settings/General_Eurocat.txt
index c489c23..db257d2 100644
--- a/Settings/General_Eurocat.txt
+++ b/Settings/General_Eurocat.txt
@@ -5,11 +5,11 @@ m_ShowRouteFixName:1
 m_ShowRouteETA:1
 m_ShowCalculatedHeading:1
 m_ShowSimulatedData:0
-m_TransitionAltitude:9000
+m_TransitionAltitude:9843
 m_AllowConcernedACTagDown:1
 m_CenterlineDme:0.0
 m_CenterlineLength:20.0
-m_CenterlineTickDme:5.0
+m_CenterlineTickDme:0.0
 m_CenterlineTickInterval:1.0
 m_CenterlineTickLength:0.5
 m_CenterlineMarkerLength:1.0
@@ -96,7 +96,7 @@ m_SupMessageLevel:4
 m_AtisMessageLevel:0
 m_PrivateMessageLevel:4
 m_FreqMessageLevel:4
-m_MericUnits:0
+m_MericUnits:1
 m_ShowCorrelatedInFpList:1
 m_ShowUncorrelatedInFpList:1
 m_ShowVFRInFpList:1
@@ -134,8 +134,8 @@ m_ShowTrackMilesInRouteButton:1
 m_FilterOutSquawks:
 ORIGPLANE
 m_Visible:1
-m_X:1569
-m_Y:527
+m_X:1659
+m_Y:288
 m_LineNumber:0
 m_Resizable:1
 m_OrderingColumn:1
diff --git a/Settings/Lists.txt b/Settings/Lists.txt
index 09de058..f8ad6c5 100644
--- a/Settings/Lists.txt
+++ b/Settings/Lists.txt
@@ -24,7 +24,7 @@ END
 SEL
 m_Visible:1
 m_X:0
-m_Y:176
+m_Y:57
 m_LineNumber:0
 m_Resizable:1
 m_OrderingColumn:2
@@ -47,7 +47,7 @@ END
 DEP
 m_Visible:1
 m_X:0
-m_Y:275
+m_Y:89
 m_LineNumber:0
 m_Resizable:1
 m_OrderingColumn:1
diff --git a/Settings/Lists_Eurocat.txt b/Settings/Lists_Eurocat.txt
index bc33312..f31ac27 100644
--- a/Settings/Lists_Eurocat.txt
+++ b/Settings/Lists_Eurocat.txt
@@ -33,8 +33,8 @@ m_Column:TYP:7:1:78:0:0:1::::0:0.0
 m_Column:R:2:1:63:0:0:1::::0:0.0
 m_Column:ADEP:5:1:61:7:0:1::::0:0.0
 m_Column:ADES:5:1:17:7:1:1::::0:0.0
-m_Column:SID:7:1:1014:17:0:1:Telephonics:::0:0.0
-m_Column:STAR:7:1:1015:18:0:1:Telephonics:::0:0.0
+m_Column:SID:7:1:56:17:0:1::::0:0.0
+m_Column:STAR:7:1:55:18:0:1::::0:0.0
 m_Column:ARWY:4:1:47:19:0:1::::0:0.0
 m_Column:ETX:6:1:53:0:0:1::::0:0.0
 m_Column:OPDATA:8:1:1:2:0:1:Eurocat Plugin:Eurocat Plugin::0:0.0
diff --git a/Settings/VCCS.txt b/Settings/VCCS.txt
index 4280181..e69de29 100644
--- a/Settings/VCCS.txt
+++ b/Settings/VCCS.txt
@@ -1,5 +0,0 @@
-VCCS
-Ts3Server:106.55.157.15
-Ts3Port:9988
-Ts3G2AChannel:118.000
-END