diff --git a/README b/README
index 6943f189..6c06d501 100644
--- a/README
+++ b/README
@@ -35,7 +35,7 @@ Texture maps
 
 # Askaniy (https://www.deviantart.com/askaniy)
 
-   Textures of Phobos, Jupiter, Ganymede, Saturn, Uranus, Puck, Pluto, and Charon.
+   Textures of Phobos, Jupiter, Ganymede, Saturn, Uranus, Puck, Neptune, Triton, Pluto, and Charon.
 
    The Deimos and Callisto textures were made by Askaniy from JVV's textures.
 
@@ -94,7 +94,7 @@ Texture maps
    Hyperion & Phoebe:
    Textures derieved from a texture by JVV
 
-   Uranus's rings are a composite of transparency data and voyager imagery.
+   Uranus & Neptune's rings are composites of transparency data and Voyager imagery.
 
    Miranda:
    Texture by Robin Charles Gilbert and shading reduced with the normal map:
@@ -105,7 +105,9 @@ Texture maps
 
    Other textures derived from work by JVV are listed above.
 
-# The Neptune texture is from James Hastings-Trew's collection.
+# Snowfall-The-Cat (https://www.deviantart.com/snowfall-the-cat)
+
+   Textures of Larissa (based on Phil Stooke's map) and Proteus.
 
 # Grant Hutchison
 
@@ -113,7 +115,7 @@ Texture maps
 
 # Phil Stooke
 
-   Proteus, Janus, Prometheus and Epimetheus maps are from Phil Stooke.
+   Janus, Prometheus and Epimetheus maps are from Phil Stooke.
 
    The Ida and Gaspra photomosaic maps are by Phil Stooke.
 
diff --git a/data/minormoons.ssc b/data/minormoons.ssc
index 35358b13..795ee79f 100644
--- a/data/minormoons.ssc
+++ b/data/minormoons.ssc
@@ -5216,236 +5216,332 @@
 
 # Minor satellites of Neptune
 
-"Larissa:Neptune VII:1989 N 2" "Sol/Neptune"
+"Naiad:Neptune III:S 1989 N 6" "Sol/Neptune"
 {
-    Texture     "asteroid.jpg"
-    Mesh        "larissa.cmod"
-    Radius      100 # maximum semi-axis
-    MeshCenter  [ 4.564 -0.126 0.302 ]
-
-    EllipticalOrbit
-    {
-        Period          0.554654
-        SemiMajorAxis   73548
-        Eccentricity    0.0014
-        Inclination     0.744
-        AscendingNode   324.857
-        ArgOfPericenter 215.004 # J2000.0
-        MeanAnomaly     157.543
-    }
-
-    BodyFrame { EquatorJ2000 {} }
-    UniformRotation
-    {
-        Inclination    46.59
-        AscendingNode  29.36
-        MeridianAngle 179.41
-    }
-
-    Albedo 0.056
-}
-
-"Naiad:Neptune III:1989 N 6" "Sol/Neptune"
-{
-    Class "minormoon"
-    Texture     "asteroid.jpg"
-    SemiAxes [ 47 30 26 ]
-
-    EllipticalOrbit
-    {
-    Period      0.294396
-    SemiMajorAxis   48227
-    Eccentricity    0.0004
-    Inclination 5.167   #
-    AscendingNode   8.998   #
-    ArgOfPericenter 30.956  # J2000.0
-    MeanAnomaly     7.538   #
-    }
-
-    Obliquity         0.1
-    EquatorAscendingNode    346.7
-    RotationOffset      242.9
-
-    Albedo 0.060
-}
-
-"Thalassa:Neptune IV:1989 N 5" "Sol/Neptune"
-{
-    Class "minormoon"
-    Texture     "asteroid.jpg"
-    SemiAxes [ 54 50 26 ]
-
-    EllipticalOrbit
-    {
-    Period      0.311485
-    SemiMajorAxis   50075
-    Eccentricity    0.0002
-    Inclination 0.381   #
-    AscendingNode   353.390 #
-    ArgOfPericenter 274.850 # J2000.0
-    MeanAnomaly     350.880 #
-    }
-
-    RotationOffset      77.6
-
-    Albedo 0.060
-}
-
-"Despina:Neptune V:1989 N 3" "Sol/Neptune"
-{
-    Class "minormoon"
-    Texture     "asteroid.jpg"
-    SemiAxes [ 90 74 64 ]
-
-    EllipticalOrbit
-    {
-    Period      0.334655
-    SemiMajorAxis   52526
-    Eccentricity    0.0002
-    Inclination 0.589   #
-    AscendingNode   334.279 #
-    ArgOfPericenter 133.891 # J2000.0
-    MeanAnomaly     349.678 #
-    }
-
-    RotationOffset      282.0
-
-    Albedo 0.059
-}
-
-"Galatea:Neptune VI:1989 N 4" "Sol/Neptune"
-{
-    Class "minormoon"
-    Texture     "asteroid.jpg"
-    SemiAxes [ 102 92 72 ]
-
-    EllipticalOrbit
-    {
-    Period      0.428745
-    SemiMajorAxis   61953
-    Eccentricity    0.0000
-    Inclination 0.565   #
-    AscendingNode   327.929 #
-    ArgOfPericenter 89.060  # J2000.0
-    MeanAnomaly     2.357   #
-    }
-
-    RotationOffset      233.6
-
-    Albedo 0.063
-}
-
-"Halimede:Neptune IX:2002 N 1" "Sol/Neptune"
-{
-	Class "minormoon"
-	Texture	 	"asteroid.jpg"
-	Mesh		"asteroid.cms"
-	Radius		24
-
+	Class	"minormoon"
+	Mesh	"roughsphere.cms"
+	Texture	"asteroid.*"
+	SemiAxes	[ 48 30 26 ]
+	OrbitFrame
+	{
+		EclipticJ2000	{ Center "Sol/Neptune" }
+	}
 	EllipticalOrbit
 	{
-	Period		1879.71
-	SemiMajorAxis	15728000
-	Eccentricity	0.5711
-	Inclination	139.094	#
-	AscendingNode	163.249	#
-	ArgOfPericenter	148.454	# J2000.0
-	MeanAnomaly     230.015	#
+		Epoch	2447763.5  # 1989 Aug 25
+		Period	0.2943958
+		SemiMajorAxis	48224.41
+		Eccentricity	0.0047
+		Inclination	33.097475
+		AscendingNode	50.705828
+		ArgOfPericenter	68.933372
+		MeanAnomaly	354.335183
 	}
-
-	RotationPeriod  10   # Guess
-
-	Albedo 0.155
+	UniformRotation
+	{
+		MeridianAngle	242.9
+	}
+	LunarLambert	0.5
+	GeomAlbedo	0.072
+	InfoURL	"https://en.wikipedia.org/wiki/Naiad_(moon)"
 }
 
-"Sao:Neptune XI:2002 N 2" "Sol/Neptune"
+"Thalassa:Neptune IV:S 1989 N 5" "Sol/Neptune"
 {
-	Class "minormoon"
-	Texture	 	"asteroid.jpg"
-	Mesh		"asteroid.cms"
-	Radius		24
-
+	Class	"minormoon"
+	Mesh	"roughsphere.cms"
+	Texture	"asteroid.*"
+	SemiAxes	[ 54 50 26 ]
+	OrbitFrame
+	{
+		EclipticJ2000	{ Center "Sol/Neptune" }
+	}
 	EllipticalOrbit
 	{
-	Period		2914.07
-	SemiMajorAxis	22422000
-	Eccentricity	0.2931
-	Inclination	26.351	#
-	AscendingNode	23.961	#
-	ArgOfPericenter	47.566	# J2000.0
-	MeanAnomaly     14.560	#
+		Epoch	2447763.5  # 1989 Aug 25
+		Period	0.31148444
+		SemiMajorAxis	50074.44
+		Eccentricity	0.00176
+		Inclination	28.583199
+		AscendingNode	48.999293
+		ArgOfPericenter	170.470579
+		MeanAnomaly	357.658510
 	}
-
-	RotationPeriod  10   # Guess
-
-	Albedo 0.155
+	UniformRotation
+	{
+		MeridianAngle	77.6
+	}
+	LunarLambert	0.5
+	GeomAlbedo	0.091
+	InfoURL	"https://en.wikipedia.org/wiki/Thalassa_(moon)"
 }
 
-"Laomedeia:Neptune XII:2002 N 3" "Sol/Neptune"
+"Despina:Neptune V:S 1989 N 3" "Sol/Neptune"
 {
-	Class "minormoon"
-	Texture	 	"asteroid.jpg"
-	Mesh		"asteroid.cms"
-	Radius		24
-
+	Class	"minormoon"
+	Mesh	"roughsphere.cms"
+	Texture	"asteroid.*"
+	SemiAxes	[ 90 74 64 ]
+	OrbitFrame
+	{
+		EclipticJ2000	{ Center "Sol/Neptune" }
+	}
 	EllipticalOrbit
 	{
-	Period		3167.85
-	SemiMajorAxis	23571000
-	Eccentricity	0.4237
-	Inclination	9.933	#
-	AscendingNode	13.595	#
-	ArgOfPericenter	122.752	# J2000.0
-	MeanAnomaly     154.007	#
+		Epoch	2447763.5  # 1989 Aug 25
+		Period	0.33465551
+		SemiMajorAxis	52525.95
+		Eccentricity	0.00038
+		Inclination	28.441193
+		AscendingNode	48.705257
+		ArgOfPericenter	206.079137
+		MeanAnomaly	7.659222
 	}
-
-	RotationPeriod  10   # Guess
-
-	Albedo 0.155
+	UniformRotation
+	{
+		MeridianAngle	282.0
+	}
+	LunarLambert	0.5
+	GeomAlbedo	0.09
+	InfoURL	"https://en.wikipedia.org/wiki/Despina_(moon)"
 }
 
-"Neso:Neptune XIII:2002 N 4" "Sol/Neptune"
+"Galatea:Neptune VI:S 1989 N 4" "Sol/Neptune"
 {
-	Class "minormoon"
-	Texture	 	"asteroid.jpg"
-	Mesh		"asteroid.cms"
-	Radius		30
-
+	Class	"minormoon"
+	Mesh	"roughsphere.cms"
+	Texture	"asteroid.*"
+	SemiAxes	[ 102 92 72 ]
+	OrbitFrame
+	{
+		EclipticJ2000	{ Center "Sol/Neptune" }
+	}
 	EllipticalOrbit
 	{
-	Period		9373.99
-	SemiMajorAxis	48387000
-	Eccentricity	0.4945
-	Inclination	113.569	#
-	AscendingNode	351.648	#
-	ArgOfPericenter	 77.981	# J2000.0
-	MeanAnomaly     216.988	#
+		Epoch	2447763.5  # 1989 Aug 25
+		Period	0.42874431
+		SemiMajorAxis	61952.57
+		Eccentricity	0.00022
+		Inclination	28.482346
+		AscendingNode	48.730913
+		ArgOfPericenter	94.040655
+		MeanAnomaly	346.601960
 	}
-
-	RotationPeriod  10   # Guess
-
-	Albedo 0.155
+	UniformRotation
+	{
+		MeridianAngle	233.6
+	}
+	LunarLambert	0.5
+	GeomAlbedo	0.08
+	InfoURL	"https://en.wikipedia.org/wiki/Galatea_(moon)"
 }
 
-"Psamathe:Neptune X:2003 N 1" "Sol/Neptune"
+"Larissa:Neptune VII:S 1981 N 1:S 1989 N 2" "Sol/Neptune"
 {
-	Class "minormoon"
-	Texture	 	"asteroid.jpg"
-	Mesh		"asteroid.cms"
-	Radius		14
-
+	Class	"minormoon"
+	Mesh	"larissa.cmod"
+	MeshCenter	[ 4.564 -0.126 0.302 ]
+	Texture	"larissa.*"
+	Radius	108
+	OrbitFrame
+	{
+		EclipticJ2000	{ Center "Sol/Neptune" }
+	}
 	EllipticalOrbit
 	{
-	Period		9115.91
-	SemiMajorAxis	46695000
-	Eccentricity	0.4499
-	Inclination	118.763	#
-	AscendingNode	288.194	#
-	ArgOfPericenter	161.232	# J2000.0
-	MeanAnomaly     182.071	#
+		Epoch	2447763.5  # 1989 Aug 25
+		Period	0.55465332
+		SemiMajorAxis	73548.26
+		Eccentricity	0.001393
+		Inclination	28.693900
+		AscendingNode	48.446761
+		ArgOfPericenter	109.167352
+		MeanAnomaly	310.958996
 	}
-
-	RotationPeriod  10   # Guess
-
-	Albedo 0.155
+	BodyFrame	{ EquatorJ2000 {} }
+	UniformRotation
+	{
+		Inclination	46.59
+		AscendingNode	29.36
+		MeridianAngle	179.41
+	}
+	LunarLambert	0.5
+	GeomAlbedo	0.09
+	InfoURL	"https://en.wikipedia.org/wiki/Larissa_(moon)"
+}
+
+"Hippocamp:Neptune XIV:S 2004 N 1" "Sol/Neptune"
+{
+	Class	"minormoon"
+	Mesh	"asteroid.cms"
+	Texture	"asteroid.*"
+	Radius	17.4
+	OrbitFrame
+	{
+		EclipticJ2000	{ Center "Sol/Neptune" }
+	}
+	EllipticalOrbit
+	{
+		Epoch	2447763.5  # 1989 Aug 25
+		Period	0.950
+		SemiMajorAxis	105283
+		Eccentricity	0.00084
+		Inclination	28.732987
+		AscendingNode	48.550228
+		ArgOfPericenter	235.612981
+		MeanAnomaly	337.247813
+	}
+	LunarLambert	0.5
+	GeomAlbedo	0.09
+	InfoURL	"https://en.wikipedia.org/wiki/Hippocamp_(moon)"
+}
+
+"Halimede:Neptune IX:S 2002 N 1" "Sol/Neptune"
+{
+	Class	"minormoon"
+	Mesh	"asteroid.cms"
+	Texture	"asteroid.*"
+	Radius	30.5
+	OrbitFrame
+	{
+		EclipticJ2000	{ Center "Sol/Neptune" }
+	}
+	EllipticalOrbit
+	{
+		Epoch	2447763.5  # 1989 Aug 25
+		Period	1878.003763
+		SemiMajorAxis	16580660.817
+		Eccentricity	0.257621
+		Inclination	112.189115
+		AscendingNode	217.072482
+		ArgOfPericenter	157.963831
+		MeanAnomaly	222.929859
+	}
+	UniformRotation
+	{
+		Period	10
+	}
+	LunarLambert	0.5
+	GeomAlbedo	0.04
+	InfoURL	"https://en.wikipedia.org/wiki/Halimede_(moon)"
+}
+
+"Sao:Neptune XI:S 2002 N 2" "Sol/Neptune"
+{
+	Class	"minormoon"
+	Mesh	"asteroid.cms"
+	Texture	"asteroid.*"
+	Radius	20
+	OrbitFrame
+	{
+		EclipticJ2000	{ Center "Sol/Neptune" }
+	}
+	EllipticalOrbit
+	{
+		Epoch	2447763.5  # 1989 Aug 25
+		Period	2903.402282
+		SemiMajorAxis	22168807.848
+		Eccentricity	0.140565
+		Inclination	53.633016
+		AscendingNode	62.733568
+		ArgOfPericenter	62.777123
+		MeanAnomaly	266.557147
+	}
+	UniformRotation
+	{
+		Period	10
+	}
+	LunarLambert	0.5
+	GeomAlbedo	0.04
+	InfoURL	"https://en.wikipedia.org/wiki/Sao_(moon)"
+}
+
+"Laomedeia:Neptune XII:S 2002 N 3" "Sol/Neptune"
+{
+	Class	"minormoon"
+	Mesh	"asteroid.cms"
+	Texture	"asteroid.*"
+	Radius	20
+	OrbitFrame
+	{
+		EclipticJ2000	{ Center "Sol/Neptune" }
+	}
+	EllipticalOrbit
+	{
+		Epoch	2447763.5  # 1989 Aug 25
+		Period	3165.898534
+		SemiMajorAxis	23485628.722
+		Eccentricity	0.369558
+		Inclination	37.991619
+		AscendingNode	54.310707
+		ArgOfPericenter	133.919743
+		MeanAnomaly	82.522618
+	}
+	UniformRotation
+	{
+		Period	10
+	}
+	LunarLambert	0.5
+	GeomAlbedo	0.04
+	InfoURL	"https://en.wikipedia.org/wiki/Laomedeia"
+}
+
+"Psamathe:Neptune X:S 2003 N 1" "Sol/Neptune"
+{
+	Class	"minormoon"
+	Mesh	"asteroid.cms"
+	Texture	"asteroid.*"
+	Radius	19
+	OrbitFrame
+	{
+		EclipticJ2000	{ Center "Sol/Neptune" }
+	}
+	EllipticalOrbit
+	{
+		Epoch	2447763.5  # 1989 Aug 25
+		Period	9185.728992
+		SemiMajorAxis	47776384.583
+		Eccentricity	0.355333
+		Inclination	122.523974
+		AscendingNode	319.348509
+		ArgOfPericenter	138.511529
+		MeanAnomaly	17.562417
+	}
+	UniformRotation
+	{
+		Period	10
+	}
+	LunarLambert	0.5
+	GeomAlbedo	0.04
+	InfoURL	"https://en.wikipedia.org/wiki/Psamathe_(moon)"
+}
+
+"Neso:Neptune XIII:S 2002 N 4" "Sol/Neptune"
+{
+	Class	"minormoon"
+	Mesh	"asteroid.cms"
+	Texture	"asteroid.*"
+	Radius	30
+	OrbitFrame
+	{
+		EclipticJ2000	{ Center "Sol/Neptune" }
+	}
+	EllipticalOrbit
+	{
+		Epoch	2447763.5  # 1989 Aug 25
+		Period	9561.918091
+		SemiMajorAxis	49072050.914
+		Eccentricity	0.730912
+		Inclination	133.608549
+		AscendingNode	15.350808
+		ArgOfPericenter	50.727424
+		MeanAnomaly	90.944380
+	}
+	UniformRotation
+	{
+		Period	10
+	}
+	LunarLambert	0.5
+	GeomAlbedo	0.04
+	InfoURL	"https://en.wikipedia.org/wiki/Neso_(moon)"
 }
diff --git a/data/solarsys.ssc b/data/solarsys.ssc
index 0bec5351..a98f63a8 100644
--- a/data/solarsys.ssc
+++ b/data/solarsys.ssc
@@ -1410,152 +1410,164 @@ AltSurface "Limit of knowledge" "Sol/Uranus/Oberon"
 
 "Neptune" "Sol"
 {
-    Texture     "neptune.*"
-    Color       [ 0.523 0.848 1.0 ]
-    HazeColor   [ 0.6 1 0.75 ]
-    HazeDensity 0.35
-    Radius      24766 # equatorial
-    Oblateness  0.017
+	Class	"planet"
+	Texture	"neptune.*"
+	Color	[ 0.78302 0.91535 1.0 ]
+	Radius	24764
+	Oblateness	0.0171
+	Atmosphere
+	{
+		Height	500
+		Mie	0.002
+		MieScaleHeight	20.3
+		MieAsymmetry	-0.1
+		Rayleigh	[ 0.00104 0.00193 0.00400 ]
+		Absorption	[ 0.00000 0.00050 0.00100 ]
+	}
+	CustomOrbit	"vsop87-neptune"
 
-    CustomOrbit "vsop87-neptune"
+	# Overridden by CustomOrbit
+	# EllipticalOrbit
+	# {
+	#	Epoch	2451545.0  # 2000 Jan 01 12:00
+	#	Period	165.087916323222
+	#	SemiMajorAxis	30.09392573136601
+	#	Eccentricity	0.01120361794639117
+	#	Inclination	1.770211285182674
+	#	AscendingNode	131.7839137619412
+	#	ArgOfPericenter	267.3151968586168
+	#	MeanAnomaly	266.1055972475706
+	# }
 
-    # Overridden by CustomOrbit
-    # EllipticalOrbit
-    # {
-    #    Period           164.793
-    #    SemiMajorAxis     30.0690
-    #    Eccentricity      0.0086
-    #    Inclination       1.7692
-    #    AscendingNode   131.722
-    #    LongOfPericenter 44.971
-    #    MeanLongitude   304.880
-    # }
-
-    Atmosphere
-    {
-        Height 130
-        Lower [ 0.6 0.65 1.0 ]
-        Upper [ 0.5 0.55 0.9 ]
-        Sky [ 0.5 0.7 0.9 ]
-    }
-
-    BodyFrame { EclipticJ2000 {} }
-    UniformRotation
-    {
-        Period          16.11 # System III (magnetic field)
-        Inclination     28.03
-        AscendingNode   49.24
-        MeridianAngle  228.66 # correct System III prime meridian
-    }
-
-    GeomAlbedo      0.409338
-    BondAlbedo      0.290
-    TempDiscrepancy 25.1  # for 1 bar level
-
-    Rings
-    {
-        Inner  53150
-        Outer  62947
-        Texture "neptune-rings.png"
-    }
+	BodyFrame	{ EclipticJ2000 {} }
+	UniformRotation
+	{
+		Period	16.11
+		Inclination	28.03
+		AscendingNode	49.24
+		MeridianAngle	228.66
+	}
+	GeomAlbedo	0.409338
+	BondAlbedo	0.290
+	TempDiscrepancy	25.1  # for 1 bar level
+	Rings
+	{
+		Inner	40900
+		Outer	62947
+		Texture	"neptune-rings.*"
+	}
+	InfoURL	"https://en.wikipedia.org/wiki/Neptune"
 }
 
-"Proteus:Neptune VIII:1989 N 1" "Sol/Neptune"
+"Proteus:Neptune VIII:S 1989 N 1" "Sol/Neptune"
 {
-    Mesh        "proteus.cmod"
-    Texture     "proteus.*" # Phil Stooke
-    Radius      219 # maximum semi-axis
-    MeshCenter  [ -4.146 -0.022 5.153 ]
-
-    EllipticalOrbit
-    {
-        Epoch           2450085.5 # 1996 Jan 3 00:00UT
-        Period          1.122315  # mean
-        SemiMajorAxis   117647    # mean
-        Eccentricity    0.0005    # mean
-        Inclination     1.090     # at epoch
-        AscendingNode   330.943   # at epoch
-        ArgOfPericenter 267.246   # at epoch
-        MeanAnomaly     213.916   # at epoch
-    }
-
-    BodyFrame { EquatorJ2000 {} }
-    UniformRotation
-    {
-        Inclination    47.09
-        AscendingNode  29.27
-        MeridianAngle  93.38
-    }
-
-    Albedo         0.061
+	Class	"moon"
+	Mesh	"proteus.cmod"
+	Texture	"proteus.*"
+	Radius	212
+	OrbitFrame
+	{
+		EclipticJ2000	{ Center "Sol/Neptune" }
+	}
+	EllipticalOrbit
+	{
+		Epoch	2447763.5  # 1989 Aug 25
+		Period	1.12231477
+		SemiMajorAxis	117647
+		Eccentricity	0.00053
+		Inclination	28.908433
+		AscendingNode	48.083589
+		ArgOfPericenter	81.195458
+		MeanAnomaly	34.162384
+	}
+	BodyFrame	{ EquatorJ2000 {} }
+	UniformRotation
+	{
+		Period	26.93555448
+		Inclination	47.09
+		AscendingNode	29.27
+		MeridianAngle	93.38
+	}
+	LunarLambert	0.5
+	GeomAlbedo	0.096
+	InfoURL	"https://en.wikipedia.org/wiki/Proteus_(moon)"
 }
 
 "Triton:Neptune I" "Sol/Neptune"
 {
-    Texture "triton.*"
-    Radius   1353.4
-
-    Atmosphere
-    {
-        Height 1
-        Lower [ 0.5 0.5 0.5 ]
-        Upper [ 0.5 0.5 0.5 ]
-        Sky [ 0.0 0.0 0.0 ]
-    }
-
-    EllipticalOrbit
-    {
-        Epoch           2447763.5    # 1989 Aug 25 00:00UT (Voyager encounter)
-        Period          5.8768541    #  mean
-        SemiMajorAxis   354765.286   # at epoch
-        Eccentricity    0.00002285   # at epoch
-        Inclination     156.826240   # at epoch
-        AscendingNode   147.899288   # at epoch
-        ArgOfPericenter 293.092400   # at epoch
-        MeanAnomaly     315.726316   # at epoch
-    }
-
-    BodyFrame { EquatorJ2000 {} }
-    UniformRotation
-    {
-        Epoch     2447763.5  # 1989 Aug 25 00:00UT (Voyager encounter)
-        Inclination   110.44 # at epoch
-        AscendingNode 206.17 # at epoch
-        MeridianAngle  77.41 # at epoch
-    }
-
-    Albedo         0.756
+	Class	"moon"
+	Texture	"triton.*"
+	Color	[ 1.0 0.99024 0.96338 ]
+	SemiAxes	[ 1354.6 1352.8 1352.4 ]
+	Atmosphere
+	{
+		Height	32
+		Mie	0.0003
+		MieScaleHeight	8
+		Absorption	[ 0.00200 0.00200 0.00250 ]
+	}
+	OrbitFrame
+	{
+		EclipticJ2000	{ Center "Sol/Neptune" }
+	}
+	EllipticalOrbit
+	{
+		Epoch	2447763.5  # 1989 Aug 25
+		Period	5.8768541
+		SemiMajorAxis	354759
+		Eccentricity	0.000016
+		Inclination	130.909204
+		AscendingNode	213.174202
+		ArgOfPericenter	278.113474
+		MeanAnomaly	349.996104
+	}
+	BodyFrame	{ EquatorJ2000 {} }
+	UniformRotation
+	{
+		Epoch	2447763.5  # 1989 Aug 25
+		Inclination	110.44
+		AscendingNode	206.17
+		MeridianAngle	77.41
+	}
+	LunarLambert	0.5
+	GeomAlbedo	0.719
+	BondAlbedo	0.65
+	InfoURL	"https://en.wikipedia.org/wiki/Triton_(moon)"
 }
 
 AltSurface "Limit of knowledge" "Sol/Neptune/Triton"
 {
-    Texture "triton.*"
-    OverlayTexture "triton-lok-mask.png"
+	Texture	"triton.*"
+	OverlayTexture	"triton-lok-mask.*"
+	LunarLambert	0.5
 }
 
 "Nereid:Neptune II" "Sol/Neptune"
 {
-    Mesh    "asteroid.cms"
-    Texture "asteroid.jpg"
-    Radius  170
-
-    EllipticalOrbit
-    {
-        Epoch           2447763.5 # 1989 Aug 25 00:00UT (Voyager encounter)
-        Period          360.13619 # mean
-        SemiMajorAxis   5513400   # mean
-        Eccentricity    0.7512    # mean
-        Inclination     28.385    # at epoch
-        AscendingNode   190.678   # at epoch
-        ArgOfPericenter 17.690    # at epoch
-        MeanAnomaly     36.056    # at epoch
-    }
-
-    # Figure of 11.52 +/- 0.14 hours from Grav, T. et al. (2003)
-    # "The Short Rotation Period of Nereid", ApJ 591
-    UniformRotation
-    {
-        Period 11.52
-    }
-    Albedo          0.155
+	Class	"minormoon"
+	Mesh	"roughsphere.cms"
+	Texture	"asteroid.*"
+	SemiAxes	[ 199 168 153 ]
+	OrbitFrame
+	{
+		EclipticJ2000	{ Center "Sol/Neptune" }
+	}
+	EllipticalOrbit
+	{
+		Epoch	2447763.5  # 1989 Aug 25
+		Period	359.396374
+		SemiMajorAxis	5506217.008
+		Eccentricity	0.753882
+		Inclination	5.055101
+		AscendingNode	319.892917
+		ArgOfPericenter	296.451886
+		MeanAnomaly	36.055860
+	}
+	UniformRotation
+	{
+		Period	11.594
+	}
+	LunarLambert	0.5
+	GeomAlbedo	0.155
+	InfoURL	"https://en.wikipedia.org/wiki/Nereid_(moon)"
 }
diff --git a/models/larissa.cmod b/models/larissa.cmod
index fcf422d4..e58a8955 100644
Binary files a/models/larissa.cmod and b/models/larissa.cmod differ
diff --git a/models/proteus.cmod b/models/proteus.cmod
index 9c090bfb..aaf5bdd6 100644
Binary files a/models/proteus.cmod and b/models/proteus.cmod differ
diff --git a/textures/hires/neptune.jpg b/textures/hires/neptune.jpg
new file mode 100644
index 00000000..b58d54d7
Binary files /dev/null and b/textures/hires/neptune.jpg differ
diff --git a/textures/hires/triton.jpg b/textures/hires/triton.jpg
new file mode 100644
index 00000000..153d1f46
Binary files /dev/null and b/textures/hires/triton.jpg differ
diff --git a/textures/lores/larissa.jpg b/textures/lores/larissa.jpg
new file mode 100644
index 00000000..8595eaa0
Binary files /dev/null and b/textures/lores/larissa.jpg differ
diff --git a/textures/lores/neptune-rings.png b/textures/lores/neptune-rings.png
index a78945ee..fb88b172 100644
Binary files a/textures/lores/neptune-rings.png and b/textures/lores/neptune-rings.png differ
diff --git a/textures/lores/neptune.jpg b/textures/lores/neptune.jpg
index 8dd8db37..0a4b75f3 100644
Binary files a/textures/lores/neptune.jpg and b/textures/lores/neptune.jpg differ
diff --git a/textures/lores/proteus.jpg b/textures/lores/proteus.jpg
index 4c7ea23b..6901fdb4 100644
Binary files a/textures/lores/proteus.jpg and b/textures/lores/proteus.jpg differ
diff --git a/textures/lores/triton-lok-mask.png b/textures/lores/triton-lok-mask.png
index 735a3f3b..02fd6814 100644
Binary files a/textures/lores/triton-lok-mask.png and b/textures/lores/triton-lok-mask.png differ
diff --git a/textures/lores/triton.jpg b/textures/lores/triton.jpg
index 5e5a3451..6d43e223 100644
Binary files a/textures/lores/triton.jpg and b/textures/lores/triton.jpg differ
diff --git a/textures/medres/neptune-rings.png b/textures/medres/neptune-rings.png
new file mode 100644
index 00000000..e56efb24
Binary files /dev/null and b/textures/medres/neptune-rings.png differ
diff --git a/textures/medres/neptune.jpg b/textures/medres/neptune.jpg
new file mode 100644
index 00000000..3fc4e8c6
Binary files /dev/null and b/textures/medres/neptune.jpg differ
diff --git a/textures/medres/triton.jpg b/textures/medres/triton.jpg
new file mode 100644
index 00000000..83c590f2
Binary files /dev/null and b/textures/medres/triton.jpg differ