diff --git a/src/buildstardb.cpp b/src/buildstardb.cpp
index ad3a5119e..34f189818 100644
--- a/src/buildstardb.cpp
+++ b/src/buildstardb.cpp
@@ -1066,13 +1066,13 @@ void CompareTycho()
     {
         CheckStarRecord(tycDatabase);
         if (++recs % 10000 == 0)
-            {
+        {
             if (verbose>=0)
                 cout << recs << " records.\n";
             else
                 cout << ".";
-                cout.flush();
-            }
+            cout.flush();
+        }
     }
     if (verbose<0)
         cout << "\n";
@@ -1137,13 +1137,13 @@ int main(int argc, char* argv[])
         {
             ReadStarRecord(mainDatabase);
             if (stars.size() % 10000 == 0)
-                {
+            {
                 if (verbose>=0)
                     cout << stars.size() << " records.\n";
                 else
                     cout << ".";
-                    cout.flush();
-                }
+                cout.flush();
+            }
         }
         if (verbose<0)
             cout << "\n";
diff --git a/src/cel3ds/3dschunk.h b/src/cel3ds/3dschunk.h
index 80b24d91a..3a406c688 100644
--- a/src/cel3ds/3dschunk.h
+++ b/src/cel3ds/3dschunk.h
@@ -1,5 +1,5 @@
 // 3dschunk.h
-// 
+//
 // Copyright (C) 2001, Chris Laurel <claurel@shatters.net>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/cel3ds/3dsmodel.cpp b/src/cel3ds/3dsmodel.cpp
index a59e85ded..ac0c960c7 100644
--- a/src/cel3ds/3dsmodel.cpp
+++ b/src/cel3ds/3dsmodel.cpp
@@ -1,5 +1,5 @@
 // 3dsmodel.cpp
-// 
+//
 // Copyright (C) 2000, Chris Laurel <claurel@shatters.net>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/cel3ds/3dsmodel.h b/src/cel3ds/3dsmodel.h
index c3c0ce30d..8afacbc95 100644
--- a/src/cel3ds/3dsmodel.h
+++ b/src/cel3ds/3dsmodel.h
@@ -1,5 +1,5 @@
 // 3dsmodel.h
-// 
+//
 // Copyright (C) 2001, Chris Laurel <claurel@shatters.net>
 //
 // This program is free software; you can redistribute it and/or
@@ -95,7 +95,7 @@ class M3DTriangleMesh
     void addMeshMaterialGroup(M3DMeshMaterialGroup* matGroup);
     M3DMeshMaterialGroup* getMeshMaterialGroup(uint32) const;
     uint32 getMeshMaterialGroupCount() const;
-    
+
  private:
     std::vector<Eigen::Vector3f> points;
     std::vector<Eigen::Vector2f> texCoords;
diff --git a/src/cel3ds/3dsread.h b/src/cel3ds/3dsread.h
index d8ac25572..fa64302e5 100644
--- a/src/cel3ds/3dsread.h
+++ b/src/cel3ds/3dsread.h
@@ -1,5 +1,5 @@
 // 3dsread.h
-// 
+//
 // Copyright (C) 2000, Chris Laurel <claurel@shatters.net>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/celengine/CGBuffer.h b/src/celengine/CGBuffer.h
index dc71af92a..ebc609a0f 100755
--- a/src/celengine/CGBuffer.h
+++ b/src/celengine/CGBuffer.h
@@ -1,6 +1,6 @@
 /*
 
-Disclaimer:	IMPORTANT:  This Apple software is supplied to you by Apple Computer, Inc.
+Disclaimer:    IMPORTANT:  This Apple software is supplied to you by Apple Computer, Inc.
                 ("Apple") in consideration of your agreement to the following terms, and your
                 use, installation, modification or redistribution of this Apple software
                 constitutes acceptance of these terms.  If you do not agree with these terms,
@@ -37,7 +37,7 @@ Disclaimer:	IMPORTANT:  This Apple software is supplied to you by Apple Computer
 
 */
 
-// Note that this is modified Apple source code, and not in its entireity (some classes are, some aren't), 
+// Note that this is modified Apple source code, and not in its entireity (some classes are, some aren't),
 // but we might as well leave it in here, even though it doesn't sound like we have to.
 // -bob
 
@@ -51,54 +51,54 @@ class CGFrame : public CGRect
 {
 public:
 
-	CGFrame(float x0, float y0, float w, float h)
-	{
-		*this = CGRectMake(x0,y0,w,h);
-	}
-	
-	explicit CGFrame(float w = 0, float h = 0)
-	{
-		*this = CGRectMake(0,0,w,h);
-	}
-	
-	CGFrame(const Rect& rect)
-	{
-		origin.x = rect.left, size.width = rect.right - rect.left;
-		origin.y = rect.top, size.height = rect.bottom - rect.top;
-	}
-	
-	CGFrame(const CGRect& copy)
-	{
-		origin = copy.origin;
-		size = copy.size;
-	}
-	
-	CGFrame(const CGSize& size)
-	{
-		origin.x = origin.y = 0;
-		this->size = size;
-	}
-	
-	CGFrame(float x, float y, const CGSize& size)
-	{
-		*this = CGRectMake(x, y, size.width, size.height);
-	}
-	
-	CGFrame(const CGPoint& pos, const CGSize& size)
-	{
-		*this = CGRectMake(pos.x, pos.y, size.width, size.height);
-	}	
-	
-	void Offset(float dx, float dy)
-	{
-		origin.x += dx, origin.y += dy;
-	}
-	
-	void Inset(float dx, float dy)
-	{
-		origin.x += dx, origin.y += dy;
-		size.width -= dx*2, size.height -= dy*2;
-	}
+    CGFrame(float x0, float y0, float w, float h)
+    {
+        *this = CGRectMake(x0,y0,w,h);
+    }
+
+    explicit CGFrame(float w = 0, float h = 0)
+    {
+        *this = CGRectMake(0,0,w,h);
+    }
+
+    CGFrame(const Rect& rect)
+    {
+        origin.x = rect.left, size.width = rect.right - rect.left;
+        origin.y = rect.top, size.height = rect.bottom - rect.top;
+    }
+
+    CGFrame(const CGRect& copy)
+    {
+        origin = copy.origin;
+        size = copy.size;
+    }
+
+    CGFrame(const CGSize& size)
+    {
+        origin.x = origin.y = 0;
+        this->size = size;
+    }
+
+    CGFrame(float x, float y, const CGSize& size)
+    {
+        *this = CGRectMake(x, y, size.width, size.height);
+    }
+
+    CGFrame(const CGPoint& pos, const CGSize& size)
+    {
+        *this = CGRectMake(pos.x, pos.y, size.width, size.height);
+    }
+
+    void Offset(float dx, float dy)
+    {
+        origin.x += dx, origin.y += dy;
+    }
+
+    void Inset(float dx, float dy)
+    {
+        origin.x += dx, origin.y += dy;
+        size.width -= dx*2, size.height -= dy*2;
+    }
 };
 
 class MemoryBuffer
@@ -146,8 +146,8 @@ class Datafile
 {
     int ref_count;
     FILE* file;
-    
-public:        
+
+public:
     MemoryBuffer* data_buffer;
     unsigned long data_size;
 
@@ -165,13 +165,13 @@ public:
         ++ref_count;
         return this;
     }
-    
+
     void Release()
     {
-        if (--ref_count==0) 
+        if (--ref_count==0)
             delete this;
     }
-    
+
     int Open(const char* path)
     {
         file = fopen(path,"r");
@@ -191,7 +191,7 @@ public:
         //DPRINTF(0,"Datafile::Open() - Successfully opened '%s' %d bytes\n", path, data_size);
         return 1;
     }
-    
+
     int Read()
     {
         if ((file == NULL) || (data_buffer == NULL) || (data_size == 0)) {
@@ -199,18 +199,18 @@ public:
             Reset();
             return 0;
         }
-        
-        fseek(file, 0, SEEK_SET);        
+
+        fseek(file, 0, SEEK_SET);
         if (fread((void*)data_buffer->data, 1, data_size, file) != data_size) {
             DPRINTF(0,"Datafile::Read() - Didn't read to finish?");
             Reset();
             return 0;
         }
-        
+
         //DPRINTF(0,"Datafile::Read() - Successfully read all %d bytes into buffer\n",data_size);
         return 1;
     }
-    
+
     void Close()
     {
         if (file) {
@@ -218,7 +218,7 @@ public:
             file = NULL;
         }
     }
-    
+
     void Reset()
     {
         Close();
@@ -231,176 +231,176 @@ public:
 
 class CGBuffer
 {
-	Datafile file;
-	CGImageRef image_ref;
-	CGContextRef context_ref;
+    Datafile file;
+    CGImageRef image_ref;
+    CGContextRef context_ref;
 
-	int ref_count;
+    int ref_count;
 
-	void Init()
-	{
-		ref_count = 1;
-		buffer = NULL;
-		image_ref = NULL;
-		context_ref = NULL;
-		image_finished = false;
-	}
+    void Init()
+    {
+        ref_count = 1;
+        buffer = NULL;
+        image_ref = NULL;
+        context_ref = NULL;
+        image_finished = false;
+    }
 
-	bool CreateCGContext()
-	{
-		if (context_ref)
-		{
-			CGContextRelease(context_ref);
-			context_ref = NULL;
-		}
+    bool CreateCGContext()
+    {
+        if (context_ref)
+        {
+            CGContextRelease(context_ref);
+            context_ref = NULL;
+        }
 
-		if (buffer)
-		{
-			buffer->Release();
-			buffer = NULL;
-		}
+        if (buffer)
+        {
+            buffer->Release();
+            buffer = NULL;
+        }
 
-		size_t buffer_rowbytes = (size_t)(image_size.width * ((image_depth == 8) ? 1 : 4)); //CGImageGetBytesPerRow(image_ref);
-	
-		buffer = MemoryBuffer::Create(buffer_rowbytes * (size_t)image_size.height); 
+        size_t buffer_rowbytes = (size_t)(image_size.width * ((image_depth == 8) ? 1 : 4)); //CGImageGetBytesPerRow(image_ref);
 
-		if (!buffer)
-			return false;
+        buffer = MemoryBuffer::Create(buffer_rowbytes * (size_t)image_size.height);
 
-		CGColorSpaceRef colorspace_ref = (image_depth == 8) ? CGColorSpaceCreateDeviceGray() : CGColorSpaceCreateDeviceRGB();
-		
-		if (!colorspace_ref)
-			return false;
-		
-		CGImageAlphaInfo alpha_info = (image_depth == 8) ? kCGImageAlphaNone : kCGImageAlphaPremultipliedLast; //kCGImageAlphaLast; //RGBA format
+        if (!buffer)
+            return false;
 
-		context_ref = CGBitmapContextCreate(buffer->data, (size_t)image_size.width, (size_t)image_size.height, 8, buffer_rowbytes, colorspace_ref, alpha_info);
+        CGColorSpaceRef colorspace_ref = (image_depth == 8) ? CGColorSpaceCreateDeviceGray() : CGColorSpaceCreateDeviceRGB();
 
-		if (context_ref)
-		{
-			CGContextSetFillColorSpace(context_ref, colorspace_ref);
-			CGContextSetStrokeColorSpace(context_ref, colorspace_ref);
-                        // move down, and flip vertically 
+        if (!colorspace_ref)
+            return false;
+
+        CGImageAlphaInfo alpha_info = (image_depth == 8) ? kCGImageAlphaNone : kCGImageAlphaPremultipliedLast; //kCGImageAlphaLast; //RGBA format
+
+        context_ref = CGBitmapContextCreate(buffer->data, (size_t)image_size.width, (size_t)image_size.height, 8, buffer_rowbytes, colorspace_ref, alpha_info);
+
+        if (context_ref)
+        {
+            CGContextSetFillColorSpace(context_ref, colorspace_ref);
+            CGContextSetStrokeColorSpace(context_ref, colorspace_ref);
+                        // move down, and flip vertically
                         // to turn postscript style coordinates to "screen style"
-			CGContextTranslateCTM(context_ref, 0.0, image_size.height);
-			CGContextScaleCTM(context_ref, 1.0, -1.0);
-		}
-		
-		CGColorSpaceRelease(colorspace_ref);
-		colorspace_ref = NULL;
+            CGContextTranslateCTM(context_ref, 0.0, image_size.height);
+            CGContextScaleCTM(context_ref, 1.0, -1.0);
+        }
 
-		return !!context_ref;
-	}
+        CGColorSpaceRelease(colorspace_ref);
+        colorspace_ref = NULL;
+
+        return !!context_ref;
+    }
+
+    void RenderCGImage(const CGRect& dst_rect)
+    {
+        if (!context_ref || !image_ref)
+            return;
+
+        CGContextDrawImage(context_ref, dst_rect, image_ref);
+    }
 
-	void RenderCGImage(const CGRect& dst_rect)
-	{
-		if (!context_ref || !image_ref)
-			return;
-			
-		CGContextDrawImage(context_ref, dst_rect, image_ref);
-	}
-	
 public:
 
-	MemoryBuffer* buffer;
-	CGSize image_size;
-	size_t image_depth;
-	bool image_finished;
-	
-	CGBuffer(const char* path)
-	{
-		Init();
-		Open(path);
-	}
+    MemoryBuffer* buffer;
+    CGSize image_size;
+    size_t image_depth;
+    bool image_finished;
+
+    CGBuffer(const char* path)
+    {
+        Init();
+        Open(path);
+    }
 
         ~CGBuffer()
-	{
-		Reset();
-	}
+    {
+        Reset();
+    }
 
-	CGBuffer* Retain()
-	{
-		++ref_count;
-		return this;
-	}
+    CGBuffer* Retain()
+    {
+        ++ref_count;
+        return this;
+    }
 
-	void Release()
-	{
-		if (--ref_count == 0)
-			delete this;
-	}
+    void Release()
+    {
+        if (--ref_count == 0)
+            delete this;
+    }
 
-	bool Open(const char* path)
-	{
-		file.Reset();
-		return file.Open(path);
-	}
+    bool Open(const char* path)
+    {
+        file.Reset();
+        return file.Open(path);
+    }
 
-	bool LoadJPEG()
-	{
-		if (!file.Read())
-			return false;
+    bool LoadJPEG()
+    {
+        if (!file.Read())
+            return false;
 
-		file.Close();
+        file.Close();
 
-		CGDataProviderRef src_provider_ref = CGDataProviderCreateWithData(this, file.data_buffer->data, file.data_size, NULL);
+        CGDataProviderRef src_provider_ref = CGDataProviderCreateWithData(this, file.data_buffer->data, file.data_size, NULL);
 
-		if (!src_provider_ref)
-			return false;
+        if (!src_provider_ref)
+            return false;
 
-		image_ref = CGImageCreateWithJPEGDataProvider(src_provider_ref, NULL, true, kCGRenderingIntentDefault);
+        image_ref = CGImageCreateWithJPEGDataProvider(src_provider_ref, NULL, true, kCGRenderingIntentDefault);
 
-		CGDataProviderRelease(src_provider_ref);
-		src_provider_ref = NULL;
+        CGDataProviderRelease(src_provider_ref);
+        src_provider_ref = NULL;
 
-		if (!image_ref)
-			return false;
+        if (!image_ref)
+            return false;
 
-		image_size = CGSizeMake(CGImageGetWidth(image_ref), CGImageGetHeight(image_ref));
-		image_depth = CGImageGetBitsPerPixel(image_ref);
-		
-		return !!image_ref;
-	}
+        image_size = CGSizeMake(CGImageGetWidth(image_ref), CGImageGetHeight(image_ref));
+        image_depth = CGImageGetBitsPerPixel(image_ref);
 
-	bool Render()
-	{
-		if (!image_ref)
-			return false;
-		
-		if (!CreateCGContext())
-			return false;
-	
-		RenderCGImage(CGFrame(image_size));
-		
-		CGContextRelease(context_ref);
-		context_ref = NULL;
+        return !!image_ref;
+    }
 
-		CGImageRelease(image_ref);
-		image_ref = NULL;
-		
-		file.Reset();
+    bool Render()
+    {
+        if (!image_ref)
+            return false;
 
-		return true;
-	}
-	
-	void Reset()
-	{
-		if (buffer)
-		{
-			buffer->Release();
-			buffer = NULL;
-		}
+        if (!CreateCGContext())
+            return false;
 
-		if (image_ref)
-		{
-			CGImageRelease(image_ref);
-			image_ref = NULL;
-		}
-		
-		if (context_ref)
-		{
-			CGContextRelease(context_ref);
-			context_ref = NULL;
-		}
-	}
+        RenderCGImage(CGFrame(image_size));
+
+        CGContextRelease(context_ref);
+        context_ref = NULL;
+
+        CGImageRelease(image_ref);
+        image_ref = NULL;
+
+        file.Reset();
+
+        return true;
+    }
+
+    void Reset()
+    {
+        if (buffer)
+        {
+            buffer->Release();
+            buffer = NULL;
+        }
+
+        if (image_ref)
+        {
+            CGImageRelease(image_ref);
+            image_ref = NULL;
+        }
+
+        if (context_ref)
+        {
+            CGContextRelease(context_ref);
+            context_ref = NULL;
+        }
+    }
 };
\ No newline at end of file
diff --git a/src/celengine/asterism.cpp b/src/celengine/asterism.cpp
index 79ee3b9dc..42de1d1f3 100644
--- a/src/celengine/asterism.cpp
+++ b/src/celengine/asterism.cpp
@@ -69,7 +69,7 @@ bool Asterism::getActive() const
  */
 void Asterism::setActive(bool _active)
 {
-	active = _active;
+    active = _active;
 }
 
 
@@ -106,7 +106,7 @@ void Asterism::unsetOverrideColor()
  *  if it should be drawn in the default color.
  */
 bool Asterism::isColorOverridden() const
-{ 
+{
     return useOverrideColor;
 }
 
diff --git a/src/celengine/asterism.h b/src/celengine/asterism.h
index fe1739f8c..1bb55fdb2 100644
--- a/src/celengine/asterism.h
+++ b/src/celengine/asterism.h
@@ -1,7 +1,7 @@
 // asterism.h
 //
 // Copyright (C) 2001-2008, the Celestia Development Team
-// Original version by Chris Laurel <claurel@gmail.com> 
+// Original version by Chris Laurel <claurel@gmail.com>
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License
@@ -28,13 +28,13 @@ class Asterism
     int getChainCount() const;
     const Chain& getChain(int) const;
 
-	bool getActive() const;
-	void setActive(bool _active);
+    bool getActive() const;
+    void setActive(bool _active);
 
     Color getOverrideColor() const;
-	void setOverrideColor(Color c);
-	void unsetOverrideColor();
-	bool isColorOverridden() const;
+    void setOverrideColor(Color c);
+    void unsetOverrideColor();
+    bool isColorOverridden() const;
 
     void addChain(Chain&);
 
@@ -43,8 +43,8 @@ class Asterism
     std::string i18nName;
     std::vector<Chain*> chains;
 
-	bool active;
-	bool useOverrideColor;
+    bool active;
+    bool useOverrideColor;
     Color color;
 };
 
diff --git a/src/celengine/astro.cpp b/src/celengine/astro.cpp
index 78a435f91..50c3da6a4 100644
--- a/src/celengine/astro.cpp
+++ b/src/celengine/astro.cpp
@@ -66,7 +66,7 @@ static const Quaterniond EQUATORIAL_TO_GALACTIC_ROTATION =
     XRotation(degToRad(GALACTIC_INCLINATION)) *
     ZRotation(degToRad(-GALACTIC_LONGITUDE_AT_NODE));
 static const Matrix3d EQUATORIAL_TO_GALACTIC_MATRIX = EQUATORIAL_TO_GALACTIC_ROTATION.toRotationMatrix();
-    
+
 // epoch B1950: 22:09 UT on 21 Dec 1949
 #define B1950         2433282.423
 
@@ -395,7 +395,7 @@ void astro::anomaly(double meanAnomaly, double eccentricity,
 {
     double e, delta, err;
     double tol = 0.00000001745;
-    int iterations = 20;	// limit while() to maximum of 20 iterations.
+    int iterations = 20;    // limit while() to maximum of 20 iterations.
 
     e = meanAnomaly - 2*PI * (int) (meanAnomaly / (2*PI));
     err = 1;
@@ -573,8 +573,8 @@ const char* astro::Date::toCStr(Format format) const
     {
     case Locale:
     case TZName:
-        snprintf(date, sizeof(date), "%04d %s %02d %02d:%02d:%02d %s", 
-                 year, _(MonthAbbrList[month-1]), day, 
+        snprintf(date, sizeof(date), "%04d %s %02d %02d:%02d:%02d %s",
+                 year, _(MonthAbbrList[month-1]), day,
                  hour, minute, (int)seconds, tzname.c_str());
         break;
     case UTCOffset:
@@ -582,8 +582,8 @@ const char* astro::Date::toCStr(Format format) const
             int sign = utc_offset < 0 ? -1:1;
             int h_offset = sign * utc_offset / 3600;
             int m_offset = (sign * utc_offset - h_offset * 3600) / 60;
-            snprintf(date, sizeof(date), "%04d %s %02d %02d:%02d:%02d %c%02d%02d", 
-                    year, _(MonthAbbrList[month-1]), day, 
+            snprintf(date, sizeof(date), "%04d %s %02d %02d:%02d:%02d %c%02d%02d",
+                    year, _(MonthAbbrList[month-1]), day,
                     hour, minute, (int)seconds, (sign==1?'+':'-'), h_offset, m_offset);
         }
         break;
@@ -678,7 +678,7 @@ astro::Date::systemDate()
     d.hour = gmt->tm_hour;
     d.minute = gmt->tm_min;
     d.seconds = (int) gmt->tm_sec;
-    
+
     return d;
 }
 
@@ -845,7 +845,7 @@ astro::TDBtoLocal(double tdb)
                     hourdiff = -24;
                 else
                     hourdiff = 24;
-                d.utc_offset = (hourdiff + d.hour - utcDate.hour) * 3600 
+                d.utc_offset = (hourdiff + d.hour - utcDate.hour) * 3600
                              + (d.minute - utcDate.minute) * 60;
             }
             d.tzname = localt->tm_isdst ? _("DST"): _("STD");
@@ -920,7 +920,7 @@ bool astro::getLengthScale(string unitName, double& scale)
             break;
         }
     }
-    
+
     return foundMatch;
 }
 
@@ -939,7 +939,7 @@ bool astro::getTimeScale(string unitName, double& scale)
             break;
         }
     }
-    
+
     return foundMatch;
 }
 
@@ -958,7 +958,7 @@ bool astro::getAngleScale(string unitName, double& scale)
             break;
         }
     }
-    
+
     return foundMatch;
 }
 
diff --git a/src/celengine/astro.h b/src/celengine/astro.h
index c5e947f5e..8aa1aace1 100644
--- a/src/celengine/astro.h
+++ b/src/celengine/astro.h
@@ -67,7 +67,7 @@ namespace astro
         const char* toCStr(Format format = Locale) const;
 
         operator double() const;
-        
+
         static Date systemDate();
 
 
@@ -171,7 +171,7 @@ namespace astro
 
     double secondsToJulianDate(double);
     double julianDateToSeconds(double);
-    
+
     bool isLengthUnit(string unitName);
     bool isTimeUnit(string unitName);
     bool isAngleUnit(string unitName);
diff --git a/src/celengine/atmosphere.h b/src/celengine/atmosphere.h
index bc734a6c5..fc8f7024c 100644
--- a/src/celengine/atmosphere.h
+++ b/src/celengine/atmosphere.h
@@ -45,12 +45,12 @@ class Atmosphere
     Color upperColor;
     Color skyColor;
     Color sunsetColor;
-        
+
     float cloudHeight;
     float cloudSpeed;
     MultiResTexture cloudTexture;
     MultiResTexture cloudNormalMap;
-    
+
     float mieCoeff;
     float mieScaleHeight;
     float miePhaseAsymmetry;
diff --git a/src/celengine/axisarrow.cpp b/src/celengine/axisarrow.cpp
index c112be546..831d1bf4b 100644
--- a/src/celengine/axisarrow.cpp
+++ b/src/celengine/axisarrow.cpp
@@ -32,11 +32,11 @@ static void RenderArrow(float shaftLength,
 {
     float sintab[MaxArrowSections];
     float costab[MaxArrowSections];
-	
+
     unsigned int i;
 
     nSections = min(MaxArrowSections, nSections);
-	
+
     // Initialize the trig tables
     for (i = 0; i < nSections; i++)
     {
@@ -44,7 +44,7 @@ static void RenderArrow(float shaftLength,
         sintab[i] = (float) sin(theta);
         costab[i] = (float) cos(theta);
     }
-	
+
     // Render the circle at the botton of the arrow shaft
     glBegin(GL_TRIANGLE_FAN);
     glVertex3f(0.0f, 0.0f, 0.0f);
@@ -54,7 +54,7 @@ static void RenderArrow(float shaftLength,
         glVertex3f(shaftRadius * costab[n], shaftRadius * sintab[n], 0.0f);
     }
     glEnd();
-	
+
     // Render the arrow shaft
     glBegin(GL_QUAD_STRIP);
     for (i = 0; i <= nSections; i++)
@@ -64,17 +64,17 @@ static void RenderArrow(float shaftLength,
         glVertex3f(shaftRadius * costab[n], shaftRadius * sintab[n], 0.0f);
     }
     glEnd();
-	
+
     // Render the annulus
     glBegin(GL_QUAD_STRIP);
     for (i = 0; i <= nSections; i++)
     {
         unsigned int n = i % nSections;
-        glVertex3f(headRadius * costab[n],  headRadius * sintab[n], shaftLength);		
+        glVertex3f(headRadius * costab[n],  headRadius * sintab[n], shaftLength);
         glVertex3f(shaftRadius * costab[n], shaftRadius * sintab[n], shaftLength);
     }
     glEnd();
-	
+
     // Render the head of the arrow
     glBegin(GL_TRIANGLE_FAN);
     glVertex3f(0.0f, 0.0f, shaftLength + headLength);
@@ -201,7 +201,7 @@ ArrowReferenceMark::render(Renderer* /* renderer */,
     float shaftRadius = 0.010f;
     float headRadius = 0.025f;
     unsigned int nSections = 30;
-	
+
     glColor4f(color.red(), color.green(), color.blue(), opacity);
     RenderArrow(shaftLength, headLength, shaftRadius, headRadius, nSections);
 
@@ -278,13 +278,13 @@ AxesReferenceMark::render(Renderer* /* renderer */,
     glPushMatrix();
     glRotate(q.cast<float>());
     glScalef(size, size, size);
-	
+
     glDisable(GL_LIGHTING);
 
 #if 0
     // Simple line axes
     glBegin(GL_LINES);
-	
+
     glColor4f(1.0f, 0.0f, 0.0f, 1.0f);
     glVertex3f(0.0f, 0.0f, 0.0f);
     glVertex3f(-1.0f, 0.0f, 0.0f);
@@ -296,7 +296,7 @@ AxesReferenceMark::render(Renderer* /* renderer */,
     glColor4f(0.0f, 0.0f, 1.0f, 1.0f);
     glVertex3f(0.0f, 0.0f, 0.0f);
     glVertex3f(0.0f, 1.0f, 0.0f);
-	
+
     glEnd();
 #endif
 
@@ -306,7 +306,7 @@ AxesReferenceMark::render(Renderer* /* renderer */,
     float headRadius = 0.025f;
     unsigned int nSections = 30;
     float labelScale = 0.1f;
-	
+
     // x-axis
     glPushMatrix();
     glRotatef(90.0f, 0.0f, 1.0f, 0.0f);
@@ -336,7 +336,7 @@ AxesReferenceMark::render(Renderer* /* renderer */,
     glScalef(labelScale, labelScale, labelScale);
     RenderZ();
     glPopMatrix();
-	
+
     glPopMatrix();
 
     glDisable(GL_DEPTH_TEST);
diff --git a/src/celengine/body.cpp b/src/celengine/body.cpp
index a6747df77..63d20bf1c 100644
--- a/src/celengine/body.cpp
+++ b/src/celengine/body.cpp
@@ -116,7 +116,7 @@ void Body::setDefaultProperties()
  */
 const vector<string>& Body::getNames() const
 {
-    return names; 
+    return names;
 }
 
 
@@ -125,7 +125,7 @@ const vector<string>& Body::getNames() const
  */
 string Body::getName(bool i18n) const
 {
-    if (!i18n) 
+    if (!i18n)
         return names[0];
     else
         return names[localizedNameIndex];
@@ -511,13 +511,13 @@ Vector3d Body::getVelocity(double tdb) const
     Vector3d v = phase->orbit()->velocityAtTime(tdb);
     v = orbitFrame->getOrientation(tdb).conjugate() * v + orbitFrame->getCenter().getVelocity(tdb);
 
-	if (!orbitFrame->isInertial())
-	{
+    if (!orbitFrame->isInertial())
+    {
         Vector3d r = Selection(const_cast<Body*>(this)).getPosition(tdb).offsetFromKm(orbitFrame->getCenter().getPosition(tdb));
         v += orbitFrame->getAngularVelocity(tdb).cross(r);
     }
 
-	return v;
+    return v;
 }
 
 
@@ -531,10 +531,10 @@ Vector3d Body::getAngularVelocity(double tdb) const
 
     ReferenceFrame* bodyFrame = phase->bodyFrame();
     v = bodyFrame->getOrientation(tdb).conjugate() * v;
-	if (!bodyFrame->isInertial())
-	{
+    if (!bodyFrame->isInertial())
+    {
         v += bodyFrame->getAngularVelocity(tdb);
-	}
+    }
 
     return v;
 }
@@ -573,7 +573,7 @@ Quaterniond Body::getEclipticToFrame(double tdb) const
 }
 
 
-/*! Get a rotation that converts from the ecliptic frame to the body's 
+/*! Get a rotation that converts from the ecliptic frame to the body's
  *  mean equatorial frame.
  */
 Quaterniond Body::getEclipticToEquatorial(double tdb) const
@@ -609,7 +609,7 @@ Quaterniond Body::getEquatorialToBodyFixed(double tdb) const
 Matrix4d Body::getBodyFixedToAstrocentric(double tdb) const
 {
     //return getEquatorialToBodyFixed(tdb).toMatrix4() * getLocalToAstrocentric(tdb);
-	Matrix4d m = Eigen::Transform<double, 3, Affine>(getEquatorialToBodyFixed(tdb)).matrix();
+    Matrix4d m = Eigen::Transform<double, 3, Affine>(getEquatorialToBodyFixed(tdb)).matrix();
     return m * getLocalToAstrocentric(tdb);
 }
 
@@ -693,7 +693,7 @@ float Body::getLuminosity(float sunLuminosity,
     double incidentEnergy = satIrradiance * circleArea(radius * 1000);
 
     double reflectedEnergy = incidentEnergy * albedo;
-    
+
     // Compute the luminosity (i.e. power relative to solar power)
     return (float) (reflectedEnergy / astro::SOLAR_POWER);
 }
@@ -884,7 +884,7 @@ Location* Body::findLocation(const string& name, bool i18n) const
 
 // Compute the positions of locations on an irregular object using ray-mesh
 // intersections.  This is not automatically done when a location is added
-// because it would force the loading of all meshes for objects with 
+// because it would force the loading of all meshes for objects with
 // defined locations; on-demand (i.e. when the object becomes visible to
 // a user) loading of meshes is preferred.
 void Body::computeLocations()
@@ -1129,7 +1129,7 @@ PlanetarySystem::~PlanetarySystem()
 void PlanetarySystem::addAlias(Body* body, const string& alias)
 {
     assert(body->getSystem() == this);
-    
+
     objectIndex.insert(make_pair(alias, body));
 }
 
@@ -1141,7 +1141,7 @@ void PlanetarySystem::addAlias(Body* body, const string& alias)
 void PlanetarySystem::removeAlias(const Body* body, const string& alias)
 {
     assert(body->getSystem() == this);
-    
+
     ObjectIndex::iterator iter = objectIndex.find(alias);
     if (iter != objectIndex.end())
     {
@@ -1173,13 +1173,13 @@ void PlanetarySystem::addBodyToNameIndex(Body* body)
 void PlanetarySystem::removeBodyFromNameIndex(const Body* body)
 {
     assert(body->getSystem() == this);
-    
+
     // Erase the object from the object indices
     const vector<string>& names = body->getNames();
     for (vector<string>::const_iterator iter = names.begin(); iter != names.end(); iter++)
     {
         removeAlias(body, *iter);
-    } 
+    }
 }
 
 
@@ -1194,7 +1194,7 @@ void PlanetarySystem::removeBody(Body* body)
             break;
         }
     }
-    
+
     removeBodyFromNameIndex(body);
 }
 
@@ -1217,7 +1217,7 @@ void PlanetarySystem::replaceBody(Body* oldBody, Body* newBody)
 
 
 /*! Find a body with the specified name within a planetary system.
- * 
+ *
  *  deepSearch: if true, recursively search the systems of child objects
  *  i18n: if true, allow matching of localized body names. When responding
  *    to a user query, this flag should be true. In other cases--such
@@ -1230,7 +1230,7 @@ Body* PlanetarySystem::find(const string& _name, bool deepSearch, bool i18n) con
     if (firstMatch != objectIndex.end())
     {
         Body* matchedBody = firstMatch->second;
-        
+
         if (i18n)
         {
             return matchedBody;
@@ -1293,13 +1293,13 @@ std::vector<std::string> PlanetarySystem::getCompletion(const std::string& _name
          iter != objectIndex.end(); iter++)
     {
         const string& alias = iter->first;
-        
+
         if (UTF8StringCompare(alias, _name, _name_length) == 0)
         {
             completion.push_back(alias);
         }
     }
-    
+
     // Scan child objects
     if (deepSearch)
     {
@@ -1313,7 +1313,7 @@ std::vector<std::string> PlanetarySystem::getCompletion(const std::string& _name
             }
         }
     }
-    
+
     return completion;
 }
 
diff --git a/src/celengine/body.h b/src/celengine/body.h
index a3fc33249..9b9dc36fb 100644
--- a/src/celengine/body.h
+++ b/src/celengine/body.h
@@ -41,7 +41,7 @@ class PlanetarySystem
     Body* getPrimaryBody() const { return primary; };
     int getSystemSize() const { return satellites.size(); };
     Body* getBody(int i) const { return satellites[i]; };
-    
+
     void addAlias(Body* body, const std::string& alias);
     void removeAlias(const Body* body, const std::string& alias);
     void addBody(Body* body);
@@ -65,7 +65,7 @@ class PlanetarySystem
  private:
     void addBodyToNameIndex(Body* body);
     void removeBodyFromNameIndex(const Body* body);
-    
+
  private:
     typedef std::map<std::string, Body*, UTF8StringOrderingPredicate> ObjectIndex;
 
@@ -77,7 +77,7 @@ class PlanetarySystem
 };
 
 
-class RingSystem 
+class RingSystem
 {
  public:
     float innerRadius;
@@ -201,7 +201,7 @@ class Body
     const Orbit* getOrbit(double tdb) const;
     const ReferenceFrame* getBodyFrame(double tdb) const;
     const RotationModel* getRotationModel(double tdb) const;
- 
+
     // Size methods
     void setSemiAxes(const Eigen::Vector3f&);
     Eigen::Vector3f getSemiAxes() const;
@@ -321,7 +321,7 @@ class Body
         SunDirection   =   0x08,
         VelocityVector =   0x10,
     };
-	
+
     bool referenceMarkVisible(uint32) const;
     uint32 getVisibleReferenceMarks() const;
     void setVisibleReferenceMarks(uint32);
diff --git a/src/celengine/cmdparser.cpp b/src/celengine/cmdparser.cpp
index b9c0f7d37..97899aad4 100644
--- a/src/celengine/cmdparser.cpp
+++ b/src/celengine/cmdparser.cpp
@@ -121,8 +121,8 @@ void CommandParser::error(const string errMsg)
 
 static ObserverFrame::CoordinateSystem parseCoordinateSystem(const string& name)
 {
-	// 'geographic' is a deprecated name for the bodyfixed coordinate system,
-	// maintained here for compatibility with older scripts.
+    // 'geographic' is a deprecated name for the bodyfixed coordinate system,
+    // maintained here for compatibility with older scripts.
     if (compareIgnoringCase(name, "observer") == 0)
         return ObserverFrame::ObserverLocal;
     else if (compareIgnoringCase(name, "bodyfixed") == 0)
@@ -558,31 +558,31 @@ Command* CommandParser::parseCommand()
 
         cmd = new CommandOrbitFlags(setFlags, clearFlags);
     }
-	else if (commandName == "constellations")
+    else if (commandName == "constellations")
     {
         string s;
-		CommandConstellations *cmdcons= new CommandConstellations();
-		
+        CommandConstellations *cmdcons= new CommandConstellations();
+
         if (paramList->getString("set", s))
             parseConstellations(cmdcons, s, 1);
         if (paramList->getString("clear", s))
-            parseConstellations(cmdcons, s, 0);   
-		cmd = cmdcons;
+            parseConstellations(cmdcons, s, 0);
+        cmd = cmdcons;
     }
 
-	else if (commandName == "constellationcolor")
+    else if (commandName == "constellationcolor")
     {
         string s;
-		CommandConstellationColor *cmdconcol= new CommandConstellationColor();
-		
-		Vec3d colorv(1.0f, 0.0f, 0.0f);
+        CommandConstellationColor *cmdconcol= new CommandConstellationColor();
+
+        Vec3d colorv(1.0f, 0.0f, 0.0f);
         paramList->getVector("color", colorv);
 
         if (paramList->getString("set", s))
             parseConstellationColor(cmdconcol, s, &colorv, 1);
         if (paramList->getString("clear", s))
-            parseConstellationColor(cmdconcol, s, &colorv, 0);   
-		cmd = cmdconcol;
+            parseConstellationColor(cmdconcol, s, &colorv, 0);
+        cmd = cmdconcol;
     }
     else if (commandName == "setvisibilitylimit")
     {
@@ -668,12 +668,12 @@ Command* CommandParser::parseCommand()
             else if (compareIgnoringCase(symbolString, "disk") == 0)
                 rep = MarkerRepresentation(MarkerRepresentation::Disk);
         }
-        
+
         string label;
         paramList->getString("label", label);
         rep.setSize((float) size);
         rep.setColor(color);
-        rep.setLabel(label);        
+        rep.setLabel(label);
 
         bool occludable = true;
         paramList->getBoolean("occludable", occludable);
@@ -784,7 +784,7 @@ Command* CommandParser::parseCommand()
         float alpha;
         string filename;
         int fitscreen;
-        
+
         if(!paramList->getNumber("duration", duration))
             duration = 3;
         if(!paramList->getNumber("xoffset", xoffset))
@@ -804,7 +804,7 @@ Command* CommandParser::parseCommand()
     else if (commandName == "verbosity")
     {
         int level;
-        
+
         if(!paramList->getNumber("level", level))
             level = 2;
 
@@ -923,12 +923,12 @@ int parseConstellations(CommandConstellations* cmd, string s, int act)
         if (ttype == Tokenizer::TokenName)
         {
             string name = tokenizer.getNameValue();
-			if (compareIgnoringCase(name, "all") == 0 && act==1)
-				cmd->all=1;
-			else if (compareIgnoringCase(name, "all") == 0 && act==0)
-				cmd->none=1;
-			else 
-				cmd->setValues(name,act);
+            if (compareIgnoringCase(name, "all") == 0 && act==1)
+                cmd->all=1;
+            else if (compareIgnoringCase(name, "all") == 0 && act==0)
+                cmd->none=1;
+            else
+                cmd->setValues(name,act);
 
             ttype = tokenizer.nextToken();
             if (ttype == Tokenizer::TokenBar)
@@ -951,10 +951,10 @@ int parseConstellationColor(CommandConstellationColor* cmd, string s, Vec3d *col
     Tokenizer tokenizer(&in);
     int flags = 0;
 
-	if(!act)
-		cmd->unsetColor();
-	else
-		cmd->setColor((float)col->x, (float)col->y, (float)col->z);
+    if(!act)
+        cmd->unsetColor();
+    else
+        cmd->setColor((float)col->x, (float)col->y, (float)col->z);
 
     Tokenizer::TokenType ttype = tokenizer.nextToken();
     while (ttype != Tokenizer::TokenEnd)
@@ -962,13 +962,13 @@ int parseConstellationColor(CommandConstellationColor* cmd, string s, Vec3d *col
         if (ttype == Tokenizer::TokenName)
         {
             string name = tokenizer.getNameValue();
-			if (compareIgnoringCase(name, "all") == 0 && act==1)
-				cmd->all=1;
-			else if (compareIgnoringCase(name, "all") == 0 && act==0)
-				cmd->none=1;
-			else 
-				cmd->setConstellations(name);
-				
+            if (compareIgnoringCase(name, "all") == 0 && act==1)
+                cmd->all=1;
+            else if (compareIgnoringCase(name, "all") == 0 && act==0)
+                cmd->none=1;
+            else
+                cmd->setConstellations(name);
+
             ttype = tokenizer.nextToken();
             if (ttype == Tokenizer::TokenBar)
                 ttype = tokenizer.nextToken();
diff --git a/src/celengine/command.cpp b/src/celengine/command.cpp
index 1a6aeee64..7d2e855f9 100644
--- a/src/celengine/command.cpp
+++ b/src/celengine/command.cpp
@@ -632,7 +632,7 @@ void CommandMark::process(ExecutionEnvironment& env)
 
     if (env.getSimulation()->getUniverse() != NULL)
     {
-        
+
         env.getSimulation()->getUniverse()->markObject(sel, rep, 1, occludable);
     }
 }
@@ -867,7 +867,7 @@ void CommandSetRadius::process(ExecutionEnvironment& env)
         {
             body->setSemiAxes(body->getSemiAxes() * ((float) radius / iradius));
         }
-        
+
         if (body->getRings() != NULL)
         {
             RingSystem rings(0.0f, 0.0f);
@@ -1017,7 +1017,7 @@ void CommandScriptImage::process(ExecutionEnvironment& env)
 }
 
 // Verbosity command
-CommandVerbosity::CommandVerbosity(int _level) : 
+CommandVerbosity::CommandVerbosity(int _level) :
     level(_level)
 {
 }
@@ -1033,9 +1033,9 @@ void CommandVerbosity::process(ExecutionEnvironment& env)
 //====================================================
 CommandConstellations::CommandConstellations()
 {
-	numConstellations = 0;
-	all = 0;
-	none = 0;
+    numConstellations = 0;
+    all = 0;
+    none = 0;
 }
 
 void CommandConstellations::process(ExecutionEnvironment& env)
@@ -1043,72 +1043,72 @@ void CommandConstellations::process(ExecutionEnvironment& env)
     Universe* u = env.getSimulation()->getUniverse();
     if (u != NULL)
     {
-		AsterismList* asterisms = u->getAsterisms();
+        AsterismList* asterisms = u->getAsterisms();
         for (AsterismList::const_iterator iter = asterisms->begin();
              iter != asterisms->end(); iter++)
         {
-			Asterism* ast = *iter;
-			if (none) 
+            Asterism* ast = *iter;
+            if (none)
             {
-				ast->setActive(0);
+                ast->setActive(0);
             }
-			else if (all) 
+            else if (all)
             {
-				ast->setActive(1);
+                ast->setActive(1);
             }
-			else
+            else
             {
-				for (int i = 0; i < numConstellations; i++)
+                for (int i = 0; i < numConstellations; i++)
                 {
-					if (compareIgnoringCase(constellation[i],ast->getName(false)) == 0)
+                    if (compareIgnoringCase(constellation[i],ast->getName(false)) == 0)
                     {
-						ast->setActive(active[i] != 0);
-						break;
-					}
+                        ast->setActive(active[i] != 0);
+                        break;
+                    }
                 }
-			}
+            }
         }
     }
 }
 
 void CommandConstellations::setValues(string cons, int act)
 {
-	int found = 0;
-	for (unsigned int j = 0; j < cons.size(); j++)
+    int found = 0;
+    for (unsigned int j = 0; j < cons.size(); j++)
     {
-		if(cons[j] == '_')
-			cons[j] = ' ';
+        if(cons[j] == '_')
+            cons[j] = ' ';
     }
-	
-	// ignore all above 99 constellations
-	if (numConstellations == MAX_CONSTELLATIONS)
-		return;
 
-	for (int i = 0; i < numConstellations; i++)
+    // ignore all above 99 constellations
+    if (numConstellations == MAX_CONSTELLATIONS)
+        return;
+
+    for (int i = 0; i < numConstellations; i++)
     {
-		if (compareIgnoringCase(constellation[i], cons) == 0 )
+        if (compareIgnoringCase(constellation[i], cons) == 0 )
         {
-			active[i]=act;
-			found=1;
-			break;
-		}
-	}
+            active[i]=act;
+            found=1;
+            break;
+        }
+    }
 
-	if (!found)
+    if (!found)
     {
-		constellation[numConstellations]=cons;
-		active[numConstellations]=act;
-		numConstellations++;
-	}
+        constellation[numConstellations]=cons;
+        active[numConstellations]=act;
+        numConstellations++;
+    }
 }
 
 
 CommandConstellationColor::CommandConstellationColor()
 {
-	numConstellations=0;
-	all=0;
-	none=0;
-	unset=0;
+    numConstellations=0;
+    all=0;
+    none=0;
+    unset=0;
 }
 
 
@@ -1117,33 +1117,33 @@ void CommandConstellationColor::process(ExecutionEnvironment& env)
     Universe* u = env.getSimulation()->getUniverse();
     if (u != NULL)
     {
-		AsterismList* asterisms = u->getAsterisms();
+        AsterismList* asterisms = u->getAsterisms();
         for (AsterismList::const_iterator iter = asterisms->begin();
              iter != asterisms->end(); iter++)
         {
-			Asterism* ast = *iter;
-			if (none) 
+            Asterism* ast = *iter;
+            if (none)
             {
-				ast->unsetOverrideColor();
+                ast->unsetOverrideColor();
             }
-			else if (all) 
+            else if (all)
             {
-				ast->setOverrideColor(rgb);
+                ast->setOverrideColor(rgb);
             }
-			else
+            else
             {
-				for(int i = 0; i < numConstellations; i++)
+                for(int i = 0; i < numConstellations; i++)
                 {
-					if (compareIgnoringCase(constellation[i],ast->getName(false)) ==0 )
+                    if (compareIgnoringCase(constellation[i],ast->getName(false)) ==0 )
                     {
-						if(unset)
-							ast->unsetOverrideColor();
-						else
-							ast->setOverrideColor(rgb);
-						break;
-					}
+                        if(unset)
+                            ast->unsetOverrideColor();
+                        else
+                            ast->setOverrideColor(rgb);
+                        break;
+                    }
                 }
-			}
+            }
         }
     }
 }
@@ -1152,41 +1152,41 @@ void CommandConstellationColor::process(ExecutionEnvironment& env)
 void CommandConstellationColor::setColor(float r, float g, float b)
 {
     rgb = Color(r, g, b);
-	unset = 0;
+    unset = 0;
 }
 
 
 void CommandConstellationColor::unsetColor()
 {
-	unset = 1;
+    unset = 1;
 }
 
 
 void CommandConstellationColor::setConstellations(string cons)
 {
-	int found=0;
-	for (unsigned int j = 0; j < cons.size(); j++)
+    int found=0;
+    for (unsigned int j = 0; j < cons.size(); j++)
     {
-		if (cons[j] == '_')
-			cons[j] = ' ';
+        if (cons[j] == '_')
+            cons[j] = ' ';
     }
-	
-	// ignore all above 99 constellations
-	if (numConstellations == MAX_CONSTELLATIONS)
-		return;
 
-	for (int i=0; i<numConstellations; i++)
+    // ignore all above 99 constellations
+    if (numConstellations == MAX_CONSTELLATIONS)
+        return;
+
+    for (int i=0; i<numConstellations; i++)
     {
-		if (compareIgnoringCase(constellation[i], cons) == 0)
+        if (compareIgnoringCase(constellation[i], cons) == 0)
         {
-			found=1;
-			break;
-		}
-	}
+            found=1;
+            break;
+        }
+    }
 
-	if (!found)
+    if (!found)
     {
-		constellation[numConstellations]=cons;
-		numConstellations++;
-	}
+        constellation[numConstellations]=cons;
+        numConstellations++;
+    }
 }
diff --git a/src/celengine/command.h b/src/celengine/command.h
index 0f69688ba..f9696bff9 100644
--- a/src/celengine/command.h
+++ b/src/celengine/command.h
@@ -395,11 +395,11 @@ class CommandConstellations : public InstantaneousCommand
  public:
     CommandConstellations();
     void process(ExecutionEnvironment&);
-	void setValues(string cons, int act);
+    void setValues(string cons, int act);
     std::string constellation[MAX_CONSTELLATIONS];
-	int active[MAX_CONSTELLATIONS];
+    int active[MAX_CONSTELLATIONS];
     int numConstellations;
-	int all;
+    int all;
     int none;
 };
 
@@ -409,14 +409,14 @@ class CommandConstellationColor : public InstantaneousCommand
  public:
     CommandConstellationColor();
     void process(ExecutionEnvironment&);
-	void setConstellations(string cons);
-	void setColor(float r, float g, float b);
-	void unsetColor();
+    void setConstellations(string cons);
+    void setColor(float r, float g, float b);
+    void unsetColor();
     std::string constellation[MAX_CONSTELLATIONS];
-	Color rgb;
-	int unset;
+    Color rgb;
+    int unset;
     int numConstellations;
-	int all;
+    int all;
     int none;
 };
 
diff --git a/src/celengine/console.cpp b/src/celengine/console.cpp
index 28d4a46c3..3b2e484f4 100644
--- a/src/celengine/console.cpp
+++ b/src/celengine/console.cpp
@@ -207,7 +207,7 @@ void Console::printf(const char* format, ...)
     char buf[1024];
     vsprintf(buf, format, args);
     print(buf);
-    
+
     va_end(args);
 }
 #endif
diff --git a/src/celengine/console.h b/src/celengine/console.h
index 37c911050..8fb3b71fe 100644
--- a/src/celengine/console.h
+++ b/src/celengine/console.h
@@ -61,7 +61,7 @@ class Console : public std::ostream
     void newline();
 #if 0
     void printf(const char*, ...);
-#endif    
+#endif
 
     int getRow() const;
     int getColumn() const;
diff --git a/src/celengine/constellation.cpp b/src/celengine/constellation.cpp
index 1db20921d..e1b5b9a4f 100644
--- a/src/celengine/constellation.cpp
+++ b/src/celengine/constellation.cpp
@@ -125,19 +125,19 @@ Constellation::Constellation(const char *_name, const char *_genitive, const cha
 Constellation* Constellation::getConstellation(unsigned int n)
 {
     if (constellations == NULL)
-	initialize();
+        initialize();
 
     if (constellations == NULL ||
-	n >= sizeof(constellationInfo) / sizeof(constellationInfo[0]))
-	return NULL;
+        n >= sizeof(constellationInfo) / sizeof(constellationInfo[0]))
+        return NULL;
     else
-	return constellations[n];
+        return constellations[n];
 }
 
 Constellation* Constellation::getConstellation(const string& name)
 {
     if (constellations == NULL)
-	initialize();
+    initialize();
 
     for (unsigned int i = 0;
          i < sizeof(constellationInfo) / sizeof(constellationInfo[0]);
@@ -176,11 +176,11 @@ void Constellation::initialize()
 
     if (constellations != NULL)
     {
-	for (int i = 0; i < nConstellations; i++)
+        for (int i = 0; i < nConstellations; i++)
         {
-	    constellations[i] = new Constellation(constellationInfo[i].name,
-						  constellationInfo[i].gen,
-						  constellationInfo[i].abbr);
-	}
+            constellations[i] = new Constellation(constellationInfo[i].name,
+                                                  constellationInfo[i].gen,
+                                                  constellationInfo[i].abbr);
+        }
     }
 }
diff --git a/src/celengine/dds.cpp b/src/celengine/dds.cpp
index 8087f2734..704956608 100644
--- a/src/celengine/dds.cpp
+++ b/src/celengine/dds.cpp
@@ -65,7 +65,7 @@ struct DDSurfaceDesc
 
     DDPixelFormat format;
     DDSCaps caps;
-    
+
     uint32 textureStage;
 };
 
diff --git a/src/celengine/deepskyobj.cpp b/src/celengine/deepskyobj.cpp
index de298b2c1..f42c8da97 100644
--- a/src/celengine/deepskyobj.cpp
+++ b/src/celengine/deepskyobj.cpp
@@ -123,59 +123,59 @@ bool DeepSkyObject::pick(const Ray3d& ray,
 
 void DeepSkyObject::hsv2rgb( float *r, float *g, float *b, float h, float s, float v )
 {
-	// r,g,b values are from 0 to 1
-	// h = [0,360], s = [0,1], v = [0,1]
+    // r,g,b values are from 0 to 1
+    // h = [0,360], s = [0,1], v = [0,1]
 
-	int i;
-	float f, p, q, t;
+    int i;
+    float f, p, q, t;
 
-	if( s == 0 ) 
-	{
-		// achromatic (grey)
-		*r = *g = *b = v;
-		return;
-	}
+    if( s == 0 )
+    {
+        // achromatic (grey)
+        *r = *g = *b = v;
+        return;
+    }
 
-	h /= 60;                      // sector 0 to 5
-	i = (int) floorf( h );
-	f = h - (float) i;            // factorial part of h
-	p = v * ( 1 - s );
-	q = v * ( 1 - s * f );
-	t = v * ( 1 - s * ( 1 - f ) );
+    h /= 60;                      // sector 0 to 5
+    i = (int) floorf( h );
+    f = h - (float) i;            // factorial part of h
+    p = v * ( 1 - s );
+    q = v * ( 1 - s * f );
+    t = v * ( 1 - s * ( 1 - f ) );
 
-	switch( i ) 
-	{
-	case 0:
-		*r = v;
-		*g = t;
-		*b = p;
-		break;
-	case 1:
-		*r = q;
-		*g = v;
-		*b = p;
-		break;
-	case 2:
-		*r = p;
-		*g = v;
-		*b = t;
-		break;
-	case 3:
-		*r = p;
-		*g = q;
-		*b = v;
-		break;
-	case 4:
-		*r = t;
-		*g = p;
-		*b = v;
-		break;
-	default:
-		*r = v;
-		*g = p;
-		*b = q;
-		break;
-	}
+    switch( i )
+    {
+    case 0:
+        *r = v;
+        *g = t;
+        *b = p;
+        break;
+    case 1:
+        *r = q;
+        *g = v;
+        *b = p;
+        break;
+    case 2:
+        *r = p;
+        *g = v;
+        *b = t;
+        break;
+    case 3:
+        *r = p;
+        *g = q;
+        *b = v;
+        break;
+    case 4:
+        *r = t;
+        *g = p;
+        *b = v;
+        break;
+    default:
+        *r = v;
+        *g = p;
+        *b = q;
+        break;
+    }
 }
 
 bool DeepSkyObject::load(AssociativeArray* params, const string& resPath)
@@ -194,7 +194,7 @@ bool DeepSkyObject::load(AssociativeArray* params, const string& resPath)
         params->getLength("Distance", distance, KM_PER_LY);
         params->getAngle("RA", RA, DEG_PER_HRA);
         params->getAngle("Dec", dec);
-        
+
         Vector3d p = astro::equatorialToCelestialCart(RA, dec, distance);
         setPosition(p);
     }
@@ -237,18 +237,18 @@ bool DeepSkyObject::load(AssociativeArray* params, const string& resPath)
         }
         setInfoURL(infoURL);
     }
-    
+
     bool visible = true;
     if (params->getBoolean("Visible", visible))
     {
         setVisible(visible);
     }
-    
+
     bool clickable = true;
     if (params->getBoolean("Clickable", clickable))
     {
         setClickable(clickable);
     }
-    
+
     return true;
 }
diff --git a/src/celengine/deepskyobj.h b/src/celengine/deepskyobj.h
index 9a1c4dcd3..6dbbc8db5 100644
--- a/src/celengine/deepskyobj.h
+++ b/src/celengine/deepskyobj.h
@@ -43,10 +43,10 @@ class DeepSkyObject
 
     Eigen::Vector3d getPosition() const;
     void setPosition(const Eigen::Vector3d&);
-    
-	static void hsv2rgb( float*, float*, float*, float, float, float);
-    
-	virtual const char* getType() const = 0;
+
+    static void hsv2rgb( float*, float*, float*, float, float, float);
+
+    virtual const char* getType() const = 0;
     virtual void setType(const std::string&) = 0;
     virtual size_t getDescription(char* buf, size_t bufLength) const;
 
@@ -62,11 +62,11 @@ class DeepSkyObject
 
     /*! Return the radius of the object. This radius will be displayed in the UI and
      *  should match the conventional astronomical definition of the object size.
-     */    
+     */
     float getRadius() const { return radius; }
     void setRadius(float r);
     virtual float getHalfMassRadius() const { return radius; }
-    
+
     float getAbsoluteMagnitude() const;
     void setAbsoluteMagnitude(float);
 
@@ -77,9 +77,9 @@ class DeepSkyObject
     void setVisible(bool _visible) { visible = _visible; }
     bool isClickable() const { return clickable; }
     void setClickable(bool _clickable) { clickable = _clickable; }
-    
 
-	virtual const char* getObjTypeName() const = 0;
+
+    virtual const char* getObjTypeName() const = 0;
 
     virtual bool pick(const Ray3d& ray,
                       double& distanceToPicker,
@@ -106,7 +106,7 @@ class DeepSkyObject
     float        radius;
     float        absMag;
     std::string* infoURL;
-    
+
     bool visible : 1;
     bool clickable : 1;
 };
diff --git a/src/celengine/dispmap.h b/src/celengine/dispmap.h
index 409ca695e..31425c8fd 100644
--- a/src/celengine/dispmap.h
+++ b/src/celengine/dispmap.h
@@ -18,7 +18,7 @@ typedef float (*DisplacementMapFunc)(float, float, void*);
 class DisplacementMap
 {
  public:
-    DisplacementMap(int w, int h); 
+    DisplacementMap(int w, int h);
     ~DisplacementMap();
     int getWidth() const { return width; };
     int getHeight() const { return height; };
@@ -26,7 +26,7 @@ class DisplacementMap
     inline void setDisplacement(int x, int y, float d);
     void generate(DisplacementMapFunc func, void* info = NULL);
     void clear();
-    
+
  private:
     int width;
     int height;
diff --git a/src/celengine/dsodb.cpp b/src/celengine/dsodb.cpp
index c0e9f0198..4f7af4e44 100644
--- a/src/celengine/dsodb.cpp
+++ b/src/celengine/dsodb.cpp
@@ -286,9 +286,9 @@ bool DSODatabase::load(istream& in, const string& resourcePath)
         DeepSkyObject* obj = NULL;
         if (compareIgnoringCase(objType, "Galaxy") == 0)
             obj = new Galaxy();
-		else if (compareIgnoringCase(objType, "Globular") == 0)
-			obj = new Globular();
-		else if (compareIgnoringCase(objType, "Nebula") == 0)        
+        else if (compareIgnoringCase(objType, "Globular") == 0)
+            obj = new Globular();
+        else if (compareIgnoringCase(objType, "Nebula") == 0)
             obj = new Nebula();
         else if (compareIgnoringCase(objType, "OpenCluster") == 0)
             obj = new OpenCluster();
diff --git a/src/celengine/dsodb.h b/src/celengine/dsodb.h
index f7a9cc5c5..a541ab99c 100644
--- a/src/celengine/dsodb.h
+++ b/src/celengine/dsodb.h
@@ -80,7 +80,7 @@ private:
     DeepSkyObject**  catalogNumberIndex;
     DSOOctree*       octreeRoot;
     uint32           nextAutoCatalogNumber;
-    
+
     double           avgAbsMag;
 };
 
diff --git a/src/celengine/execution.h b/src/celengine/execution.h
index 2b03ea1da..71fe561e5 100644
--- a/src/celengine/execution.h
+++ b/src/celengine/execution.h
@@ -18,7 +18,7 @@ class Execution
 {
  public:
     Execution(CommandSequence&, ExecutionEnvironment&);
-    
+
     bool tick(double);
     void reset(CommandSequence&);
 
diff --git a/src/celengine/frame.cpp b/src/celengine/frame.cpp
index 7911ed9d1..ba0f526b4 100644
--- a/src/celengine/frame.cpp
+++ b/src/celengine/frame.cpp
@@ -1,5 +1,5 @@
 // frame.cpp
-// 
+//
 // Reference frame base class.
 //
 // Copyright (C) 2003-2009, the Celestia Development Team
@@ -57,11 +57,11 @@ static UniversalCoord rotate(const UniversalCoord& uc, const Quaterniond& q)
 {
     Matrix3d r = q.toRotationMatrix();
     UniversalCoord uc1;
-    
+
     uc1.x = uc.x * BigFix(r(0, 0)) + uc.y * BigFix(r(1, 0)) + uc.z * BigFix(r(2, 0));
     uc1.y = uc.x * BigFix(r(0, 1)) + uc.y * BigFix(r(1, 1)) + uc.z * BigFix(r(2, 1));
     uc1.z = uc.x * BigFix(r(0, 2)) + uc.y * BigFix(r(1, 2)) + uc.z * BigFix(r(2, 2));
-    
+
     return uc1;
 }
 
@@ -152,7 +152,7 @@ ReferenceFrame::convertToAstrocentric(const Vector3d& p, double tjd) const
         // bad if the center object is a galaxy
         // what about locations?
         return Vector3d::Zero();
-    }    
+    }
 }
 
 
@@ -175,11 +175,11 @@ ReferenceFrame::getAngularVelocity(double tjd) const
     if (std::abs(dq.w()) > 0.99999999)
         return Vector3d::Zero();
     else
-        return dq.vec().normalized() * 	(2.0 * acos(dq.w()) / ANGULAR_VELOCITY_DIFF_DELTA);
+        return dq.vec().normalized() *     (2.0 * acos(dq.w()) / ANGULAR_VELOCITY_DIFF_DELTA);
 #ifdef CELVEC
     Vector3d v(dq.x, dq.y, dq.z);
-	v.normalize();
-	return v * (2.0 * acos(dq.w) / ANGULAR_VELOCITY_DIFF_DELTA);
+    v.normalize();
+    return v * (2.0 * acos(dq.w) / ANGULAR_VELOCITY_DIFF_DELTA);
 #endif
 }
 
@@ -216,7 +216,7 @@ getFrameDepth(const Selection& sel, unsigned int depth, unsigned int maxDepth,
         if (orbitFrameDepth > maxDepth)
             return orbitFrameDepth;
     }
-        
+
     if (body->getBodyFrame(0.0) != NULL && frameType == ReferenceFrame::OrientationFrame)
     {
         bodyFrameDepth = body->getBodyFrame(0.0)->nestingDepth(depth + 1, maxDepth, frameType);
@@ -238,7 +238,7 @@ J2000EclipticFrame::J2000EclipticFrame(Selection center) :
 bool
 J2000EclipticFrame::isInertial() const
 {
-	return true;
+    return true;
 }
 
 
@@ -269,7 +269,7 @@ J2000EquatorFrame::getOrientation(double /* tjd */) const
 bool
 J2000EquatorFrame::isInertial() const
 {
-	return true;
+    return true;
 }
 
 
@@ -318,11 +318,11 @@ BodyFixedFrame::getOrientation(double tjd) const
 Vector3d
 BodyFixedFrame::getAngularVelocity(double tjd) const
 {
-	switch (fixObject.getType())
-	{
-	case Selection::Type_Body:
+    switch (fixObject.getType())
+    {
+    case Selection::Type_Body:
         return fixObject.body()->getAngularVelocity(tjd);
-	case Selection::Type_Star:
+    case Selection::Type_Star:
         return fixObject.star()->getRotationModel()->angularVelocityAtTime(tjd);
     case Selection::Type_Location:
         if (fixObject.location()->getParentBody())
@@ -331,14 +331,14 @@ BodyFixedFrame::getAngularVelocity(double tjd) const
             return Vector3d::Zero();
     default:
         return Vector3d::Zero();
-	}
+    }
 }
 
 
 bool
 BodyFixedFrame::isInertial() const
 {
-	return false;
+    return false;
 }
 
 
@@ -403,12 +403,12 @@ BodyMeanEquatorFrame::getOrientation(double tjd) const
 Vector3d
 BodyMeanEquatorFrame::getAngularVelocity(double tjd) const
 {
-	if (isFrozen)
-	{
+    if (isFrozen)
+    {
         return Vector3d::Zero();
-	}
-	else
-	{
+    }
+    else
+    {
         if (equatorObject.body() != NULL)
         {
             return equatorObject.body()->getBodyFrame(tjd)->getAngularVelocity(tjd);
@@ -417,32 +417,32 @@ BodyMeanEquatorFrame::getAngularVelocity(double tjd) const
         {
             return Vector3d::Zero();
         }
-	}
+    }
 }
 
 
 bool
 BodyMeanEquatorFrame::isInertial() const
 {
-	if (isFrozen)
-	{
-		return true;
-	}
-	else
-	{
-		// Although the mean equator of an object may vary slightly due to precession,
-		// treat it as an inertial frame as long as the body frame of the object is
-		// also inertial.
-		if (equatorObject.body() != NULL)
-		{
+    if (isFrozen)
+    {
+        return true;
+    }
+    else
+    {
+        // Although the mean equator of an object may vary slightly due to precession,
+        // treat it as an inertial frame as long as the body frame of the object is
+        // also inertial.
+        if (equatorObject.body() != NULL)
+        {
             // TIMELINE-TODO: isInertial must take a time argument.
-			return equatorObject.body()->getBodyFrame(0.0)->isInertial();
-		}
+            return equatorObject.body()->getBodyFrame(0.0)->isInertial();
+        }
         else
         {
             return true;
         }
-	}
+    }
 }
 
 
@@ -471,9 +471,9 @@ CachingFrame::CachingFrame(Selection _center) :
     ReferenceFrame(_center),
     lastTime(-1.0e50),
     lastOrientation(Quaterniond::Identity()),
-	lastAngularVelocity(0.0, 0.0, 0.0),
-	orientationCacheValid(false),
-	angularVelocityCacheValid(false)
+    lastAngularVelocity(0.0, 0.0, 0.0),
+    orientationCacheValid(false),
+    angularVelocityCacheValid(false)
 {
 }
 
@@ -481,39 +481,39 @@ CachingFrame::CachingFrame(Selection _center) :
 Quaterniond
 CachingFrame::getOrientation(double tjd) const
 {
-	if (tjd != lastTime)
-	{
-		lastTime = tjd;
-		lastOrientation = computeOrientation(tjd);
-		orientationCacheValid = true;
-		angularVelocityCacheValid = false;
-	}
-	else if (!orientationCacheValid)
-	{
-		lastOrientation = computeOrientation(tjd);
-		orientationCacheValid = true;
-	}
+    if (tjd != lastTime)
+    {
+        lastTime = tjd;
+        lastOrientation = computeOrientation(tjd);
+        orientationCacheValid = true;
+        angularVelocityCacheValid = false;
+    }
+    else if (!orientationCacheValid)
+    {
+        lastOrientation = computeOrientation(tjd);
+        orientationCacheValid = true;
+    }
 
-	return lastOrientation;
+    return lastOrientation;
 }
 
 
 Vector3d CachingFrame::getAngularVelocity(double tjd) const
 {
-	if (tjd != lastTime)
-	{
-		lastTime = tjd;
-		lastAngularVelocity = computeAngularVelocity(tjd);
-		orientationCacheValid = false;
-		angularVelocityCacheValid = true;
-	}
-	else if (!angularVelocityCacheValid)
-	{
-		lastAngularVelocity = computeAngularVelocity(tjd);
-		angularVelocityCacheValid = true;
-	}
+    if (tjd != lastTime)
+    {
+        lastTime = tjd;
+        lastAngularVelocity = computeAngularVelocity(tjd);
+        orientationCacheValid = false;
+        angularVelocityCacheValid = true;
+    }
+    else if (!angularVelocityCacheValid)
+    {
+        lastAngularVelocity = computeAngularVelocity(tjd);
+        angularVelocityCacheValid = true;
+    }
 
-	return lastAngularVelocity;
+    return lastAngularVelocity;
 }
 
 
@@ -525,10 +525,10 @@ Vector3d CachingFrame::computeAngularVelocity(double tjd) const
 {
     Quaterniond q0 = getOrientation(tjd);
 
-	// Call computeOrientation() instead of getOrientation() so that we
-	// don't affect the cached value. 
-	// TODO: check the valid ranges of the frame to make sure that
-	// jd+dt is still in range.
+    // Call computeOrientation() instead of getOrientation() so that we
+    // don't affect the cached value.
+    // TODO: check the valid ranges of the frame to make sure that
+    // jd+dt is still in range.
     Quaterniond q1 = computeOrientation(tjd + ANGULAR_VELOCITY_DIFF_DELTA);
 
     Quaterniond dq = q0.conjugate() * q1;
@@ -639,7 +639,7 @@ TwoVectorFrame::computeOrientation(double tjd) const
         }
 
         // The axes are the rows of a rotation matrix. The getOrientation
-        // method must return the quaternion representation of the 
+        // method must return the quaternion representation of the
         // orientation, so convert the rotation matrix to a quaternion now.
         Quatd q = Quatd::matrixToQuaternion(Mat3d(v[0], v[1], v[2]));
 #endif
@@ -679,10 +679,10 @@ TwoVectorFrame::computeOrientation(double tjd) const
 bool
 TwoVectorFrame::isInertial() const
 {
-	// Although it's possible to specify an inertial two-vector frame, we won't
-	// bother trying to distinguish these cases: all two-vector frames will be
-	// treated as non-inertial.
-	return true;
+    // Although it's possible to specify an inertial two-vector frame, we won't
+    // bother trying to distinguish these cases: all two-vector frames will be
+    // treated as non-inertial.
+    return true;
 }
 
 
@@ -735,7 +735,7 @@ FrameVector::operator=(const FrameVector& fv)
     frame = fv.frame;
     if (frame != NULL)
         frame->addRef();
-    
+
     return *this;
 }
 
diff --git a/src/celengine/frame.h b/src/celengine/frame.h
index 254276cef..ecfe0578c 100644
--- a/src/celengine/frame.h
+++ b/src/celengine/frame.h
@@ -1,5 +1,5 @@
 // frame.h
-// 
+//
 // Copyright (C) 2003-2009, the Celestia Development Team
 // Original version by Chris Laurel <claurel@gmail.com>
 //
@@ -31,7 +31,7 @@ class ReferenceFrame
 
     int addRef() const;
     int release() const;
-    
+
     UniversalCoord convertFromUniversal(const UniversalCoord& uc, double tjd) const;
     UniversalCoord convertToUniversal(const UniversalCoord& uc, double tjd) const;
     Eigen::Quaterniond convertFromUniversal(const Eigen::Quaterniond& q, double tjd) const;
@@ -39,13 +39,13 @@ class ReferenceFrame
 
     Eigen::Vector3d convertFromAstrocentric(const Eigen::Vector3d& p, double tjd) const;
     Eigen::Vector3d convertToAstrocentric(const Eigen::Vector3d& p, double tjd) const;
-    
+
     Selection getCenter() const;
 
     virtual Eigen::Quaterniond getOrientation(double tjd) const = 0;
     virtual Eigen::Vector3d getAngularVelocity(double tdb) const;
 
-	virtual bool isInertial() const = 0;
+    virtual bool isInertial() const = 0;
 
     enum FrameType
     {
@@ -85,8 +85,8 @@ class CachingFrame : public ReferenceFrame
     mutable double lastTime;
     mutable Eigen::Quaterniond lastOrientation;
     mutable Eigen::Vector3d lastAngularVelocity;
-	mutable bool orientationCacheValid;
-	mutable bool angularVelocityCacheValid;
+    mutable bool orientationCacheValid;
+    mutable bool angularVelocityCacheValid;
 };
 
 
@@ -102,7 +102,7 @@ class J2000EclipticFrame : public ReferenceFrame
         return Eigen::Quaterniond::Identity();
     }
 
-	virtual bool isInertial() const;
+    virtual bool isInertial() const;
 
     virtual unsigned int nestingDepth(unsigned int depth,
                                       unsigned int maxDepth,
@@ -117,7 +117,7 @@ class J2000EquatorFrame : public ReferenceFrame
     J2000EquatorFrame(Selection center);
     virtual ~J2000EquatorFrame() {};
     Eigen::Quaterniond getOrientation(double tjd) const;
-	virtual bool isInertial() const;
+    virtual bool isInertial() const;
     virtual unsigned int nestingDepth(unsigned int depth,
                                       unsigned int maxDepth,
                                       FrameType frameType) const;
@@ -137,7 +137,7 @@ class BodyFixedFrame : public ReferenceFrame
     virtual ~BodyFixedFrame() {};
     Eigen::Quaterniond getOrientation(double tjd) const;
     virtual Eigen::Vector3d getAngularVelocity(double tjd) const;
-	virtual bool isInertial() const;
+    virtual bool isInertial() const;
     virtual unsigned int nestingDepth(unsigned int depth,
                                       unsigned int maxDepth,
                                       FrameType frameType) const;
@@ -155,7 +155,7 @@ class BodyMeanEquatorFrame : public ReferenceFrame
     virtual ~BodyMeanEquatorFrame() {};
     Eigen::Quaterniond getOrientation(double tjd) const;
     virtual Eigen::Vector3d getAngularVelocity(double tjd) const;
-	virtual bool isInertial() const;
+    virtual bool isInertial() const;
     virtual unsigned int nestingDepth(unsigned int depth,
                                       unsigned int maxDepth,
                                       FrameType frameType) const;
@@ -193,7 +193,7 @@ class FrameVector
         RelativeVelocity,
         ConstantVector,
     };
-    
+
     static FrameVector createRelativePositionVector(const Selection& _observer,
                                                     const Selection& _target);
     static FrameVector createRelativeVelocityVector(const Selection& _observer,
@@ -229,7 +229,7 @@ class TwoVectorFrame : public CachingFrame
      *  the primary and secondary vectors:
      *  1 = x, 2 = y, 3 = z, -1 = -x, -2 = -y, -3 = -z
      */
-    TwoVectorFrame(Selection center, 
+    TwoVectorFrame(Selection center,
                    const FrameVector& prim,
                    int primAxis,
                    const FrameVector& sec,
@@ -237,7 +237,7 @@ class TwoVectorFrame : public CachingFrame
     virtual ~TwoVectorFrame() {};
 
     Eigen::Quaterniond computeOrientation(double tjd) const;
-	virtual bool isInertial() const;
+    virtual bool isInertial() const;
     virtual unsigned int nestingDepth(unsigned int depth,
                                       unsigned int maxDepth,
                                       FrameType frameType) const;
diff --git a/src/celengine/frametree.cpp b/src/celengine/frametree.cpp
index e9b33a856..93a43c00b 100644
--- a/src/celengine/frametree.cpp
+++ b/src/celengine/frametree.cpp
@@ -30,7 +30,7 @@
  * parents.
  *
  * The FrameTree hiearchy is designed for fast visibility culling. There are
- * two values stored in each node for this purpose: the bounding sphere 
+ * two values stored in each node for this purpose: the bounding sphere
  * radius, and the maximum child object radius. The bounding sphere is large
  * enough to contain the orbits of all child objects, as well as the child
  * objects themselves. Change tracking is performed whenever the frame tree
diff --git a/src/celengine/galaxy.cpp b/src/celengine/galaxy.cpp
index fe0d10206..527211962 100644
--- a/src/celengine/galaxy.cpp
+++ b/src/celengine/galaxy.cpp
@@ -47,7 +47,7 @@ float Galaxy::lightGain  = 0.0f;
 
 bool operator< (const Blob& b1, const Blob& b2)
 {
-  return (b1.position.squaredNorm() < b2.position.squaredNorm());
+    return (b1.position.squaredNorm() < b2.position.squaredNorm());
 }
 
 typedef vector<Blob, aligned_allocator<Blob> > BlobVector;
@@ -164,39 +164,39 @@ void Galaxy::setType(const string& typeStr)
     if (!formsInitialized)
         InitializeForms();
 
-	if (customTmpName != NULL)
-	{
-			form = buildGalacticForms("models/" + *customTmpName);
-	}
-	else
-	{
-		switch (type)
-		{
-		case S0:
-		case Sa:
-		case Sb:
-		case Sc:
-		case SBa:
-		case SBb:
-		case SBc:
-			form = spiralForms[type - S0];
-			break;
-		case E0:
-		case E1:
-		case E2:
-		case E3:
-		case E4:
-		case E5:
-		case E6:
-		case E7:
-			form = ellipticalForms[type - E0];
-			//form = NULL;
-			break;
-		case Irr:
-			form = irregularForm;
-			break;
-		}
-	}
+    if (customTmpName != NULL)
+    {
+        form = buildGalacticForms("models/" + *customTmpName);
+    }
+    else
+    {
+        switch (type)
+        {
+        case S0:
+        case Sa:
+        case Sb:
+        case Sc:
+        case SBa:
+        case SBb:
+        case SBc:
+            form = spiralForms[type - S0];
+            break;
+        case E0:
+        case E1:
+        case E2:
+        case E3:
+        case E4:
+        case E5:
+        case E6:
+        case E7:
+            form = ellipticalForms[type - E0];
+            //form = NULL;
+            break;
+        case Irr:
+            form = irregularForm;
+            break;
+        }
+    }
 }
 
 
@@ -228,7 +228,7 @@ bool Galaxy::pick(const Ray3d& ray,
 {
     if (!isVisible())
         return false;
-    
+
     // The ellipsoid should be slightly larger to compensate for the fact
     // that blobs are considered points when galaxies are built, but have size
     // when they are drawn.
@@ -251,9 +251,9 @@ bool Galaxy::load(AssociativeArray* params, const string& resPath)
     params->getNumber("Detail", detail);
     setDetail((float) detail);
 
-	string customTmpName;
-	if(params->getString("CustomTemplate",customTmpName))
-		setCustomTmpName(customTmpName);
+    string customTmpName;
+    if(params->getString("CustomTemplate",customTmpName))
+        setCustomTmpName(customTmpName);
 
     string typeName;
     params->getString("Type", typeName);
@@ -518,95 +518,95 @@ void Galaxy::setLightGain(float lg)
 
 GalacticForm* buildGalacticForms(const std::string& filename)
 {
-	Blob b;
+    Blob b;
     BlobVector* galacticPoints = new BlobVector;
 
-	// Load templates in standard .png format
-	int width, height, rgb, j = 0, kmin = 9;
-	unsigned char value;
-	float h = 0.75f;
-	Image* img;
-	img = LoadPNGImage(filename);
-	if (img == NULL)
-	{
-	cout<<"\nThe galaxy template *** "<<filename<<" *** could not be loaded!\n\n";
-	return NULL;
-	}
-	width  = img->getWidth();
-	height = img->getHeight();
-	rgb    = img->getComponents();
+    // Load templates in standard .png format
+    int width, height, rgb, j = 0, kmin = 9;
+    unsigned char value;
+    float h = 0.75f;
+    Image* img;
+    img = LoadPNGImage(filename);
+    if (img == NULL)
+    {
+        cout<<"\nThe galaxy template *** "<<filename<<" *** could not be loaded!\n\n";
+        return NULL;
+    }
+    width  = img->getWidth();
+    height = img->getHeight();
+    rgb    = img->getComponents();
 
-		for (int i = 0; i < width * height; i++)
-		{
-			value = img->getPixels()[rgb * i];
-			if (value > 10)
-			{
-				float x, y, z, r2, yy, prob;
-				z  = floor(i /(float) width);
-				x  = (i - width * z - 0.5f * (width - 1)) / (float) width;
-				z  = (0.5f * (height - 1) - z) / (float) height;
-				x  += Mathf::sfrand() * 0.008f;
-				z  += Mathf::sfrand() * 0.008f;
-				r2 = x * x + z * z;
+    for (int i = 0; i < width * height; i++)
+    {
+        value = img->getPixels()[rgb * i];
+        if (value > 10)
+        {
+            float x, y, z, r2, yy, prob;
+            z  = floor(i /(float) width);
+            x  = (i - width * z - 0.5f * (width - 1)) / (float) width;
+            z  = (0.5f * (height - 1) - z) / (float) height;
+            x  += Mathf::sfrand() * 0.008f;
+            z  += Mathf::sfrand() * 0.008f;
+            r2 = x * x + z * z;
 
-				if ( strcmp ( filename.c_str(), "models/E0.png") != 0 )
-				{
-					float y0 = 0.5f * MAX_SPIRAL_THICKNESS * sqrt((float)value/256.0f) * exp(- 5.0f * r2);
-					float B, yr;
-					B = (r2 > 0.35f)? 1.0f: 0.75f; // the darkness of the "dust lane", 0 < B < 1
-					float p0 = 1.0f - B * exp(-h * h); // the uniform reference probability, envelopping prob*p0.
-					do
-					{
-						// generate "thickness" y of spirals with emulation of a dust lane
-						// in galctic plane (y=0)
+            if ( strcmp ( filename.c_str(), "models/E0.png") != 0 )
+            {
+                float y0 = 0.5f * MAX_SPIRAL_THICKNESS * sqrt((float)value/256.0f) * exp(- 5.0f * r2);
+                float B, yr;
+                B = (r2 > 0.35f)? 1.0f: 0.75f; // the darkness of the "dust lane", 0 < B < 1
+                float p0 = 1.0f - B * exp(-h * h); // the uniform reference probability, envelopping prob*p0.
+                do
+                {
+                    // generate "thickness" y of spirals with emulation of a dust lane
+                    // in galctic plane (y=0)
 
-						yr =  Mathf::sfrand() * h;
-						prob = (1.0f - B * exp(-yr * yr))/p0;
+                    yr =  Mathf::sfrand() * h;
+                    prob = (1.0f - B * exp(-yr * yr))/p0;
 
-					} while (Mathf::frand() > prob);
-					b.brightness  = value * prob;
-					y = y0 * yr / h;
-				}
-				else
-				{
-					// generate spherically symmetric distribution from E0.png
-					do
-					{
-						yy = Mathf::sfrand();
-						float ry2 = 1.0f - yy * yy;
-						prob = ry2 > 0? sqrt(ry2): 0.0f;
-					} while (Mathf::frand() > prob);
-					y = yy * sqrt(0.25f - r2) ;
-					b.brightness  = value;
-					kmin = 12;
-				}
+                } while (Mathf::frand() > prob);
+                b.brightness  = value * prob;
+                y = y0 * yr / h;
+            }
+            else
+            {
+                // generate spherically symmetric distribution from E0.png
+                do
+                {
+                    yy = Mathf::sfrand();
+                    float ry2 = 1.0f - yy * yy;
+                    prob = ry2 > 0? sqrt(ry2): 0.0f;
+                } while (Mathf::frand() > prob);
+                y = yy * sqrt(0.25f - r2) ;
+                b.brightness  = value;
+                kmin = 12;
+            }
 
-				b.position    = Vector4f(x, y, z, 1.0f);
-				unsigned int rr =  (unsigned int) (b.position.head(3).norm() * 511);
-				b.colorIndex  = rr < 256? rr: 255;
-				galacticPoints->push_back(b);
-				j++;
-			 }
-		}
+            b.position    = Vector4f(x, y, z, 1.0f);
+            unsigned int rr =  (unsigned int) (b.position.head(3).norm() * 511);
+            b.colorIndex  = rr < 256? rr: 255;
+            galacticPoints->push_back(b);
+            j++;
+        }
+    }
 
     delete img;
-	galacticPoints->reserve(j);
+    galacticPoints->reserve(j);
 
-	// sort to start with the galaxy center region (x^2 + y^2 + z^2 ~ 0), such that
-	// the biggest (brightest) sprites will be localized there!
+    // sort to start with the galaxy center region (x^2 + y^2 + z^2 ~ 0), such that
+    // the biggest (brightest) sprites will be localized there!
 
-	sort(galacticPoints->begin(), galacticPoints->end());
+    sort(galacticPoints->begin(), galacticPoints->end());
 
-	// reshuffle the galaxy points randomly...except the first kmin+1 in the center!
-	// the higher that number the stronger the central "glow"
+    // reshuffle the galaxy points randomly...except the first kmin+1 in the center!
+    // the higher that number the stronger the central "glow"
 
-	random_shuffle( galacticPoints->begin() + kmin, galacticPoints->end());
+    random_shuffle( galacticPoints->begin() + kmin, galacticPoints->end());
 
-	GalacticForm* galacticForm  = new GalacticForm();
-	galacticForm->blobs         = galacticPoints;
+    GalacticForm* galacticForm  = new GalacticForm();
+    galacticForm->blobs         = galacticPoints;
     galacticForm->scale         = Vector3f::Ones();
 
-	return galacticForm;
+    return galacticForm;
 }
 
 
@@ -625,7 +625,7 @@ void InitializeForms()
 
         //convert Hue to RGB
 
-		DeepSkyObject::hsv2rgb(&rr, &gg, &bb, hue, 0.20f, 1.0f);
+        DeepSkyObject::hsv2rgb(&rr, &gg, &bb, hue, 0.20f, 1.0f);
         Color c(rr, gg, bb);
         colorTable[i]  = Vector3f(c.red(), c.green(), c.blue());
     }
@@ -652,20 +652,20 @@ void InitializeForms()
         float ell = 1.0f - (float) eform / 8.0f;
 
         // note the correct x,y-alignment of 'ell' scaling!!
-   		// build all elliptical templates from rescaling E0
+        // build all elliptical templates from rescaling E0
 
-   		ellipticalForms[eform] = buildGalacticForms("models/E0.png");
-   		if (*ellipticalForms)
-   			ellipticalForms[eform]->scale = Vector3f(ell, ell, 1.0f);
+        ellipticalForms[eform] = buildGalacticForms("models/E0.png");
+        if (*ellipticalForms)
+            ellipticalForms[eform]->scale = Vector3f(ell, ell, 1.0f);
 
         // account for reddening of ellipticals rel.to spirals
         if (*ellipticalForms)
         {
-        	unsigned int nPoints = (unsigned int) (ellipticalForms[eform]->blobs->size());
-			for (unsigned int i = 0; i < nPoints; ++i)
-    		{
-            	(*ellipticalForms[eform]->blobs)[i].colorIndex = (unsigned int) ceil(0.76f * (*ellipticalForms[eform]->blobs)[i].colorIndex);
-        	}
+            unsigned int nPoints = (unsigned int) (ellipticalForms[eform]->blobs->size());
+            for (unsigned int i = 0; i < nPoints; ++i)
+            {
+                (*ellipticalForms[eform]->blobs)[i].colorIndex = (unsigned int) ceil(0.76f * (*ellipticalForms[eform]->blobs)[i].colorIndex);
+            }
         }
     }
     //Irregular Galaxies
@@ -688,7 +688,7 @@ void InitializeForms()
                 b.position   = Vector4f(p.x, p.y, p.z, 1.0f);
                 b.brightness = 64u;
                 unsigned int rr =  (unsigned int) (r * 511);
-        	    b.colorIndex  = rr < 256? rr: 255;
+                b.colorIndex  = rr < 256? rr: 255;
                 irregularPoints->push_back(b);
                 ++ip;
             }
diff --git a/src/celengine/galaxy.h b/src/celengine/galaxy.h
index 99557c819..793031f99 100644
--- a/src/celengine/galaxy.h
+++ b/src/celengine/galaxy.h
@@ -73,7 +73,7 @@ class Galaxy : public DeepSkyObject
 
     virtual unsigned int getRenderMask() const;
     virtual unsigned int getLabelMask() const;
-    
+
     virtual const char* getObjTypeName() const;
 
  public:
diff --git a/src/celengine/geometry.h b/src/celengine/geometry.h
index d080fcd63..c54f662cc 100644
--- a/src/celengine/geometry.h
+++ b/src/celengine/geometry.h
@@ -32,14 +32,14 @@ public:
      *  distance unmodified.
      */
     virtual bool pick(const Ray3d& r, double& distance) const = 0;
-    
+
     virtual bool isOpaque() const = 0;
 
     virtual bool isNormalized() const
     {
         return true;
     }
-    
+
     /*! Return true if the specified texture map type is used at
      *  all within this geometry object. This information is used
      *  to decide whether multiple rendering passes are required.
diff --git a/src/celengine/glcontext.cpp b/src/celengine/glcontext.cpp
index 388d73915..87fbd520f 100644
--- a/src/celengine/glcontext.cpp
+++ b/src/celengine/glcontext.cpp
@@ -39,7 +39,7 @@ void GLContext::init(const vector<string>& ignoreExt)
     if (extensionsString != NULL)
     {
         char* next = extensionsString;
-        
+
         while (*next != '\0')
         {
             while (*next != '\0' && *next != ' ')
diff --git a/src/celengine/glcontext.h b/src/celengine/glcontext.h
index e41065924..c213a2059 100644
--- a/src/celengine/glcontext.h
+++ b/src/celengine/glcontext.h
@@ -21,7 +21,7 @@ class GLContext
     GLContext();
     virtual ~GLContext();
 
-    enum GLRenderPath 
+    enum GLRenderPath
     {
         GLPath_Basic             = 0,
         GLPath_Multitexture      = 1,
@@ -42,7 +42,7 @@ class GLContext
     };
 
     void init(const std::vector<std::string>& ignoreExt);
-    
+
     GLRenderPath getRenderPath() const { return renderPath; };
     bool setRenderPath(GLRenderPath);
     bool renderPathSupported(GLRenderPath) const;
diff --git a/src/celengine/globular.cpp b/src/celengine/globular.cpp
index 99a67d4b8..89596257e 100644
--- a/src/celengine/globular.cpp
+++ b/src/celengine/globular.cpp
@@ -3,9 +3,9 @@
 // Copyright (C) 2008, Celestia Development Team
 // Initial code by Dr. Fridger Schrempp <fridger.schrempp@desy.de>
 //
-// Simulation of globular clusters, theoretical framework by  
+// Simulation of globular clusters, theoretical framework by
 // Ivan King, Astron. J. 67 (1962) 471; ibid. 71 (1966) 64
-// 
+//
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License
 // as published by the Free Software Foundation; either version 2
@@ -33,16 +33,16 @@
 using namespace Eigen;
 using namespace std;
 
-static int cntrTexWidth = 512, cntrTexHeight = 512; 
+static int cntrTexWidth = 512, cntrTexHeight = 512;
 static int starTexWidth = 128, starTexHeight = 128;
 static Color colorTable[256];
 static const unsigned int GLOBULAR_POINTS  = 8192;
 static const float LumiShape = 3.0f, Lumi0 = exp(-LumiShape);
 
-// Reference values ( = data base averages) of core radius, King concentration 
-// and mu25 isophote radius:  
- 
-static const float R_c_ref = 0.83f, C_ref = 2.1f, R_mu25 = 40.32f;  
+// Reference values ( = data base averages) of core radius, King concentration
+// and mu25 isophote radius:
+
+static const float R_c_ref = 0.83f, C_ref = 2.1f, R_mu25 = 40.32f;
 
 // min/max c-values of globular cluster data
 
@@ -65,18 +65,18 @@ static bool formsInitialized = false;
 
 static bool decreasing (const GBlob& b1, const GBlob& b2)
 {
-	return (b1.radius_2d > b2.radius_2d);
+    return (b1.radius_2d > b2.radius_2d);
 }
 
 static void GlobularTextureEval(float u, float v, float /*w*/, unsigned char *pixel)
 {
-	// use an exponential luminosity shape for the individual stars
+    // use an exponential luminosity shape for the individual stars
     // giving sort of a halo for the brighter (i.e.bigger) stars.
 
     float lumi = exp(- LumiShape * sqrt(u * u + v * v)) - Lumi0;
 
-	if (lumi <= 0.0f)
-		lumi = 0.0f;
+    if (lumi <= 0.0f)
+        lumi = 0.0f;
 
     int pixVal = (int) (lumi * 255.99f);
 #ifdef HDR_COMPRESS
@@ -94,91 +94,91 @@ static void GlobularTextureEval(float u, float v, float /*w*/, unsigned char *pi
 
 float relStarDensity(float eta)
 {
-	/*! As alpha blending weight (relStarDensity) I take the theoretical
-	 *  number of globular stars in 2d projection at a distance 
-	 *  rho = r / r_c = eta * r_t from the center (cf. King_1962's Eq.(18)), 
-	 *  divided by the area = PI * rho * rho . This number density of stars 
-	 *  I normalized to 1 at rho=0.   
+    /*! As alpha blending weight (relStarDensity) I take the theoretical
+     *  number of globular stars in 2d projection at a distance
+     *  rho = r / r_c = eta * r_t from the center (cf. King_1962's Eq.(18)),
+     *  divided by the area = PI * rho * rho . This number density of stars
+     *  I normalized to 1 at rho=0.
 
-	 *  The resulting blending weight increases strongly -> 1 if the 
-	 *  2d number density of stars rises, i.e for rho -> 0. 
-	 */	 	 
+     *  The resulting blending weight increases strongly -> 1 if the
+     *  2d number density of stars rises, i.e for rho -> 0.
+     */
      // Since the central "cloud" is due to lack of visual resolution,
-	 // rather than cluster morphology, we limit it's size by
-	 // taking max(C_ref, CBin). Smaller c gives a shallower distribution!
-     
-     float rRatio = max(RRatio_min, RRatio);
-     float Xi = 1.0f / sqrt(1.0f + rRatio * rRatio);           	 
-     float XI2 = Xi * Xi; 
-	 float rho2 = 1.0001f + eta * eta * rRatio * rRatio; //add 1e-4 as regulator near rho=0
+     // rather than cluster morphology, we limit it's size by
+     // taking max(C_ref, CBin). Smaller c gives a shallower distribution!
 
-	 return ((log(rho2) + 4.0f * (1.0f - sqrt(rho2)) * Xi) / (rho2 - 1.0f) + XI2) / (1.0f - 2.0f * Xi + XI2);
+     float rRatio = max(RRatio_min, RRatio);
+     float Xi = 1.0f / sqrt(1.0f + rRatio * rRatio);
+     float XI2 = Xi * Xi;
+     float rho2 = 1.0001f + eta * eta * rRatio * rRatio; //add 1e-4 as regulator near rho=0
+
+     return ((log(rho2) + 4.0f * (1.0f - sqrt(rho2)) * Xi) / (rho2 - 1.0f) + XI2) / (1.0f - 2.0f * Xi + XI2);
 }
 
 static void CenterCloudTexEval(float u, float v, float /*w*/, unsigned char *pixel)
-{	
-	/*! For reasons of speed, calculate central "cloud" texture only for  
-	 *  8 bins of King_1962 concentration, c = CBin, XI(CBin), RRatio(CBin). 
-	 */
-	 
-	// Skyplane projected King_1962 profile at center (rho = eta = 0):	
-	float c2d   = 1.0f - XI;	
-		
-	float eta = sqrt(u * u + v * v);  // u,v = (-1..1)
-	
-	// eta^2 = u * u  + v * v = 1 is the biggest circle fitting into the quadratic
-	// procedural texture. Hence clipping 
-		
-	if (eta >= 1.0f)
-		eta  = 1.0f;
+{
+    /*! For reasons of speed, calculate central "cloud" texture only for
+     *  8 bins of King_1962 concentration, c = CBin, XI(CBin), RRatio(CBin).
+     */
 
-	// eta = 1 corresponds to tidalRadius:
+    // Skyplane projected King_1962 profile at center (rho = eta = 0):
+    float c2d   = 1.0f - XI;
 
-	float rho   = eta  * RRatio;
-	float rho2  = 1.0f + rho * rho;		
+    float eta = sqrt(u * u + v * v);  // u,v = (-1..1)
+
+    // eta^2 = u * u  + v * v = 1 is the biggest circle fitting into the quadratic
+    // procedural texture. Hence clipping
+
+    if (eta >= 1.0f)
+        eta  = 1.0f;
+
+    // eta = 1 corresponds to tidalRadius:
+
+    float rho   = eta  * RRatio;
+    float rho2  = 1.0f + rho * rho;
 
     // Skyplane projected King_1962 profile (Eq.(14)), vanishes for eta = 1:
-	// i.e. absolutely no globular stars for r > tidalRadius:	
-		
-	float profile_2d = (1.0f / sqrt(rho2) - 1.0f)/c2d + 1.0f ;	
-	profile_2d = profile_2d * profile_2d;	
+    // i.e. absolutely no globular stars for r > tidalRadius:
+
+    float profile_2d = (1.0f / sqrt(rho2) - 1.0f)/c2d + 1.0f ;
+    profile_2d = profile_2d * profile_2d;
 
 #ifdef HDR_COMPRESS
     pixel[0] = 127;
-    pixel[1] = 127; 
+    pixel[1] = 127;
     pixel[2] = 127;
-#else    
+#else
     pixel[0] = 255;
     pixel[1] = 255;
     pixel[2] = 255;
 #endif
-	pixel[3] = (int) (relStarDensity(eta) * profile_2d * 255.99f);
+    pixel[3] = (int) (relStarDensity(eta) * profile_2d * 255.99f);
 }
 
 Globular::Globular() :
     detail (1.0f),
     customTmpName (NULL),
     form (NULL),
-	r_c (R_c_ref),
-	c (C_ref),
-	tidalRadius(0.0f)
+    r_c (R_c_ref),
+    c (C_ref),
+    tidalRadius(0.0f)
 {
-	recomputeTidalRadius();
+    recomputeTidalRadius();
 }
 
 unsigned int Globular::cSlot(float conc) const
 {
-	// map the physical range of c, minC <= c <= maxC, 
-	// to 8 integers (bin numbers), 0 < cSlot <= 7:
-	
-	if (conc <= MinC)
-		conc  = MinC;
-	if (conc >= MaxC)
-		conc  = MaxC;
-  	 
+    // map the physical range of c, minC <= c <= maxC,
+    // to 8 integers (bin numbers), 0 < cSlot <= 7:
+
+    if (conc <= MinC)
+        conc  = MinC;
+    if (conc >= MaxC)
+        conc  = MaxC;
+
     return (unsigned int) floor((conc - MinC) / BinWidth);
 }
-		
+
 
 const char* Globular::getType() const
 {
@@ -224,38 +224,38 @@ float Globular::getCoreRadius() const
 
 void Globular::setCoreRadius(const float coreRadius)
 {
-	r_c = coreRadius;
-	recomputeTidalRadius();
+    r_c = coreRadius;
+    recomputeTidalRadius();
 }
-	
+
 float Globular::getHalfMassRadius() const
 {
-	// Aproximation to the half-mass radius r_h [ly]
-	// (~ 20% accuracy) 
-    
-	return std::tan(degToRad(r_c / 60.0f)) * (float) getPosition().norm() * pow(10.0f, 0.6f * c - 0.4f); 	  
+    // Aproximation to the half-mass radius r_h [ly]
+    // (~ 20% accuracy)
+
+    return std::tan(degToRad(r_c / 60.0f)) * (float) getPosition().norm() * pow(10.0f, 0.6f * c - 0.4f);
 }
 
 float Globular::getConcentration() const
 {
-	return c;
+    return c;
 }
 void Globular::setConcentration(const float conc)
 {
     c = conc;
     if (!formsInitialized)
-		InitializeForms();
-	
-	// For saving time, account for the c dependence via 8 bins only,
+        InitializeForms();
 
-	form = globularForms[cSlot(conc)];
+    // For saving time, account for the c dependence via 8 bins only,
+
+    form = globularForms[cSlot(conc)];
     recomputeTidalRadius();
 }
 
 
 size_t Globular::getDescription(char* buf, size_t bufLength) const
 {
-	return snprintf(buf, bufLength, _("Globular (core radius: %4.2f', King concentration: %4.2f)"), r_c, c);
+    return snprintf(buf, bufLength, _("Globular (core radius: %4.2f', King concentration: %4.2f)"), r_c, c);
 }
 
 
@@ -277,12 +277,12 @@ bool Globular::pick(const Ray3d& ray,
 {
     if (!isVisible())
         return false;
-	/*
+    /*
      * The selection ellipsoid should be slightly larger to compensate for the fact
      * that blobs are considered points when globulars are built, but have size
-     * when they are drawn. 
-	 */
-	Vec3d ellipsoidAxes(getRadius() * (form->scale.x + RADIUS_CORRECTION),
+     * when they are drawn.
+     */
+    Vec3d ellipsoidAxes(getRadius() * (form->scale.x + RADIUS_CORRECTION),
                         getRadius() * (form->scale.y + RADIUS_CORRECTION),
                         getRadius() * (form->scale.z + RADIUS_CORRECTION));
 
@@ -300,25 +300,25 @@ bool Globular::load(AssociativeArray* params, const string& resPath)
 
     bool ok = DeepSkyObject::load(params, resPath);
     if (!ok)
-		return false;
+        return false;
 
     if (params->getNumber("Detail", detail))
-    	setDetail((float) detail);
-			
-	string customTmpName;
-	if (params->getString("CustomTemplate", customTmpName ))
-		setCustomTmpName(customTmpName);
-    
+        setDetail((float) detail);
+
+    string customTmpName;
+    if (params->getString("CustomTemplate", customTmpName ))
+        setCustomTmpName(customTmpName);
+
     double coreRadius;
-	if (params->getAngle("CoreRadius", coreRadius, 1.0 / MINUTES_PER_DEG))
+    if (params->getAngle("CoreRadius", coreRadius, 1.0 / MINUTES_PER_DEG))
     {
         r_c = coreRadius;
-		setCoreRadius(r_c);
+        setCoreRadius(r_c);
     }
-			
-	if (params->getNumber("KingConcentration", c))
-		setConcentration(c);
-	
+
+    if (params->getNumber("KingConcentration", c))
+        setConcentration(c);
+
     return true;
 }
 
@@ -328,7 +328,7 @@ void Globular::render(const GLContext& context,
                     const Quaternionf& viewerOrientation,
                     float brightness,
                     float pixelSize)
-{					        
+{
     renderGlobularPointSprites(context, fromEigen(offset), fromEigen(viewerOrientation), brightness, pixelSize);
 }
 
@@ -341,164 +341,164 @@ void Globular::renderGlobularPointSprites(const GLContext&,
 {
     if (form == NULL)
         return;
-			
-	float distanceToDSO = offset.length() - getRadius();
-	if (distanceToDSO < 0)
-    	distanceToDSO = 0;
-			
-	float minimumFeatureSize = 0.5f * pixelSize * distanceToDSO;    
-	
-	DiskSizeInPixels = getRadius() / minimumFeatureSize;
-	
-	/*
+
+    float distanceToDSO = offset.length() - getRadius();
+    if (distanceToDSO < 0)
+        distanceToDSO = 0;
+
+    float minimumFeatureSize = 0.5f * pixelSize * distanceToDSO;
+
+    DiskSizeInPixels = getRadius() / minimumFeatureSize;
+
+    /*
      * Is the globular's apparent size big enough to
      * be noticeable on screen? If it's not, break right here to
      * avoid all the overhead of the matrix transformations and
-	 * GL state changes: 
-	 */
-	
-	if (DiskSizeInPixels < 1.0f)	
-		return;	    			
+     * GL state changes:
+     */
+
+    if (DiskSizeInPixels < 1.0f)
+        return;
     /*
-	 * When resolution (zoom) varies, the blended texture opacity is controlled by the 
-	 * factor 'pixelWeight'. At low resolution, the latter starts at 1, but tends to 0,  
-     * if the resolution increases sufficiently (DiskSizeInPixels >= P1 pixels)! 
-	 * The smaller P2 (<1), the faster pixelWeight -> 0, for DiskSizeInPixels >= P1.
-	 */	
-			
-	float pixelWeight = (DiskSizeInPixels >= P1)? 1.0f/(P2 + (1.0f - P2) * DiskSizeInPixels / P1): 1.0f;
-							
-    // Use same 8 c-bins as in globularForms below!        
-    
-    unsigned int ic = cSlot(c); 
+     * When resolution (zoom) varies, the blended texture opacity is controlled by the
+     * factor 'pixelWeight'. At low resolution, the latter starts at 1, but tends to 0,
+     * if the resolution increases sufficiently (DiskSizeInPixels >= P1 pixels)!
+     * The smaller P2 (<1), the faster pixelWeight -> 0, for DiskSizeInPixels >= P1.
+     */
+
+    float pixelWeight = (DiskSizeInPixels >= P1)? 1.0f/(P2 + (1.0f - P2) * DiskSizeInPixels / P1): 1.0f;
+
+    // Use same 8 c-bins as in globularForms below!
+
+    unsigned int ic = cSlot(c);
     CBin = MinC + ((float) ic + 0.5f) * BinWidth; // center value of (ic+1)th c-bin
 
-	RRatio = pow(10.0f, CBin); 
-    XI = 1.0f / sqrt(1.0f + RRatio * RRatio);           
-    
+    RRatio = pow(10.0f, CBin);
+    XI = 1.0f / sqrt(1.0f + RRatio * RRatio);
+
     if(centerTex[ic] == NULL)
-	{
-		centerTex[ic] = CreateProceduralTexture( cntrTexWidth, cntrTexHeight, GL_RGBA, CenterCloudTexEval);
-	}
-	assert(centerTex[ic] != NULL);
-		
-	if (globularTex == NULL)
+    {
+        centerTex[ic] = CreateProceduralTexture( cntrTexWidth, cntrTexHeight, GL_RGBA, CenterCloudTexEval);
+    }
+    assert(centerTex[ic] != NULL);
+
+    if (globularTex == NULL)
     {
         globularTex = CreateProceduralTexture( starTexWidth, starTexHeight, GL_RGBA,
                                                GlobularTextureEval);
     }
     assert(globularTex != NULL);
 
-	glEnable (GL_BLEND);
-	glEnable (GL_TEXTURE_2D);
-	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-					    
+    glEnable (GL_BLEND);
+    glEnable (GL_TEXTURE_2D);
+    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
     Mat3f viewMat = viewerOrientation.toMatrix3();
     Vec3f v0 = Vec3f(-1, -1, 0) * viewMat;
     Vec3f v1 = Vec3f( 1, -1, 0) * viewMat;
     Vec3f v2 = Vec3f( 1,  1, 0) * viewMat;
     Vec3f v3 = Vec3f(-1,  1, 0) * viewMat;
-	
-	float tidalSize = 2 * tidalRadius;
-	Mat3f m =
-        Mat3f::scaling(form->scale) * fromEigen(getOrientation()).toMatrix3() * 
-		Mat3f::scaling(tidalSize);
-				     
+
+    float tidalSize = 2 * tidalRadius;
+    Mat3f m =
+        Mat3f::scaling(form->scale) * fromEigen(getOrientation()).toMatrix3() *
+        Mat3f::scaling(tidalSize);
+
     vector<GBlob>* points = form->gblobs;
-    unsigned int nPoints = 
-				 (unsigned int) (points->size() * clamp(getDetail()));
-				 				 	
-	/* Render central cloud sprite (centerTex). It fades away when
-	 * distance from center or resolution increases sufficiently. 	
-	 */
-	
-	centerTex[ic]->bind();	
-    
-	float br = 2 * brightness;
+    unsigned int nPoints =
+                 (unsigned int) (points->size() * clamp(getDetail()));
 
-	glColor4f(Rr, Gg, Bb, min(br * pixelWeight, 1.0f));	
+    /* Render central cloud sprite (centerTex). It fades away when
+     * distance from center or resolution increases sufficiently.
+     */
 
-	glBegin(GL_QUADS);		
-		
-	glTexCoord2f(0, 0);          glVertex(v0 * tidalSize);
+    centerTex[ic]->bind();
+
+    float br = 2 * brightness;
+
+    glColor4f(Rr, Gg, Bb, min(br * pixelWeight, 1.0f));
+
+    glBegin(GL_QUADS);
+
+    glTexCoord2f(0, 0);          glVertex(v0 * tidalSize);
     glTexCoord2f(1, 0);          glVertex(v1 * tidalSize);
     glTexCoord2f(1, 1);          glVertex(v2 * tidalSize);
-    glTexCoord2f(0, 1);          glVertex(v3 * tidalSize);   					
-		
-	glEnd();						     
-			 				
-	/*! Next, render globular cluster via distinct "star" sprites (globularTex) 
-	 * for sufficiently large resolution and distance from center of globular.
-	 *  
-	 * This RGBA texture fades away when resolution decreases (e.g. via automag!), 
-	 * or when distance from globular center decreases.
-	 */
-	
-	
-	globularTex->bind();
-	
-	
-	int pow2 = 128;			     // Associate "Red Giants" with the 128 biggest star-sprites  
+    glTexCoord2f(0, 1);          glVertex(v3 * tidalSize);
 
-	float starSize =  br * 0.5f; // Maximal size of star sprites -> "Red Giants"
-	float clipDistance = 100.0f; // observer distance [ly] from globular, where we 
-		                         // start "morphing" the star-sprite sizes towards 
-			                     // their physical values
-	glBegin(GL_QUADS);
-    
-	for (unsigned int i = 0; i < nPoints; ++i)
-	{  						  
-		GBlob         b  = (*points)[i];
-		Point3f       p  = b.position * m;		
-		float    eta_2d  = b.radius_2d;
-		
-		/*! Note that the [axis,angle] input in globulars.dsc transforms the 
-		 *  2d projected star distance r_2d in the globular frame to refer to the 
-		 *  skyplane frame for each globular! That's what I need here.
-	     *
-	     *  The [axis,angle] input will be needed anyway, when upgrading to 
-		 *  account for  ellipticities, with corresponding  inclinations and 
-		 *  position angles...
-	     */
+    glEnd();
+
+    /*! Next, render globular cluster via distinct "star" sprites (globularTex)
+     * for sufficiently large resolution and distance from center of globular.
+     *
+     * This RGBA texture fades away when resolution decreases (e.g. via automag!),
+     * or when distance from globular center decreases.
+     */
 
 
-		if ((i & pow2) != 0)
-		{      
-			pow2    <<=   1;		   
-			starSize /= 1.25f;			
-	   			
-			if (starSize < minimumFeatureSize)
-           		break;
-		} 
+    globularTex->bind();
 
-		float obsDistanceToStarRatio = (p + offset).distanceFromOrigin() / clipDistance;		
-		float saveSize = starSize;
 
-		if (obsDistanceToStarRatio < 1.0f)
-		{  
-			// "Morph" the star-sprite sizes at close observer distance such that
-			// the overdense globular core is dissolved upon closing in.
-            
-			starSize = starSize * min(obsDistanceToStarRatio, 1.0f);     
-		}	
-         
-		/* Colors of normal globular stars are given by color profile.
-		 * Associate orange "Red Giant" stars with the largest sprite
-		 * sizes (while pow2 = 128).
-		 */
+    int pow2 = 128;                 // Associate "Red Giants" with the 128 biggest star-sprites
 
-		Color col  = (pow2 < 256)? colorTable[255]: colorTable[b.colorIndex];		
-		glColor4f(col.red(), col.green(), col.blue(), 
-			      min(br * (1.0f - pixelWeight * relStarDensity(eta_2d)), 1.0f));
-	   
-		glTexCoord2f(0, 0);          glVertex(p + (v0 * starSize));
-		glTexCoord2f(1, 0);          glVertex(p + (v1 * starSize));
-		glTexCoord2f(1, 1);          glVertex(p + (v2 * starSize));
-		glTexCoord2f(0, 1);          glVertex(p + (v3 * starSize));
-	   					        
-		starSize = saveSize;	
-	}
-	glEnd();
+    float starSize =  br * 0.5f; // Maximal size of star sprites -> "Red Giants"
+    float clipDistance = 100.0f; // observer distance [ly] from globular, where we
+                                 // start "morphing" the star-sprite sizes towards
+                                 // their physical values
+    glBegin(GL_QUADS);
+
+    for (unsigned int i = 0; i < nPoints; ++i)
+    {
+        GBlob         b  = (*points)[i];
+        Point3f       p  = b.position * m;
+        float    eta_2d  = b.radius_2d;
+
+        /*! Note that the [axis,angle] input in globulars.dsc transforms the
+         *  2d projected star distance r_2d in the globular frame to refer to the
+         *  skyplane frame for each globular! That's what I need here.
+         *
+         *  The [axis,angle] input will be needed anyway, when upgrading to
+         *  account for  ellipticities, with corresponding  inclinations and
+         *  position angles...
+         */
+
+
+        if ((i & pow2) != 0)
+        {
+            pow2    <<=   1;
+            starSize /= 1.25f;
+
+            if (starSize < minimumFeatureSize)
+                   break;
+        }
+
+        float obsDistanceToStarRatio = (p + offset).distanceFromOrigin() / clipDistance;
+        float saveSize = starSize;
+
+        if (obsDistanceToStarRatio < 1.0f)
+        {
+            // "Morph" the star-sprite sizes at close observer distance such that
+            // the overdense globular core is dissolved upon closing in.
+
+            starSize = starSize * min(obsDistanceToStarRatio, 1.0f);
+        }
+
+        /* Colors of normal globular stars are given by color profile.
+         * Associate orange "Red Giant" stars with the largest sprite
+         * sizes (while pow2 = 128).
+         */
+
+        Color col  = (pow2 < 256)? colorTable[255]: colorTable[b.colorIndex];
+        glColor4f(col.red(), col.green(), col.blue(),
+                  min(br * (1.0f - pixelWeight * relStarDensity(eta_2d)), 1.0f));
+
+        glTexCoord2f(0, 0);          glVertex(p + (v0 * starSize));
+        glTexCoord2f(1, 0);          glVertex(p + (v1 * starSize));
+        glTexCoord2f(1, 1);          glVertex(p + (v2 * starSize));
+        glTexCoord2f(0, 1);          glVertex(p + (v3 * starSize));
+
+        starSize = saveSize;
+    }
+    glEnd();
 }
 
 unsigned int Globular::getRenderMask() const
@@ -510,168 +510,168 @@ unsigned int Globular::getLabelMask() const
 {
     return Renderer::GlobularLabels;
 }
-		
+
 
 void Globular::recomputeTidalRadius()
 {
-	// Convert the core radius from arcminutes to light years
-	// Compute the tidal radius in light years
-        
-	float coreRadiusLy = std::tan(degToRad(r_c / 60.0f)) * (float) getPosition().norm();
-    tidalRadius = coreRadiusLy * std::pow(10.0f, c);     
+    // Convert the core radius from arcminutes to light years
+    // Compute the tidal radius in light years
+
+    float coreRadiusLy = std::tan(degToRad(r_c / 60.0f)) * (float) getPosition().norm();
+    tidalRadius = coreRadiusLy * std::pow(10.0f, c);
 }
 
 
 GlobularForm* buildGlobularForms(float c)
 {
-	GBlob b;
-	vector<GBlob>* globularPoints = new vector<GBlob>;
+    GBlob b;
+    vector<GBlob>* globularPoints = new vector<GBlob>;
 
-	float rRatio = pow(10.0f, c); //  = r_t / r_c
-	float prob;
-	float cc =  1.0f + rRatio * rRatio;
-	unsigned int i = 0, k = 0;
-	
-	// Value of King_1962 luminosity profile at center:	
-	
-	float prob0 = sqrt(cc) - 1.0f;
+    float rRatio = pow(10.0f, c); //  = r_t / r_c
+    float prob;
+    float cc =  1.0f + rRatio * rRatio;
+    unsigned int i = 0, k = 0;
 
-	/*! Generate the globular star distribution randomly, according 
-	 *  to the  King_1962 surface density profile f(r), eq.(14).
-	 *
-	 *  rho = r / r_c = eta r_t / r_c, 0 <= eta <= 1,  
-  	 *  coreRadius r_c, tidalRadius r_t, King concentration c = log10(r_t/r_c). 
-	 */	
-	
-	while (i < GLOBULAR_POINTS)
-	{	
-	    /*!  
-		 *  Use a combination of the Inverse Transform method and 
-		 *  Von Neumann's Acceptance-Rejection method for generating sprite stars 
-		 *  with eta distributed according to the exact King luminosity profile.    
-		 *
-		 * This algorithm leads to almost 100% efficiency for all values of  
-		 * parameters and variables!
-		 */
-	
-		float uu = Mathf::frand();
-		
-		/* First step: eta distributed as inverse power distribution (~1/Z^2) 
-		 * that majorizes the exact King profile. Compute eta in terms of uniformly 
-		 * distributed variable uu! Normalization to 1 for eta -> 0.
-         */ 				
-		
-		float eta = tan(uu *atan(rRatio))/rRatio;
+    // Value of King_1962 luminosity profile at center:
 
-		float rho = eta * rRatio;		
-		float  cH = 1.0f/(1.0f + rho * rho);
+    float prob0 = sqrt(cc) - 1.0f;
+
+    /*! Generate the globular star distribution randomly, according
+     *  to the  King_1962 surface density profile f(r), eq.(14).
+     *
+     *  rho = r / r_c = eta r_t / r_c, 0 <= eta <= 1,
+     *  coreRadius r_c, tidalRadius r_t, King concentration c = log10(r_t/r_c).
+     */
+
+    while (i < GLOBULAR_POINTS)
+    {
+        /*!
+         *  Use a combination of the Inverse Transform method and
+         *  Von Neumann's Acceptance-Rejection method for generating sprite stars
+         *  with eta distributed according to the exact King luminosity profile.
+         *
+         * This algorithm leads to almost 100% efficiency for all values of
+         * parameters and variables!
+         */
+
+        float uu = Mathf::frand();
+
+        /* First step: eta distributed as inverse power distribution (~1/Z^2)
+         * that majorizes the exact King profile. Compute eta in terms of uniformly
+         * distributed variable uu! Normalization to 1 for eta -> 0.
+         */
+
+        float eta = tan(uu *atan(rRatio))/rRatio;
+
+        float rho = eta * rRatio;
+        float  cH = 1.0f/(1.0f + rho * rho);
         float   Z = sqrt((1.0f + rho * rho)/cc); // scaling variable
-		
-	    // Express King_1962 profile in terms of the UNIVERSAL variable 0 < Z <= 1,		
-		
-		prob = (1.0f - 1.0f / Z) / prob0;
-		prob = prob * prob;
-								
-  	    /* Second step: Use Acceptance-Rejection method (Von Neumann) for
-		 * correcting the power distribution of eta into the exact, 
-		 * desired King form 'prob'!
-		 */
+
+        // Express King_1962 profile in terms of the UNIVERSAL variable 0 < Z <= 1,
+
+        prob = (1.0f - 1.0f / Z) / prob0;
+        prob = prob * prob;
+
+        /* Second step: Use Acceptance-Rejection method (Von Neumann) for
+         * correcting the power distribution of eta into the exact,
+         * desired King form 'prob'!
+         */
 
         k++;
 
-		if (Mathf::frand() < prob / cH)
-		{
-		   	/* Generate 3d points of globular cluster stars in polar coordinates:
-			 * Distribution in eta (<=> r) according to King's profile. 
-		     * Uniform distribution on any spherical surface for given eta. 
-			 * Note: u = cos(phi) must be used as a stochastic variable to get uniformity in angle!
-			 */
-			float u = Mathf::sfrand(); 
-			float theta = 2 * (float) PI * Mathf::frand();
-			float sthetu2 = sin(theta) * sqrt(1.0f - u * u);
-			
-			// x,y,z points within -0.5..+0.5, as required for consistency: 
-			b.position = 0.5f * Point3f(eta * sqrt(1.0f - u * u) * cos(theta), eta * sthetu2 , eta * u);
-			            
-			/* 
-			 * Note: 2d projection in x-z plane, according to Celestia's
-			 * conventions! Hence...
-			 */			
-			b.radius_2d = eta * sqrt(1.0f - sthetu2 * sthetu2);
+        if (Mathf::frand() < prob / cH)
+        {
+            /* Generate 3d points of globular cluster stars in polar coordinates:
+             * Distribution in eta (<=> r) according to King's profile.
+             * Uniform distribution on any spherical surface for given eta.
+             * Note: u = cos(phi) must be used as a stochastic variable to get uniformity in angle!
+             */
+            float u = Mathf::sfrand();
+            float theta = 2 * (float) PI * Mathf::frand();
+            float sthetu2 = sin(theta) * sqrt(1.0f - u * u);
 
-			/* For now, implement only a generic spectrum for normal cluster
-			 * stars, modelled from Hubble photo of M80. 
-			 * Blue Stragglers are qualitatively accounted for...
-   			 * assume color index poportional to Z as function of which the King profile
-			 * becomes universal!
-			 */
-			  
-			b.colorIndex  = (unsigned int) (Z * 254);
-            
-		    globularPoints->push_back(b);					
-			i++;		
-		}
-	}
-	
-	// Check for efficiency of sprite-star generation => close to 100 %!
-	//cout << "c =  "<< c <<"  i =  " << i - 1 <<"  k =  " << k - 1 <<                                                       "  Efficiency:  " << 100.0f * i / (float)k<<"%" << endl;	
-	
-	GlobularForm* globularForm  = new GlobularForm();
-	globularForm->gblobs        = globularPoints;
-	globularForm->scale         = Vec3f(1.0f, 1.0f, 1.0f);	
-		
-	return globularForm;
+            // x,y,z points within -0.5..+0.5, as required for consistency:
+            b.position = 0.5f * Point3f(eta * sqrt(1.0f - u * u) * cos(theta), eta * sthetu2 , eta * u);
+
+            /*
+             * Note: 2d projection in x-z plane, according to Celestia's
+             * conventions! Hence...
+             */
+            b.radius_2d = eta * sqrt(1.0f - sthetu2 * sthetu2);
+
+            /* For now, implement only a generic spectrum for normal cluster
+             * stars, modelled from Hubble photo of M80.
+             * Blue Stragglers are qualitatively accounted for...
+             * assume color index poportional to Z as function of which the King profile
+             * becomes universal!
+             */
+
+            b.colorIndex  = (unsigned int) (Z * 254);
+
+            globularPoints->push_back(b);
+            i++;
+        }
+    }
+
+    // Check for efficiency of sprite-star generation => close to 100 %!
+    //cout << "c =  "<< c <<"  i =  " << i - 1 <<"  k =  " << k - 1 <<                                                       "  Efficiency:  " << 100.0f * i / (float)k<<"%" << endl;
+
+    GlobularForm* globularForm  = new GlobularForm();
+    globularForm->gblobs        = globularPoints;
+    globularForm->scale         = Vec3f(1.0f, 1.0f, 1.0f);
+
+    return globularForm;
 }
 
 void InitializeForms()
 {
 
-	// Build RGB color table, using hue, saturation, value as input.
-	// Hue in degrees.
-	
-	// Location of hue transition and saturation peak in color index space: 
-	int i0 = 36, i_satmax = 16; 
-	// Width of hue transition in color index space: 	
-	int i_width = 3;
-				
-	float sat_l = 0.08f, sat_h = 0.1f, hue_r = 27.0f, hue_b = 220.0f;
-	
-	// Red Giant star color: i = 255:
-	// -------------------------------
-	// Convert hue, saturation and value to RGB
+    // Build RGB color table, using hue, saturation, value as input.
+    // Hue in degrees.
 
-	DeepSkyObject::hsv2rgb(&Rr, &Gg, &Bb, 25.0f, 0.65f, 1.0f);
-	colorTable[255]  = Color(Rr, Gg, Bb);
-		
-	// normal stars: i < 255, generic color profile for now, improve later
-	// --------------------------------------------------------------------
+    // Location of hue transition and saturation peak in color index space:
+    int i0 = 36, i_satmax = 16;
+    // Width of hue transition in color index space:
+    int i_width = 3;
+
+    float sat_l = 0.08f, sat_h = 0.1f, hue_r = 27.0f, hue_b = 220.0f;
+
+    // Red Giant star color: i = 255:
+    // -------------------------------
+    // Convert hue, saturation and value to RGB
+
+    DeepSkyObject::hsv2rgb(&Rr, &Gg, &Bb, 25.0f, 0.65f, 1.0f);
+    colorTable[255]  = Color(Rr, Gg, Bb);
+
+    // normal stars: i < 255, generic color profile for now, improve later
+    // --------------------------------------------------------------------
     // Convert hue, saturation, value to RGB
-		
-	for (int i = 254; i >=0; i--)
+
+    for (int i = 254; i >=0; i--)
     {
-		// simple qualitative saturation profile:	
-		// i_satmax is value of i where sat = sat_h + sat_l maximal
+        // simple qualitative saturation profile:
+        // i_satmax is value of i where sat = sat_h + sat_l maximal
 
-	    float x = (float) i / (float) i_satmax, x2 = x ;
-		float sat = sat_l + 2 * sat_h /(x2 + 1.0f / x2);
-				
-		// Fast transition from hue_r to hue_b at i = i0 within a width
-		// i_width in color index space:
+        float x = (float) i / (float) i_satmax, x2 = x ;
+        float sat = sat_l + 2 * sat_h /(x2 + 1.0f / x2);
 
-		float hue = hue_r + 0.5f * (hue_b - hue_r) * (std::tanh((float)(i - i0) / (float) i_width) + 1.0f);
-		
-		DeepSkyObject::hsv2rgb(&Rr, &Gg, &Bb, hue, sat, 0.85f);
-		colorTable[i]  = Color(Rr, Gg, Bb);
-	}
-	// Define globularForms corresponding to 8 different bins of King concentration c 
-   
-	globularForms = new GlobularForm*[8];   
+        // Fast transition from hue_r to hue_b at i = i0 within a width
+        // i_width in color index space:
 
-	for (unsigned int ic  = 0; ic <= 7; ++ic)
+        float hue = hue_r + 0.5f * (hue_b - hue_r) * (std::tanh((float)(i - i0) / (float) i_width) + 1.0f);
+
+        DeepSkyObject::hsv2rgb(&Rr, &Gg, &Bb, hue, sat, 0.85f);
+        colorTable[i]  = Color(Rr, Gg, Bb);
+    }
+    // Define globularForms corresponding to 8 different bins of King concentration c
+
+    globularForms = new GlobularForm*[8];
+
+    for (unsigned int ic  = 0; ic <= 7; ++ic)
     {
         float CBin = MinC + ((float) ic + 0.5f) * BinWidth;
-		globularForms[ic] = buildGlobularForms(CBin); 
-	}				
-	formsInitialized = true;
+        globularForms[ic] = buildGlobularForms(CBin);
+    }
+    formsInitialized = true;
 
 }
diff --git a/src/celengine/globular.h b/src/celengine/globular.h
index 140bc493d..7b4159fc8 100644
--- a/src/celengine/globular.h
+++ b/src/celengine/globular.h
@@ -3,9 +3,9 @@
 // Copyright (C) 2008, Celestia Development Team
 // Initial implementation by Dr. Fridger Schrempp <fridger.schrempp@desy.de>
 //
-// Simulation of globular clusters, theoretical framework by  
+// Simulation of globular clusters, theoretical framework by
 // Ivan King, Astron. J. 67 (1962) 471; ibid. 71 (1966) 64
-// 
+//
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License
@@ -36,23 +36,23 @@ class Globular : public DeepSkyObject
  public:
     EIGEN_MAKE_ALIGNED_OPERATOR_NEW
 
- 	Globular();
+    Globular();
     virtual const char* getType() const;
     virtual void setType(const std::string&);
     virtual size_t getDescription(char* buf, size_t bufLength) const;
     virtual std::string getCustomTmpName() const;
     virtual void setCustomTmpName(const std::string&);
-    float getDetail() const;	
+    float getDetail() const;
     void  setDetail(float);
     float getCoreRadius() const;
     void  setCoreRadius(const float);
-	void  setConcentration(const float);	
-	float getConcentration() const;
-	float getHalfMassRadius() const;
+    void  setConcentration(const float);
+    float getConcentration() const;
+    float getHalfMassRadius() const;
     unsigned int cSlot(float) const;
-    
+
     virtual float getBoundingSphereRadius() const { return tidalRadius; }
-    
+
     virtual bool pick(const Ray3d& ray,
                       double& distanceToPicker,
                       double& cosAngleToBoundCenter) const;
@@ -63,25 +63,25 @@ class Globular : public DeepSkyObject
                         float brightness,
                         float pixelSize);
     virtual void renderGlobularPointSprites(const GLContext& context,
-                                          const Vec3f& offset,
-                                          const Quatf& viewerOrientation,
-                                          float brightness,
-                                          float pixelSize);
-	GlobularForm* getForm() const;
+                                            const Vec3f& offset,
+                                            const Quatf& viewerOrientation,
+                                            float brightness,
+                                            float pixelSize);
+    GlobularForm* getForm() const;
 
     virtual unsigned int getRenderMask() const;
     virtual unsigned int getLabelMask() const;
     virtual const char* getObjTypeName() const;
-    
+
  private:
     void recomputeTidalRadius();
-    
+
  private:
-    float detail; 
-    std::string* customTmpName;     
-    GlobularForm* form;    
- 	float r_c;
-    float c;  
+    float detail;
+    std::string* customTmpName;
+    GlobularForm* form;
+    float r_c;
+    float c;
     float tidalRadius;
 };
 
diff --git a/src/celengine/glshader.cpp b/src/celengine/glshader.cpp
index f3e1e62a0..d2afe864f 100644
--- a/src/celengine/glshader.cpp
+++ b/src/celengine/glshader.cpp
@@ -38,7 +38,7 @@ GLShader::compile(const vector<string>& source)
 {
     if (source.empty())
         return ShaderStatus_EmptyProgram;
-    
+
     // Convert vector of shader source strings to an array for OpenGL
     const char** sourceStrings = new const char*[source.size()];
     for (unsigned int i = 0; i < source.size(); i++)
@@ -50,7 +50,7 @@ GLShader::compile(const vector<string>& source)
 
     // Actually compile the shader
     glCompileShaderARB(id);
-    
+
     GLint compileSuccess;
     glGetObjectParameterivARB(id, GL_OBJECT_COMPILE_STATUS_ARB,
                                    &compileSuccess);
@@ -235,7 +235,7 @@ GLShaderLoader::CreateFragmentShader(const vector<string>& source,
 GLShaderStatus
 GLShaderLoader::CreateVertexShader(const string& source,
                                    GLVertexShader** vs)
-                                        
+
 {
     vector<string> v;
     v.push_back(source);
@@ -338,11 +338,11 @@ GetInfoLog(GLhandleARB obj)
     char* log = new char[logLength];
     if (log == NULL)
         return string();
-    
+
     glGetInfoLogARB(obj, logLength, &charsWritten, log);
-    
+
     string s(log, charsWritten);
     delete[] log;
-    
+
     return s;
 }
diff --git a/src/celengine/glshader.h b/src/celengine/glshader.h
index 26d5ebabc..4076ec5a6 100644
--- a/src/celengine/glshader.h
+++ b/src/celengine/glshader.h
@@ -92,7 +92,7 @@ class FloatShaderParameter
     FloatShaderParameter(GLhandleARB _obj, const char* name);
 
     FloatShaderParameter& operator=(float);
-    
+
  private:
     int slot;
 };
diff --git a/src/celengine/image.cpp b/src/celengine/image.cpp
index 5f97892d0..cb5103105 100644
--- a/src/celengine/image.cpp
+++ b/src/celengine/image.cpp
@@ -403,7 +403,7 @@ Image* LoadImageFromFile(const string& filename)
 
 struct my_error_mgr
 {
-    struct jpeg_error_mgr pub;	// "public" fields
+    struct jpeg_error_mgr pub;  // "public" fields
     jmp_buf setjmp_buffer;      // for return to caller
 };
 
@@ -438,8 +438,8 @@ Image* LoadJPEGImage(const string& filename, int)
     // struct, to avoid dangling-pointer problems.
     struct my_error_mgr jerr;
     // More stuff
-    JSAMPARRAY buffer;		// Output row buffer
-    int row_stride;		// physical row width in output buffer
+    JSAMPARRAY buffer;        // Output row buffer
+    int row_stride;        // physical row width in output buffer
     long cont;
 
     // In this example we want to open the input file before doing anything else,
diff --git a/src/celengine/lightenv.h b/src/celengine/lightenv.h
index 986764865..262078bbd 100644
--- a/src/celengine/lightenv.h
+++ b/src/celengine/lightenv.h
@@ -94,7 +94,7 @@ public:
 
     Eigen::Vector3f eyeDir_obj;
     Eigen::Vector3f eyePos_obj;
-    
+
     Eigen::Vector3f ambientColor;
 };
 
diff --git a/src/celengine/location.cpp b/src/celengine/location.cpp
index 8e1dde041..ae7732711 100644
--- a/src/celengine/location.cpp
+++ b/src/celengine/location.cpp
@@ -62,7 +62,7 @@ FeatureNameEntry FeatureNames[] =
     { "Landing Site", Location::LandingSite },
     { "Crater", Location::Crater },
 };
- 
+
 
 Location::Location() :
     parent(NULL),
@@ -93,7 +93,7 @@ string Location::getName(bool i18n) const
 void Location::setName(const string& _name)
 {
     name = _name;
-    i18nName = _(_name.c_str()); 
+    i18nName = _(_name.c_str());
     if (name == i18nName) i18nName = "";
 }
 
@@ -190,7 +190,7 @@ void Location::setParentBody(Body* _parent)
 }
 
 
-/*! Get the position of the location relative to its body in 
+/*! Get the position of the location relative to its body in
  *  the J2000 ecliptic coordinate system.
  */
 Vector3d Location::getPlanetocentricPosition(double t) const
diff --git a/src/celengine/lodspheremesh.h b/src/celengine/lodspheremesh.h
index ffb5fa63e..99d172846 100644
--- a/src/celengine/lodspheremesh.h
+++ b/src/celengine/lodspheremesh.h
@@ -1,5 +1,5 @@
 // lodspheremesh.h
-// 
+//
 // Copyright (C) 2001-2010, Celestia Development Team
 // Original version by Chris Laurel <claurel@gmail.com>
 //
@@ -60,7 +60,7 @@ public:
             context(_context)
         {};
 
-        int step;                 
+        int step;
         unsigned int attributes;  // vertex attributes
         const Frustum& frustum;   // frustum, for culling
         Point3f fp[8];            // frustum points, for culling
@@ -68,7 +68,7 @@ public:
         const GLContext& context;
     };
 
-    int renderPatches(int phi0, int theta0, 
+    int renderPatches(int phi0, int theta0,
                       int extent,
                       int level,
                       const RenderInfo&);
diff --git a/src/celengine/marker.cpp b/src/celengine/marker.cpp
index 3cb0a522b..4035d235c 100644
--- a/src/celengine/marker.cpp
+++ b/src/celengine/marker.cpp
@@ -121,11 +121,11 @@ MarkerRepresentation::operator=(const MarkerRepresentation& rep)
     m_size = rep.m_size;
     m_color = rep.m_color;
     m_label = rep.m_label;
-    
+
     return *this;
 }
-    
-   
+
+
 void MarkerRepresentation::setColor(Color color)
 {
     m_color = color;
@@ -260,9 +260,9 @@ void MarkerRepresentation::render(float size) const
     case Circle:
         glBegin(GL_LINE_LOOP);
         DrawCircle(s);
-        glEnd();    
+        glEnd();
         break;
-            
+
     case Disk:
         glBegin(GL_POLYGON);
         DrawCircle(s);
diff --git a/src/celengine/marker.h b/src/celengine/marker.h
index 027c90f76..806020b52 100644
--- a/src/celengine/marker.h
+++ b/src/celengine/marker.h
@@ -35,8 +35,8 @@ public:
         Circle    = 10,
         Disk      = 11,
         Crosshair = 12,
-    };    
-    
+    };
+
     MarkerRepresentation(Symbol symbol = MarkerRepresentation::Diamond,
                          float size = 10.0f,
                          Color color = Color::White,
@@ -47,11 +47,11 @@ public:
         m_label(label)
     {
     }
-    
+
     MarkerRepresentation(const MarkerRepresentation& rep);
-    
+
     MarkerRepresentation& operator=(const MarkerRepresentation& rep);
-    
+
     Symbol symbol() const { return m_symbol; }
     Color color() const { return m_color; }
     void setColor(Color);
@@ -59,9 +59,9 @@ public:
     void setSize(float size);
     string label() const { return m_label; }
     void setLabel(const std::string&);
-        
+
     void render(float size) const;
-    
+
 private:
     Symbol m_symbol;
     float m_size;
diff --git a/src/celengine/meshmanager.cpp b/src/celengine/meshmanager.cpp
index 475d0f8ab..e60bb6acd 100644
--- a/src/celengine/meshmanager.cpp
+++ b/src/celengine/meshmanager.cpp
@@ -86,7 +86,7 @@ string GeometryInfo::resolve(const string& baseDir)
     // This suffix is stripped before the file is actually loaded.
     char uniquifyingSuffix[128];
     sprintf(uniquifyingSuffix, "%c%f,%f,%f,%f,%d", UniqueSuffixChar, center.x(), center.y(), center.z(), scale, (int) isNormalized);
-    
+
     if (!path.empty())
     {
         string filename = path + "/models/" + source;
@@ -107,7 +107,7 @@ Geometry* GeometryInfo::load(const string& resolvedFilename)
     // Strip off the uniquifying suffix
     string::size_type uniquifyingSuffixStart = resolvedFilename.rfind(UniqueSuffixChar);
     string filename(resolvedFilename, 0, uniquifyingSuffixStart);
-    
+
     clog << _("Loading model: ") << filename << '\n';
     Model* model = NULL;
     ContentType fileType = DetermineFileType(filename);
@@ -168,7 +168,7 @@ Geometry* GeometryInfo::load(const string& resolvedFilename)
         }
     }
 #endif
-        
+
     // Condition the model for optimal rendering
     if (model != NULL)
     {
@@ -468,7 +468,7 @@ ConvertTriangleMesh(M3DTriangleMesh& mesh,
                 Vector2f texCoord = mesh.getTexCoord(triVert[j]);
                 vertexData[dataOffset + 6] = texCoord.x();
                 vertexData[dataOffset + 7] = texCoord.y();
-            }            
+            }
         }
     }
 
diff --git a/src/celengine/modelgeometry.cpp b/src/celengine/modelgeometry.cpp
index bc33b562c..793a4ba34 100644
--- a/src/celengine/modelgeometry.cpp
+++ b/src/celengine/modelgeometry.cpp
@@ -123,7 +123,7 @@ ModelGeometry::render(RenderContext& rc, double /* t */)
                                     mesh->getVertexCount() * vertexDesc.stride,
                                     mesh->getVertexData(),
                                     GL_STATIC_DRAW_ARB);
-					glBindBufferARB(GL_ARRAY_BUFFER_ARB, 0);
+                    glBindBufferARB(GL_ARRAY_BUFFER_ARB, 0);
                 }
             }
 
diff --git a/src/celengine/nebula.h b/src/celengine/nebula.h
index 1fa39d238..8ad63207a 100644
--- a/src/celengine/nebula.h
+++ b/src/celengine/nebula.h
@@ -40,7 +40,7 @@ class Nebula : public DeepSkyObject
 
     void setGeometry(ResourceHandle);
     ResourceHandle getGeometry() const;
-    
+
     virtual const char* getObjTypeName() const;
 
  public:
diff --git a/src/celengine/observer.cpp b/src/celengine/observer.cpp
index 3b5af97a4..9e9dd6391 100644
--- a/src/celengine/observer.cpp
+++ b/src/celengine/observer.cpp
@@ -80,55 +80,55 @@ Observer::Observer() :
 
 /*! Copy constructor. */
 Observer::Observer(const Observer& o) :
-	simTime(o.simTime),
-	position(o.position),
-	orientation(o.orientation),
-	velocity(o.velocity),
-	angularVelocity(o.angularVelocity),
-	frame(NULL),
-	realTime(o.realTime),
-	targetSpeed(o.targetSpeed),
-	targetVelocity(o.targetVelocity),
-	beginAccelTime(o.beginAccelTime),
-	observerMode(o.observerMode),
-	journey(o.journey),
-	trackObject(o.trackObject),
-	trackingOrientation(o.trackingOrientation),
-	fov(o.fov),
-	reverseFlag(o.reverseFlag),
-	locationFilter(o.locationFilter),
-	displayedSurface(o.displayedSurface)
+    simTime(o.simTime),
+    position(o.position),
+    orientation(o.orientation),
+    velocity(o.velocity),
+    angularVelocity(o.angularVelocity),
+    frame(NULL),
+    realTime(o.realTime),
+    targetSpeed(o.targetSpeed),
+    targetVelocity(o.targetVelocity),
+    beginAccelTime(o.beginAccelTime),
+    observerMode(o.observerMode),
+    journey(o.journey),
+    trackObject(o.trackObject),
+    trackingOrientation(o.trackingOrientation),
+    fov(o.fov),
+    reverseFlag(o.reverseFlag),
+    locationFilter(o.locationFilter),
+    displayedSurface(o.displayedSurface)
 {
-	frame = new ObserverFrame(*o.frame);
-	updateUniversal();
+    frame = new ObserverFrame(*o.frame);
+    updateUniversal();
 }
 
 
 Observer& Observer::operator=(const Observer& o)
 {
-	simTime = o.simTime;
-	position = o.position;
-	orientation = o.orientation;
-	velocity = o.velocity;
-	angularVelocity = o.angularVelocity;
-	frame = NULL;
-	realTime = o.realTime;
-	targetSpeed = o.targetSpeed;
-	targetVelocity = o.targetVelocity;
-	beginAccelTime = o.beginAccelTime;
-	observerMode = o.observerMode;
-	journey = o.journey;
-	trackObject = o.trackObject;
-	trackingOrientation = o.trackingOrientation;
-	fov = o.fov;
-	reverseFlag = o.reverseFlag;
-	locationFilter = o.locationFilter;
-	displayedSurface = o.displayedSurface;
+    simTime = o.simTime;
+    position = o.position;
+    orientation = o.orientation;
+    velocity = o.velocity;
+    angularVelocity = o.angularVelocity;
+    frame = NULL;
+    realTime = o.realTime;
+    targetSpeed = o.targetSpeed;
+    targetVelocity = o.targetVelocity;
+    beginAccelTime = o.beginAccelTime;
+    observerMode = o.observerMode;
+    journey = o.journey;
+    trackObject = o.trackObject;
+    trackingOrientation = o.trackingOrientation;
+    fov = o.fov;
+    reverseFlag = o.reverseFlag;
+    locationFilter = o.locationFilter;
+    displayedSurface = o.displayedSurface;
 
-	setFrame(*o.frame);
-	updateUniversal();
+    setFrame(*o.frame);
+    updateUniversal();
 
-	return *this;
+    return *this;
 }
 
 
@@ -155,7 +155,7 @@ double Observer::getRealTime() const
 void Observer::setTime(double jd)
 {
     simTime = jd;
-	updateUniversal();
+    updateUniversal();
 }
 
 
@@ -260,7 +260,7 @@ void Observer::setAngularVelocity(const Vector3d& v)
  */
 // TODO: This is a generally useful function that should be moved to
 // the celmath package.
-template<class T> static Quaternion<T> 
+template<class T> static Quaternion<T>
 lookAt(Matrix<T, 3, 1> from, Matrix<T, 3, 1> to, Matrix<T, 3, 1> up)
 {
     Matrix<T, 3, 1> n = to - from;
@@ -277,7 +277,7 @@ lookAt(Matrix<T, 3, 1> from, Matrix<T, 3, 1> to, Matrix<T, 3, 1> up)
 }
 
 #ifdef CELVEC
-template<class T> static Quat<T> 
+template<class T> static Quat<T>
 lookAt(Point3<T> from, Point3<T> to, Vector3<T> up)
 {
     Vector3<T> n = to - from;
@@ -487,7 +487,7 @@ void Observer::update(double dt, double timeScale)
 
         position = p;
         orientation = q;
-        
+
         // If the journey's complete, reset to manual control
         if (t == 1.0f)
         {
@@ -530,7 +530,7 @@ void Observer::update(double dt, double timeScale)
         orientation.normalize();
 #endif
     }
-   
+
     updateUniversal();
 
     // Update orientation for tracking--must occur after updateUniversal(), as it
@@ -539,7 +539,7 @@ void Observer::update(double dt, double timeScale)
     {
         Vector3d up = getOrientation().conjugate() * Vector3d::UnitY();
         Vector3d viewDir = trackObject.getPosition(getTime()).offsetFromKm(getPosition()).normalized();
-        
+
         setOrientation(lookAt<double>(Vector3d::Zero(), viewDir, up));
     }
 }
@@ -627,17 +627,17 @@ void Observer::computeGotoParameters(const Selection& destination,
     {
         setFrame(frame->getCoordinateSystem(), destination);
     }
-    
+
     UniversalCoord targetPosition = destination.getPosition(getTime());
     Vector3d v = targetPosition.offsetFromKm(getPosition()).normalized();
-    
+
     jparams.traj = Linear;
     jparams.duration = gotoTime;
     jparams.startTime = realTime;
-    
+
     // Right where we are now . . .
     jparams.from = getPosition();
-    
+
     if (offsetCoordSys == ObserverFrame::ObserverLocal)
     {
         jparams.to = targetPosition.offsetKm(orientationUniv.conjugate() * offset);
@@ -647,7 +647,7 @@ void Observer::computeGotoParameters(const Selection& destination,
         ObserverFrame offsetFrame(offsetCoordSys, destination);
         jparams.to = targetPosition.offsetKm(offsetFrame.getFrame()->getOrientation(getTime()).conjugate() * offset);
     }
-    
+
     Vector3d upd = up.cast<double>();
     if (upCoordSys == ObserverFrame::ObserverLocal)
     {
@@ -658,25 +658,25 @@ void Observer::computeGotoParameters(const Selection& destination,
         ObserverFrame upFrame(upCoordSys, destination);
         upd = upFrame.getFrame()->getOrientation(getTime()).conjugate() * upd;
     }
-    
+
     jparams.initialOrientation = getOrientation();
     Vector3d focus = targetPosition.offsetFromKm(jparams.to);
     jparams.finalOrientation = lookAt<double>(Vector3d::Zero(), focus, upd);
     jparams.startInterpolation = min(startInter, endInter);
     jparams.endInterpolation   = max(startInter, endInter);
-    
+
     jparams.accelTime = 0.5;
     double distance = jparams.from.offsetFromKm(jparams.to).norm() / 2.0;
     pair<double, double> sol = solve_bisection(TravelExpFunc(distance, jparams.accelTime),
                                                0.0001, 100.0,
                                                1e-10);
     jparams.expFactor = sol.first;
-    
+
     // Convert to frame coordinates
     jparams.from = frame->convertFromUniversal(jparams.from, getTime());
     jparams.initialOrientation = frame->convertFromUniversal(jparams.initialOrientation, getTime());
     jparams.to = frame->convertFromUniversal(jparams.to, getTime());
-    jparams.finalOrientation = frame->convertFromUniversal(jparams.finalOrientation, getTime());        
+    jparams.finalOrientation = frame->convertFromUniversal(jparams.finalOrientation, getTime());
 }
 
 
@@ -707,7 +707,7 @@ void Observer::computeGotoParametersGC(const Selection& destination,
 
     ObserverFrame offsetFrame(offsetCoordSys, destination);
     Vector3d offsetTransformed = offsetFrame.getFrame()->getOrientation(getTime()).conjugate() * offset;
-    
+
     jparams.to = targetPosition.offsetKm(offsetTransformed);
 
     Vector3d upd = up.cast<double>();
@@ -720,7 +720,7 @@ void Observer::computeGotoParametersGC(const Selection& destination,
         ObserverFrame upFrame(upCoordSys, destination);
         upd = upFrame.getFrame()->getOrientation(getTime()).conjugate() * upd;
     }
-    
+
     jparams.initialOrientation = getOrientation();
     Vector3d focus = targetPosition.offsetFromKm(jparams.to);
     jparams.finalOrientation = lookAt<double>(Vector3d::Zero(), focus, upd);
@@ -738,7 +738,7 @@ void Observer::computeGotoParametersGC(const Selection& destination,
     jparams.from = frame->convertFromUniversal(jparams.from, getTime());
     jparams.initialOrientation = frame->convertFromUniversal(jparams.initialOrientation, getTime());
     jparams.to = frame->convertFromUniversal(jparams.to, getTime());
-    jparams.finalOrientation = frame->convertFromUniversal(jparams.finalOrientation, getTime());    
+    jparams.finalOrientation = frame->convertFromUniversal(jparams.finalOrientation, getTime());
 }
 
 
@@ -771,7 +771,7 @@ void Observer::computeCenterParameters(const Selection& destination,
     jparams.from = frame->convertFromUniversal(jparams.from, getTime());
     jparams.initialOrientation = frame->convertFromUniversal(jparams.initialOrientation, getTime());
     jparams.to = frame->convertFromUniversal(jparams.to, getTime());
-    jparams.finalOrientation = frame->convertFromUniversal(jparams.finalOrientation, getTime());    
+    jparams.finalOrientation = frame->convertFromUniversal(jparams.finalOrientation, getTime());
 }
 
 
@@ -845,12 +845,12 @@ void Observer::setMode(Observer::ObserverMode mode)
 void Observer::convertFrameCoordinates(const ObserverFrame* newFrame)
 {
     double now = getTime();
-    
+
     // Universal coordinates don't change.
     // Convert frame coordinates to the new frame.
     position = newFrame->convertFromUniversal(positionUniv, now);
     orientation = newFrame->convertFromUniversal(orientationUniv, now);
-    
+
     // Convert goto parameters to the new frame
     journey.from               = ObserverFrame::convert(frame, newFrame, journey.from, now);
     journey.initialOrientation = ObserverFrame::convert(frame, newFrame, journey.initialOrientation, now);
@@ -864,7 +864,7 @@ void Observer::convertFrameCoordinates(const ObserverFrame* newFrame)
 */
 void Observer::setFrame(ObserverFrame::CoordinateSystem cs, const Selection& refObj, const Selection& targetObj)
 {
-    ObserverFrame* newFrame = new ObserverFrame(cs, refObj, targetObj);    
+    ObserverFrame* newFrame = new ObserverFrame(cs, refObj, targetObj);
     if (newFrame != NULL)
     {
         convertFrameCoordinates(newFrame);
@@ -891,17 +891,17 @@ void Observer::setFrame(const ObserverFrame& f)
     if (frame != &f)
     {
         ObserverFrame* newFrame = new ObserverFrame(f);
-        
+
         if (newFrame != NULL)
         {
-			if (frame != NULL)
-			{
-				convertFrameCoordinates(newFrame);
-				delete frame;
-			}
+            if (frame != NULL)
+            {
+                convertFrameCoordinates(newFrame);
+                delete frame;
+            }
             frame = newFrame;
         }
-    }    
+    }
 }
 
 
@@ -1080,7 +1080,7 @@ static double getPreferredDistance(const Selection& selection)
         // Handle reference points (i.e. invisible objects) specially, since the
         // actual radius of the point is meaningless. Instead, use the size of
         // bounding sphere of all child objects. This is useful for system
-        // barycenters--the normal goto command will place the observer at 
+        // barycenters--the normal goto command will place the observer at
         // a viewpoint in which the entire system can be seen.
         if (selection.body()->getClassification() == Body::Invisible)
         {
@@ -1309,10 +1309,10 @@ void Observer::gotoLocation(const UniversalCoord& toPosition,
     journey.duration = duration;
 
     journey.from = position;
-    journey.initialOrientation = orientation;    
+    journey.initialOrientation = orientation;
     journey.to = toPosition;
     journey.finalOrientation = toOrientation;
-    
+
     journey.startInterpolation = 0.25f;
     journey.endInterpolation   = 0.75f;
 
@@ -1338,7 +1338,7 @@ void Observer::getSelectionLongLat(const Selection& selection,
     {
         ObserverFrame frame(ObserverFrame::BodyFixed, selection);
         Vector3d bfPos = frame.convertFromUniversal(positionUniv, getTime()).offsetFromKm(UniversalCoord::Zero());
-        
+
         // Convert from Celestia's coordinate system
         double x = bfPos.x();
         double y = -bfPos.z();
@@ -1355,7 +1355,7 @@ void Observer::gotoSurface(const Selection& sel, double duration)
 {
     Vector3d v = getPosition().offsetFromKm(sel.getPosition(getTime()));
     v.normalize();
-    
+
     Vector3d viewDir = orientationUniv.conjugate() * -Vector3d::UnitZ();
     Vector3d up      = orientationUniv.conjugate() * Vector3d::UnitY();
     Quaterniond q = orientationUniv;
@@ -1363,16 +1363,16 @@ void Observer::gotoSurface(const Selection& sel, double duration)
     {
         q = lookAt<double>(Vector3d::Zero(), up, v);
     }
-    
+
     ObserverFrame frame(ObserverFrame::BodyFixed, sel);
     UniversalCoord bfPos = frame.convertFromUniversal(positionUniv, getTime());
     q = frame.convertFromUniversal(q, getTime());
-    
+
     double height = 1.0001 * sel.radius();
     Vector3d dir = bfPos.offsetFromKm(UniversalCoord::Zero()).normalized() * height;
     UniversalCoord nearSurfacePoint = UniversalCoord::Zero().offsetKm(dir);
-    
-    gotoLocation(nearSurfacePoint, q, duration);    
+
+    gotoLocation(nearSurfacePoint, q, duration);
 };
 
 
@@ -1412,7 +1412,7 @@ void Observer::geosynchronousFollow(const Selection& selection)
 void Observer::phaseLock(const Selection& selection)
 {
     Selection refObject = frame->getRefObject();
-    
+
     if (selection != refObject)
     {
         if (refObject.body() != NULL || refObject.star() != NULL)
@@ -1427,7 +1427,7 @@ void Observer::phaseLock(const Selection& selection)
         if (selection.body() != NULL)
         {
             setFrame(ObserverFrame::PhaseLock, selection, Selection(selection.body()->getSystem()->getStar()));
-        }        
+        }
     }
 }
 
@@ -1525,12 +1525,12 @@ ObserverFrame& ObserverFrame::operator=(const ObserverFrame& f)
 {
     coordSys = f.coordSys;
     targetObject = f.targetObject;
-    
+
     // In case frames are the same, make sure we addref before releasing
     f.frame->addRef();
     frame->release();
     frame = f.frame;
-    
+
     return *this;
 }
 
@@ -1570,7 +1570,7 @@ ObserverFrame::getFrame() const
 }
 
 
-UniversalCoord 
+UniversalCoord
 ObserverFrame::convertFromUniversal(const UniversalCoord& uc, double tjd) const
 {
     return frame->convertFromUniversal(uc, tjd);
@@ -1584,7 +1584,7 @@ ObserverFrame::convertToUniversal(const UniversalCoord& uc, double tjd) const
 }
 
 
-Quaterniond 
+Quaterniond
 ObserverFrame::convertFromUniversal(const Quaterniond& q, double tjd) const
 {
     return frame->convertFromUniversal(q, tjd);
@@ -1634,30 +1634,30 @@ ObserverFrame::createFrame(CoordinateSystem _coordSys,
     {
     case Universal:
         return new J2000EclipticFrame(Selection());
-        
+
     case Ecliptical:
         return new J2000EclipticFrame(_refObject);
-        
+
     case Equatorial:
         return new BodyMeanEquatorFrame(_refObject, _refObject);
-        
+
     case BodyFixed:
         return new BodyFixedFrame(_refObject, _refObject);
-        
+
     case PhaseLock:
     {
         return new TwoVectorFrame(_refObject,
                                   FrameVector::createRelativePositionVector(_refObject, _targetObject), 1,
                                   FrameVector::createRelativeVelocityVector(_refObject, _targetObject), 2);
     }
-        
+
     case Chase:
     {
         return new TwoVectorFrame(_refObject,
                                   FrameVector::createRelativeVelocityVector(_refObject, _refObject.parent()), 1,
                                   FrameVector::createRelativePositionVector(_refObject, _refObject.parent()), 2);
     }
-        
+
     case PhaseLock_Old:
     {
         FrameVector rotAxis(FrameVector::createConstantVector(Vector3d::UnitY(),
@@ -1666,12 +1666,12 @@ ObserverFrame::createFrame(CoordinateSystem _coordSys,
                                   FrameVector::createRelativePositionVector(_refObject, _targetObject), 3,
                                   rotAxis, 2);
     }
-        
+
     case Chase_Old:
     {
         FrameVector rotAxis(FrameVector::createConstantVector(Vector3d::UnitY(),
                                                               new BodyMeanEquatorFrame(_refObject, _refObject)));
-        
+
         return new TwoVectorFrame(_refObject,
                                   FrameVector::createRelativeVelocityVector(_refObject.parent(), _refObject), 3,
                                   rotAxis, 2);
@@ -1681,7 +1681,7 @@ ObserverFrame::createFrame(CoordinateSystem _coordSys,
         // TODO: This is only used for computing up vectors for orientation; it does
         // define a proper frame for the observer position orientation.
         return new J2000EclipticFrame(Selection());
-        
+
     default:
         return new J2000EclipticFrame(_refObject);
     }
diff --git a/src/celengine/observer.h b/src/celengine/observer.h
index 8d149614f..a14f438ee 100644
--- a/src/celengine/observer.h
+++ b/src/celengine/observer.h
@@ -34,44 +34,44 @@ public:
         BodyFixed       = 3,
         PhaseLock       = 5,
         Chase           = 6,
-        
+
         // Previous versions of PhaseLock and Chase used the
         // spin axis of the reference object as a secondary
         // vector for the coordinate system.
         PhaseLock_Old   = 100,
         Chase_Old       = 101,
-        
+
         // ObserverLocal is not a real frame; it's an optional
         // way to specify view vectors. Eventually, there will
         // be some other way to accomplish this and ObserverLocal
         // will go away.
         ObserverLocal   = 200,
-        
+
         Unknown         = 1000,
     };
-    
+
     ObserverFrame();
     ObserverFrame(CoordinateSystem cs,
                   const Selection& _refObject,
                   const Selection& _targetObj = Selection());
     ObserverFrame(const ObserverFrame&);
     ObserverFrame(const ReferenceFrame& f);
-    
+
     ~ObserverFrame();
-    
+
     ObserverFrame& operator=(const ObserverFrame& f);
-    
+
     CoordinateSystem getCoordinateSystem() const;
     Selection getRefObject() const;
     Selection getTargetObject() const;
-    
+
     const ReferenceFrame* getFrame() const;
-    
+
     UniversalCoord convertFromUniversal(const UniversalCoord& uc, double tjd) const;
     UniversalCoord convertToUniversal(const UniversalCoord& uc, double tjd) const;
     Eigen::Quaterniond convertFromUniversal(const Eigen::Quaterniond& q, double tjd) const;
     Eigen::Quaterniond convertToUniversal(const Eigen::Quaterniond& q, double tjd) const;
-    
+
     static UniversalCoord convert(const ObserverFrame* fromFrame,
                                   const ObserverFrame* toFrame,
                                   const UniversalCoord& uc,
@@ -80,12 +80,12 @@ public:
                                       const ObserverFrame* toFrame,
                                       const Eigen::Quaterniond& q,
                                       double t);
-    
+
 private:
     ReferenceFrame* createFrame(CoordinateSystem _coordSys,
                                 const Selection& _refObject,
                                 const Selection& _targetObject);
-    
+
 private:
     CoordinateSystem coordSys;
     const ReferenceFrame* frame;
@@ -107,24 +107,24 @@ public:
     EIGEN_MAKE_ALIGNED_OPERATOR_NEW
 
     Observer();
-	Observer(const Observer& o);
+    Observer(const Observer& o);
+
+    Observer& operator=(const Observer& o);
 
-	Observer& operator=(const Observer& o);
-        
     UniversalCoord getPosition() const;
     void          setPosition(const UniversalCoord&);
-    void          setPosition(const Eigen::Vector3d&);    
-    
+    void          setPosition(const Eigen::Vector3d&);
+
     Eigen::Quaterniond getOrientation() const;
     Eigen::Quaternionf getOrientationf() const;
     void          setOrientation(const Eigen::Quaternionf&);
     void          setOrientation(const Eigen::Quaterniond&);
-    
+
     Eigen::Vector3d getVelocity() const;
     void          setVelocity(const Eigen::Vector3d&);
     Eigen::Vector3d getAngularVelocity() const;
     void          setAngularVelocity(const Eigen::Vector3d&);
-    
+
     float          getFOV() const;
     void           setFOV(float);
 
@@ -144,7 +144,7 @@ public:
 
     const std::string& getDisplayedSurface() const;
     void setDisplayedSurface(const std::string&);
-    
+
     uint32 getLocationFilter() const;
     void setLocationFilter(uint32);
 
@@ -214,7 +214,7 @@ public:
         Free                    = 0,
         Travelling              = 1,
     };
-    
+
     ObserverMode getMode() const;
     void setMode(ObserverMode);
 
@@ -222,7 +222,7 @@ public:
     {
         Linear        = 0,
         GreatCircle   = 1,
-        CircularOrbit = 2,          
+        CircularOrbit = 2,
     };
 
     struct JourneyParams
@@ -241,7 +241,7 @@ public:
         Eigen::Quaterniond rotation1; // rotation on the CircularOrbit around centerObject
 
         Selection centerObject;
-        
+
         TrajectoryType traj;
     };
 
@@ -277,7 +277,7 @@ public:
 
     void updateUniversal();
     void convertFrameCoordinates(const ObserverFrame* newFrame);
-    
+
  private:
     double         simTime;
 
@@ -286,14 +286,14 @@ public:
     Eigen::Quaterniond  orientation;
     Eigen::Vector3d     velocity;
     Eigen::Vector3d     angularVelocity;
-    
+
     // Position and orientation in universal coordinates, derived from the
     // equivalent quantities in the observer reference frame.
     UniversalCoord positionUniv;
     Eigen::Quaterniond  orientationUniv;
-    
+
     ObserverFrame* frame;
-    
+
     double          realTime;
 
     double          targetSpeed;
@@ -302,7 +302,7 @@ public:
     double          beginAccelTime;
 
     ObserverMode     observerMode;
-    JourneyParams    journey;    
+    JourneyParams    journey;
     Selection        trackObject;
 
     Eigen::Quaterniond trackingOrientation;   // orientation prior to selecting tracking
diff --git a/src/celengine/opencluster.h b/src/celengine/opencluster.h
index 0171ac60d..0bd57e8bf 100644
--- a/src/celengine/opencluster.h
+++ b/src/celengine/opencluster.h
@@ -37,7 +37,7 @@ class OpenCluster : public DeepSkyObject
 
     virtual unsigned int getRenderMask() const;
     virtual unsigned int getLabelMask() const;
-    
+
     virtual const char* getObjTypeName() const;
 
  public:
diff --git a/src/celengine/overlay.cpp b/src/celengine/overlay.cpp
index 1470ca0e7..8b6fddd92 100644
--- a/src/celengine/overlay.cpp
+++ b/src/celengine/overlay.cpp
@@ -92,7 +92,7 @@ void Overlay::endText()
     if (textBlock > 0)
     {
         textBlock--;
-		xoffset = 0.0f;
+        xoffset = 0.0f;
         glPopMatrix();
     }
 }
@@ -184,7 +184,7 @@ void Overlay::oprintf(const char* format, ...)
     char buf[1024];
     vsprintf(buf, format, args);
     print(buf);
-    
+
     va_end(args);
 }
 
diff --git a/src/celengine/parseobject.cpp b/src/celengine/parseobject.cpp
index 77362e85a..f6ebee759 100644
--- a/src/celengine/parseobject.cpp
+++ b/src/celengine/parseobject.cpp
@@ -33,11 +33,11 @@ using namespace std;
 
 /**
  * Returns the default units scale for orbits.
- * 
+ *
  * If the usePlanetUnits flag is set, this returns a distance scale of AU and a
  * time scale of years. Otherwise the distace scale is kilometers and the time
  * scale is days.
- * 
+ *
  * @param[in] usePlanetUnits Controls whether to return planet units or satellite units.
  * @param[out] distanceScale The default distance scale in kilometers.
  * @param[out] timeScale The default time scale in days.
@@ -60,10 +60,10 @@ GetDefaultUnits(bool usePlanetUnits, double& distanceScale, double& timeScale)
 
 /**
  * Returns the default distance scale for orbits.
- * 
+ *
  * If the usePlanetUnits flag is set, this returns AU, otherwise it returns
  * kilometers.
- * 
+ *
  * @param[in] usePlanetUnits Controls whether to return planet units or satellite units.
  * @param[out] distanceScale The default distance scale in kilometers.
  */
@@ -98,7 +98,7 @@ ParseDate(Hash* hash, const string& name, double& jd)
 
 /*!
  * Create a new Keplerian orbit from an ssc property table:
- * 
+ *
  * \code EllipticalOrbit
  * {
  *     # One of the following is required to specify orbit size:
@@ -107,7 +107,7 @@ ParseDate(Hash* hash, const string& name, double& jd)
  *
  *     # Required
  *     Period <number>
- *     
+ *
  *     Eccentricity <number>   (default: 0.0)
  *     Inclination <degrees>   (default: 0.0)
  *     AscendingNode <degrees> (default: 0.0)
@@ -128,7 +128,7 @@ ParseDate(Hash* hash, const string& name, double& jd)
  *     SemiMajorAxis or PericenterDistance is in AU
  * Otherwise:
  *     Period is in Julian days
- *     SemiMajorAxis or PericenterDistance is in kilometers.    
+ *     SemiMajorAxis or PericenterDistance is in kilometers.
  */
 static EllipticalOrbit*
 CreateEllipticalOrbit(Hash* orbitData,
@@ -136,7 +136,7 @@ CreateEllipticalOrbit(Hash* orbitData,
 {
 
     // default units for planets are AU and years, otherwise km and days
-    
+
     double distanceScale;
     double timeScale;
     GetDefaultUnits(usePlanetUnits, distanceScale, timeScale);
@@ -153,23 +153,23 @@ CreateEllipticalOrbit(Hash* orbitData,
             return NULL;
         }
     }
-    
+
     double period = 0.0;
     if (!orbitData->getTime("Period", period, 1.0, timeScale))
     {
         clog << "Period missing!  Skipping planet . . .\n";
         return NULL;
     }
-    
+
     double eccentricity = 0.0;
     orbitData->getNumber("Eccentricity", eccentricity);
 
     double inclination = 0.0;
     orbitData->getAngle("Inclination", inclination);
-    
+
     double ascendingNode = 0.0;
     orbitData->getAngle("AscendingNode", ascendingNode);
-    
+
     double argOfPericenter = 0.0;
     if (!orbitData->getAngle("ArgOfPericenter", argOfPericenter))
     {
@@ -266,13 +266,13 @@ CreateSampledTrajectory(Hash* trajData, const string& path)
 
 
 /** Create a new FixedPosition trajectory.
- * 
+ *
  * A FixedPosition is a property list with one of the following 3-vector properties:
- * 
+ *
  * - \c Rectangular
  * - \c Planetographic
  * - \c Planetocentric
- * 
+ *
  * Planetographic and planetocentric coordinates are given in the order longitude,
  * latitude, altitude. Units of altitude are kilometers. Planetographic and
  * and planetocentric coordinates are only practical when the coordinate system
@@ -283,10 +283,10 @@ CreateFixedPosition(Hash* trajData, const Selection& centralObject, bool usePlan
 {
     double distanceScale;
     GetDefaultUnits(usePlanetUnits, distanceScale);
-    
+
     Vector3d position = Vector3d::Zero();
 
-    Vector3d v = Vector3d::Zero();    
+    Vector3d v = Vector3d::Zero();
     if (trajData->getLengthVector("Rectangular", v, 1.0, distanceScale))
     {
         // Convert to Celestia's coordinate system
@@ -330,41 +330,41 @@ CreateFixedPosition(Hash* trajData, const Selection& centralObject, bool usePlan
  */
 static bool
 ParseStringList(Hash* table,
-				const string& propertyName,
-				list<string>& stringList)
+                const string& propertyName,
+                list<string>& stringList)
 {
-	Value* v = table->getValue(propertyName);
-	if (v == NULL)
-		return NULL;
+    Value* v = table->getValue(propertyName);
+    if (v == NULL)
+        return NULL;
 
-	// Check for a single string first.
-	if (v->getType() == Value::StringType)
-	{
-		stringList.push_back(v->getString());
-		return true;
-	}
-	else if (v->getType() == Value::ArrayType)
-	{
-		ValueArray* array = v->getArray();
-		ValueArray::const_iterator iter;
+    // Check for a single string first.
+    if (v->getType() == Value::StringType)
+    {
+        stringList.push_back(v->getString());
+        return true;
+    }
+    else if (v->getType() == Value::ArrayType)
+    {
+        ValueArray* array = v->getArray();
+        ValueArray::const_iterator iter;
 
-		// Verify that all array entries are strings
-		for (iter = array->begin(); iter != array->end(); iter++)
-		{
-			if ((*iter)->getType() != Value::StringType)
-				return false;
-		}
+        // Verify that all array entries are strings
+        for (iter = array->begin(); iter != array->end(); iter++)
+        {
+            if ((*iter)->getType() != Value::StringType)
+                return false;
+        }
 
-		// Add strings to stringList
-		for (iter = array->begin(); iter != array->end(); iter++)
-			 stringList.push_back((*iter)->getString());
+        // Add strings to stringList
+        for (iter = array->begin(); iter != array->end(); iter++)
+             stringList.push_back((*iter)->getString());
 
-		return true;
-	}
-	else
-	{
-		return false;
-	}
+        return true;
+    }
+    else
+    {
+        return false;
+    }
 }
 
 
@@ -384,7 +384,7 @@ ParseStringList(Hash* table,
  *      Ending <number>                # optional
  *  } \endcode
  *
- *  The Kernel property specifies one or more SPK files that must be loaded. Any 
+ *  The Kernel property specifies one or more SPK files that must be loaded. Any
  *  already loaded kernels will also be used if they contain trajectories for
  *  the target or origin.
  *  Target and origin are strings that give NAIF IDs for the target and origin
@@ -406,22 +406,22 @@ CreateSpiceOrbit(Hash* orbitData,
 {
     string targetBodyName;
     string originName;
-	list<string> kernelList;
+    list<string> kernelList;
     double distanceScale;
     double timeScale;
-    
+
     GetDefaultUnits(usePlanetUnits, distanceScale, timeScale);
-    
-	if (orbitData->getValue("Kernel") != NULL)
-	{
-		// Kernel list is optional; a SPICE orbit may rely on kernels already loaded into
-		// the kernel pool.
-		if (!ParseStringList(orbitData, "Kernel", kernelList))
-		{
-			clog << "Kernel list for SPICE orbit is neither a string nor array of strings\n";
-			return NULL;
-		}
-	}
+
+    if (orbitData->getValue("Kernel") != NULL)
+    {
+        // Kernel list is optional; a SPICE orbit may rely on kernels already loaded into
+        // the kernel pool.
+        if (!ParseStringList(orbitData, "Kernel", kernelList))
+        {
+            clog << "Kernel list for SPICE orbit is neither a string nor array of strings\n";
+            return NULL;
+        }
+    }
 
     if (!orbitData->getString("Target", targetBodyName))
     {
@@ -449,55 +449,55 @@ CreateSpiceOrbit(Hash* orbitData,
     double period = 0.0;
     orbitData->getTime("Period", period, 1.0, timeScale);
 
-	// Either a complete time interval must be specified with Beginning/Ending, or
-	// else neither field can be present.
-	Value* beginningDate = orbitData->getValue("Beginning");
-	Value* endingDate = orbitData->getValue("Ending");
-	if (beginningDate != NULL && endingDate == NULL)
-	{
-		clog << "Beginning specified for SPICE orbit, but ending is missing.\n";
-		return NULL;
-	}
+    // Either a complete time interval must be specified with Beginning/Ending, or
+    // else neither field can be present.
+    Value* beginningDate = orbitData->getValue("Beginning");
+    Value* endingDate = orbitData->getValue("Ending");
+    if (beginningDate != NULL && endingDate == NULL)
+    {
+        clog << "Beginning specified for SPICE orbit, but ending is missing.\n";
+        return NULL;
+    }
 
-	if (endingDate != NULL && beginningDate == NULL)
-	{
-		clog << "Ending specified for SPICE orbit, but beginning is missing.\n";
-		return NULL;
-	}
+    if (endingDate != NULL && beginningDate == NULL)
+    {
+        clog << "Ending specified for SPICE orbit, but beginning is missing.\n";
+        return NULL;
+    }
 
-	SpiceOrbit* orbit = NULL;
-	if (beginningDate != NULL && endingDate != NULL)
-	{
-		double beginningTDBJD = 0.0;
-		if (!ParseDate(orbitData, "Beginning", beginningTDBJD))
-		{
-			clog << "Invalid beginning date specified for SPICE orbit.\n";
-			return NULL;
-		}
+    SpiceOrbit* orbit = NULL;
+    if (beginningDate != NULL && endingDate != NULL)
+    {
+        double beginningTDBJD = 0.0;
+        if (!ParseDate(orbitData, "Beginning", beginningTDBJD))
+        {
+            clog << "Invalid beginning date specified for SPICE orbit.\n";
+            return NULL;
+        }
 
-		double endingTDBJD = 0.0;
-		if (!ParseDate(orbitData, "Ending", endingTDBJD))
-		{
-			clog << "Invalid ending date specified for SPICE orbit.\n";
-			return NULL;
-		}
-	
-		orbit = new SpiceOrbit(targetBodyName,
-							   originName,
-							   period,
-							   boundingRadius,
-							   beginningTDBJD,
-							   endingTDBJD);
-	}
-	else
-	{
-		// No time interval given; we'll use whatever coverage window is given
-		// in the SPICE kernel.
-		orbit = new SpiceOrbit(targetBodyName,
-							   originName,
-							   period,
-							   boundingRadius);
-	}
+        double endingTDBJD = 0.0;
+        if (!ParseDate(orbitData, "Ending", endingTDBJD))
+        {
+            clog << "Invalid ending date specified for SPICE orbit.\n";
+            return NULL;
+        }
+
+        orbit = new SpiceOrbit(targetBodyName,
+                               originName,
+                               period,
+                               boundingRadius,
+                               beginningTDBJD,
+                               endingTDBJD);
+    }
+    else
+    {
+        // No time interval given; we'll use whatever coverage window is given
+        // in the SPICE kernel.
+        orbit = new SpiceOrbit(targetBodyName,
+                               originName,
+                               period,
+                               boundingRadius);
+    }
 
     if (!orbit->init(path, &kernelList))
     {
@@ -524,7 +524,7 @@ CreateSpiceOrbit(Hash* orbitData,
  *  } \endcode
  *
  *  The Kernel property specifies one or more SPICE kernel files that must be
- *  loaded in order for the frame to be defined over the required range. Any 
+ *  loaded in order for the frame to be defined over the required range. Any
  *  already loaded kernels will be used if they contain information relevant
  *  for defining the frame.
  *  Frame and base name are strings that give SPICE names for the frames. The
@@ -545,18 +545,18 @@ CreateSpiceRotation(Hash* rotationData,
 {
     string frameName;
     string baseFrameName = "eclipj2000";
-	list<string> kernelList;
+    list<string> kernelList;
 
-	if (rotationData->getValue("Kernel") != NULL)
-	{
-		// Kernel list is optional; a SPICE rotation may rely on kernels already loaded into
-		// the kernel pool.
-		if (!ParseStringList(rotationData, "Kernel", kernelList))
-		{
-			clog << "Kernel list for SPICE rotation is neither a string nor array of strings\n";
-			return NULL;
-		}
-	}
+    if (rotationData->getValue("Kernel") != NULL)
+    {
+        // Kernel list is optional; a SPICE rotation may rely on kernels already loaded into
+        // the kernel pool.
+        if (!ParseStringList(rotationData, "Kernel", kernelList))
+        {
+            clog << "Kernel list for SPICE rotation is neither a string nor array of strings\n";
+            return NULL;
+        }
+    }
 
     if (!rotationData->getString("Frame", frameName))
     {
@@ -572,52 +572,52 @@ CreateSpiceRotation(Hash* rotationData,
     double period = 0.0;
     rotationData->getTime("Period", period, 1.0, 1.0 / HOURS_PER_DAY);
 
-	// Either a complete time interval must be specified with Beginning/Ending, or
-	// else neither field can be present.
-	Value* beginningDate = rotationData->getValue("Beginning");
-	Value* endingDate = rotationData->getValue("Ending");
-	if (beginningDate != NULL && endingDate == NULL)
-	{
-		clog << "Beginning specified for SPICE rotation, but ending is missing.\n";
-		return NULL;
-	}
+    // Either a complete time interval must be specified with Beginning/Ending, or
+    // else neither field can be present.
+    Value* beginningDate = rotationData->getValue("Beginning");
+    Value* endingDate = rotationData->getValue("Ending");
+    if (beginningDate != NULL && endingDate == NULL)
+    {
+        clog << "Beginning specified for SPICE rotation, but ending is missing.\n";
+        return NULL;
+    }
 
-	if (endingDate != NULL && beginningDate == NULL)
-	{
-		clog << "Ending specified for SPICE rotation, but beginning is missing.\n";
-		return NULL;
-	}
+    if (endingDate != NULL && beginningDate == NULL)
+    {
+        clog << "Ending specified for SPICE rotation, but beginning is missing.\n";
+        return NULL;
+    }
 
-	SpiceRotation* rotation = NULL;
-	if (beginningDate != NULL && endingDate != NULL)
-	{
-		double beginningTDBJD = 0.0;
-		if (!ParseDate(rotationData, "Beginning", beginningTDBJD))
-		{
-			clog << "Invalid beginning date specified for SPICE rotation.\n";
-			return NULL;
-		}
+    SpiceRotation* rotation = NULL;
+    if (beginningDate != NULL && endingDate != NULL)
+    {
+        double beginningTDBJD = 0.0;
+        if (!ParseDate(rotationData, "Beginning", beginningTDBJD))
+        {
+            clog << "Invalid beginning date specified for SPICE rotation.\n";
+            return NULL;
+        }
 
-		double endingTDBJD = 0.0;
-		if (!ParseDate(rotationData, "Ending", endingTDBJD))
-		{
-			clog << "Invalid ending date specified for SPICE rotation.\n";
-			return NULL;
-		}
-	
-		rotation = new SpiceRotation(frameName,
-				  			         baseFrameName,
-							         period,
-							         beginningTDBJD,
-							         endingTDBJD);
-	}
-	else
-	{
-		// No time interval given; rotation is valid at any time.
-		rotation = new SpiceRotation(frameName,
+        double endingTDBJD = 0.0;
+        if (!ParseDate(rotationData, "Ending", endingTDBJD))
+        {
+            clog << "Invalid ending date specified for SPICE rotation.\n";
+            return NULL;
+        }
+
+        rotation = new SpiceRotation(frameName,
+                                     baseFrameName,
+                                     period,
+                                     beginningTDBJD,
+                                     endingTDBJD);
+    }
+    else
+    {
+        // No time interval given; rotation is valid at any time.
+        rotation = new SpiceRotation(frameName,
                                      baseFrameName,
                                      period);
-	}
+    }
 
     if (!rotation->init(path, &kernelList))
     {
@@ -807,7 +807,7 @@ CreateOrbit(const Selection& centralObject,
             fixedPosition = Vector3d(fixedPosition.x(),
                                      fixedPosition.z(),
                                      -fixedPosition.y());
-            
+
             return new FixedOrbit(fixedPosition);
         }
         else if (fixedPositionValue->getType() == Value::HashType)
@@ -942,19 +942,19 @@ CreateFixedAttitudeRotationModel(Hash* rotationData)
     {
         heading = degToRad(heading);
     }
-    
+
     double tilt = 0.0;
     if (rotationData->getAngle("Tilt", tilt))
     {
         tilt = degToRad(tilt);
     }
-    
+
     double roll = 0.0;
     if (rotationData->getAngle("Roll", roll))
     {
         roll = degToRad(roll);
     }
-    
+
     Quaterniond q = YRotation(-PI - heading) *
                     XRotation(-tilt) *
                     ZRotation(-roll);
@@ -1189,7 +1189,7 @@ CreateRotationModel(Hash* planetData,
             return CreateFixedRotationModel(fixedRotationValue->getHash());
         }
     }
-    
+
     Value* fixedAttitudeValue = planetData->getValue("FixedAttitude");
     if (fixedAttitudeValue != NULL)
     {
@@ -1673,7 +1673,7 @@ CreateJ2000EclipticFrame(const Universe& universe,
                          const Selection& defaultCenter)
 {
     Selection center = getFrameCenter(universe, frameData, defaultCenter);
-    
+
     if (center.empty())
         return NULL;
     else
@@ -1687,7 +1687,7 @@ CreateJ2000EquatorFrame(const Universe& universe,
                         const Selection& defaultCenter)
 {
     Selection center = getFrameCenter(universe, frameData, defaultCenter);
-    
+
     if (center.empty())
         return NULL;
     else
@@ -1707,8 +1707,8 @@ CreateTopocentricFrame(const Selection& center,
     BodyMeanEquatorFrame* eqFrame = new BodyMeanEquatorFrame(target, target);
     FrameVector north = FrameVector::createConstantVector(Vector3d::UnitY(), eqFrame);
     FrameVector up = FrameVector::createRelativePositionVector(observer, target);
-    
-    return new TwoVectorFrame(center, up, -2, north, -3);    
+
+    return new TwoVectorFrame(center, up, -2, north, -3);
 }
 
 
@@ -1722,15 +1722,15 @@ CreateTopocentricFrame(const Selection& center,
  * \code TwoVector
  * {
  *    Center <center>
- *    Primary   
+ *    Primary
  *    {
  *       Axis "z"
  *       RelativePosition { Target <target> Observer <observer> }
  *    }
- *    Secondary   
+ *    Secondary
  *    {
  *       Axis "x"
- *       ConstantVector   
+ *       ConstantVector
  *       {
  *          Vector [ 0 0 1]
  *          Frame { BodyFixed { Center <target> } }
@@ -1777,7 +1777,7 @@ CreateTopocentricFrame(const Universe& universe,
 
        observer = center;
        target = center.parent();
-    }  
+    }
     else
     {
         // When no center is provided, use the default observer as the center. This
diff --git a/src/celengine/parser.cpp b/src/celengine/parser.cpp
index 790a92bde..5506b201f 100644
--- a/src/celengine/parser.cpp
+++ b/src/celengine/parser.cpp
@@ -131,7 +131,7 @@ ValueArray* Parser::readArray()
         return NULL;
     }
 
-	ValueArray* array = new ValueArray();
+    ValueArray* array = new ValueArray();
 
     Value* v = readValue();
     while (v != NULL)
@@ -139,7 +139,7 @@ ValueArray* Parser::readArray()
         array->insert(array->end(), v);
         v = readValue();
     }
-    
+
     tok = tokenizer->nextToken();
     if (tok != Tokenizer::TokenEndArray)
     {
@@ -173,7 +173,7 @@ Hash* Parser::readHash()
             return NULL;
         }
         string name = tokenizer->getNameValue();
-        
+
 #ifndef USE_POSTFIX_UNITS
         readUnits(name, hash);
 #endif
@@ -186,7 +186,7 @@ Hash* Parser::readHash()
         }
 
         hash->addValue(name, *value);
-        
+
 #ifdef USE_POSTFIX_UNITS
         readUnits(name, hash);
 #endif
@@ -221,10 +221,10 @@ bool Parser::readUnits(const string& propertyName, Hash* hash)
             tokenizer->pushBack();
             return false;
         }
-       
+
         string unit = tokenizer->getNameValue();
         Value* value = new Value(unit);
-        
+
         if (astro::isLengthUnit(unit))
         {
             string keyName(propertyName + "%Length");
@@ -245,10 +245,10 @@ bool Parser::readUnits(const string& propertyName, Hash* hash)
             delete value;
             return false;
         }
-        
+
         tok = tokenizer->nextToken();
     }
-    
+
     return true;
 }
 
@@ -278,7 +278,7 @@ Value* Parser::readValue()
     case Tokenizer::TokenBeginArray:
         tokenizer->pushBack();
         {
-			ValueArray* array = readArray();
+            ValueArray* array = readArray();
             if (array == NULL)
                 return NULL;
             else
@@ -418,7 +418,7 @@ bool AssociativeArray::getVector(const string& key, Vec3d& val) const
     if (v == NULL || v->getType() != Value::ArrayType)
         return false;
 
-	ValueArray* arr = v->getArray();
+    ValueArray* arr = v->getArray();
     if (arr->size() != 3)
         return false;
 
@@ -442,7 +442,7 @@ bool AssociativeArray::getVector(const string& key, Vector3d& val) const
     if (v == NULL || v->getType() != Value::ArrayType)
         return false;
 
-	ValueArray* arr = v->getArray();
+    ValueArray* arr = v->getArray();
     if (arr->size() != 3)
         return false;
 
@@ -493,7 +493,7 @@ bool AssociativeArray::getRotation(const string& key, Quatf& val) const
     if (v == NULL || v->getType() != Value::ArrayType)
         return false;
 
-	ValueArray* arr = v->getArray();
+    ValueArray* arr = v->getArray();
     if (arr->size() != 4)
         return false;
 
@@ -512,7 +512,7 @@ bool AssociativeArray::getRotation(const string& key, Quatf& val) const
                (float) y->getNumber(),
                (float) z->getNumber());
     axis.normalize();
-    
+
     double ang = w->getNumber();
     double angScale = 1.0;
     getAngleScale(key, angScale);
@@ -526,10 +526,10 @@ bool AssociativeArray::getRotation(const string& key, Quatf& val) const
 
 /**
  * Retrieves a quaternion, scaled to an associated angle unit.
- * 
+ *
  * The quaternion is specified in the catalog file in axis-angle format as follows:
  * \verbatim {PropertyName} [ angle axisX axisY axisZ ] \endverbatim
- * 
+ *
  * @param[in] key Hash key for the rotation.
  * @param[out] val A quaternion representing the value if present, unaffected if not.
  * @return True if the key exists in the hash, false otherwise.
@@ -540,7 +540,7 @@ bool AssociativeArray::getRotation(const string& key, Eigen::Quaternionf& val) c
     if (v == NULL || v->getType() != Value::ArrayType)
         return false;
 
-	ValueArray* arr = v->getArray();
+    ValueArray* arr = v->getArray();
     if (arr->size() != 4)
         return false;
 
@@ -596,7 +596,7 @@ AssociativeArray::getAngle(const string& key, double& val, double outputScale, d
 {
     if (!getNumber(key, val))
         return false;
-    
+
     double angleScale;
     if(getAngleScale(key, angleScale))
     {
@@ -606,24 +606,24 @@ AssociativeArray::getAngle(const string& key, double& val, double outputScale, d
     {
         angleScale = (defaultScale == 0.0) ? 1.0 : defaultScale / outputScale;
     }
-    
+
     val *= angleScale;
-    
+
     return true;
 }
 
 
-/** @copydoc AssociativeArray::getAngle() */ 
+/** @copydoc AssociativeArray::getAngle() */
 bool
 AssociativeArray::getAngle(const string& key, float& val, double outputScale, double defaultScale) const
 {
     double dval;
-    
+
     if (!getAngle(key, dval, outputScale, defaultScale))
         return false;
-        
+
     val = ((float) dval);
-    
+
     return true;
 }
 
@@ -641,7 +641,7 @@ AssociativeArray::getLength(const string& key, double& val, double outputScale,
 {
     if(!getNumber(key, val))
         return false;
-    
+
     double lengthScale;
     if(getLengthScale(key, lengthScale))
     {
@@ -651,9 +651,9 @@ AssociativeArray::getLength(const string& key, double& val, double outputScale,
     {
         lengthScale = (defaultScale == 0.0) ? 1.0 : defaultScale / outputScale;
     }
-    
+
     val *= lengthScale;
-    
+
     return true;
 }
 
@@ -662,12 +662,12 @@ AssociativeArray::getLength(const string& key, double& val, double outputScale,
 bool AssociativeArray::getLength(const string& key, float& val, double outputScale, double defaultScale) const
 {
     double dval;
-    
+
     if (!getLength(key, dval, outputScale, defaultScale))
         return false;
-    
+
     val = ((float) dval);
-    
+
     return true;
 }
 
@@ -684,7 +684,7 @@ bool AssociativeArray::getTime(const string& key, double& val, double outputScal
 {
     if(!getNumber(key, val))
         return false;
-    
+
     double timeScale;
     if(getTimeScale(key, timeScale))
     {
@@ -694,9 +694,9 @@ bool AssociativeArray::getTime(const string& key, double& val, double outputScal
     {
         timeScale = (defaultScale == 0.0) ? 1.0 : defaultScale / outputScale;
     }
-    
+
     val *= timeScale;
-    
+
     return true;
 }
 
@@ -705,12 +705,12 @@ bool AssociativeArray::getTime(const string& key, double& val, double outputScal
 bool AssociativeArray::getTime(const string& key, float& val, double outputScale, double defaultScale) const
 {
     double dval;
-    
+
     if(!getLength(key, dval, outputScale, defaultScale))
         return false;
-    
+
     val = ((float) dval);
-    
+
     return true;
 }
 
@@ -727,7 +727,7 @@ bool AssociativeArray::getLengthVector(const string& key, Eigen::Vector3d& val,
 {
     if(!getVector(key, val))
         return false;
-    
+
     double lengthScale;
     if(getLengthScale(key, lengthScale))
     {
@@ -737,9 +737,9 @@ bool AssociativeArray::getLengthVector(const string& key, Eigen::Vector3d& val,
     {
         lengthScale = (defaultScale == 0.0) ? 1.0 : defaultScale / outputScale;
     }
-    
+
     val *= lengthScale;
-    
+
     return true;
 }
 
@@ -748,12 +748,12 @@ bool AssociativeArray::getLengthVector(const string& key, Eigen::Vector3d& val,
 bool AssociativeArray::getLengthVector(const string& key, Eigen::Vector3f& val, double outputScale, double defaultScale) const
 {
     Vector3d vecVal;
-    
+
     if(!getLengthVector(key, vecVal, outputScale, defaultScale))
         return false;
-        
+
     val = vecVal.cast<float>();
-    
+
     return true;
 }
 
@@ -768,18 +768,18 @@ bool AssociativeArray::getSphericalTuple(const string& key, Vector3d& val) const
 {
     if(!getVector(key, val))
         return false;
-    
+
     double angleScale;
     if(getAngleScale(key, angleScale))
     {
         val[0] *= angleScale;
         val[1] *= angleScale;
     }
-    
+
     double lengthScale = 1.0;
     getLengthScale(key, lengthScale);
     val[2] *= lengthScale;
-    
+
     return true;
 }
 
@@ -788,12 +788,12 @@ bool AssociativeArray::getSphericalTuple(const string& key, Vector3d& val) const
 bool AssociativeArray::getSphericalTuple(const string& key, Vector3f& val) const
 {
     Vector3d vecVal;
-    
+
     if(!getSphericalTuple(key, vecVal))
         return false;
-    
+
     val = vecVal.cast<float>();
-    
+
     return true;
 }
 
@@ -808,10 +808,10 @@ bool AssociativeArray::getAngleScale(const string& key, double& scale) const
 {
     string unitKey(key + "%Angle");
     string unit;
-    
+
     if (!getString(unitKey, unit))
         return false;
-    
+
     return astro::getAngleScale(unit, scale);
 }
 
@@ -822,7 +822,7 @@ bool AssociativeArray::getAngleScale(const string& key, float& scale) const
     double dscale;
     if (!getAngleScale(key, dscale))
         return false;
-    
+
     scale = ((float) dscale);
     return true;
 }
@@ -838,10 +838,10 @@ bool AssociativeArray::getLengthScale(const string& key, double& scale) const
 {
     string unitKey(key + "%Length");
     string unit;
-    
+
     if (!getString(unitKey, unit))
         return false;
-    
+
     return astro::getLengthScale(unit, scale);
 }
 
@@ -852,7 +852,7 @@ bool AssociativeArray::getLengthScale(const string& key, float& scale) const
     double dscale;
     if (!getLengthScale(key, dscale))
         return false;
-    
+
     scale = ((float) dscale);
     return true;
 }
@@ -868,10 +868,10 @@ bool AssociativeArray::getTimeScale(const string& key, double& scale) const
 {
     string unitKey(key + "%Time");
     string unit;
-    
+
     if (!getString(unitKey, unit))
         return false;
-    
+
     return astro::getTimeScale(unit, scale);
 }
 
@@ -882,7 +882,7 @@ bool AssociativeArray::getTimeScale(const string& key, float& scale) const
     double dscale;
     if (!getTimeScale(key, dscale))
         return false;
-    
+
     scale = ((float) dscale);
     return true;
 }
diff --git a/src/celengine/parser.h b/src/celengine/parser.h
index 72cbc00d7..6a6bf63b3 100644
--- a/src/celengine/parser.h
+++ b/src/celengine/parser.h
@@ -66,7 +66,7 @@ class AssociativeArray
 
     HashIterator begin();
     HashIterator end();
-    
+
  private:
     map<string, Value*> assoc;
 };
@@ -97,7 +97,7 @@ public:
 
     double getNumber() const;
     string getString() const;
-	ValueArray* getArray() const;
+    ValueArray* getArray() const;
     Hash* getHash() const;
     bool getBoolean() const;
 
@@ -107,7 +107,7 @@ private:
     union {
         string* s;
         double d;
-		ValueArray* a;
+        ValueArray* a;
         Hash* h;
     } data;
 };
@@ -122,9 +122,9 @@ public:
 
 private:
     Tokenizer* tokenizer;
-    
+
     bool readUnits(const std::string&, Hash*);
-	ValueArray* readArray();
+    ValueArray* readArray();
     Hash* readHash();
 };
 
diff --git a/src/celengine/particlesystem.cpp b/src/celengine/particlesystem.cpp
index f0bc380c8..29b99e0ad 100644
--- a/src/celengine/particlesystem.cpp
+++ b/src/celengine/particlesystem.cpp
@@ -50,7 +50,7 @@ using namespace std;
  *  This process is well-suited to a simulation where the time steps are
  *  relatively uniform. But, we cannot rely on a uniform time step in Celestia.
  *  The user may skip ahead instantly to times in the distance past or future,
- *  change the time rate to over a billion times normal, or reverse time. 
+ *  change the time rate to over a billion times normal, or reverse time.
  *  Numerical integration of particle positions is completely impractical.
  *
  *  Instead, Celestia uses 'stateless' particle systems. From the particle
@@ -94,26 +94,26 @@ public:
         previous(0)
     {
     }
-    
+
     LCGRandomGenerator(uint64 seed) :
         previous(seed)
     {
     }
-    
+
     uint64 randUint64()
     {
         previous = (A * previous + C) & M;
         return previous;
     }
-    
+
     /*! Return a random integer between -2^31 and 2^31 - 1
      */
     int32 randInt32()
     {
         return (int32) (randUint64() >> 16);
     }
-    
-    /*! Return a random integer between 0 and 2^32 - 1                           
+
+    /*! Return a random integer between 0 and 2^32 - 1
      */
     uint32 randUint32()
     {
@@ -131,7 +131,7 @@ public:
         randBits = (randBits & 0x007fffff) | 0x3f800000;
         return *reinterpret_cast<float*>(&randBits) - 1.0f;
     }
-    
+
     /*! Generate a random floating point value in [ -1, 1 )
      *  This function directly manipulates the bits of a floating
      *  point number, and will not work properly on a system that
@@ -143,7 +143,7 @@ public:
         randBits = (randBits & 0x007fffff) | 0x40000000;
         return *reinterpret_cast<float*>(&randBits) - 3.0f;
     }
-    
+
 private:
     uint64 previous;
 };
@@ -182,7 +182,7 @@ EllipsoidSurfaceGenerator::generate(LCGRandomGenerator& gen) const
     float sinPhi = std::sqrt(1.0f - cosPhi * cosPhi);
     if (cosPhi < 0.0f)
         sinPhi = -sinPhi;
-    
+
     float s = std::sin(theta);
     float c = std::cos(theta);
     return Vector3f(sinPhi * c * m_semiAxes.x(), sinPhi * s * m_semiAxes.y(), cosPhi * m_semiAxes.z()) + m_center;
@@ -197,11 +197,11 @@ ConeGenerator::generate(LCGRandomGenerator& gen) const
     float sinPhi = std::sqrt(1.0f - cosPhi * cosPhi);
     if (cosPhi < 0.0f)
         sinPhi = -sinPhi;
-    
+
     float s = std::sin(theta);
     float c = std::cos(theta);
     return Vector3f(sinPhi * c, sinPhi * s, cosPhi) * (m_minLength + gen.randFloat() * m_lengthVariance);
-}    
+}
 
 
 
@@ -291,7 +291,7 @@ ParticleEmitter::setBlendMode(cmod::Material::BlendMode blendMode)
 }
 
 
-static const uint64 scrambleMask = (uint64(0xcccccccc) << 32) | 0xcccccccc; 
+static const uint64 scrambleMask = (uint64(0xcccccccc) << 32) | 0xcccccccc;
 
 void
 ParticleEmitter::render(double tsec,
@@ -310,7 +310,7 @@ ParticleEmitter::render(double tsec,
         if (t > m_endTime + m_lifetime)
             return;
     }
-    
+
     // If a start time is specified, set t to be relative to the start time.
     // Return immediately if we haven't reached the start time yet.
     if (startBounded)
@@ -319,7 +319,7 @@ ParticleEmitter::render(double tsec,
         if (t < 0.0)
             return;
     }
-    
+
     Matrix3f modelViewMatrix = rc.getCameraOrientation().conjugate().toRotationMatrix();
 
     rc.setMaterial(&m_material);
@@ -330,13 +330,13 @@ ParticleEmitter::render(double tsec,
     Vector3f v3 = modelViewMatrix * Vector3f(-1.0f,  1.0f, 0.0f);
 
     glDisable(GL_LIGHTING);
-    
+
     Texture* texture = NULL;
     if (m_texture != InvalidResource)
     {
         texture = GetTextureManager()->find(m_texture);
     }
-    
+
     if (texture != NULL)
     {
         glEnable(GL_TEXTURE_2D);
@@ -346,50 +346,50 @@ ParticleEmitter::render(double tsec,
     {
         glDisable(GL_TEXTURE_2D);
     }
-    
+
     // Use premultiplied alpha
     glEnable(GL_BLEND);
     glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
-    
-    glDepthMask(GL_FALSE);    
-    
+
+    glDepthMask(GL_FALSE);
+
     double emissionInterval = 1.0 / m_rate;
     double dserial = std::fmod(t * m_rate, (double) (1 << 31));
     int serial = (int) (dserial);
     double age = (dserial - serial) * emissionInterval;
     float invLifetime = (float) (1.0 / m_lifetime);
-    
+
     double maxAge = m_lifetime;
     if (startBounded)
     {
         maxAge = std::min((double) m_lifetime, t);
     }
-    
+
     if (endBounded && tsec > m_endTime)
     {
         int skipParticles = (int) ((tsec - m_endTime) * m_rate);
         serial -= skipParticles;
         age += skipParticles * emissionInterval;
     }
-    
+
     Vec4f startColor(m_startColor.red(), m_startColor.green(), m_startColor.blue(), m_startColor.alpha());
     Vec4f endColor(m_endColor.red(), m_endColor.green(), m_endColor.blue(), m_endColor.alpha());
-    
+
     unsigned int particleCount = 0;
-    
+
     while (age < maxAge)
     {
         // When the particle buffer is full, render the particles and flush it
         if (particleCount == particleBufferCapacity)
         {
-            glDrawArrays(GL_QUADS, 0, particleCount * 4);            
+            glDrawArrays(GL_QUADS, 0, particleCount * 4);
             particleCount = 0;
         }
-        
+
         float alpha = (float) age * invLifetime;
         float beta = 1.0f - alpha;
         float size = alpha * m_endSize + beta * m_startSize;
-        
+
         // Scramble the random number generator seed so that we don't end up with
         // artifacts from using regularly incrementing values.
         //
@@ -406,12 +406,12 @@ ParticleEmitter::render(double tsec,
         color[Color::Green] = (unsigned char) ((alpha * endColor.y + beta * startColor.y) * 255.99f);
         color[Color::Blue]  = (unsigned char) ((alpha * endColor.z + beta * startColor.z) * 255.99f);
         color[Color::Alpha] = (unsigned char) ((alpha * endColor.w + beta * startColor.w) * 255.99f);
-        
+
         Vector3f v = m_velocityGenerator->generate(gen);
         Vector3f center = m_positionGenerator->generate(gen) + v * (float) age;
         if (m_nonZeroAcceleration)
             center += m_acceleration * (float) (age * age);
-        
+
         if (!m_rotationEnabled)
         {
             particleBuffer[particleCount * 4 + 0].set(center + v0 * size, Vector2f(0.0f, 1.0f), color);
@@ -425,19 +425,19 @@ ParticleEmitter::render(double tsec,
             float rotation = rotationRate * (float) age;
             float c = std::cos(rotation);
             float s = std::sin(rotation);
-            
+
             particleBuffer[particleCount * 4 + 0].set(center + (modelViewMatrix * Vector3f(-c + s, -s - c, 0.0f)) * size, Vector2f(0.0f, 1.0f), color);
             particleBuffer[particleCount * 4 + 1].set(center + (modelViewMatrix * Vector3f( c + s,  s - c, 0.0f)) * size, Vector2f(1.0f, 1.0f), color);
             particleBuffer[particleCount * 4 + 2].set(center + (modelViewMatrix * Vector3f( c - s,  s + c, 0.0f)) * size, Vector2f(1.0f, 0.0f), color);
             particleBuffer[particleCount * 4 + 3].set(center + (modelViewMatrix * Vector3f(-c - s, -s + c, 0.0f)) * size, Vector2f(0.0f, 0.0f), color);
         }
-        
+
         ++particleCount;
-        
+
         age += emissionInterval;
         serial--;
     }
-    
+
     // Render any remaining particles in the buffer
     if (particleCount > 0)
     {
@@ -454,7 +454,7 @@ ParticleEmitter::createMaterial()
     m_material.blend = m_blendMode;
     m_material.opacity = 0.99f;
     m_material.maps[0] = new CelestiaTextureResource(m_texture);
-}    
+}
 
 
 #define STRUCT_OFFSET(s, memberName) ((uint32) (reinterpret_cast<char*>(&(s).memberName) - reinterpret_cast<char*>(&(s))))
@@ -467,7 +467,7 @@ ParticleSystem::ParticleSystem() :
 {
     m_particleCapacity = 1000;
     m_vertexData = new ParticleVertex[m_particleCapacity * 4];
-    
+
     // Create the vertex description; currently, it is the same for all
     // particle systems.
     ParticleVertex temp;
@@ -485,8 +485,8 @@ ParticleSystem::~ParticleSystem()
          iter != m_emitterList.end(); iter++)
     {
         delete (*iter);
-    }    
-    
+    }
+
     delete[] m_vertexData;
     delete m_vertexDesc;
 }
@@ -496,13 +496,13 @@ void
 ParticleSystem::render(RenderContext& rc, double tsec)
 {
     rc.setVertexArrays(*m_vertexDesc, m_vertexData);
-    
+
     for (list<ParticleEmitter*>::const_iterator iter = m_emitterList.begin();
          iter != m_emitterList.end(); iter++)
     {
         (*iter)->render(tsec, rc, m_vertexData, m_particleCapacity);
     }
-        
+
     glEnable(GL_LIGHTING);
     glEnable(GL_TEXTURE_2D);
 }
diff --git a/src/celengine/particlesystem.h b/src/celengine/particlesystem.h
index ac0aa3403..01d2f41e9 100644
--- a/src/celengine/particlesystem.h
+++ b/src/celengine/particlesystem.h
@@ -34,7 +34,7 @@ struct ParticleVertex
         color[Color::Blue]  = _color[Color::Blue];
         color[Color::Alpha] = _color[Color::Alpha];
     }
-    
+
     Eigen::Vector3f position;
     Eigen::Vector2f texCoord;
     unsigned char color[4];
@@ -48,45 +48,45 @@ public:
 
     ParticleEmitter();
     ~ParticleEmitter();
-    
+
     void render(double tsec, RenderContext& rc, ParticleVertex* particleBuffer, unsigned int bufferCapacity) const;
-    
+
     void setAcceleration(const Eigen::Vector3f& acceleration);
     void createMaterial();
-    
+
     void setLifespan(double startTime, double endTime);
     void setRotationRateRange(float minRate, float maxRate);
     void setBlendMode(cmod::Material::BlendMode blendMode);
-    
+
 private:
     double m_startTime;
     double m_endTime;
 
 public:
     ResourceHandle m_texture;
-    
+
     float m_rate;
     float m_lifetime;
-    
+
     Color m_startColor;
     float m_startSize;
-    
+
     Color m_endColor;
     float m_endSize;
-    
+
     VectorGenerator* m_positionGenerator;
     VectorGenerator* m_velocityGenerator;
-    
+
 private:
     Eigen::Vector3f m_acceleration;
     bool m_nonZeroAcceleration;
-    
+
     float m_minRotationRate;
     float m_rotationRateVariance;
     bool m_rotationEnabled;
-    
+
     cmod::Material::BlendMode m_blendMode;
-    
+
     cmod::Material m_material;
 };
 
@@ -96,20 +96,20 @@ class ParticleSystem : public Geometry
  public:
     ParticleSystem();
     virtual ~ParticleSystem();
-    
+
     virtual void render(RenderContext& rc, double t = 0.0);
     virtual bool pick(const Ray3d& r, double& distance) const;
     virtual bool isOpaque() const;
-    
+
     void addEmitter(ParticleEmitter* emitter);
-        
+
  public:
     std::list<ParticleEmitter*> m_emitterList;
 
     cmod::Mesh::VertexDescription* m_vertexDesc;
     ParticleVertex* m_vertexData;
     unsigned int m_particleCapacity;
-    unsigned int m_particleCount;    
+    unsigned int m_particleCount;
 };
 
 
@@ -134,9 +134,9 @@ class ConstantGenerator : public VectorGenerator
 {
 public:
     ConstantGenerator(const Eigen::Vector3f& value) : m_value(value) {}
-    
+
     virtual Eigen::Vector3f generate(LCGRandomGenerator& gen) const;
-    
+
 private:
     Eigen::Vector3f m_value;
 };
@@ -152,9 +152,9 @@ public:
         m_semiAxes(axes * 0.5f)
     {
     }
-    
+
     virtual Eigen::Vector3f generate(LCGRandomGenerator& gen) const;
-    
+
 private:
     Eigen::Vector3f m_center;
     Eigen::Vector3f m_semiAxes;
@@ -172,9 +172,9 @@ public:
         m_direction(p1 - p0)
     {
     }
-    
+
     virtual Eigen::Vector3f generate(LCGRandomGenerator& gen) const;
-    
+
 private:
     Eigen::Vector3f m_origin;
     Eigen::Vector3f m_direction;
@@ -192,9 +192,9 @@ public:
         m_semiAxes(semiAxes)
     {
     }
-    
+
     virtual Eigen::Vector3f generate(LCGRandomGenerator& gen) const;
-    
+
 private:
     Eigen::Vector3f m_center;
     Eigen::Vector3f m_semiAxes;
@@ -214,9 +214,9 @@ public:
         m_lengthVariance(maxLength - minLength)
     {
     }
-    
+
     virtual Eigen::Vector3f generate(LCGRandomGenerator& gen) const;
-    
+
 private:
     float m_cosMinAngle;
     float m_cosAngleVariance;
diff --git a/src/celengine/particlesystemfile.cpp b/src/celengine/particlesystemfile.cpp
index d624eff81..4ab4477a0 100644
--- a/src/celengine/particlesystemfile.cpp
+++ b/src/celengine/particlesystemfile.cpp
@@ -43,18 +43,18 @@ ParticleSystem*
 ParticleSystemLoader::load()
 {
     ParticleSystem* particleSystem = new ParticleSystem();
-    
+
     while (m_tokenizer.nextToken() != Tokenizer::TokenEnd)
     {
         string objType;
-        
+
         if (m_tokenizer.getTokenType() != Tokenizer::TokenName)
         {
             raiseError("Error parsing particle system");
             delete particleSystem;
             return NULL;
         }
-        
+
         objType = m_tokenizer.getNameValue();
         if (objType != "Emitter")
         {
@@ -74,7 +74,7 @@ ParticleSystemLoader::load()
             delete particleSystem;
             return NULL;
         }
-        
+
         Hash* objParams = objParamsValue->getHash();
         if (objType == "Emitter")
         {
@@ -84,11 +84,11 @@ ParticleSystemLoader::load()
                 delete particleSystem;
                 return NULL;
             }
-            
+
             particleSystem->addEmitter(emitter);
         }
     }
-    
+
     return particleSystem;
 }
 
@@ -101,7 +101,7 @@ ParticleSystemLoader::parseGenerator(Hash* params)
     {
         return new ConstantGenerator(constantValue);
     }
-    
+
     Value* generatorValue = NULL;
     generatorValue = params->getValue("Box");
     if (generatorValue != NULL)
@@ -111,17 +111,17 @@ ParticleSystemLoader::parseGenerator(Hash* params)
             raiseError("Error in Box syntax");
             return NULL;
         }
-        
+
         Hash* boxParams = generatorValue->getHash();
-        
+
         Vector3f center(0.0f, 0.0f, 0.0f);
         Vector3f size(0.0f, 0.0f, 0.0f);
         boxParams->getVector("Center", center);
         boxParams->getVector("Size", size);
-        
+
         return new BoxGenerator(center, size);
     }
-    
+
     generatorValue = params->getValue("Line");
     if (generatorValue != NULL)
     {
@@ -130,17 +130,17 @@ ParticleSystemLoader::parseGenerator(Hash* params)
             raiseError("Error in Line syntax");
             return NULL;
         }
-        
+
         Hash* lineParams = generatorValue->getHash();
-        
+
         Vector3f p0(0.0f, 0.0f, 0.0f);
         Vector3f p1(0.0f, 0.0f, 0.0f);
         lineParams->getVector("Point1", p0);
         lineParams->getVector("Point2", p1);
-        
+
         return new LineGenerator(p0, p1);
     }
-    
+
     generatorValue = params->getValue("EllipsoidSurface");
     if (generatorValue != NULL)
     {
@@ -149,17 +149,17 @@ ParticleSystemLoader::parseGenerator(Hash* params)
             raiseError("Error in EllipsoidSurface syntax");
             return NULL;
         }
-        
+
         Hash* ellipsoidSurfaceParams = generatorValue->getHash();
-        
+
         Vector3f center(0.0f, 0.0f, 0.0f);
         Vector3f size(2.0f, 2.0f, 2.0f);
         ellipsoidSurfaceParams->getVector("Center", center);
         ellipsoidSurfaceParams->getVector("Size", size);
-        
-        return new EllipsoidSurfaceGenerator(center, size * 0.5f);        
+
+        return new EllipsoidSurfaceGenerator(center, size * 0.5f);
     }
-    
+
     generatorValue = params->getValue("Cone");
     if (generatorValue != NULL)
     {
@@ -168,9 +168,9 @@ ParticleSystemLoader::parseGenerator(Hash* params)
             raiseError("Error in Cone syntax");
             return NULL;
         }
-        
+
         Hash* coneParams = generatorValue->getHash();
-        
+
         double minAngle = 0.0;
         double maxAngle = 0.0;
         double minSpeed = 0.0;
@@ -179,8 +179,8 @@ ParticleSystemLoader::parseGenerator(Hash* params)
         coneParams->getNumber("MaxAngle", maxAngle);
         coneParams->getNumber("MinSpeed", minSpeed);
         coneParams->getNumber("MaxSpeed", maxSpeed);
-        
-        return new ConeGenerator((float) degToRad(minAngle), (float) degToRad(maxAngle), (float) minSpeed, (float) maxSpeed);                
+
+        return new ConeGenerator((float) degToRad(minAngle), (float) degToRad(maxAngle), (float) minSpeed, (float) maxSpeed);
     }
 
     generatorValue = params->getValue("GaussianDisc");
@@ -191,17 +191,17 @@ ParticleSystemLoader::parseGenerator(Hash* params)
             raiseError("Error in GaussianDisc syntax");
             return NULL;
         }
-        
+
         Hash* gaussianDiscParams = generatorValue->getHash();
-        
+
         double sigma = 1.0;
         gaussianDiscParams->getNumber("Sigma", sigma);
 
         return new GaussianDiscGenerator((float) sigma);
     }
-    
+
     raiseError("Missing generator for emitter");
-    
+
     return NULL;
 }
 
@@ -215,27 +215,27 @@ ParticleSystemLoader::parseEmitter(Hash* params)
     {
         textureHandle = GetTextureManager()->getHandle(TextureInfo(textureFileName, getTexturePath(), TextureInfo::BorderClamp));
     }
-    
+
     double rate = 1.0;
     double lifetime = 1.0;
     params->getNumber("Rate", rate);
     params->getNumber("Lifetime", lifetime);
-    
+
     double startSize = 1.0;
     double endSize = 1.0;
     params->getNumber("StartSize", startSize);
     params->getNumber("EndSize", endSize);
-    
+
     Color startColor(Color::White);
     Color endColor(Color::Black);
     float startOpacity = 0.0f;
     float endOpacity = 0.0f;
-    
+
     params->getColor("StartColor", startColor);
     params->getNumber("StartOpacity", startOpacity);
     params->getColor("EndColor", endColor);
     params->getNumber("EndOpacity", endOpacity);
-    
+
     VectorGenerator* initialPositionGenerator = NULL;
     Value* positionValue = params->getValue("InitialPosition");
     if (positionValue == NULL)
@@ -253,12 +253,12 @@ ParticleSystemLoader::parseEmitter(Hash* params)
             initialPositionGenerator = parseGenerator(positionValue->getHash());
         }
     }
-    
+
     if (initialPositionGenerator == NULL)
     {
         return NULL;
     }
-    
+
     VectorGenerator* initialVelocityGenerator = NULL;
     Value* velocityValue = params->getValue("InitialVelocity");
     if (velocityValue == NULL)
@@ -276,26 +276,26 @@ ParticleSystemLoader::parseEmitter(Hash* params)
             initialVelocityGenerator = parseGenerator(velocityValue->getHash());
         }
     }
-    
+
     if (initialVelocityGenerator == NULL)
     {
         delete initialPositionGenerator;
         return NULL;
     }
-    
+
     Vector3f acceleration;
     params->getVector("Acceleration", acceleration);
-    
+
     double startTime = -numeric_limits<double>::infinity();
     double endTime   =  numeric_limits<double>::infinity();
     params->getNumber("Beginning", startTime);
     params->getNumber("Ending", endTime);
-    
+
     double minRotationRate = 0.0;
     double maxRotationRate = 0.0;
     params->getNumber("MinRotationRate", minRotationRate);
     params->getNumber("MaxRotationRate", maxRotationRate);
-    
+
     ParticleEmitter* emitter = new ParticleEmitter();
     emitter->m_texture = textureHandle;
     emitter->m_rate = (float) rate;
@@ -307,12 +307,12 @@ ParticleSystemLoader::parseEmitter(Hash* params)
     emitter->m_positionGenerator = initialPositionGenerator;
     emitter->m_velocityGenerator = initialVelocityGenerator;
     emitter->createMaterial();
-    
+
     emitter->setAcceleration(acceleration);
-    
+
     emitter->setLifespan(startTime, endTime);
     emitter->setRotationRateRange((float) degToRad(minRotationRate), (float) degToRad(maxRotationRate));
-    
+
     return emitter;
 }
 
@@ -345,7 +345,7 @@ ParticleSystemLoader::getTexturePath() const
 }
 
 
-ParticleSystem* 
+ParticleSystem*
 LoadParticleSystem(istream& in, const string& texPath)
 {
     ParticleSystemLoader* loader = new ParticleSystemLoader(in);
diff --git a/src/celengine/particlesystemfile.h b/src/celengine/particlesystemfile.h
index 1cdd54a67..af03157de 100644
--- a/src/celengine/particlesystemfile.h
+++ b/src/celengine/particlesystemfile.h
@@ -34,7 +34,7 @@ class ParticleSystemLoader
     const std::string& getErrorMessage() const;
     void setTexturePath(const std::string&);
     const std::string& getTexturePath() const;
-    
+
     static ParticleSystemLoader* OpenParticleSystemFile(std::istream& in);
 
  private:
@@ -44,7 +44,7 @@ class ParticleSystemLoader
     Tokenizer m_tokenizer;
     Parser m_parser;
     std::string m_errorMessage;
-    std::string m_texPath;   
+    std::string m_texPath;
 };
 
 
diff --git a/src/celengine/planetgrid.cpp b/src/celengine/planetgrid.cpp
index 1c0f53bc8..04d54223a 100644
--- a/src/celengine/planetgrid.cpp
+++ b/src/celengine/planetgrid.cpp
@@ -63,11 +63,11 @@ static void longLatLabel(const string& labelText,
     Vector3d pos(cos(phi) * cos(theta) * semiAxes.x(),
                  sin(phi) * semiAxes.y(),
                  -cos(phi) * sin(theta) * semiAxes.z());
-    
+
     float nearDist = renderer->getNearPlaneDistance();
-    
+
     pos = pos * (1.0 + labelOffset);
-    
+
     double boundingRadius = semiAxes.maxCoeff();
 
     // Draw the label only if it isn't obscured by the body ellipsoid
@@ -77,7 +77,7 @@ static void longLatLabel(const string& labelText,
         // Compute the position of the label
         Vector3d labelPos = bodyCenter +
                             bodyOrientation.conjugate() * pos * (1.0 + labelOffset);
-        
+
         // Calculate the intersection of the eye-to-label ray with the plane perpendicular to
         // the view normal that touches the front of the objects bounding sphere
         double planetZ = viewNormal.dot(bodyCenter) - boundingRadius;
@@ -85,7 +85,7 @@ static void longLatLabel(const string& labelText,
             planetZ = -nearDist * 1.001;
         double z = viewNormal.dot(labelPos);
         labelPos *= planetZ / z;
-        
+
         renderer->addObjectAnnotation(NULL, labelText,
                                       Renderer::PlanetographicGridLabelColor,
                                       labelPos.cast<float>());
@@ -113,7 +113,7 @@ PlanetographicGrid::render(Renderer* renderer,
     Vector3f semiAxes = body.getSemiAxes();
     Vector3d posd = pos.cast<double>();
     Vector3d viewRayOrigin = q * -pos.cast<double>();
-    
+
     // Calculate the view normal; this is used for placement of the long/lat
     // label text.
     Vector3f vn  = renderer->getCameraOrientation().conjugate() * -Vector3f::UnitZ();
@@ -146,7 +146,7 @@ PlanetographicGrid::render(Renderer* renderer,
         latitudeStep = 30.0f;
         longitudeStep = 30.0f;
     }
-    
+
     for (float latitude = -90.0f + latitudeStep; latitude < 90.0f; latitude += latitudeStep)
     {
         float phi = degToRad(latitude);
@@ -167,7 +167,7 @@ PlanetographicGrid::render(Renderer* renderer,
         glDrawArrays(GL_LINE_LOOP, 0, circleSubdivisions);
         glPopMatrix();
         glLineWidth(1.0f);
-        
+
         if (showCoordinateLabels)
         {
             if (latitude != 0.0f && abs(latitude) < 90.0f)
@@ -241,7 +241,7 @@ PlanetographicGrid::render(Renderer* renderer,
                     break;
                 }
 
-                sprintf(buf, "%d%c", showLongitude, ew);       
+                sprintf(buf, "%d%c", showLongitude, ew);
                 longLatLabel(buf, -longitude, 0.0, viewRayOrigin, viewNormal, posd, q, semiAxes, offset, renderer);
             }
         }
diff --git a/src/celengine/regcombine.h b/src/celengine/regcombine.h
index 1b0b97721..478518b86 100644
--- a/src/celengine/regcombine.h
+++ b/src/celengine/regcombine.h
@@ -1,5 +1,5 @@
 // regcombine.h
-// 
+//
 // Copyright (C) 2001, Chris Laurel <claurel@shatters.net>
 //
 // Some functions for setting up the nVidia register combiners
diff --git a/src/celengine/rendcontext.cpp b/src/celengine/rendcontext.cpp
index 32d408633..fb3120c31 100644
--- a/src/celengine/rendcontext.cpp
+++ b/src/celengine/rendcontext.cpp
@@ -319,7 +319,7 @@ FixedFunctionRenderContext::makeCurrent(const Material& m)
                 glMaterialfv(GL_FRONT, GL_SHININESS, &m.specularPower);
                 specularOn = true;
             }
-            
+
             {
                 float matEmissive[4] = { m.emissive.red(),
                                          m.emissive.green(),
@@ -836,7 +836,7 @@ GLSL_RenderContext::makeCurrent(const Material& m)
             glEnable(GL_BLEND);
             glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
             glDepthMask(disableDepthWriteOnBlend ? GL_FALSE : GL_TRUE);
-            break;                
+            break;
         default:
             glDisable(GL_BLEND);
             glDepthMask(GL_TRUE);
@@ -1002,7 +1002,7 @@ GLSLUnlit_RenderContext::makeCurrent(const Material& m)
             glEnable(GL_BLEND);
             glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
             glDepthMask(GL_FALSE);
-            break;                
+            break;
         default:
             glDisable(GL_BLEND);
             glDepthMask(GL_TRUE);
diff --git a/src/celengine/rendcontext.h b/src/celengine/rendcontext.h
index 687be92e0..c0665dc53 100644
--- a/src/celengine/rendcontext.h
+++ b/src/celengine/rendcontext.h
@@ -47,10 +47,10 @@ class RenderContext
 
     void setPointScale(float);
     float getPointScale() const;
-    
+
     void setCameraOrientation(const Eigen::Quaternionf& q);
     Eigen::Quaternionf getCameraOrientation() const;
-    
+
  private:
     const cmod::Material* material;
     bool locked;
@@ -113,15 +113,15 @@ class GLSL_RenderContext : public RenderContext
 {
  public:
     EIGEN_MAKE_ALIGNED_OPERATOR_NEW
-    
+
     GLSL_RenderContext(const LightingState& ls, float _objRadius, const Eigen::Quaternionf& orientation);
     GLSL_RenderContext(const LightingState& ls, const Eigen::Vector3f& _objScale, const Eigen::Quaternionf& orientation);
     virtual ~GLSL_RenderContext();
-    
+
     virtual void makeCurrent(const cmod::Material&);
     virtual void setVertexArrays(const cmod::Mesh::VertexDescription& desc,
                                  const void* vertexData);
-                 
+
     virtual void setLunarLambert(float);
     virtual void setAtmosphere(const Atmosphere*);
 
@@ -129,7 +129,7 @@ class GLSL_RenderContext : public RenderContext
      void initLightingEnvironment();
      void setLightingParameters(CelestiaGLProgram& prog, Color diffuseColor, Color specularColor);
      void setShadowParameters(CelestiaGLProgram& prog);
-     
+
  private:
     const LightingState& lightingState;
     const Atmosphere* atmosphere;
@@ -137,10 +137,10 @@ class GLSL_RenderContext : public RenderContext
     float objRadius;
     Eigen::Vector3f objScale;
     Eigen::Quaternionf objOrientation;
-    
+
     // extended material properties
     float lunarLambert;
-    
+
     ShaderProperties shaderProps;
 };
 
@@ -150,7 +150,7 @@ class GLSLUnlit_RenderContext : public RenderContext
  public:
     GLSLUnlit_RenderContext(float _objRadius);
     virtual ~GLSLUnlit_RenderContext();
-    
+
     virtual void makeCurrent(const cmod::Material&);
     virtual void setVertexArrays(const cmod::Mesh::VertexDescription& desc,
                                  const void* vertexData);
@@ -158,11 +158,11 @@ class GLSLUnlit_RenderContext : public RenderContext
  private:
     void initLightingEnvironment();
     void setLightingParameters(CelestiaGLProgram& prog, Color diffuseColor, Color specularColor);
-     
+
  private:
     cmod::Material::BlendMode blendMode;
     float objRadius;
-    
+
     ShaderProperties shaderProps;
 };
 
diff --git a/src/celengine/render.cpp b/src/celengine/render.cpp
index 018153d5a..065724d3c 100644
--- a/src/celengine/render.cpp
+++ b/src/celengine/render.cpp
@@ -317,7 +317,7 @@ public:
     void render();
     void finish();
     inline void addStar(const Eigen::Vector3f& pos, const Color&, float);
-	void setTexture(Texture*);
+    void setTexture(Texture*);
 
 private:
     struct StarVertex
@@ -333,7 +333,7 @@ private:
     StarVertex* vertices;
     const GLContext* context;
     bool useSprites;
-	Texture* texture;
+    Texture* texture;
 };
 
 
@@ -442,7 +442,7 @@ PointStarVertexBuffer::PointStarVertexBuffer(unsigned int _capacity) :
     vertices(NULL),
     context(NULL),
     useSprites(false),
-	texture(NULL)
+    texture(NULL)
 {
     vertices = new StarVertex[capacity];
 }
@@ -576,7 +576,7 @@ inline void PointStarVertexBuffer::addStar(const Eigen::Vector3f& pos,
 
 void PointStarVertexBuffer::setTexture(Texture* _texture)
 {
-	texture = _texture;
+  texture = _texture;
 }
 
 /**** End star vertex buffer classes ****/
@@ -852,11 +852,11 @@ static void RectToSphericalMapEval(float x, float y, float z,
     // Compute spherical coodinates (r is always 1)
     double phi = asin(y);
     double theta = atan2(z, -x);
-   
+
     // Convert to texture coordinates
     double u = (theta / PI + 1.0) * 0.5;
     double v = (-phi / PI + 0.5);
-   
+
     // Pack texture coordinates in red/green and blue/alpha
     // u = red + green/256
     // v = blue* + alpha/256
@@ -1613,7 +1613,7 @@ void Renderer::addSortedAnnotation(const MarkerRepresentation* markerRep,
                    &winX, &winY, &winZ) != GL_FALSE)
     {
         Annotation a;
-        
+
         a.labelText[0] = '\0';
         if (markerRep == NULL)
         {
@@ -1673,7 +1673,7 @@ void Renderer::beginObjectAnnotations()
 void Renderer::endObjectAnnotations()
 {
     objectAnnotationSetOpen = false;
-    
+
     if (!objectAnnotations.empty())
     {
         renderAnnotations(objectAnnotations.begin(),
@@ -1708,7 +1708,7 @@ void Renderer::addObjectAnnotation(const MarkerRepresentation* markerRep,
         {
 
             Annotation a;
-            
+
             a.labelText[0] = '\0';
             if (!labelText.empty())
             {
@@ -2325,7 +2325,7 @@ void Renderer::genBlurTexture(int blurLevel)
 
 void Renderer::genSceneTexture()
 {
-	unsigned int *data;
+    unsigned int *data;
     if (sceneTexture != 0)
         glDeleteTextures(1, &sceneTexture);
 
@@ -2339,19 +2339,19 @@ void Renderer::genSceneTexture()
         1.0f;
     sceneTexHScale = (windowHeight > 0) ? (GLfloat)sceneTexHeight / (GLfloat)windowHeight :
         1.0f;
-	data = (unsigned int* )malloc(sceneTexWidth*sceneTexHeight*4*sizeof(unsigned int));
+    data = (unsigned int* )malloc(sceneTexWidth*sceneTexHeight*4*sizeof(unsigned int));
     memset(data, 0, sceneTexWidth*sceneTexHeight*4*sizeof(unsigned int));
-    
+
     glGenTextures(1, &sceneTexture);
-	glBindTexture(GL_TEXTURE_2D, sceneTexture);
+    glBindTexture(GL_TEXTURE_2D, sceneTexture);
     glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_S,GL_CLAMP_TO_EDGE);
     glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_T,GL_CLAMP_TO_EDGE);
     glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR);
     glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR);
-	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, sceneTexWidth, sceneTexHeight, 0,
+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, sceneTexWidth, sceneTexHeight, 0,
                  GL_RGBA, GL_UNSIGNED_BYTE, data);
-    
-	free(data);
+
+    free(data);
 #ifdef DEBUG_HDR
     static int genSceneTexCounter = 1;
     HDR_LOG <<
@@ -3000,12 +3000,12 @@ void Renderer::draw(const Observer& observer,
         {
             float nearZ = center.distanceFromOrigin() - radius;
             nearZ = -nearZ * nearZcoeff;
-            
+
             if (nearZ > -MinNearPlaneDistance)
                 iter->nearZ = -max(MinNearPlaneDistance, radius / 2000.0f);
             else
                 iter->nearZ = nearZ;
-            
+
             if (!convex)
             {
                 iter->farZ = center.z - radius;
@@ -3016,7 +3016,7 @@ void Renderer::draw(const Observer& observer,
             {
                 // Make the far plane as close as possible
                 float d = center.distanceFromOrigin();
-                
+
                 // Account for ellipsoidal objects
                 float eradius = radius;
                 if (iter->body != NULL)
@@ -3036,7 +3036,7 @@ void Renderer::draw(const Observer& observer,
                     // is spherical, inside the planet.)
                     iter->farZ = iter->nearZ * 2.0f;
                 }
-                
+
                 if (cloudHeight > 0.0f)
                 {
                     // If there's a cloud layer, we need to move the
@@ -3046,7 +3046,7 @@ void Renderer::draw(const Observer& observer,
                                                square(eradius));
                 }
             }
-            
+
             *notCulled = *iter;
             notCulled++;
 
@@ -3080,7 +3080,7 @@ void Renderer::draw(const Observer& observer,
                 float radius = iter->body->getRadius();
                 Vector3f semiAxes = iter->body->getSemiAxes() / radius;
 
-				Vector3f recipSemiAxes = semiAxes.cwiseInverse();
+                Vector3f recipSemiAxes = semiAxes.cwiseInverse();
                 Vector3f eyeVec = iter->position / radius;
 
                 // Compute the orientation of the planet before axial rotation
@@ -3173,7 +3173,7 @@ void Renderer::draw(const Observer& observer,
     glDepthMask(GL_FALSE);
     glEnable(GL_BLEND);
     glEnable(GL_TEXTURE_2D);
-    
+
     // Render sky grids first--these will always be in the background
     {
         glDisable(GL_TEXTURE_2D);
@@ -3187,8 +3187,8 @@ void Renderer::draw(const Observer& observer,
     }
 
     // Render deep sky objects
-    if ((renderFlags & (ShowGalaxies | 
-						ShowGlobulars |
+    if ((renderFlags & (ShowGalaxies |
+                        ShowGlobulars |
                         ShowNebulae |
                         ShowOpenClusters)) != 0 &&
         universe.getDSOCatalog() != NULL)
@@ -3250,24 +3250,24 @@ void Renderer::draw(const Observer& observer,
         {
             Asterism* ast = *iter;
 
-			if (ast->getActive())
+            if (ast->getActive())
             {
-				if (ast->isColorOverridden())
-					glColor(ast->getOverrideColor(), opacity);
-				else
-					glColor(ConstellationColor, opacity);
+                if (ast->isColorOverridden())
+                    glColor(ast->getOverrideColor(), opacity);
+                else
+                    glColor(ConstellationColor, opacity);
 
-				for (int i = 0; i < ast->getChainCount(); i++)
-				{
-					const Asterism::Chain& chain = ast->getChain(i);
+            for (int i = 0; i < ast->getChainCount(); i++)
+            {
+                const Asterism::Chain& chain = ast->getChain(i);
 
-					glBegin(GL_LINE_STRIP);
-					for (Asterism::Chain::const_iterator iter = chain.begin();
-						 iter != chain.end(); iter++)
-						glVertex3fv(iter->data());
-					glEnd();
-				}
-			}
+                    glBegin(GL_LINE_STRIP);
+                    for (Asterism::Chain::const_iterator iter = chain.begin();
+                         iter != chain.end(); iter++)
+                        glVertex3fv(iter->data());
+                    glEnd();
+                }
+            }
         }
 
         if ((renderFlags & ShowSmoothLines) != 0)
@@ -3313,13 +3313,13 @@ void Renderer::draw(const Observer& observer,
     {
         renderMarkers(*universe.getMarkers(),
                       observer.getPosition(),
-        		      observer.getOrientation(),
+                      observer.getOrientation(),
                       now);
-        
+
         // Render background markers; rendering of other markers is deferred until
         // solar system objects are rendered.
         renderBackgroundAnnotations(FontNormal);
-    }    
+    }
 
     // Draw the selection cursor
     bool selectionVisible = false;
@@ -3340,7 +3340,7 @@ void Renderer::draw(const Observer& observer,
             if (sel.body() != NULL)
                 boundingRadius = sel.body()->getBoundingRadius();
             else
-                boundingRadius = sel.radius();                
+                boundingRadius = sel.radius();
             offset *= (1.0 - boundingRadius * 1.01 / distance);
 
             // The selection cursor is only partially visible when the selected object is obscured. To implement
@@ -3666,19 +3666,19 @@ void Renderer::draw(const Observer& observer,
             if (minNearDistance > zNearest)
                 zNearest = minNearDistance;
         }
-        
+
         // Adjust the nearest interval to include the closest marker (if it's
         // closer to the observer than anything else
         if (!depthSortedAnnotations.empty())
         {
             // Factor of 0.999 makes sure ensures that the near plane does not fall
-            // exactly at the marker's z coordinate (in which case the marker 
-            // would be susceptible to getting clipped.) 
+            // exactly at the marker's z coordinate (in which case the marker
+            // would be susceptible to getting clipped.)
             if (-depthSortedAnnotations[0].position.z() > zNearest)
                 zNearest = -depthSortedAnnotations[0].position.z() * 0.999f;
         }
 
-        
+
 #if DEBUG_COALESCE
         clog << "nEntries: " << nEntries << ",   zNearest: " << zNearest << ",   prevNear: " << prevNear << "\n";
 #endif
@@ -3793,7 +3793,7 @@ void Renderer::draw(const Observer& observer,
                         clog << "point: " << renderList[i].body->getName() << "\n";
                     }
                     break;
-                        
+
                 case RenderListEntry::RenderableStar:
                     if (renderList[i].discSizeInPixels > 1)
                     {
@@ -3804,7 +3804,7 @@ void Renderer::draw(const Observer& observer,
                         clog << "point: " << "Star" << "\n";
                     }
                     break;
-                        
+
                 default:
                     break;
                 }
@@ -3910,7 +3910,7 @@ void Renderer::draw(const Observer& observer,
         // reset the depth range
         glDepthRange(0, 1);
     }
-    
+
     renderForegroundAnnotations(FontNormal);
 
     glMatrixMode(GL_PROJECTION);
@@ -3932,7 +3932,7 @@ void Renderer::draw(const Observer& observer,
 
     glPolygonMode(GL_FRONT, GL_FILL);
     glPolygonMode(GL_BACK, GL_FILL);
-    
+
     glDisable(GL_BLEND);
     glDepthMask(GL_TRUE);
     glEnable(GL_LIGHTING);
@@ -4621,7 +4621,7 @@ void Renderer::renderEllipsoidAtmosphere(const Atmosphere& atmosphere,
     double centerDist = eyeVec.norm();
 
     float height = atmosphere.height / radius;
-	Vector3f recipSemiAxes = semiAxes.cwiseInverse();
+    Vector3f recipSemiAxes = semiAxes.cwiseInverse();
 
     Vector3f recipAtmSemiAxes = recipSemiAxes / (1.0f + height);
     // ellipDist is not the true distance from the surface unless the
@@ -4733,7 +4733,7 @@ void Renderer::renderEllipsoidAtmosphere(const Atmosphere& atmosphere,
     Vector3f botColor = atmosphere.lowerColor.toVector3();
     Vector3f topColor = atmosphere.upperColor.toVector3();
     Vector3f sunsetColor = atmosphere.sunsetColor.toVector3();
-    
+
     if (within)
     {
         Vector3f skyColor = atmosphere.skyColor.toVector3();
@@ -4994,7 +4994,7 @@ static void setLightParameters_VP(VertexProcessor& vproc,
         Vector3f lightColor = light.color.toVector3() * light.irradiance;
         Vector3f diffuse = diffuseColor.cwiseProduct(lightColor);
         Vector3f specular = specularColor.cwiseProduct(lightColor);
-        
+
         // Just handle two light sources for now
         if (i == 0)
         {
@@ -6296,7 +6296,7 @@ renderEclipseShadows_Shaders(Geometry* geometry,
                              const GLContext& context)
 {
     Matrix3f planetTransform = planetOrientation.toRotationMatrix();
-    
+
     // Eclipse shadows on mesh objects are only implemented in the GLSL path
     if (geometry != NULL)
         return;
@@ -6498,9 +6498,9 @@ void Renderer::renderLocations(const Body& body,
     const vector<Location*>* locations = body.getLocations();
     if (locations == NULL)
         return;
-    
+
     Vector3f semiAxes = body.getSemiAxes();
-    
+
     float nearDist = getNearPlaneDistance();
     double boundingRadius = semiAxes.maxCoeff();
 
@@ -6510,37 +6510,37 @@ void Renderer::renderLocations(const Body& body,
 
     Vector3f vn  = getCameraOrientation().conjugate() * -Vector3f::UnitZ();
     Vector3d viewNormal = vn.cast<double>();
-    
+
     Ellipsoidd bodyEllipsoid(semiAxes.cast<double>());
-    
+
     Matrix3d bodyMatrix = bodyOrientation.conjugate().toRotationMatrix();
-    
+
     for (vector<Location*>::const_iterator iter = locations->begin();
          iter != locations->end(); iter++)
     {
         const Location& location = **iter;
-        
+
         if (location.getFeatureType() & locationFilter)
         {
             // Get the position of the location with respect to the planet center
             Vector3f ppos = location.getPosition();
-            
+
             // Compute the bodycentric position of the location
             Vector3d locPos = ppos.cast<double>();
-            
+
             // Get the planetocentric position of the label.  Add a slight scale factor
             // to keep the point from being exactly on the surface.
             Vector3d pcLabelPos = locPos * (1.0 + labelOffset);
-            
+
             // Get the camera space label position
             Vector3d labelPos = bodyCenter + bodyMatrix * locPos;
-            
+
             float effSize = location.getImportance();
             if (effSize < 0.0f)
                 effSize = location.getSize();
-            
+
             float pixSize = effSize / (float) (labelPos.norm() * pixelSize);
-            
+
             if (pixSize > minFeatureSize && labelPos.dot(viewNormal) > 0.0)
             {
                 // Labels on non-ellipsoidal bodies need special handling; the
@@ -6554,9 +6554,9 @@ void Renderer::renderLocations(const Body& body,
                     if (r < boundingRadius)
                         pcLabelPos = locPos * (boundingRadius * 1.01 / r);
                 }
-                
+
                 double t = 0.0;
-                
+
                 // Test for an intersection of the eye-to-location ray with
                 // the planet ellipsoid.  If we hit the planet first, then
                 // the label is obscured by the planet.  An exact calculation
@@ -6566,7 +6566,7 @@ void Renderer::renderLocations(const Body& body,
                 bool hit = testIntersection(testRay, bodyEllipsoid, t);
 
                 if (!hit || t >= 1.0)
-                {                    
+                {
                     // Calculate the intersection of the eye-to-label ray with the plane perpendicular to
                     // the view normal that touches the front of the object's bounding sphere
                     double planetZ = viewNormal.dot(bodyCenter) - boundingRadius;
@@ -6574,7 +6574,7 @@ void Renderer::renderLocations(const Body& body,
                         planetZ = -nearDist * 1.001;
                     double z = viewNormal.dot(labelPos);
                     labelPos *= planetZ / z;
-                                        
+
                     uint32 featureType = location.getFeatureType();
                     MarkerRepresentation* locationMarker = NULL;
                     if (featureType & Location::City)
@@ -6596,7 +6596,7 @@ void Renderer::renderLocations(const Body& body,
                 }
             }
         }
-    }    
+    }
 }
 
 
@@ -6639,7 +6639,7 @@ estimateReflectedLightFraction(const Vector3d& toSun,
 
     // s = sin(phi) * sin(theta)
     float s = (float) sqrt((1.0f - cosPhi * cosPhi) * (1.0f - cosTheta * cosTheta));
-    
+
     float cosPhi1 = cosPhi * cosTheta - s;  // cos(phi + theta)
     float cosPhi2 = cosPhi * cosTheta + s;  // cos(phi - theta)
 
@@ -6715,7 +6715,7 @@ setupObjectLighting(const vector<LightSource>& suns,
                 {
                     // Account for the phase
                     Vector3d toSun = objpos - suns[0].position;
-                    irr *= estimateReflectedLightFraction(toSun, toIllum, iter->radius);              
+                    irr *= estimateReflectedLightFraction(toSun, toIllum, iter->radius);
                     if (irr > maxIrr)
                     {
                         maxIrr = irr;
@@ -6724,7 +6724,7 @@ setupObjectLighting(const vector<LightSource>& suns,
                 }
             }
         }
-#if DEBUG_SECONDARY_ILLUMINATION      
+#if DEBUG_SECONDARY_ILLUMINATION
         clog << "maxIrr = " << maxIrr << ", "
              << secondaryIlluminators[maxIrrSource].body->getName() << ", "
              << secondaryIlluminators[maxIrrSource].reflectedIrradiance << endl;
@@ -6737,7 +6737,7 @@ setupObjectLighting(const vector<LightSource>& suns,
             ls.lights[i].direction_eye = toIllum.cast<float>();
             ls.lights[i].direction_eye.normalize();
             ls.lights[i].irradiance = maxIrr;
-            ls.lights[i].color = secondaryIlluminators[maxIrrSource].body->getSurface().color;        
+            ls.lights[i].color = secondaryIlluminators[maxIrrSource].body->getSurface().color;
             ls.lights[i].apparentSize = 0.0f;
             ls.lights[i].castsShadows = false;
             i++;
@@ -7436,7 +7436,7 @@ bool Renderer::testEclipse(const Body& receiver,
     const DirectionalLight& light = lightingState.lights[lightIndex];
     LightingState::EclipseShadowVector& shadows = *lightingState.shadows[lightIndex];
     bool isReceiverShadowed = false;
-    
+
     // Ignore situations where the shadow casting body is much smaller than
     // the receiver, as these shadows aren't likely to be relevant.  Also,
     // ignore eclipses where the caster is not an ellipsoid, since we can't
@@ -7520,21 +7520,21 @@ bool Renderer::testEclipse(const Body& receiver,
 
             isReceiverShadowed = true;
         }
-        
+
         // If the caster has a ring system, see if it casts a shadow on the receiver.
         // Ring shadows are only supported in the OpenGL 2.0 path.
         if (caster.getRings() && context->getRenderPath() == GLContext::GLPath_GLSL)
         {
             bool shadowed = false;
-            
+
             // The shadow volume of the rings is an oblique circular cylinder
             if (dist < caster.getRings()->outerRadius + receiver.getRadius())
             {
                 // Possible intersection, but it depends on the orientation of the
                 // rings.
                 Quaterniond casterOrientation = caster.getOrientation(now);
-                Vector3d ringPlaneNormal = casterOrientation * Vector3d::UnitY();                
-                Vector3d shadowDirection = lightToCasterDir.normalized();                
+                Vector3d ringPlaneNormal = casterOrientation * Vector3d::UnitY();
+                Vector3d shadowDirection = lightToCasterDir.normalized();
                 Vector3d v = ringPlaneNormal.cross(shadowDirection);
                 if (v.squaredNorm() < 1.0e-6)
                 {
@@ -7549,7 +7549,7 @@ bool Renderer::testEclipse(const Body& receiver,
                     // perpendicular to the ring plane and containing the light direction.
                     Vector3d shadowPlaneNormal = v.normalized().cross(shadowDirection);
                     Hyperplane<double, 3> shadowPlane(shadowPlaneNormal, posCaster - posReceiver);
-                    double minDistance = receiver.getRadius() + 
+                    double minDistance = receiver.getRadius() +
                         caster.getRings()->outerRadius * ringPlaneNormal.dot(shadowDirection);
                     if (abs(shadowPlane.signedDistance(Vector3d::Zero())) < minDistance)
                     {
@@ -7566,7 +7566,7 @@ bool Renderer::testEclipse(const Body& receiver,
                     shadow.ringSystem = caster.getRings();
                     shadow.casterOrientation = casterOrientation.cast<float>();
                 }
-            }                        
+            }
         }
     }
 
@@ -7672,7 +7672,7 @@ void Renderer::renderPlanet(Body& body,
                 lights.ringShadows[li].direction = -lights.lights[li].position.normalized().cast<float>();
             }
         }
-        
+
         // Calculate eclipse circumstances
         if ((renderFlags & ShowEclipseShadows) != 0 &&
             body.getSystem() != NULL)
@@ -7835,7 +7835,7 @@ void Renderer::renderPlanet(Body& body,
             observatoryRep = MarkerRepresentation(MarkerRepresentation::Plus,     8.0f, LocationLabelColor);
             cityRep        = MarkerRepresentation(MarkerRepresentation::X,        3.0f, LocationLabelColor);
             genericLocationRep = MarkerRepresentation(MarkerRepresentation::Square, 8.0f, LocationLabelColor);
-            
+
             glEnable(GL_DEPTH_TEST);
             glDepthMask(GL_FALSE);
             glDisable(GL_BLEND);
@@ -8244,7 +8244,7 @@ static float luminosityAtOpposition(float sunLuminosity,
     // Compute the total energy hitting the planet; assume an albedo of 1.0, so
     // reflected energy = incident energy.
     double incidentEnergy = irradiance * circleArea(objRadius * 1000);
-    
+
     // Compute the luminosity (i.e. power relative to solar power)
     return (float) (incidentEnergy / astro::SOLAR_POWER);
 }
@@ -8323,7 +8323,7 @@ void Renderer::buildRenderLists(const Vector3d& astrocentricObserverPos,
     Matrix3f viewMat = observer.getOrientationf().toRotationMatrix();
     Vector3f viewMatZ = viewMat.row(2);
     double invCosViewAngle = 1.0 / cosViewConeAngle;
-    double sinViewAngle = sqrt(1.0 - square(cosViewConeAngle));   
+    double sinViewAngle = sqrt(1.0 - square(cosViewConeAngle));
 
     unsigned int nChildren = tree != NULL ? tree->childCount() : 0;
     for (unsigned int i = 0; i < nChildren; i++)
@@ -8360,7 +8360,7 @@ void Renderer::buildRenderLists(const Vector3d& astrocentricObserverPos,
 
         // The result of the planetshine test can be reused for the view cone
         // test, but only when the object's light influence sphere is larger
-        // than the geometry. This is not 
+        // than the geometry. This is not
         bool viewConeTestFailed = false;
         if (body->isSecondaryIlluminator())
         {
@@ -8476,7 +8476,7 @@ void Renderer::buildRenderLists(const Vector3d& astrocentricObserverPos,
                 // Figure out the magnitude of the brightest possible object in the subtree.
 
                 // Compute the luminosity from reflected light of the largest object in the subtree
-                float lum = 0.0f;                
+                float lum = 0.0f;
                 for (unsigned int li = 0; li < lightSourceList.size(); li++)
                 {
                     Vector3d sunPos = pos_v - lightSourceList[li].position;
@@ -8517,7 +8517,7 @@ void Renderer::buildRenderLists(const Vector3d& astrocentricObserverPos,
                 {
                     double maxPerpDist = (influenceRadius + dist_vn * sinViewAngle) * invCosViewAngle;
                     double perpDistSq = toViewNormal.squaredNorm();
-                    if (perpDistSq < maxPerpDist * maxPerpDist)                   
+                    if (perpDistSq < maxPerpDist * maxPerpDist)
                         traverseSubtree = true;
                 }
             }
@@ -8569,7 +8569,7 @@ void Renderer::buildOrbitLists(const Vector3d& astrocentricObserverPos,
         // relative to the observer.
         Vector3d pos_v = pos_s - astrocentricObserverPos;
 
-        // Only show orbits for major bodies or selected objects. 
+        // Only show orbits for major bodies or selected objects.
         Body::VisibilityPolicy orbitVis = body->getOrbitVisibility();
 
         if (body->isVisible() &&
@@ -8788,7 +8788,7 @@ void Renderer::buildLabelLists(const Frustum& viewFrustum,
                 }
             }
         }
-    } // for each render list entry      
+    } // for each render list entry
 }
 
 
@@ -9616,29 +9616,29 @@ void DSORenderer::process(DeepSkyObject* const & dso,
 {
     if (distanceToDSO > distanceLimit)
         return;
-    
+
     Vector3d dsoPos = dso->getPosition();
     Vector3f relPos = (dsoPos - obsPos).cast<float>();
 
     Vector3f center = orientationMatrix.transpose() * relPos;
-	
-	double enhance = 4.0, pc10 = 32.6167;
-	
-	// The parameter 'enhance' adjusts the DSO brightness as viewed from "inside" 
-	// (e.g. MilkyWay as seen from Earth). It provides an enhanced apparent  core  
-	// brightness appMag  ~ absMag - enhance. 'enhance' thus serves to uniformly  
-	// enhance the too low sprite luminosity at close distance.
+
+    double enhance = 4.0, pc10 = 32.6167;
+
+    // The parameter 'enhance' adjusts the DSO brightness as viewed from "inside"
+    // (e.g. MilkyWay as seen from Earth). It provides an enhanced apparent  core
+    // brightness appMag  ~ absMag - enhance. 'enhance' thus serves to uniformly
+    // enhance the too low sprite luminosity at close distance.
 
     float  appMag = (distanceToDSO >= pc10)? (float) astro::absToAppMag((double) absMag, distanceToDSO): absMag + (float) (enhance * tanh(distanceToDSO/pc10 - 1.0));
-    
-	// Test the object's bounding sphere against the view frustum. If we
+
+    // Test the object's bounding sphere against the view frustum. If we
     // avoid this stage, overcrowded octree cells may hit performance badly:
     // each object (even if it's not visible) would be sent to the OpenGL
     // pipeline.
-    
+
     if (dso->isVisible())
     {
-        double dsoRadius = dso->getBoundingSphereRadius(); 
+        double dsoRadius = dso->getBoundingSphereRadius();
         bool inFrustum = frustum.testSphere(center, (float) dsoRadius) != Frustum::Outside;
 
         if (inFrustum)
@@ -9651,29 +9651,29 @@ void DSORenderer::process(DeepSkyObject* const & dso,
                 // Ansatz: brightness = a - b * appMag(distanceToDSO), emulating eye sensitivity...
                 // determine a,b such that
                 // a - b * absMag = absMag / avgAbsMag ~ 1; a - b * faintestMag = 0.2.
-                // The 2nd eq. guarantees that the faintest galaxies are still visible.            
-                
-			    if(!strcmp(dso->getObjTypeName(),"globular"))		
-				    avgAbsMag =  -6.86;    // average over 150  globulars in globulars.dsc.
-			    else if (!strcmp(dso->getObjTypeName(),"galaxy"))
-				    avgAbsMag = -19.04;    // average over 10937 galaxies in galaxies.dsc.
-                
-    			
-                float r   = absMag / (float) avgAbsMag;			  
-			    float brightness = r - (r - 0.2f) * (absMag - appMag) / (absMag - faintestMag);
-    	
-			    // obviously, brightness(appMag = absMag) = r and 
-			    // brightness(appMag = faintestMag) = 0.2, as desired.
+                // The 2nd eq. guarantees that the faintest galaxies are still visible.
 
-			    brightness = 2.3f * brightness * (faintestMag - 4.75f) / renderer->getFaintestAM45deg();
+                if(!strcmp(dso->getObjTypeName(),"globular"))
+                    avgAbsMag =  -6.86;    // average over 150  globulars in globulars.dsc.
+                else if (!strcmp(dso->getObjTypeName(),"galaxy"))
+                    avgAbsMag = -19.04;    // average over 10937 galaxies in galaxies.dsc.
+
+
+                float r = absMag / (float) avgAbsMag;
+                float brightness = r - (r - 0.2f) * (absMag - appMag) / (absMag - faintestMag);
+
+                // obviously, brightness(appMag = absMag) = r and
+                // brightness(appMag = faintestMag) = 0.2, as desired.
+
+                brightness = 2.3f * brightness * (faintestMag - 4.75f) / renderer->getFaintestAM45deg();
 
 #ifdef USE_HDR
                 brightness *= exposure;
 #endif
                 if (brightness < 0)
-				    brightness = 0;
-    						
-			    if (dsoRadius < 1000.0)
+                    brightness = 0;
+
+                if (dsoRadius < 1000.0)
                 {
                     // Small objects may be prone to clipping; give them special
                     // handling.  We don't want to always set the projection
@@ -9753,11 +9753,11 @@ void DSORenderer::process(DeepSkyObject* const & dso,
                     appMagEff = appMag;
                     step = 6.0f;
                     break;
-		        case Renderer::GlobularLabels:
+                case Renderer::GlobularLabels:
                     labelColor = Renderer::GlobularLabelColor;
                     appMagEff = appMag;
                     step = 3.0f;
-                    break;	        			
+                    break;
                 default:
                     // Unrecognized object class
                     labelColor = Color::White;
@@ -9897,7 +9897,7 @@ void Renderer::renderSkyGrids(const Observer& observer)
         double tdb = observer.getTime();
         const ObserverFrame* frame = observer.getFrame();
         Body* body = frame->getRefObject().body();
-        
+
         if (body)
         {
             SkyGrid grid;
@@ -9905,13 +9905,13 @@ void Renderer::renderSkyGrids(const Observer& observer)
             grid.setLabelColor(HorizonGridLabelColor);
             grid.setLongitudeUnits(SkyGrid::LongitudeDegrees);
             grid.setLongitudeDirection(SkyGrid::IncreasingClockwise);
-            
+
             Vector3d zenithDirection = observer.getPosition().offsetFromKm(body->getPosition(tdb)).normalized();
-            
+
             Vector3d northPole = body->getEclipticToEquatorial(tdb).conjugate() * Vector3d::UnitY();
             zenithDirection = toStandardCoords(zenithDirection);
             northPole = toStandardCoords(northPole);
-            
+
             Vector3d v = zenithDirection.cross(northPole);
 
             // Horizontal coordinate system not well defined when observer
@@ -9921,13 +9921,13 @@ void Renderer::renderSkyGrids(const Observer& observer)
             {
                 v.normalize();
                 Vector3d u = v.cross(zenithDirection);
-                
+
                 Matrix3d m;
                 m.row(0) = u;
                 m.row(1) = v;
                 m.row(2) = zenithDirection;
                 grid.setOrientation(Quaterniond(m));
-                
+
                 grid.render(*this, observer, windowWidth, windowHeight);
             }
         }
@@ -10016,9 +10016,9 @@ void Renderer::renderSelectionPointer(const Observer& observer,
         Vector3f p2(-20.0f * pixelSize, -6.0f * pixelSize, 0.0f);
 
         glBegin(GL_TRIANGLES);
-        glVertex((p0.x() * c - p0.y() * s + x0) * u + (p0.x() * s + p0.y() * c + y0) * v); 
-        glVertex((p1.x() * c - p1.y() * s + x0) * u + (p1.x() * s + p1.y() * c + y0) * v); 
-        glVertex((p2.x() * c - p2.y() * s + x0) * u + (p2.x() * s + p2.y() * c + y0) * v); 
+        glVertex((p0.x() * c - p0.y() * s + x0) * u + (p0.x() * s + p0.y() * c + y0) * v);
+        glVertex((p1.x() * c - p1.y() * s + x0) * u + (p1.x() * s + p1.y() * c + y0) * v);
+        glVertex((p2.x() * c - p2.y() * s + x0) * u + (p2.x() * s + p2.y() * c + y0) * v);
         glEnd();
 
         glPopMatrix();
@@ -10172,7 +10172,7 @@ void Renderer::renderAnnotations(const vector<Annotation>& annotations, FontStyl
     // Enable line smoothing for rendering symbols
     if ((renderFlags & ShowSmoothLines) != 0)
         enableSmoothLines();
-    
+
 #ifdef USE_HDR
     glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_FALSE);
 #endif
@@ -10212,13 +10212,13 @@ void Renderer::renderAnnotations(const vector<Annotation>& annotations, FontStyl
             else
                 markerRep.render(size);
             glEnable(GL_TEXTURE_2D);
-            
+
             if (!markerRep.label().empty())
             {
                 int labelOffset = (int) markerRep.size() / 2;
                 glTranslatef(labelOffset + PixelOffset, -labelOffset - font[fs]->getHeight() + PixelOffset, 0.0f);
                 font[fs]->render(markerRep.label(), 0.0f, 0.0f);
-            }  
+            }
             glPopMatrix();
         }
 
@@ -10228,25 +10228,25 @@ void Renderer::renderAnnotations(const vector<Annotation>& annotations, FontStyl
             int labelWidth = 0;
             int hOffset = 2;
             int vOffset = 0;
-            
+
             switch (annotations[i].halign)
             {
             case AlignCenter:
                 labelWidth = (font[fs]->getWidth(annotations[i].labelText));
                 hOffset = -labelWidth / 2;
                 break;
-            
+
             case AlignRight:
                 labelWidth = (font[fs]->getWidth(annotations[i].labelText));
                 hOffset = -(labelWidth + 2);
                 break;
-            
+
             case AlignLeft:
                 if (annotations[i].markerRep != NULL)
                     hOffset = 2 + (int) annotations[i].markerRep->size() / 2;
                 break;
             }
-            
+
             switch (annotations[i].valign)
             {
             case AlignCenter:
@@ -10259,7 +10259,7 @@ void Renderer::renderAnnotations(const vector<Annotation>& annotations, FontStyl
                 vOffset = 0;
                 break;
             }
-            
+
             glColor(annotations[i].color);
             glTranslatef((int) annotations[i].position.x() + hOffset + PixelOffset,
                          (int) annotations[i].position.y() + vOffset + PixelOffset, 0.0f);
@@ -10288,7 +10288,7 @@ Renderer::renderBackgroundAnnotations(FontStyle fs)
     glEnable(GL_DEPTH_TEST);
     renderAnnotations(backgroundAnnotations, fs);
     glDisable(GL_DEPTH_TEST);
-    
+
     clearAnnotations(backgroundAnnotations);
 }
 
@@ -10298,7 +10298,7 @@ Renderer::renderForegroundAnnotations(FontStyle fs)
 {
     glDisable(GL_DEPTH_TEST);
     renderAnnotations(foregroundAnnotations, fs);
-    
+
     clearAnnotations(foregroundAnnotations);
 }
 
@@ -10352,17 +10352,17 @@ Renderer::renderSortedAnnotations(vector<Annotation>::iterator iter,
             {
                 size = iter->size;
             }
-            
+
             glTranslatef((GLfloat) (int) iter->position.x(), (GLfloat) (int) iter->position.y(), ndc_z);
             glColor(iter->color);
-                        
+
             glDisable(GL_TEXTURE_2D);
             if (markerRep.symbol() == MarkerRepresentation::Crosshair)
                 renderCrosshair(size, realTime);
             else
                 markerRep.render(size);
-            glEnable(GL_TEXTURE_2D);            
-            
+            glEnable(GL_TEXTURE_2D);
+
             if (!markerRep.label().empty())
             {
                 int labelOffset = (int) markerRep.size() / 2;
@@ -10442,17 +10442,17 @@ Renderer::renderAnnotations(vector<Annotation>::iterator startIter,
             {
                 size = iter->size;
             }
-            
+
             glTranslatef((GLfloat) (int) iter->position.x(), (GLfloat) (int) iter->position.y(), ndc_z);
             glColor(iter->color);
-                        
+
             glDisable(GL_TEXTURE_2D);
             if (markerRep.symbol() == MarkerRepresentation::Crosshair)
                 renderCrosshair(size, realTime);
             else
                 markerRep.render(size);
-            glEnable(GL_TEXTURE_2D);            
-            
+            glEnable(GL_TEXTURE_2D);
+
             if (!markerRep.label().empty())
             {
                 int labelOffset = (int) markerRep.size() / 2;
@@ -10461,7 +10461,7 @@ Renderer::renderAnnotations(vector<Annotation>::iterator startIter,
             }
             glPopMatrix();
         }
-        
+
         if (iter->labelText[0] != '\0')
         {
             if (iter->markerRep != NULL)
@@ -10489,7 +10489,7 @@ Renderer::renderAnnotations(vector<Annotation>::iterator startIter,
 
 void Renderer::renderMarkers(const MarkerList& markers,
                              const UniversalCoord& cameraPosition,
-			                 const Quaterniond& cameraOrientation,
+                             const Quaterniond& cameraOrientation,
                              double jd)
 {
     // Calculate the cosine of half the maximum field of view. We'll use this for
@@ -10499,13 +10499,13 @@ void Renderer::renderMarkers(const MarkerList& markers,
     double h = tan(degToRad(fov / 2));
     double diag = sqrt(1.0 + square(h) + square(h * (double) windowWidth / (double) windowHeight));
     double cosFOV = 1.0 / diag;
-    
+
     Vector3d viewVector = cameraOrientation.conjugate() * -Vector3d::UnitZ();
-    
+
     for (MarkerList::const_iterator iter = markers.begin(); iter != markers.end(); iter++)
     {
         Vector3d offset = iter->position(jd).offsetFromKm(cameraPosition);
-                
+
         // Only render those markers that lie withing the field of view.
         if ((offset.dot(viewVector)) > cosFOV * offset.norm())
         {
@@ -10527,9 +10527,9 @@ void Renderer::renderMarkers(const MarkerList& markers,
                     if (iter->object().body() != NULL)
                         boundingRadius = iter->object().body()->getBoundingRadius();
                     else
-                        boundingRadius = iter->object().radius();                
+                        boundingRadius = iter->object().radius();
                     offset *= (1.0 - boundingRadius * 1.01 / distance);
-                
+
                     addSortedAnnotation(&(iter->representation()), EMPTY_STRING, iter->representation().color(),
                                         offset.cast<float>(),
                                         AlignLeft, VerticalAlignTop, symbolSize);
@@ -10596,7 +10596,7 @@ void Renderer::loadTextures(Body* body)
     {
         body->getRings()->texture.find(textureResolution);
     }
-    
+
     if (body->getGeometry() != InvalidResource)
     {
         Geometry* geometry = GetGeometryManager()->find(body->getGeometry());
@@ -10633,6 +10633,7 @@ void Renderer::addWatcher(RendererWatcher* watcher)
     watchers.insert(watchers.end(), watcher);
 }
 
+
 void Renderer::removeWatcher(RendererWatcher* watcher)
 {
     list<RendererWatcher*>::iterator iter =
@@ -10641,6 +10642,7 @@ void Renderer::removeWatcher(RendererWatcher* watcher)
         watchers.erase(iter);
 }
 
+
 void Renderer::notifyWatchers() const
 {
     for (list<RendererWatcher*>::const_iterator iter = watchers.begin();
diff --git a/src/celengine/render.h b/src/celengine/render.h
index 0b9174a2d..574e460d1 100644
--- a/src/celengine/render.h
+++ b/src/celengine/render.h
@@ -139,9 +139,9 @@ class Renderer
         I18nConstellationLabels = 0x800,
         DwarfPlanetLabels   = 0x1000,
         MinorMoonLabels     = 0x2000,
-		GlobularLabels      = 0x4000,		        
-		BodyLabelMask       = (PlanetLabels | DwarfPlanetLabels | MoonLabels | MinorMoonLabels | AsteroidLabels | SpacecraftLabels | CometLabels),	   
-	};
+        GlobularLabels      = 0x4000,
+        BodyLabelMask       = (PlanetLabels | DwarfPlanetLabels | MoonLabels | MinorMoonLabels | AsteroidLabels | SpacecraftLabels | CometLabels),
+    };
 
     enum {
         ShowNothing         =   0x0000,
@@ -174,7 +174,7 @@ class Renderer
         ShowTintedIllumination = 0x4000000,
     };
 
-    enum StarStyle 
+    enum StarStyle
     {
         FuzzyPointStars  = 0,
         PointStars       = 1,
@@ -186,7 +186,7 @@ class Renderer
     static const int DefaultRenderFlags = Renderer::ShowStars          |
                                           Renderer::ShowPlanets        |
                                           Renderer::ShowGalaxies       |
-										  Renderer::ShowGlobulars      |	 
+                                          Renderer::ShowGlobulars      |
                                           Renderer::ShowCloudMaps      |
                                           Renderer::ShowAtmospheres    |
                                           Renderer::ShowEclipseShadows |
@@ -249,14 +249,14 @@ class Renderer
         AlignLeft,
         AlignRight
     };
-    
+
     enum LabelVerticalAlignment
     {
         VerticalAlignCenter,
         VerticalAlignBottom,
         VerticalAlignTop,
     };
-        
+
     static const int MaxLabelLength = 48;
     struct Annotation
     {
@@ -270,7 +270,7 @@ class Renderer
 
         bool operator<(const Annotation&) const;
     };
-        
+
     void addForegroundAnnotation(const MarkerRepresentation* markerRep,
                                  const std::string& labelText,
                                  Color color,
@@ -300,12 +300,12 @@ class Renderer
     void endObjectAnnotations();
     Eigen::Quaternionf getCameraOrientation() const;
     float getNearPlaneDistance() const;
-    
+
     void clearAnnotations(std::vector<Annotation>&);
-	void clearSortedAnnotations();
+    void clearSortedAnnotations();
 
     void invalidateOrbitCache();
-    
+
     struct OrbitPathListEntry
     {
         float centerZ;
@@ -316,7 +316,7 @@ class Renderer
         float opacity;
 
         bool operator<(const OrbitPathListEntry&) const;
-    };        
+    };
 
     enum FontStyle
     {
@@ -324,7 +324,7 @@ class Renderer
         FontLarge  = 1,
         FontCount  = 2,
     };
-    
+
     void setFont(FontStyle, TextureFont*);
     TextureFont* getFont(FontStyle) const;
 
@@ -338,7 +338,7 @@ class Renderer
  public:
     // Internal types
     // TODO: Figure out how to make these private.  Even with a friend
-    // 
+    //
     struct Particle
     {
         Eigen::Vector3f center;
@@ -419,7 +419,7 @@ class Renderer
 
     typedef ObjectLabel<Star>          StarLabel;
     typedef ObjectLabel<DeepSkyObject> DSOLabel;    // currently not used
-    
+
     struct DepthBufferPartition
     {
         int index;
@@ -491,7 +491,7 @@ class Renderer
                     const Eigen::Quaternionf& orientation,
                     double now,
                     float, float);
-    
+
     void renderReferenceMark(const ReferenceMark& refMark,
                              const Eigen::Vector3f& pos,
                              float distance,
@@ -533,8 +533,8 @@ class Renderer
     void renderLocations(const Body& body,
                          const Eigen::Vector3d& bodyPosition,
                          const Eigen::Quaterniond& bodyOrientation);
-                   
-    // Render an item from the render list                   
+
+    // Render an item from the render list
     void renderItem(const RenderListEntry& rle,
                     const Observer& observer,
                     const Eigen::Quaternionf& cameraOrientation,
@@ -551,8 +551,8 @@ class Renderer
                              const Observer& observer);
     void renderParticles(const std::vector<Particle>& particles,
                          const Eigen::Quaternionf& orientation);
-    
-    
+
+
     void addAnnotation(std::vector<Annotation>&,
                        const MarkerRepresentation*,
                        const std::string& labelText,
@@ -654,7 +654,7 @@ class Renderer
     Eigen::Quaternionf m_cameraOrientation;
     StarVertexBuffer* starVertexBuffer;
     PointStarVertexBuffer* pointStarVertexBuffer;
-	PointStarVertexBuffer* glareVertexBuffer;
+    PointStarVertexBuffer* glareVertexBuffer;
     std::vector<RenderListEntry> renderList;
     std::vector<SecondaryIlluminator> secondaryIlluminators;
     std::vector<DepthBufferPartition> depthPartitions;
@@ -679,7 +679,7 @@ class Renderer
     bool useClampToBorder;
     unsigned int textureResolution;
     DetailOptions detailOptions;
-    
+
     bool useNewStarRendering;
 
     uint32 frameCount;
@@ -689,11 +689,11 @@ class Renderer
 
  public:
 #if 0
-    struct OrbitSample 
+    struct OrbitSample
     {
         double t;
         Point3d pos;
-        
+
         OrbitSample(const Eigen::Vector3d& _pos, double _t) : t(_t), pos(_pos.x(), _pos.y(), _pos.z()) { }
         OrbitSample() { }
     };
@@ -703,7 +703,7 @@ class Renderer
         Capsuled boundingVolume;
         uint32 firstSample;
     };
-    
+
     struct CachedOrbit
     {
         std::vector<OrbitSample> trajectory;
@@ -727,7 +727,7 @@ class Renderer
     SkyContourPoint* skyContour;
 
     const ColorTemperatureTable* colorTemp;
-    
+
     Selection highlightObject;
 
     bool videoSync;
@@ -737,7 +737,7 @@ class Renderer
     bool objectAnnotationSetOpen;
 
     double realTime;
-    
+
     // Location markers
  public:
     MarkerRepresentation mountainRep;
@@ -764,8 +764,8 @@ class Renderer
     static Color SpacecraftLabelColor;
     static Color LocationLabelColor;
     static Color GalaxyLabelColor;
-    static Color GlobularLabelColor;	    
-	static Color NebulaLabelColor;
+    static Color GlobularLabelColor;
+    static Color NebulaLabelColor;
     static Color OpenClusterLabelColor;
     static Color ConstellationLabelColor;
     static Color EquatorialGridLabelColor;
diff --git a/src/celengine/renderglsl.cpp b/src/celengine/renderglsl.cpp
index 15644440b..863ec5697 100644
--- a/src/celengine/renderglsl.cpp
+++ b/src/celengine/renderglsl.cpp
@@ -65,7 +65,7 @@ void renderEllipsoid_GLSL(const RenderInfo& ri,
 {
     float radius = semiAxes.maxCoeff();
 
-    Texture* textures[MAX_SPHERE_MESH_TEXTURES] = 
+    Texture* textures[MAX_SPHERE_MESH_TEXTURES] =
         { NULL, NULL, NULL, NULL, NULL, NULL };
     unsigned int nTextures = 0;
 
@@ -186,7 +186,7 @@ void renderEllipsoid_GLSL(const RenderInfo& ri,
     // Track the total number of shadows; if there are too many, we'll have
     // to fall back to multipass.
     unsigned int totalShadows = 0;
-    
+
     for (unsigned int li = 0; li < ls.nLights; li++)
     {
         if (ls.shadows[li] && !ls.shadows[li]->empty())
@@ -205,7 +205,7 @@ void renderEllipsoid_GLSL(const RenderInfo& ri,
             glActiveTextureARB(GL_TEXTURE0_ARB + nTextures);
             ringsTex->bind();
             nTextures++;
-            
+
             // Tweak the texture--set clamp to border and a border color with
             // a zero alpha.
             float bc[4] = { 0.0f, 0.0f, 0.0f, 0.0f };
@@ -225,8 +225,8 @@ void renderEllipsoid_GLSL(const RenderInfo& ri,
             }
         }
     }
-    
-    
+
+
     // Get a shader for the current rendering configuration
     CelestiaGLProgram* prog = GetShaderManager().getShader(shadprop);
     if (prog == NULL)
@@ -402,7 +402,7 @@ void renderClouds_GLSL(const RenderInfo& ri,
 {
     float radius = semiAxes.maxCoeff();
 
-    Texture* textures[MAX_SPHERE_MESH_TEXTURES] = 
+    Texture* textures[MAX_SPHERE_MESH_TEXTURES] =
         { NULL, NULL, NULL, NULL, NULL, NULL };
     unsigned int nTextures = 0;
 
@@ -448,7 +448,7 @@ void renderClouds_GLSL(const RenderInfo& ri,
         }
     }
 #endif
-    
+
     if (atmosphere != NULL)
     {
         if (renderFlags & Renderer::ShowAtmospheres)
@@ -502,7 +502,7 @@ void renderClouds_GLSL(const RenderInfo& ri,
         prog->ringWidth = 1.0f / (ringWidth / cloudRadius);
     }
 #endif
-    
+
     if (shadprop.shadowCounts != 0)
         prog->setEclipseShadowParameters(ls, semiAxes, planetOrientation);
 
diff --git a/src/celengine/renderglsl.h b/src/celengine/renderglsl.h
index 0bfdc3f19..1fc298a7d 100644
--- a/src/celengine/renderglsl.h
+++ b/src/celengine/renderglsl.h
@@ -27,7 +27,7 @@ void renderEllipsoid_GLSL(const RenderInfo& ri,
                        const Eigen::Quaternionf& planetOrientation,
                        const Frustum& frustum,
                        const GLContext& context);
-                       
+
 void renderGeometry_GLSL(Geometry* geometry,
                          const RenderInfo& ri,
                          ResourceHandle texOverride,
@@ -37,7 +37,7 @@ void renderGeometry_GLSL(Geometry* geometry,
                          int renderFlags,
                          const Eigen::Quaternionf& planetOrientation,
                          double tsec);
-                      
+
 void renderClouds_GLSL(const RenderInfo& ri,
                        const LightingState& ls,
                        Atmosphere* atmosphere,
@@ -50,7 +50,7 @@ void renderClouds_GLSL(const RenderInfo& ri,
                        const Eigen::Quaternionf& planetOrientation,
                        const Frustum& frustum,
                        const GLContext& context);
-                       
+
 void renderAtmosphere_GLSL(const RenderInfo& ri,
                            const LightingState& ls,
                            Atmosphere* atmosphere,
@@ -58,7 +58,7 @@ void renderAtmosphere_GLSL(const RenderInfo& ri,
                            const Eigen::Quaternionf& planetOrientation,
                            const Frustum& frustum,
                            const GLContext& context);
-                           
+
 void renderRings_GLSL(RingSystem& rings,
                       RenderInfo& ri,
                       const LightingState& ls,
@@ -124,6 +124,5 @@ private:
 
 
 #endif // _CELENGINE_RENDERGLSL_H_
-                       
 
 
diff --git a/src/celengine/selection.cpp b/src/celengine/selection.cpp
index 0099ca6fe..adf1678d5 100644
--- a/src/celengine/selection.cpp
+++ b/src/celengine/selection.cpp
@@ -1,5 +1,5 @@
 // selection.cpp
-// 
+//
 // Copyright (C) 2001-2009, the Celestia Development Team
 // Original version by Chris Laurel <claurel@gmail.com>
 //
@@ -48,7 +48,7 @@ UniversalCoord Selection::getPosition(double t) const
     {
     case Type_Body:
         return body()->getPosition(t);
-        
+
     case Type_Star:
         return star()->getPosition(t);
 
@@ -59,7 +59,7 @@ UniversalCoord Selection::getPosition(double t) const
             Vector3f p = deepsky()->getPosition().cast<float>();
             return UniversalCoord::CreateLy(p.cast<double>());
         }
-        
+
     case Type_Location:
         {
             Body* body = location()->getParentBody();
@@ -87,7 +87,7 @@ Vector3d Selection::getVelocity(double t) const
     {
     case Type_Body:
         return body()->getVelocity(t);
-        
+
     case Type_Star:
         return star()->getVelocity(t);
 
@@ -95,10 +95,10 @@ Vector3d Selection::getVelocity(double t) const
         return Vector3d::Zero();
 
     case Type_Location:
-		{
-			// For now, just use differentiation for location velocities.
+        {
+            // For now, just use differentiation for location velocities.
             return getPosition(t).offsetFromKm(getPosition(t - VELOCITY_DIFF_DELTA)) / VELOCITY_DIFF_DELTA;
-		}
+        }
 
     default:
         return Vector3d::Zero();
@@ -123,7 +123,7 @@ string Selection::getName(bool i18n) const
             sprintf(buf, "#%d", deepsky()->getCatalogNumber());
             return string(buf);
         }
-        
+
     case Type_Body:
         {
             string name = body()->getName(i18n);
@@ -191,7 +191,7 @@ Selection Selection::parent() const
 
     case Type_Star:
         return Selection(star()->getOrbitBarycenter());
-        
+
     case Type_DeepSky:
         // Currently no hierarchy for stars and deep sky objects.
         return Selection();
diff --git a/src/celengine/selection.h b/src/celengine/selection.h
index c1d0e8e83..cda3bcb5b 100644
--- a/src/celengine/selection.h
+++ b/src/celengine/selection.h
@@ -1,5 +1,5 @@
 // selection.h
-// 
+//
 // Copyright (C) 2001, Chris Laurel <claurel@shatters.net>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/celengine/shadermanager.cpp b/src/celengine/shadermanager.cpp
index 496aba9d6..491e5cf76 100644
--- a/src/celengine/shadermanager.cpp
+++ b/src/celengine/shadermanager.cpp
@@ -1228,16 +1228,16 @@ Shadow(unsigned int light, unsigned int shadow)
     // surrounded by a ring of linear falloff from maxDepth to zero. For a total
     // eclipse, maxDepth is zero. In reality, the falloff function is much more complex:
     // to calculate the exact amount of sunlight blocked, we need to calculate the
-    // a circle-circle intersection area. 
+    // a circle-circle intersection area.
     // (See http://mathworld.wolfram.com/Circle-CircleIntersection.html)
-    
+
     // The code generated below will compute:
     // r = 2 * sqrt(dot(shadowCenter, shadowCenter));
     // shadowR = clamp((r - 1) * shadowFalloff, 0, shadowMaxDepth)
     source += "shadowR = clamp((2.0 * sqrt(dot(shadowCenter, shadowCenter)) - 1.0) * " +
         IndexedParameter("shadowFalloff", light, shadow) + ", 0.0, " +
         IndexedParameter("shadowMaxDepth", light, shadow) + ");\n";
-    
+
     source += "shadow *= 1.0 - shadowR;\n";
 
     return source;
@@ -1537,7 +1537,7 @@ PointSizeCalculation()
     source += "float ptSize = pointScale * pointSize / length(vec3(gl_ModelViewMatrix * gl_Vertex));\n";
     source += "pointFade = min(1.0, ptSize * ptSize);\n";
     source += "gl_PointSize = ptSize;\n";
-    
+
     return source;
 }
 
@@ -2036,7 +2036,7 @@ ShaderManager::buildFragmentShader(const ShaderProperties& props)
     {
         source += DeclareVarying("pointFade", Shader_Float);
     }
-    
+
     source += "\nvoid main(void)\n{\n";
     source += "vec4 color;\n";
 
@@ -2243,7 +2243,7 @@ ShaderManager::buildFragmentShader(const ShaderProperties& props)
             if (!props.usesTangentSpaceLighting())
             {
                 source += "float totalLight = ";
-                
+
                 if (props.nLights == 0)
                 {
                     source += "0.0f\n";
@@ -2763,7 +2763,7 @@ ShaderManager::buildEmissiveVertexShader(const ShaderProperties& props)
         source += "    gl_TexCoord[0].st = " + TexCoord2D(0) + ";\n";
     }
 
-    // Set the color. 
+    // Set the color.
     string colorSource;
     if (props.texUsage & ShaderProperties::VertexColors)
         colorSource = "gl_Color.rgb";
@@ -2811,7 +2811,7 @@ ShaderManager::buildEmissiveFragmentShader(const ShaderProperties& props)
     {
         source += "varying float pointFade;\n";
     }
-    
+
     // Begin main()
     source += "\nvoid main(void)\n";
     source += "{\n";
@@ -2825,7 +2825,7 @@ ShaderManager::buildEmissiveFragmentShader(const ShaderProperties& props)
 #endif
         colorSource = "color";
     }
-    
+
     if (props.texUsage & ShaderProperties::DiffuseTexture)
     {
         source += "    gl_FragColor = " + colorSource + " * texture2D(diffTex, gl_TexCoord[0].st);\n";
@@ -2859,30 +2859,30 @@ GLVertexShader*
 ShaderManager::buildParticleVertexShader(const ShaderProperties& props)
 {
     ostringstream source;
-    
+
     source << CommonHeader;
-    
+
     source << "// PARTICLE SHADER\n";
     source << "// shadow count: " << props.shadowCounts << endl;
-    
+
     source << DeclareLights(props);
-    
+
     source << "uniform vec3 eyePosition;\n";
 
     // TODO: scattering constants
-    
+
     if (props.texUsage & ShaderProperties::PointSprite)
     {
         source << "uniform float pointScale;\n";
         source << "attribute float pointSize;\n";
     }
-    
+
     // Shadow parameters
     if (props.shadowCounts != 0)
     {
         source << "varying vec3 position_obj;\n";
     }
-    
+
     // Begin main() function
     source << "\nvoid main(void)\n{\n";
 
@@ -2913,26 +2913,26 @@ ShaderManager::buildParticleVertexShader(const ShaderProperties& props)
     {
         source << "    gl_TexCoord[0].st = " << TexCoord2D(0) << ";\n";
     }
-    
+
     // Set the color. Should *always* use vertex colors for color and opacity.
     source << "    gl_FrontColor = gl_Color * brightness;\n";
-    
+
     // Optional point size
     if ((props.texUsage & ShaderProperties::PointSprite) != 0)
         source << PointSizeCalculation();
-    
+
     source << "    gl_Position = ftransform();\n";
-    
+
     source << "}\n";
     // End of main()
-    
+
     if (g_shaderLogFile != NULL)
     {
         *g_shaderLogFile << "Vertex shader source:\n";
         DumpShaderSource(*g_shaderLogFile, source.str());
         *g_shaderLogFile << endl;
     }
-    
+
     GLVertexShader* vs = NULL;
     GLShaderStatus status = GLShaderLoader::CreateVertexShader(source.str(), &vs);
     if (status != ShaderStatus_OK)
@@ -2948,7 +2948,7 @@ ShaderManager::buildParticleFragmentShader(const ShaderProperties& props)
     ostringstream source;
 
     source << CommonHeader;
-    
+
     if (props.texUsage & ShaderProperties::DiffuseTexture)
     {
         source << "uniform sampler2D diffTex;\n";
@@ -2960,9 +2960,9 @@ ShaderManager::buildParticleFragmentShader(const ShaderProperties& props)
         for (unsigned int i = 0; i < props.nLights; i++)
         {
             source << "uniform vec3 " << FragLightProperty(i, "color") << ";\n";
-        }        
+        }
     }
-    
+
     // Declare shadow parameters
     if (props.shadowCounts != 0)
     {
@@ -2978,11 +2978,11 @@ ShaderManager::buildParticleFragmentShader(const ShaderProperties& props)
             }
         }
     }
-    
+
     // Begin main()
     source << "\nvoid main(void)\n";
     source << "{\n";
-    
+
     if (props.texUsage & ShaderProperties::DiffuseTexture)
     {
         source << "    gl_FragColor = gl_Color * texture2D(diffTex, gl_TexCoord[0].st);\n";
@@ -2991,17 +2991,17 @@ ShaderManager::buildParticleFragmentShader(const ShaderProperties& props)
     {
         source << "    gl_FragColor = gl_Color;\n";
     }
-    
+
     source << "}\n";
     // End of main()
-    
+
     if (g_shaderLogFile != NULL)
     {
         *g_shaderLogFile << "Fragment shader source:\n";
         DumpShaderSource(*g_shaderLogFile, source.str());
         *g_shaderLogFile << '\n';
     }
-    
+
     GLFragmentShader* fs = NULL;
     GLShaderStatus status = GLShaderLoader::CreateFragmentShader(source.str(), &fs);
     if (status != ShaderStatus_OK)
@@ -3415,7 +3415,7 @@ CelestiaGLProgram::setEclipseShadowParameters(const LightingState& ls,
                 // Compose the world-to-shadow matrix
                 Matrix4f worldToShadow = shadowRotation *
                                          Affine3f(Scaling(1.0f / shadow.penumbraRadius)).matrix() *
-					                     Affine3f(Translation3f(-shadow.origin)).matrix();
+                                         Affine3f(Translation3f(-shadow.origin)).matrix();
 
                 // Finally, multiply all the matrices together to get the mapping from
                 // object space to shadow map space.
@@ -3468,6 +3468,6 @@ CelestiaGLProgram::setAtmosphereParameters(const Atmosphere& atmosphere,
     // in the vertex shader.
     Vector3f tScatterCoeffSum = tRayleighCoeff.array() + tMieCoeff;
     scatterCoeffSum = tScatterCoeffSum;
-	invScatterCoeffSum = tScatterCoeffSum.cwiseInverse();
+    invScatterCoeffSum = tScatterCoeffSum.cwiseInverse();
     extinctionCoeff = tScatterCoeffSum + tAbsorptionCoeff;
 }
diff --git a/src/celengine/shadermanager.h b/src/celengine/shadermanager.h
index b054d7499..406f04a9f 100644
--- a/src/celengine/shadermanager.h
+++ b/src/celengine/shadermanager.h
@@ -79,7 +79,7 @@ class ShaderProperties
      EmissiveModel         = 8,
      ParticleModel         = 9,
  };
- 
+
  enum
  {
      VolumetricScatteringEffect      = 0x0001,
@@ -89,7 +89,7 @@ class ShaderProperties
 
  public:
     unsigned short nLights;
-    unsigned short texUsage;    
+    unsigned short texUsage;
     unsigned short lightModel;
 
     // Eight bits per light, up to four lights
@@ -99,16 +99,16 @@ class ShaderProperties
     //   Bit  3,   on for self shadowing
     //   Bit  4,   on for cloud shadows
     uint32 shadowCounts;
-    
+
     // Effects that may be applied with any light model
     unsigned short effects;
-    
+
  private:
     enum
     {
         ShadowBitsPerLight = 4,
     };
-    
+
     enum
     {
         EclipseShadowMask = 0x3,
@@ -119,7 +119,7 @@ class ShaderProperties
         AnyRingShadowMask    = 0x04040404,
         AnySelfShadowMask    = 0x08080808,
         AnyCloudShadowMask   = 0x10101010,
-    }; 
+    };
 };
 
 
@@ -149,7 +149,7 @@ class CelestiaGLProgram
     ~CelestiaGLProgram();
 
     void use() const { program->use(); }
-    
+
     void setLightParameters(const LightingState& ls,
                             Color materialDiffuse,
                             Color materialSpecular,
@@ -164,7 +164,7 @@ class CelestiaGLProgram
     void setAtmosphereParameters(const Atmosphere& atmosphere,
                                  float atmPlanetRadius,
                                  float objRadius);
-    
+
  public:
     CelestiaGLProgramLight lights[MaxShaderLights];
     Vec3ShaderParameter fragLightColor[MaxShaderLights];
@@ -183,7 +183,7 @@ class CelestiaGLProgram
     FloatShaderParameter ringRadius;
     Vec4ShaderParameter ringPlane;
     Vec3ShaderParameter ringCenter;
-    
+
     // Mix of Lambertian and "lunar" (Lommel-Seeliger) photometric models.
     // 0 = pure Lambertian, 1 = L-S
     FloatShaderParameter lunarLambert;
@@ -195,7 +195,7 @@ class CelestiaGLProgram
     // Height of cloud layer above planet, in units of object radius
     FloatShaderParameter cloudHeight;
     FloatShaderParameter shadowTextureOffset;
-    
+
     // Parameters for atmospheric scattering; all distances are normalized for
     // a unit sphere.
     FloatShaderParameter mieCoeff;
@@ -204,21 +204,21 @@ class CelestiaGLProgram
     // A value of 0 is isotropic, negative values a primarily backscattering,
     // positive values are forward scattering.
     FloatShaderParameter miePhaseAsymmetry;
-    
+
     // Rayleigh scattering terms. There are three scattering coefficients: red,
-    // green, and blue light. To simulate Rayleigh scattering, the coefficients 
+    // green, and blue light. To simulate Rayleigh scattering, the coefficients
     // should be in ratios that fit 1/wavelength^4, but other values may be used
     // to simulate different types of wavelength dependent scattering.
     Vec3ShaderParameter rayleighCoeff;
     FloatShaderParameter rayleighScaleHeight;
-    
+
     // Precomputed sum and inverse sum of Rayleigh and Mie scattering coefficients
     Vec3ShaderParameter scatterCoeffSum;
     Vec3ShaderParameter invScatterCoeffSum;
     // Precomputed sum of absorption and scattering coefficients--identical to
     // scatterCoeffSum when there is no absorption.
     Vec3ShaderParameter extinctionCoeff;
-    
+
     // Radius of sphere for atmosphere--should be significantly larger than
     // scale height. Three components:
     //    x = radius
@@ -230,7 +230,7 @@ class CelestiaGLProgram
     FloatShaderParameter pointScale;
 
     CelestiaGLProgramShadow shadows[MaxShaderLights][MaxShaderEclipseShadows];
-    
+
  private:
     void initParameters();
     void initSamplers();
@@ -254,13 +254,13 @@ class ShaderManager
 
  private:
     CelestiaGLProgram* buildProgram(const ShaderProperties&);
-    
+
     GLVertexShader* buildVertexShader(const ShaderProperties&);
     GLFragmentShader* buildFragmentShader(const ShaderProperties&);
-    
+
     GLVertexShader* buildRingsVertexShader(const ShaderProperties&);
     GLFragmentShader* buildRingsFragmentShader(const ShaderProperties&);
-    
+
     GLVertexShader* buildAtmosphereVertexShader(const ShaderProperties&);
     GLFragmentShader* buildAtmosphereFragmentShader(const ShaderProperties&);
 
diff --git a/src/celengine/simulation.h b/src/celengine/simulation.h
index 540b6422e..256c38b93 100644
--- a/src/celengine/simulation.h
+++ b/src/celengine/simulation.h
@@ -63,7 +63,7 @@ class Simulation
     Selection findObjectFromPath(std::string s, bool i18n = false);
     std::vector<std::string> getObjectCompletion(std::string s, bool withLocations = false);
     void gotoSelection(double gotoTime,
-                       const Eigen::Vector3f& up, 
+                       const Eigen::Vector3f& up,
                        ObserverFrame::CoordinateSystem upFrame);
     void gotoSelection(double gotoTime, double distance,
                        const Eigen::Vector3f& up,
@@ -113,7 +113,7 @@ class Simulation
     void setObserverMode(Observer::ObserverMode);
     Observer::ObserverMode getObserverMode() const;
 
-    void setFrame(ObserverFrame::CoordinateSystem, const Selection& refObject, const Selection& targetObject); 
+    void setFrame(ObserverFrame::CoordinateSystem, const Selection& refObject, const Selection& targetObject);
     void setFrame(ObserverFrame::CoordinateSystem, const Selection& refObject);
     const ObserverFrame* getFrame() const;
 
diff --git a/src/celengine/skygrid.cpp b/src/celengine/skygrid.cpp
index 4b4ae3282..85e863fa4 100644
--- a/src/celengine/skygrid.cpp
+++ b/src/celengine/skygrid.cpp
@@ -96,7 +96,7 @@ static const int DEG_MIN_SEC_SPACING[]  =
     200*MSEC,
     100*MSEC
 };
-    
+
 
 // Alternate spacing tables
 #if 0
@@ -107,7 +107,7 @@ static const int HOUR_MIN_SEC_SPACING[] =
     2*HR,   1*HR,  30*MIN, 10*MIN,  5*MIN,
     1*MIN, 30*SEC, 10*SEC,  5*SEC,  1*SEC,
     500*MSEC, 100*MSEC
-}; 
+};
 
 static const int DEG_MIN_SEC_SPACING[]  =
 {
@@ -124,10 +124,10 @@ static const int HOUR_MIN_SEC_STEPS[] =
     2*HR,   1*HR,  30*MIN, 10*MIN,  5*MIN, 2*MIN+30*SEC,
     1*MIN, 30*SEC, 10*SEC,  5*SEC, 2*SEC+500*MSEC, 1*SEC,
     500*MSEC, 200*MSEC, 100*MSEC, 50*MSEC, 20*MSEC, 10*MSEC
-}; 
+};
 
 static const int DEG_MIN_SEC_STEPS[]  =
-{ 
+{
     30*DEG, 10*DEG,  5*DEG, 2*DEG+30*MIN, 1*DEG, 30*MIN,
     10*MIN,  5*MIN, 2*MIN+30*SEC, 1*MIN, 30*SEC, 10*SEC,
     5*SEC, 2*SEC+500*MSEC, 1*SEC, 500*MSEC, 200*MSEC, 100*MSEC,
@@ -233,7 +233,7 @@ template<typename T> static bool planeCircleIntersection(const Matrix<T, 3, 1>&
     T a = u.dot(planeNormal);
     T b = v.dot(planeNormal);
     T c = center.dot(planeNormal);
-    
+
     // The solution is +-acos((-ac +- sqrt(a^2+b^2-c^2))/(a^2+b^2))
     T s = a * a + b * b;
     if (s == 0.0)
@@ -241,14 +241,14 @@ template<typename T> static bool planeCircleIntersection(const Matrix<T, 3, 1>&
         // No solution; plane containing circle is parallel to test plane
         return false;
     }
-    
+
     if (s - c * c <= 0)
     {
         // One or no solutions; no need to distinguish between these
         // cases for our purposes.
         return false;
     }
-    
+
     // No need to actually call acos to get the solution, since we're just
     // going to plug it into sin and cos anyhow.
     T r = b * std::sqrt(s - c * c);
@@ -256,22 +256,22 @@ template<typename T> static bool planeCircleIntersection(const Matrix<T, 3, 1>&
     T cosTheta1 = (-a * c - r) / s;
     T sinTheta0 = std::sqrt(1 - cosTheta0 * cosTheta0);
     T sinTheta1 = std::sqrt(1 - cosTheta1 * cosTheta1);
-    
+
     *sol0 = center + cosTheta0 * u + sinTheta0 * v;
     *sol1 = center + cosTheta1 * u + sinTheta1 * v;
-    
+
     // Check that we've chosen a solution that produces a point on the
     // plane. If not, we need to use the -acos solution.
     if (std::abs(sol0->dot(planeNormal)) > 1.0e-8)
     {
         *sol0 = center + cosTheta0 * u - sinTheta0 * v;
     }
-    
+
     if (std::abs(sol1->dot(planeNormal)) > 1.0e-8)
     {
         *sol1 = center + cosTheta1 * u - sinTheta1 * v;
     }
-    
+
     return true;
 }
 
@@ -332,7 +332,7 @@ SkyGrid::longitudeLabel(int longitude, int longitudeStep) const
     // eastward from due north.
     if (m_longitudeDirection == IncreasingClockwise)
         longitude = (totalUnits - longitude) % totalUnits;
-    
+
     out << longitude / baseUnit << baseUnitSymbol;
     if (longitudeStep % baseUnit != 0)
     {
@@ -351,7 +351,7 @@ SkyGrid::longitudeLabel(int longitude, int longitudeStep) const
 
 
 // Compute the angular step between parallels
-int 
+int
 SkyGrid::parallelSpacing(double idealSpacing) const
 {
     // We want to use parallels and meridian spacings that are nice multiples of hours, degrees,
@@ -367,7 +367,7 @@ SkyGrid::parallelSpacing(double idealSpacing) const
             break;
         spacing = DEG_MIN_SEC_SPACING[i];
     }
-    
+
     return spacing;
 }
 
@@ -423,7 +423,7 @@ SkyGrid::render(Renderer& renderer,
     double diag = sqrt(1.0 + square(h) + square(h * viewAspectRatio));
     double cosHalfFov = 1.0 / diag;
     double halfFov = acos(cosHalfFov);
-    
+
     float polarCrossSize = (float) (POLAR_CROSS_SIZE * halfFov);
 
     // We want to avoid drawing more of the grid than we have to. The following code
@@ -458,7 +458,7 @@ SkyGrid::render(Renderer& renderer,
     // Compute the minimum longitude range containing the corners; slightly
     // tricky because of the wrapping at PI/-PI.
     double minTheta = thetaC0;
-    double maxTheta = thetaC1;   
+    double maxTheta = thetaC1;
     double maxDiff = 0.0;
     updateAngleRange(thetaC0, thetaC1, &maxDiff, &minTheta, &maxTheta);
     updateAngleRange(thetaC0, thetaC2, &maxDiff, &minTheta, &maxTheta);
@@ -478,7 +478,7 @@ SkyGrid::render(Renderer& renderer,
             std::swap(minTheta, maxTheta);
     }
     maxTheta = minTheta + maxDiff;
-    
+
     // Calculate the normals to the view frustum planes; we'll use these to
     // when computing intersection points with the parallels and meridians of the
     // grid. Coordinate labels will be drawn at the intersection points.
@@ -487,7 +487,7 @@ SkyGrid::render(Renderer& renderer,
     frustumNormal[1] = Vector3d( 0, -1, -h);
     frustumNormal[2] = Vector3d( 1,  0, -w);
     frustumNormal[3] = Vector3d(-1,  0, -w);
-    
+
     {
         for (int i = 0; i < 4; i++)
         {
@@ -505,7 +505,7 @@ SkyGrid::render(Renderer& renderer,
         centerDec = -PI / 2.0;
     else
         centerDec = PI / 2.0;
-    
+
     double minDec = centerDec - halfFov;
     double maxDec = centerDec + halfFov;
 
@@ -586,7 +586,7 @@ SkyGrid::render(Renderer& renderer,
             glVertex3f(x, z, -y);  // convert to Celestia coords
         }
         glEnd();
-        
+
         // Place labels at the intersections of the view frustum planes
         // and the parallels.
         Vector3d center(0.0, 0.0, sinPhi);
@@ -616,20 +616,20 @@ SkyGrid::render(Renderer& renderer,
                 glColor(m_lineColor);
                 glEnd();
 #endif
-                
+
                 Matrix3f m = observer.getOrientationf().toRotationMatrix();
                 p0 = orientationf.conjugate() * p0;
                 p1 = orientationf.conjugate() * p1;
-                
+
                 if ((m * p0).z() < 0.0)
                 {
                     renderer.addBackgroundAnnotation(NULL, labelText, m_labelColor, p0, hAlign, vAlign);
                 }
-                
+
                 if ((m * p1).z() < 0.0)
                 {
                     renderer.addBackgroundAnnotation(NULL, labelText, m_labelColor, p1, hAlign, vAlign);
-                }                
+                }
             }
         }
     }
@@ -662,7 +662,7 @@ SkyGrid::render(Renderer& renderer,
             glVertex3f(x, z, -y);  // convert to Celestia coords
         }
         glEnd();
-        
+
         // Place labels at the intersections of the view frustum planes
         // and the meridians.
         Vector3d center(0.0, 0.0, 0.0);
@@ -696,20 +696,20 @@ SkyGrid::render(Renderer& renderer,
                 Matrix3f m = observer.getOrientationf().toRotationMatrix();
                 p0 = orientationf.conjugate() * p0;
                 p1 = orientationf.conjugate() * p1;
-                
+
                 if ((m * p0).z() < 0.0 && axis0.dot(isect0) >= cosMaxMeridianAngle)
                 {
                     renderer.addBackgroundAnnotation(NULL, labelText, m_labelColor, p0, hAlign, vAlign);
                 }
-                
+
                 if ((m * p1).z() < 0.0 && axis0.dot(isect1) >= cosMaxMeridianAngle)
                 {
                     renderer.addBackgroundAnnotation(NULL, labelText, m_labelColor, p1, hAlign, vAlign);
-                }               
+                }
             }
-        }        
+        }
     }
-    
+
     // Draw crosses indicating the north and south poles
     glBegin(GL_LINES);
     glVertex3f(-polarCrossSize, 1.0f,  0.0f);
@@ -721,6 +721,6 @@ SkyGrid::render(Renderer& renderer,
     glVertex3f(0.0f, -1.0f, -polarCrossSize);
     glVertex3f(0.0f, -1.0f,  polarCrossSize);
     glEnd();
-    
+
     glPopMatrix();
 }
diff --git a/src/celengine/skygrid.h b/src/celengine/skygrid.h
index 5a5bfa675..00d079b3b 100644
--- a/src/celengine/skygrid.h
+++ b/src/celengine/skygrid.h
@@ -38,7 +38,7 @@ public:
         IncreasingCounterclockwise,
         IncreasingClockwise,
     };
-    
+
     SkyGrid();
     ~SkyGrid();
 
@@ -88,13 +88,13 @@ public:
     {
         m_longitudeUnits = longitudeUnits;
     }
-    
+
     //! Get the direction of increasing longitude
     LongitudeDirection longitudeDirection() const
     {
         return m_longitudeDirection;
     }
-    
+
     //! Set the direction of increasing longitude (clockwise or counterclockwise)
     void setLongitudeDirection(LongitudeDirection longitudeDirection)
     {
diff --git a/src/celengine/solarsys.cpp b/src/celengine/solarsys.cpp
index 9ebba8523..45f9b2105 100644
--- a/src/celengine/solarsys.cpp
+++ b/src/celengine/solarsys.cpp
@@ -368,7 +368,7 @@ TimelinePhase* CreateTimelinePhase(Body* body,
     }
     bodyFrame->addRef();
 
-    // Use planet units (AU for semimajor axis) if the center of the orbit 
+    // Use planet units (AU for semimajor axis) if the center of the orbit
     // reference frame is a star.
     bool usePlanetUnits = orbitFrame->getCenter().star() != NULL;
 
@@ -497,7 +497,7 @@ static bool CreateTimeline(Body* body,
         defaultOrbitFrame = parentFrameTree->getDefaultReferenceFrame();
         defaultBodyFrame = parentFrameTree->getDefaultReferenceFrame();
     }
-    
+
     // If there's an explicit timeline definition, parse that. Otherwise, we'll do
     // things the old way.
     Value* value = planetData->getValue("Timeline");
@@ -643,7 +643,7 @@ static bool CreateTimeline(Body* body,
         // for nearly all natural satellites in the solar system.)
         rotationModel = CreateDefaultRotationModel(syncRotationPeriod);
     }
-    
+
     if (ParseDate(planetData, "Beginning", beginning))
         overrideOldTimeline = true;
     if (ParseDate(planetData, "Ending", ending))
@@ -730,7 +730,7 @@ static Body* CreateBody(const string& name,
         body = new Body(system, name);
         // If the body doesn't exist, always treat the disposition as 'Add'
         disposition = AddObject;
-        
+
         // Set the default classification for new objects based on the body type.
         // This may be overridden by the Class property.
         if (bodyType == SurfaceObject)
@@ -1009,7 +1009,7 @@ static Body* CreateBody(const string& name,
             }
         }
     }
-    
+
     bool clickable = true;
     if (planetData->getBoolean("Clickable", clickable))
     {
@@ -1131,7 +1131,7 @@ bool LoadSolarSystemObjects(istream& in,
             sscError(tokenizer, "object name expected");
             return false;
         }
-        
+
         // The name list is a string with zero more names. Multiple names are
         // delimited by colons.
         string nameList = tokenizer.getStringValue().c_str();
@@ -1160,7 +1160,7 @@ bool LoadSolarSystemObjects(istream& in,
 
         Selection parent = universe.findPath(parentName, NULL, 0);
         PlanetarySystem* parentSystem = NULL;
-        
+
         vector<string> names;
         // Iterate through the string for names delimited
         // by ':', and insert them into the name list.
@@ -1193,7 +1193,7 @@ bool LoadSolarSystemObjects(istream& in,
             bodyType = ReferencePoint;
         else if (itemType == "SurfaceObject")
             bodyType = SurfaceObject;
-        
+
         if (bodyType != UnknownBodyType)
         {
             //bool orbitsPlanet = false;
@@ -1249,7 +1249,7 @@ bool LoadSolarSystemObjects(istream& in,
                     body = CreateReferencePoint(primaryName, parentSystem, universe, existingBody, objectData, directory, disposition);
                 else
                     body = CreateBody(primaryName, parentSystem, universe, existingBody, objectData, directory, disposition, bodyType);
-                
+
                 if (body != NULL && disposition == AddObject)
                 {
                     vector<string>::const_iterator iter = names.begin();
@@ -1302,7 +1302,7 @@ bool LoadSolarSystemObjects(istream& in,
 }
 
 
-SolarSystem::SolarSystem(Star* _star) : 
+SolarSystem::SolarSystem(Star* _star) :
     star(_star),
     planets(NULL),
     frameTree(NULL)
diff --git a/src/celengine/spheremesh.cpp b/src/celengine/spheremesh.cpp
index 28fb0668c..2f709e3e2 100644
--- a/src/celengine/spheremesh.cpp
+++ b/src/celengine/spheremesh.cpp
@@ -287,7 +287,7 @@ void SphereMesh::scale(const Vector3f& s)
     {
         // TODO: Make a fast special case for uniform scale factors, where
         // renormalization is not required.
-		Vector3f is = s.cwiseInverse();
+        Vector3f is = s.cwiseInverse();
         for (i = 0; i < nVertices; i++)
         {
             int n = i * 3;
diff --git a/src/celengine/spheremesh.h b/src/celengine/spheremesh.h
index f031aa0a4..3138b6114 100644
--- a/src/celengine/spheremesh.h
+++ b/src/celengine/spheremesh.h
@@ -1,5 +1,5 @@
 // spheremesh.h
-// 
+//
 // Copyright (C) 2001-2009, the Celestia Development Team
 // Original version by Chris Laurel <claurel@gmail.com>
 //
diff --git a/src/celengine/star.cpp b/src/celengine/star.cpp
index a5119cd69..1e675cdb2 100644
--- a/src/celengine/star.cpp
+++ b/src/celengine/star.cpp
@@ -461,7 +461,7 @@ StarDetails::GetNormalStarDetails(StellarClass::SpectralClass specClass,
                     SubclassNames[subclass],
                     LumClassNames[lumClass]);
         }
-        
+
         // Use the same properties for an unknown subclass as for subclass 5
         if (subclass == StellarClass::Subclass_Unknown)
         {
@@ -1067,8 +1067,8 @@ Star::getVelocity(double t) const
     const Orbit* orbit = getOrbit();
     if (!orbit)
     {
-		// The star doesn't have a defined orbit, so the velocity is just
-		// zero. (This will change when stellar proper motion is implemented.)
+        // The star doesn't have a defined orbit, so the velocity is just
+        // zero. (This will change when stellar proper motion is implemented.)
         return Vector3d::Zero();
     }
     else
@@ -1077,13 +1077,13 @@ Star::getVelocity(double t) const
 
         if (barycenter == NULL)
         {
-			// Star orbit is defined around a fixed point, so the total velocity
-			// is just the star's orbit velocity.
+            // Star orbit is defined around a fixed point, so the total velocity
+            // is just the star's orbit velocity.
             return orbit->velocityAtTime(t);
         }
         else
         {
-			// Sum the star's orbital velocity and the velocity of the barycenter.
+            // Sum the star's orbital velocity and the velocity of the barycenter.
             return barycenter->getVelocity(t) + orbit->velocityAtTime(t);
         }
     }
diff --git a/src/celengine/star.h b/src/celengine/star.h
index eb827c0a6..101c27b87 100644
--- a/src/celengine/star.h
+++ b/src/celengine/star.h
@@ -34,7 +34,7 @@ class StarDetails
     StarDetails(const StarDetails&);
 
     ~StarDetails();
-    
+
  private:
     // Prohibit assignment of StarDetails objects
     StarDetails& operator=(const StarDetails&);
@@ -70,7 +70,7 @@ class StarDetails
     void setInfoURL(const std::string& _infoURL);
 
     bool shared() const;
-    
+
     enum
     {
         KnowRadius   = 0x1,
@@ -106,7 +106,7 @@ class StarDetails
     Eigen::Vector3f semiAxes;
 
     std::string* infoURL;
-    
+
     std::vector<Star*>* orbitingStars;
     bool isShared;
 
@@ -117,7 +117,7 @@ class StarDetails
         MultiResTexture neutronStarTex;
         MultiResTexture starTex[StellarClass::Spectral_Count];
     };
-    
+
  public:
     static StarDetails* GetStarDetails(const StellarClass&);
     static StarDetails* CreateStandardStarType(const std::string& _specType,
@@ -132,9 +132,9 @@ class StarDetails
     static StarDetails* GetNeutronStarDetails();
     static StarDetails* GetBlackHoleDetails();
     static StarDetails* GetBarycenterDetails();
-    
+
     static void SetStarTextures(const StarTextureSet&);
-    
+
  private:
     static StarTextureSet starTextures;
 };
diff --git a/src/celengine/starbrowser.cpp b/src/celengine/starbrowser.cpp
index 78fb5f236..7899282e7 100644
--- a/src/celengine/starbrowser.cpp
+++ b/src/celengine/starbrowser.cpp
@@ -1,5 +1,5 @@
 // starbrowser.cpp
-// 
+//
 // Copyright (C) 2001, Chris Laurel <claurel@shatters.net>
 //
 // Star browser tool for Celestia.
@@ -36,7 +36,7 @@ struct CloserStarPredicate
         Vector3f v0 = p0 * 1.0e6f - pos;
         Vector3f v1 = p1 * 1.0e6f - pos;
 
-        return (v0.squaredNorm() < v1.squaredNorm());                               
+        return (v0.squaredNorm() < v1.squaredNorm());
     }
 };
 
diff --git a/src/celengine/starbrowser.h b/src/celengine/starbrowser.h
index 45d40ca81..0ffc9d907 100644
--- a/src/celengine/starbrowser.h
+++ b/src/celengine/starbrowser.h
@@ -1,5 +1,5 @@
 // starbrowser.h
-// 
+//
 // Copyright (C) 2001, Chris Laurel <claurel@shatters.net>
 //
 // Star browser tool for celestia.
diff --git a/src/celengine/starcolors.cpp b/src/celengine/starcolors.cpp
index 67f43ace9..10dd177a6 100644
--- a/src/celengine/starcolors.cpp
+++ b/src/celengine/starcolors.cpp
@@ -66,407 +66,407 @@ Color StarColors_Enhanced[41] =
 //     http://www.vendian.org/mncharity/dir3/blackbody/
 Color StarColors_Blackbody_2deg_D65[401] =
 {
-    Color(0.0000f, 0.0000f, 0.0000f),    // T=     0K P=2.472e+06   
-    Color(1.0000f, 0.0337f, 0.0000f),    // T=   100K P=2.472e+06   
-    Color(1.0000f, 0.0337f, 0.0000f),    // T=   200K P=2.472e+06   
-    Color(1.0000f, 0.0337f, 0.0000f),    // T=   300K P=2.472e+06   
-    Color(1.0000f, 0.0337f, 0.0000f),    // T=   400K P=2.472e+06   
-    Color(1.0000f, 0.0337f, 0.0000f),    // T=   500K P=2.472e+06   
-    Color(1.0000f, 0.0337f, 0.0000f),    // T=   600K P=2.472e+06   
-    Color(1.0000f, 0.0337f, 0.0000f),    // T=   700K P=2.472e+06   
-    Color(1.0000f, 0.0337f, 0.0000f),    // T=   800K P=2.472e+06   
-    Color(1.0000f, 0.0337f, 0.0000f),    // T=   900K P=2.472e+06   
-    Color(1.0000f, 0.0337f, 0.0000f),    // T=  1000K P=2.472e+06   
-    Color(1.0000f, 0.0592f, 0.0000f),    // T=  1100K P=2.112e+07   
-    Color(1.0000f, 0.0846f, 0.0000f),    // T=  1200K P=1.282e+08   
-    Color(1.0000f, 0.1096f, 0.0000f),    // T=  1300K P=5.959e+08   
-    Color(1.0000f, 0.1341f, 0.0000f),    // T=  1400K P=2.243e+09   
-    Color(1.0000f, 0.1578f, 0.0000f),    // T=  1500K P=7.121e+09   
-    Color(1.0000f, 0.1806f, 0.0000f),    // T=  1600K P=1.967e+10   
-    Color(1.0000f, 0.2025f, 0.0000f),    // T=  1700K P=4.839e+10   
-    Color(1.0000f, 0.2235f, 0.0000f),    // T=  1800K P=1.081e+11   
-    Color(1.0000f, 0.2434f, 0.0000f),    // T=  1900K P=2.224e+11   
-    Color(1.0000f, 0.2647f, 0.0033f),    // T=  2000K P=4.268e+11   
-    Color(1.0000f, 0.2889f, 0.0120f),    // T=  2100K P=7.710e+11   
-    Color(1.0000f, 0.3126f, 0.0219f),    // T=  2200K P=1.322e+12   
-    Color(1.0000f, 0.3360f, 0.0331f),    // T=  2300K P=2.166e+12   
-    Color(1.0000f, 0.3589f, 0.0454f),    // T=  2400K P=3.408e+12   
-    Color(1.0000f, 0.3814f, 0.0588f),    // T=  2500K P=5.178e+12   
-    Color(1.0000f, 0.4034f, 0.0734f),    // T=  2600K P=7.624e+12   
-    Color(1.0000f, 0.4250f, 0.0889f),    // T=  2700K P=1.092e+13   
-    Color(1.0000f, 0.4461f, 0.1054f),    // T=  2800K P=1.524e+13   
-    Color(1.0000f, 0.4668f, 0.1229f),    // T=  2900K P=2.081e+13   
-    Color(1.0000f, 0.4870f, 0.1411f),    // T=  3000K P=2.784e+13   
-    Color(1.0000f, 0.5067f, 0.1602f),    // T=  3100K P=3.657e+13   
-    Color(1.0000f, 0.5259f, 0.1800f),    // T=  3200K P=4.725e+13   
-    Color(1.0000f, 0.5447f, 0.2005f),    // T=  3300K P=6.012e+13   
-    Color(1.0000f, 0.5630f, 0.2216f),    // T=  3400K P=7.545e+13   
-    Color(1.0000f, 0.5809f, 0.2433f),    // T=  3500K P=9.349e+13   
-    Color(1.0000f, 0.5983f, 0.2655f),    // T=  3600K P=1.145e+14   
-    Color(1.0000f, 0.6153f, 0.2881f),    // T=  3700K P=1.387e+14   
-    Color(1.0000f, 0.6318f, 0.3112f),    // T=  3800K P=1.665e+14   
-    Color(1.0000f, 0.6480f, 0.3346f),    // T=  3900K P=1.979e+14   
-    Color(1.0000f, 0.6636f, 0.3583f),    // T=  4000K P=2.333e+14   
-    Color(1.0000f, 0.6789f, 0.3823f),    // T=  4100K P=2.729e+14   
-    Color(1.0000f, 0.6938f, 0.4066f),    // T=  4200K P=3.169e+14   
-    Color(1.0000f, 0.7083f, 0.4310f),    // T=  4300K P=3.654e+14   
-    Color(1.0000f, 0.7223f, 0.4556f),    // T=  4400K P=4.188e+14   
-    Color(1.0000f, 0.7360f, 0.4803f),    // T=  4500K P=4.771e+14   
-    Color(1.0000f, 0.7494f, 0.5051f),    // T=  4600K P=5.406e+14   
-    Color(1.0000f, 0.7623f, 0.5299f),    // T=  4700K P=6.093e+14   
-    Color(1.0000f, 0.7750f, 0.5548f),    // T=  4800K P=6.835e+14   
-    Color(1.0000f, 0.7872f, 0.5797f),    // T=  4900K P=7.632e+14   
-    Color(1.0000f, 0.7992f, 0.6045f),    // T=  5000K P=8.485e+14   
-    Color(1.0000f, 0.8108f, 0.6293f),    // T=  5100K P=9.396e+14   
-    Color(1.0000f, 0.8221f, 0.6541f),    // T=  5200K P=1.036e+15   
-    Color(1.0000f, 0.8330f, 0.6787f),    // T=  5300K P=1.139e+15   
-    Color(1.0000f, 0.8437f, 0.7032f),    // T=  5400K P=1.248e+15   
-    Color(1.0000f, 0.8541f, 0.7277f),    // T=  5500K P=1.363e+15   
-    Color(1.0000f, 0.8642f, 0.7519f),    // T=  5600K P=1.484e+15   
-    Color(1.0000f, 0.8740f, 0.7760f),    // T=  5700K P=1.611e+15   
-    Color(1.0000f, 0.8836f, 0.8000f),    // T=  5800K P=1.744e+15   
-    Color(1.0000f, 0.8929f, 0.8238f),    // T=  5900K P=1.883e+15   
-    Color(1.0000f, 0.9019f, 0.8473f),    // T=  6000K P=2.028e+15   
-    Color(1.0000f, 0.9107f, 0.8707f),    // T=  6100K P=2.179e+15   
-    Color(1.0000f, 0.9193f, 0.8939f),    // T=  6200K P=2.337e+15   
-    Color(1.0000f, 0.9276f, 0.9168f),    // T=  6300K P=2.500e+15   
-    Color(1.0000f, 0.9357f, 0.9396f),    // T=  6400K P=2.669e+15   
-    Color(1.0000f, 0.9436f, 0.9621f),    // T=  6500K P=2.845e+15   
-    Color(1.0000f, 0.9513f, 0.9844f),    // T=  6600K P=3.026e+15   
-    Color(0.9937f, 0.9526f, 1.0000f),    // T=  6700K P=3.214e+15   
-    Color(0.9726f, 0.9395f, 1.0000f),    // T=  6800K P=3.407e+15   
-    Color(0.9526f, 0.9270f, 1.0000f),    // T=  6900K P=3.606e+15   
-    Color(0.9337f, 0.9150f, 1.0000f),    // T=  7000K P=3.811e+15   
-    Color(0.9157f, 0.9035f, 1.0000f),    // T=  7100K P=4.022e+15   
-    Color(0.8986f, 0.8925f, 1.0000f),    // T=  7200K P=4.238e+15   
-    Color(0.8823f, 0.8819f, 1.0000f),    // T=  7300K P=4.460e+15   
-    Color(0.8668f, 0.8718f, 1.0000f),    // T=  7400K P=4.688e+15   
-    Color(0.8520f, 0.8621f, 1.0000f),    // T=  7500K P=4.920e+15   
-    Color(0.8379f, 0.8527f, 1.0000f),    // T=  7600K P=5.159e+15   
-    Color(0.8244f, 0.8437f, 1.0000f),    // T=  7700K P=5.402e+15   
-    Color(0.8115f, 0.8351f, 1.0000f),    // T=  7800K P=5.651e+15   
-    Color(0.7992f, 0.8268f, 1.0000f),    // T=  7900K P=5.906e+15   
-    Color(0.7874f, 0.8187f, 1.0000f),    // T=  8000K P=6.165e+15   
-    Color(0.7761f, 0.8110f, 1.0000f),    // T=  8100K P=6.429e+15   
-    Color(0.7652f, 0.8035f, 1.0000f),    // T=  8200K P=6.698e+15   
-    Color(0.7548f, 0.7963f, 1.0000f),    // T=  8300K P=6.973e+15   
-    Color(0.7449f, 0.7894f, 1.0000f),    // T=  8400K P=7.252e+15   
-    Color(0.7353f, 0.7827f, 1.0000f),    // T=  8500K P=7.535e+15   
-    Color(0.7260f, 0.7762f, 1.0000f),    // T=  8600K P=7.824e+15   
-    Color(0.7172f, 0.7699f, 1.0000f),    // T=  8700K P=8.117e+15   
-    Color(0.7086f, 0.7638f, 1.0000f),    // T=  8800K P=8.415e+15   
-    Color(0.7004f, 0.7579f, 1.0000f),    // T=  8900K P=8.717e+15   
-    Color(0.6925f, 0.7522f, 1.0000f),    // T=  9000K P=9.023e+15   
-    Color(0.6848f, 0.7467f, 1.0000f),    // T=  9100K P=9.334e+15   
-    Color(0.6774f, 0.7414f, 1.0000f),    // T=  9200K P=9.649e+15   
-    Color(0.6703f, 0.7362f, 1.0000f),    // T=  9300K P=9.969e+15   
-    Color(0.6635f, 0.7311f, 1.0000f),    // T=  9400K P=1.029e+16   
-    Color(0.6568f, 0.7263f, 1.0000f),    // T=  9500K P=1.062e+16   
-    Color(0.6504f, 0.7215f, 1.0000f),    // T=  9600K P=1.095e+16   
-    Color(0.6442f, 0.7169f, 1.0000f),    // T=  9700K P=1.129e+16   
-    Color(0.6382f, 0.7124f, 1.0000f),    // T=  9800K P=1.163e+16   
-    Color(0.6324f, 0.7081f, 1.0000f),    // T=  9900K P=1.197e+16   
-    Color(0.6268f, 0.7039f, 1.0000f),    // T= 10000K P=1.231e+16   
-    Color(0.6213f, 0.6998f, 1.0000f),    // T= 10100K P=1.267e+16   
-    Color(0.6161f, 0.6958f, 1.0000f),    // T= 10200K P=1.302e+16   
-    Color(0.6109f, 0.6919f, 1.0000f),    // T= 10300K P=1.338e+16   
-    Color(0.6060f, 0.6881f, 1.0000f),    // T= 10400K P=1.374e+16   
-    Color(0.6012f, 0.6844f, 1.0000f),    // T= 10500K P=1.410e+16   
-    Color(0.5965f, 0.6808f, 1.0000f),    // T= 10600K P=1.447e+16   
-    Color(0.5919f, 0.6773f, 1.0000f),    // T= 10700K P=1.484e+16   
-    Color(0.5875f, 0.6739f, 1.0000f),    // T= 10800K P=1.521e+16   
-    Color(0.5833f, 0.6706f, 1.0000f),    // T= 10900K P=1.559e+16   
-    Color(0.5791f, 0.6674f, 1.0000f),    // T= 11000K P=1.597e+16   
-    Color(0.5750f, 0.6642f, 1.0000f),    // T= 11100K P=1.636e+16   
-    Color(0.5711f, 0.6611f, 1.0000f),    // T= 11200K P=1.674e+16   
-    Color(0.5673f, 0.6581f, 1.0000f),    // T= 11300K P=1.713e+16   
-    Color(0.5636f, 0.6552f, 1.0000f),    // T= 11400K P=1.752e+16   
-    Color(0.5599f, 0.6523f, 1.0000f),    // T= 11500K P=1.792e+16   
-    Color(0.5564f, 0.6495f, 1.0000f),    // T= 11600K P=1.832e+16   
-    Color(0.5530f, 0.6468f, 1.0000f),    // T= 11700K P=1.872e+16   
-    Color(0.5496f, 0.6441f, 1.0000f),    // T= 11800K P=1.912e+16   
-    Color(0.5463f, 0.6415f, 1.0000f),    // T= 11900K P=1.953e+16   
-    Color(0.5431f, 0.6389f, 1.0000f),    // T= 12000K P=1.994e+16   
-    Color(0.5400f, 0.6364f, 1.0000f),    // T= 12100K P=2.035e+16   
-    Color(0.5370f, 0.6340f, 1.0000f),    // T= 12200K P=2.076e+16   
-    Color(0.5340f, 0.6316f, 1.0000f),    // T= 12300K P=2.118e+16   
-    Color(0.5312f, 0.6293f, 1.0000f),    // T= 12400K P=2.160e+16   
-    Color(0.5283f, 0.6270f, 1.0000f),    // T= 12500K P=2.202e+16   
-    Color(0.5256f, 0.6247f, 1.0000f),    // T= 12600K P=2.244e+16   
-    Color(0.5229f, 0.6225f, 1.0000f),    // T= 12700K P=2.287e+16   
-    Color(0.5203f, 0.6204f, 1.0000f),    // T= 12800K P=2.330e+16   
-    Color(0.5177f, 0.6183f, 1.0000f),    // T= 12900K P=2.373e+16   
-    Color(0.5152f, 0.6162f, 1.0000f),    // T= 13000K P=2.416e+16   
-    Color(0.5128f, 0.6142f, 1.0000f),    // T= 13100K P=2.459e+16   
-    Color(0.5104f, 0.6122f, 1.0000f),    // T= 13200K P=2.503e+16   
-    Color(0.5080f, 0.6103f, 1.0000f),    // T= 13300K P=2.547e+16   
-    Color(0.5057f, 0.6084f, 1.0000f),    // T= 13400K P=2.591e+16   
-    Color(0.5035f, 0.6065f, 1.0000f),    // T= 13500K P=2.635e+16   
-    Color(0.5013f, 0.6047f, 1.0000f),    // T= 13600K P=2.680e+16   
-    Color(0.4991f, 0.6029f, 1.0000f),    // T= 13700K P=2.724e+16   
-    Color(0.4970f, 0.6012f, 1.0000f),    // T= 13800K P=2.769e+16   
-    Color(0.4950f, 0.5994f, 1.0000f),    // T= 13900K P=2.814e+16   
-    Color(0.4930f, 0.5978f, 1.0000f),    // T= 14000K P=2.860e+16   
-    Color(0.4910f, 0.5961f, 1.0000f),    // T= 14100K P=2.905e+16   
-    Color(0.4891f, 0.5945f, 1.0000f),    // T= 14200K P=2.951e+16   
-    Color(0.4872f, 0.5929f, 1.0000f),    // T= 14300K P=2.997e+16   
-    Color(0.4853f, 0.5913f, 1.0000f),    // T= 14400K P=3.043e+16   
-    Color(0.4835f, 0.5898f, 1.0000f),    // T= 14500K P=3.089e+16   
-    Color(0.4817f, 0.5882f, 1.0000f),    // T= 14600K P=3.135e+16   
-    Color(0.4799f, 0.5868f, 1.0000f),    // T= 14700K P=3.182e+16   
-    Color(0.4782f, 0.5853f, 1.0000f),    // T= 14800K P=3.228e+16   
-    Color(0.4765f, 0.5839f, 1.0000f),    // T= 14900K P=3.275e+16   
-    Color(0.4749f, 0.5824f, 1.0000f),    // T= 15000K P=3.322e+16   
-    Color(0.4733f, 0.5811f, 1.0000f),    // T= 15100K P=3.369e+16   
-    Color(0.4717f, 0.5797f, 1.0000f),    // T= 15200K P=3.416e+16   
-    Color(0.4701f, 0.5784f, 1.0000f),    // T= 15300K P=3.464e+16   
-    Color(0.4686f, 0.5770f, 1.0000f),    // T= 15400K P=3.511e+16   
-    Color(0.4671f, 0.5757f, 1.0000f),    // T= 15500K P=3.559e+16   
-    Color(0.4656f, 0.5745f, 1.0000f),    // T= 15600K P=3.607e+16   
-    Color(0.4641f, 0.5732f, 1.0000f),    // T= 15700K P=3.655e+16   
-    Color(0.4627f, 0.5720f, 1.0000f),    // T= 15800K P=3.703e+16   
-    Color(0.4613f, 0.5708f, 1.0000f),    // T= 15900K P=3.751e+16   
-    Color(0.4599f, 0.5696f, 1.0000f),    // T= 16000K P=3.800e+16   
-    Color(0.4586f, 0.5684f, 1.0000f),    // T= 16100K P=3.848e+16   
-    Color(0.4572f, 0.5673f, 1.0000f),    // T= 16200K P=3.897e+16   
-    Color(0.4559f, 0.5661f, 1.0000f),    // T= 16300K P=3.946e+16   
-    Color(0.4546f, 0.5650f, 1.0000f),    // T= 16400K P=3.995e+16   
-    Color(0.4534f, 0.5639f, 1.0000f),    // T= 16500K P=4.044e+16   
-    Color(0.4521f, 0.5628f, 1.0000f),    // T= 16600K P=4.093e+16   
-    Color(0.4509f, 0.5617f, 1.0000f),    // T= 16700K P=4.143e+16   
-    Color(0.4497f, 0.5607f, 1.0000f),    // T= 16800K P=4.192e+16   
-    Color(0.4485f, 0.5597f, 1.0000f),    // T= 16900K P=4.241e+16   
-    Color(0.4474f, 0.5586f, 1.0000f),    // T= 17000K P=4.291e+16   
-    Color(0.4462f, 0.5576f, 1.0000f),    // T= 17100K P=4.341e+16   
-    Color(0.4451f, 0.5566f, 1.0000f),    // T= 17200K P=4.391e+16   
-    Color(0.4440f, 0.5557f, 1.0000f),    // T= 17300K P=4.441e+16   
-    Color(0.4429f, 0.5547f, 1.0000f),    // T= 17400K P=4.491e+16   
-    Color(0.4418f, 0.5538f, 1.0000f),    // T= 17500K P=4.541e+16   
-    Color(0.4408f, 0.5528f, 1.0000f),    // T= 17600K P=4.592e+16   
-    Color(0.4397f, 0.5519f, 1.0000f),    // T= 17700K P=4.642e+16   
-    Color(0.4387f, 0.5510f, 1.0000f),    // T= 17800K P=4.693e+16   
-    Color(0.4377f, 0.5501f, 1.0000f),    // T= 17900K P=4.743e+16   
-    Color(0.4367f, 0.5492f, 1.0000f),    // T= 18000K P=4.794e+16   
-    Color(0.4357f, 0.5483f, 1.0000f),    // T= 18100K P=4.845e+16   
-    Color(0.4348f, 0.5475f, 1.0000f),    // T= 18200K P=4.896e+16   
-    Color(0.4338f, 0.5466f, 1.0000f),    // T= 18300K P=4.947e+16   
-    Color(0.4329f, 0.5458f, 1.0000f),    // T= 18400K P=4.998e+16   
-    Color(0.4319f, 0.5450f, 1.0000f),    // T= 18500K P=5.049e+16   
-    Color(0.4310f, 0.5442f, 1.0000f),    // T= 18600K P=5.100e+16   
-    Color(0.4301f, 0.5434f, 1.0000f),    // T= 18700K P=5.152e+16   
-    Color(0.4293f, 0.5426f, 1.0000f),    // T= 18800K P=5.203e+16   
-    Color(0.4284f, 0.5418f, 1.0000f),    // T= 18900K P=5.255e+16   
-    Color(0.4275f, 0.5410f, 1.0000f),    // T= 19000K P=5.307e+16   
-    Color(0.4267f, 0.5403f, 1.0000f),    // T= 19100K P=5.358e+16   
-    Color(0.4258f, 0.5395f, 1.0000f),    // T= 19200K P=5.410e+16   
-    Color(0.4250f, 0.5388f, 1.0000f),    // T= 19300K P=5.462e+16   
-    Color(0.4242f, 0.5381f, 1.0000f),    // T= 19400K P=5.514e+16   
-    Color(0.4234f, 0.5373f, 1.0000f),    // T= 19500K P=5.566e+16   
-    Color(0.4226f, 0.5366f, 1.0000f),    // T= 19600K P=5.618e+16   
-    Color(0.4218f, 0.5359f, 1.0000f),    // T= 19700K P=5.671e+16   
-    Color(0.4211f, 0.5352f, 1.0000f),    // T= 19800K P=5.723e+16   
-    Color(0.4203f, 0.5345f, 1.0000f),    // T= 19900K P=5.775e+16   
-    Color(0.4196f, 0.5339f, 1.0000f),    // T= 20000K P=5.828e+16   
-    Color(0.4188f, 0.5332f, 1.0000f),    // T= 20100K P=5.880e+16   
-    Color(0.4181f, 0.5325f, 1.0000f),    // T= 20200K P=5.933e+16   
-    Color(0.4174f, 0.5319f, 1.0000f),    // T= 20300K P=5.986e+16   
-    Color(0.4167f, 0.5312f, 1.0000f),    // T= 20400K P=6.038e+16   
-    Color(0.4160f, 0.5306f, 1.0000f),    // T= 20500K P=6.091e+16   
-    Color(0.4153f, 0.5300f, 1.0000f),    // T= 20600K P=6.144e+16   
-    Color(0.4146f, 0.5293f, 1.0000f),    // T= 20700K P=6.197e+16   
-    Color(0.4139f, 0.5287f, 1.0000f),    // T= 20800K P=6.250e+16   
-    Color(0.4133f, 0.5281f, 1.0000f),    // T= 20900K P=6.303e+16   
-    Color(0.4126f, 0.5275f, 1.0000f),    // T= 21000K P=6.357e+16   
-    Color(0.4119f, 0.5269f, 1.0000f),    // T= 21100K P=6.410e+16   
-    Color(0.4113f, 0.5264f, 1.0000f),    // T= 21200K P=6.463e+16   
-    Color(0.4107f, 0.5258f, 1.0000f),    // T= 21300K P=6.517e+16   
-    Color(0.4100f, 0.5252f, 1.0000f),    // T= 21400K P=6.570e+16   
-    Color(0.4094f, 0.5246f, 1.0000f),    // T= 21500K P=6.623e+16   
-    Color(0.4088f, 0.5241f, 1.0000f),    // T= 21600K P=6.677e+16   
-    Color(0.4082f, 0.5235f, 1.0000f),    // T= 21700K P=6.731e+16   
-    Color(0.4076f, 0.5230f, 1.0000f),    // T= 21800K P=6.784e+16   
-    Color(0.4070f, 0.5224f, 1.0000f),    // T= 21900K P=6.838e+16   
-    Color(0.4064f, 0.5219f, 1.0000f),    // T= 22000K P=6.892e+16   
-    Color(0.4059f, 0.5214f, 1.0000f),    // T= 22100K P=6.946e+16   
-    Color(0.4053f, 0.5209f, 1.0000f),    // T= 22200K P=7.000e+16   
-    Color(0.4047f, 0.5203f, 1.0000f),    // T= 22300K P=7.054e+16   
-    Color(0.4042f, 0.5198f, 1.0000f),    // T= 22400K P=7.108e+16   
-    Color(0.4036f, 0.5193f, 1.0000f),    // T= 22500K P=7.162e+16   
-    Color(0.4031f, 0.5188f, 1.0000f),    // T= 22600K P=7.216e+16   
-    Color(0.4026f, 0.5183f, 1.0000f),    // T= 22700K P=7.270e+16   
-    Color(0.4020f, 0.5178f, 1.0000f),    // T= 22800K P=7.325e+16   
-    Color(0.4015f, 0.5174f, 1.0000f),    // T= 22900K P=7.379e+16   
-    Color(0.4010f, 0.5169f, 1.0000f),    // T= 23000K P=7.433e+16   
-    Color(0.4005f, 0.5164f, 1.0000f),    // T= 23100K P=7.488e+16   
-    Color(0.4000f, 0.5159f, 1.0000f),    // T= 23200K P=7.542e+16   
-    Color(0.3995f, 0.5155f, 1.0000f),    // T= 23300K P=7.597e+16   
-    Color(0.3990f, 0.5150f, 1.0000f),    // T= 23400K P=7.651e+16   
-    Color(0.3985f, 0.5146f, 1.0000f),    // T= 23500K P=7.706e+16   
-    Color(0.3980f, 0.5141f, 1.0000f),    // T= 23600K P=7.760e+16   
-    Color(0.3975f, 0.5137f, 1.0000f),    // T= 23700K P=7.815e+16   
-    Color(0.3970f, 0.5132f, 1.0000f),    // T= 23800K P=7.870e+16   
-    Color(0.3966f, 0.5128f, 1.0000f),    // T= 23900K P=7.925e+16   
-    Color(0.3961f, 0.5123f, 1.0000f),    // T= 24000K P=7.980e+16   
-    Color(0.3956f, 0.5119f, 1.0000f),    // T= 24100K P=8.035e+16   
-    Color(0.3952f, 0.5115f, 1.0000f),    // T= 24200K P=8.089e+16   
-    Color(0.3947f, 0.5111f, 1.0000f),    // T= 24300K P=8.144e+16   
-    Color(0.3943f, 0.5107f, 1.0000f),    // T= 24400K P=8.199e+16   
-    Color(0.3938f, 0.5103f, 1.0000f),    // T= 24500K P=8.255e+16   
-    Color(0.3934f, 0.5098f, 1.0000f),    // T= 24600K P=8.310e+16   
-    Color(0.3930f, 0.5094f, 1.0000f),    // T= 24700K P=8.365e+16   
-    Color(0.3925f, 0.5090f, 1.0000f),    // T= 24800K P=8.420e+16   
-    Color(0.3921f, 0.5086f, 1.0000f),    // T= 24900K P=8.475e+16   
-    Color(0.3917f, 0.5083f, 1.0000f),    // T= 25000K P=8.531e+16   
-    Color(0.3913f, 0.5079f, 1.0000f),    // T= 25100K P=8.586e+16   
-    Color(0.3909f, 0.5075f, 1.0000f),    // T= 25200K P=8.641e+16   
-    Color(0.3905f, 0.5071f, 1.0000f),    // T= 25300K P=8.697e+16   
-    Color(0.3901f, 0.5067f, 1.0000f),    // T= 25400K P=8.752e+16   
-    Color(0.3897f, 0.5064f, 1.0000f),    // T= 25500K P=8.808e+16   
-    Color(0.3893f, 0.5060f, 1.0000f),    // T= 25600K P=8.863e+16   
-    Color(0.3889f, 0.5056f, 1.0000f),    // T= 25700K P=8.919e+16   
-    Color(0.3885f, 0.5053f, 1.0000f),    // T= 25800K P=8.974e+16   
-    Color(0.3881f, 0.5049f, 1.0000f),    // T= 25900K P=9.030e+16   
-    Color(0.3877f, 0.5045f, 1.0000f),    // T= 26000K P=9.086e+16   
-    Color(0.3874f, 0.5042f, 1.0000f),    // T= 26100K P=9.141e+16   
-    Color(0.3870f, 0.5038f, 1.0000f),    // T= 26200K P=9.197e+16   
-    Color(0.3866f, 0.5035f, 1.0000f),    // T= 26300K P=9.253e+16   
-    Color(0.3863f, 0.5032f, 1.0000f),    // T= 26400K P=9.309e+16   
-    Color(0.3859f, 0.5028f, 1.0000f),    // T= 26500K P=9.365e+16   
-    Color(0.3855f, 0.5025f, 1.0000f),    // T= 26600K P=9.421e+16   
-    Color(0.3852f, 0.5021f, 1.0000f),    // T= 26700K P=9.476e+16   
-    Color(0.3848f, 0.5018f, 1.0000f),    // T= 26800K P=9.532e+16   
-    Color(0.3845f, 0.5015f, 1.0000f),    // T= 26900K P=9.588e+16   
-    Color(0.3841f, 0.5012f, 1.0000f),    // T= 27000K P=9.644e+16   
-    Color(0.3838f, 0.5008f, 1.0000f),    // T= 27100K P=9.701e+16   
-    Color(0.3835f, 0.5005f, 1.0000f),    // T= 27200K P=9.757e+16   
-    Color(0.3831f, 0.5002f, 1.0000f),    // T= 27300K P=9.813e+16   
-    Color(0.3828f, 0.4999f, 1.0000f),    // T= 27400K P=9.869e+16   
-    Color(0.3825f, 0.4996f, 1.0000f),    // T= 27500K P=9.925e+16   
-    Color(0.3821f, 0.4993f, 1.0000f),    // T= 27600K P=9.981e+16   
-    Color(0.3818f, 0.4990f, 1.0000f),    // T= 27700K P=1.004e+17   
-    Color(0.3815f, 0.4987f, 1.0000f),    // T= 27800K P=1.009e+17   
-    Color(0.3812f, 0.4984f, 1.0000f),    // T= 27900K P=1.015e+17   
-    Color(0.3809f, 0.4981f, 1.0000f),    // T= 28000K P=1.021e+17   
-    Color(0.3805f, 0.4978f, 1.0000f),    // T= 28100K P=1.026e+17   
-    Color(0.3802f, 0.4975f, 1.0000f),    // T= 28200K P=1.032e+17   
-    Color(0.3799f, 0.4972f, 1.0000f),    // T= 28300K P=1.038e+17   
-    Color(0.3796f, 0.4969f, 1.0000f),    // T= 28400K P=1.043e+17   
-    Color(0.3793f, 0.4966f, 1.0000f),    // T= 28500K P=1.049e+17   
-    Color(0.3790f, 0.4963f, 1.0000f),    // T= 28600K P=1.055e+17   
-    Color(0.3787f, 0.4960f, 1.0000f),    // T= 28700K P=1.060e+17   
-    Color(0.3784f, 0.4958f, 1.0000f),    // T= 28800K P=1.066e+17   
-    Color(0.3781f, 0.4955f, 1.0000f),    // T= 28900K P=1.072e+17   
-    Color(0.3779f, 0.4952f, 1.0000f),    // T= 29000K P=1.077e+17   
-    Color(0.3776f, 0.4949f, 1.0000f),    // T= 29100K P=1.083e+17   
-    Color(0.3773f, 0.4947f, 1.0000f),    // T= 29200K P=1.089e+17   
-    Color(0.3770f, 0.4944f, 1.0000f),    // T= 29300K P=1.094e+17   
-    Color(0.3767f, 0.4941f, 1.0000f),    // T= 29400K P=1.100e+17   
-    Color(0.3764f, 0.4939f, 1.0000f),    // T= 29500K P=1.106e+17   
-    Color(0.3762f, 0.4936f, 1.0000f),    // T= 29600K P=1.111e+17   
-    Color(0.3759f, 0.4934f, 1.0000f),    // T= 29700K P=1.117e+17   
-    Color(0.3756f, 0.4931f, 1.0000f),    // T= 29800K P=1.123e+17   
-    Color(0.3754f, 0.4928f, 1.0000f),    // T= 29900K P=1.128e+17   
-    Color(0.3751f, 0.4926f, 1.0000f),    // T= 30000K P=1.134e+17   
-    Color(0.3748f, 0.4923f, 1.0000f),    // T= 30100K P=1.140e+17   
-    Color(0.3746f, 0.4921f, 1.0000f),    // T= 30200K P=1.145e+17   
-    Color(0.3743f, 0.4918f, 1.0000f),    // T= 30300K P=1.151e+17   
-    Color(0.3741f, 0.4916f, 1.0000f),    // T= 30400K P=1.157e+17   
-    Color(0.3738f, 0.4914f, 1.0000f),    // T= 30500K P=1.162e+17   
-    Color(0.3735f, 0.4911f, 1.0000f),    // T= 30600K P=1.168e+17   
-    Color(0.3733f, 0.4909f, 1.0000f),    // T= 30700K P=1.174e+17   
-    Color(0.3730f, 0.4906f, 1.0000f),    // T= 30800K P=1.180e+17   
-    Color(0.3728f, 0.4904f, 1.0000f),    // T= 30900K P=1.185e+17   
-    Color(0.3726f, 0.4902f, 1.0000f),    // T= 31000K P=1.191e+17   
-    Color(0.3723f, 0.4899f, 1.0000f),    // T= 31100K P=1.197e+17   
-    Color(0.3721f, 0.4897f, 1.0000f),    // T= 31200K P=1.202e+17   
-    Color(0.3718f, 0.4895f, 1.0000f),    // T= 31300K P=1.208e+17   
-    Color(0.3716f, 0.4893f, 1.0000f),    // T= 31400K P=1.214e+17   
-    Color(0.3714f, 0.4890f, 1.0000f),    // T= 31500K P=1.220e+17   
-    Color(0.3711f, 0.4888f, 1.0000f),    // T= 31600K P=1.225e+17   
-    Color(0.3709f, 0.4886f, 1.0000f),    // T= 31700K P=1.231e+17   
-    Color(0.3707f, 0.4884f, 1.0000f),    // T= 31800K P=1.237e+17   
-    Color(0.3704f, 0.4881f, 1.0000f),    // T= 31900K P=1.242e+17   
-    Color(0.3702f, 0.4879f, 1.0000f),    // T= 32000K P=1.248e+17   
-    Color(0.3700f, 0.4877f, 1.0000f),    // T= 32100K P=1.254e+17   
-    Color(0.3698f, 0.4875f, 1.0000f),    // T= 32200K P=1.260e+17   
-    Color(0.3695f, 0.4873f, 1.0000f),    // T= 32300K P=1.265e+17   
-    Color(0.3693f, 0.4871f, 1.0000f),    // T= 32400K P=1.271e+17   
-    Color(0.3691f, 0.4869f, 1.0000f),    // T= 32500K P=1.277e+17   
-    Color(0.3689f, 0.4867f, 1.0000f),    // T= 32600K P=1.283e+17   
-    Color(0.3687f, 0.4864f, 1.0000f),    // T= 32700K P=1.288e+17   
-    Color(0.3684f, 0.4862f, 1.0000f),    // T= 32800K P=1.294e+17   
-    Color(0.3682f, 0.4860f, 1.0000f),    // T= 32900K P=1.300e+17   
-    Color(0.3680f, 0.4858f, 1.0000f),    // T= 33000K P=1.306e+17   
-    Color(0.3678f, 0.4856f, 1.0000f),    // T= 33100K P=1.311e+17   
-    Color(0.3676f, 0.4854f, 1.0000f),    // T= 33200K P=1.317e+17   
-    Color(0.3674f, 0.4852f, 1.0000f),    // T= 33300K P=1.323e+17   
-    Color(0.3672f, 0.4850f, 1.0000f),    // T= 33400K P=1.329e+17   
-    Color(0.3670f, 0.4848f, 1.0000f),    // T= 33500K P=1.334e+17   
-    Color(0.3668f, 0.4847f, 1.0000f),    // T= 33600K P=1.340e+17   
-    Color(0.3666f, 0.4845f, 1.0000f),    // T= 33700K P=1.346e+17   
-    Color(0.3664f, 0.4843f, 1.0000f),    // T= 33800K P=1.352e+17   
-    Color(0.3662f, 0.4841f, 1.0000f),    // T= 33900K P=1.358e+17   
-    Color(0.3660f, 0.4839f, 1.0000f),    // T= 34000K P=1.363e+17   
-    Color(0.3658f, 0.4837f, 1.0000f),    // T= 34100K P=1.369e+17   
-    Color(0.3656f, 0.4835f, 1.0000f),    // T= 34200K P=1.375e+17   
-    Color(0.3654f, 0.4833f, 1.0000f),    // T= 34300K P=1.381e+17   
-    Color(0.3652f, 0.4831f, 1.0000f),    // T= 34400K P=1.386e+17   
-    Color(0.3650f, 0.4830f, 1.0000f),    // T= 34500K P=1.392e+17   
-    Color(0.3649f, 0.4828f, 1.0000f),    // T= 34600K P=1.398e+17   
-    Color(0.3647f, 0.4826f, 1.0000f),    // T= 34700K P=1.404e+17   
-    Color(0.3645f, 0.4824f, 1.0000f),    // T= 34800K P=1.410e+17   
-    Color(0.3643f, 0.4822f, 1.0000f),    // T= 34900K P=1.415e+17   
-    Color(0.3641f, 0.4821f, 1.0000f),    // T= 35000K P=1.421e+17   
-    Color(0.3639f, 0.4819f, 1.0000f),    // T= 35100K P=1.427e+17   
-    Color(0.3638f, 0.4817f, 1.0000f),    // T= 35200K P=1.433e+17   
-    Color(0.3636f, 0.4815f, 1.0000f),    // T= 35300K P=1.439e+17   
-    Color(0.3634f, 0.4814f, 1.0000f),    // T= 35400K P=1.444e+17   
-    Color(0.3632f, 0.4812f, 1.0000f),    // T= 35500K P=1.450e+17   
-    Color(0.3630f, 0.4810f, 1.0000f),    // T= 35600K P=1.456e+17   
-    Color(0.3629f, 0.4809f, 1.0000f),    // T= 35700K P=1.462e+17   
-    Color(0.3627f, 0.4807f, 1.0000f),    // T= 35800K P=1.468e+17   
-    Color(0.3625f, 0.4805f, 1.0000f),    // T= 35900K P=1.473e+17   
-    Color(0.3624f, 0.4804f, 1.0000f),    // T= 36000K P=1.479e+17   
-    Color(0.3622f, 0.4802f, 1.0000f),    // T= 36100K P=1.485e+17   
-    Color(0.3620f, 0.4800f, 1.0000f),    // T= 36200K P=1.491e+17   
-    Color(0.3619f, 0.4799f, 1.0000f),    // T= 36300K P=1.497e+17   
-    Color(0.3617f, 0.4797f, 1.0000f),    // T= 36400K P=1.502e+17   
-    Color(0.3615f, 0.4796f, 1.0000f),    // T= 36500K P=1.508e+17   
-    Color(0.3614f, 0.4794f, 1.0000f),    // T= 36600K P=1.514e+17   
-    Color(0.3612f, 0.4792f, 1.0000f),    // T= 36700K P=1.520e+17   
-    Color(0.3610f, 0.4791f, 1.0000f),    // T= 36800K P=1.526e+17   
-    Color(0.3609f, 0.4789f, 1.0000f),    // T= 36900K P=1.531e+17   
-    Color(0.3607f, 0.4788f, 1.0000f),    // T= 37000K P=1.537e+17   
-    Color(0.3605f, 0.4786f, 1.0000f),    // T= 37100K P=1.543e+17   
-    Color(0.3604f, 0.4785f, 1.0000f),    // T= 37200K P=1.549e+17   
-    Color(0.3602f, 0.4783f, 1.0000f),    // T= 37300K P=1.555e+17   
-    Color(0.3601f, 0.4782f, 1.0000f),    // T= 37400K P=1.561e+17   
-    Color(0.3599f, 0.4780f, 1.0000f),    // T= 37500K P=1.566e+17   
-    Color(0.3598f, 0.4779f, 1.0000f),    // T= 37600K P=1.572e+17   
-    Color(0.3596f, 0.4777f, 1.0000f),    // T= 37700K P=1.578e+17   
-    Color(0.3595f, 0.4776f, 1.0000f),    // T= 37800K P=1.584e+17   
-    Color(0.3593f, 0.4774f, 1.0000f),    // T= 37900K P=1.590e+17   
-    Color(0.3592f, 0.4773f, 1.0000f),    // T= 38000K P=1.595e+17   
-    Color(0.3590f, 0.4771f, 1.0000f),    // T= 38100K P=1.601e+17   
-    Color(0.3589f, 0.4770f, 1.0000f),    // T= 38200K P=1.607e+17   
-    Color(0.3587f, 0.4768f, 1.0000f),    // T= 38300K P=1.613e+17   
-    Color(0.3586f, 0.4767f, 1.0000f),    // T= 38400K P=1.619e+17   
-    Color(0.3584f, 0.4766f, 1.0000f),    // T= 38500K P=1.625e+17   
-    Color(0.3583f, 0.4764f, 1.0000f),    // T= 38600K P=1.630e+17   
-    Color(0.3581f, 0.4763f, 1.0000f),    // T= 38700K P=1.636e+17   
-    Color(0.3580f, 0.4761f, 1.0000f),    // T= 38800K P=1.642e+17   
-    Color(0.3579f, 0.4760f, 1.0000f),    // T= 38900K P=1.648e+17   
-    Color(0.3577f, 0.4759f, 1.0000f),    // T= 39000K P=1.654e+17   
-    Color(0.3576f, 0.4757f, 1.0000f),    // T= 39100K P=1.660e+17   
-    Color(0.3574f, 0.4756f, 1.0000f),    // T= 39200K P=1.666e+17   
-    Color(0.3573f, 0.4755f, 1.0000f),    // T= 39300K P=1.671e+17   
-    Color(0.3572f, 0.4753f, 1.0000f),    // T= 39400K P=1.677e+17   
-    Color(0.3570f, 0.4752f, 1.0000f),    // T= 39500K P=1.683e+17   
-    Color(0.3569f, 0.4751f, 1.0000f),    // T= 39600K P=1.689e+17   
-    Color(0.3567f, 0.4749f, 1.0000f),    // T= 39700K P=1.695e+17   
-    Color(0.3566f, 0.4748f, 1.0000f),    // T= 39800K P=1.701e+17   
-    Color(0.3565f, 0.4747f, 1.0000f),    // T= 39900K P=1.707e+17   
-    Color(0.3563f, 0.4745f, 1.0000f),    // T= 40000K P=1.712e+17   
+    Color(0.0000f, 0.0000f, 0.0000f),    // T=     0K P=2.472e+06
+    Color(1.0000f, 0.0337f, 0.0000f),    // T=   100K P=2.472e+06
+    Color(1.0000f, 0.0337f, 0.0000f),    // T=   200K P=2.472e+06
+    Color(1.0000f, 0.0337f, 0.0000f),    // T=   300K P=2.472e+06
+    Color(1.0000f, 0.0337f, 0.0000f),    // T=   400K P=2.472e+06
+    Color(1.0000f, 0.0337f, 0.0000f),    // T=   500K P=2.472e+06
+    Color(1.0000f, 0.0337f, 0.0000f),    // T=   600K P=2.472e+06
+    Color(1.0000f, 0.0337f, 0.0000f),    // T=   700K P=2.472e+06
+    Color(1.0000f, 0.0337f, 0.0000f),    // T=   800K P=2.472e+06
+    Color(1.0000f, 0.0337f, 0.0000f),    // T=   900K P=2.472e+06
+    Color(1.0000f, 0.0337f, 0.0000f),    // T=  1000K P=2.472e+06
+    Color(1.0000f, 0.0592f, 0.0000f),    // T=  1100K P=2.112e+07
+    Color(1.0000f, 0.0846f, 0.0000f),    // T=  1200K P=1.282e+08
+    Color(1.0000f, 0.1096f, 0.0000f),    // T=  1300K P=5.959e+08
+    Color(1.0000f, 0.1341f, 0.0000f),    // T=  1400K P=2.243e+09
+    Color(1.0000f, 0.1578f, 0.0000f),    // T=  1500K P=7.121e+09
+    Color(1.0000f, 0.1806f, 0.0000f),    // T=  1600K P=1.967e+10
+    Color(1.0000f, 0.2025f, 0.0000f),    // T=  1700K P=4.839e+10
+    Color(1.0000f, 0.2235f, 0.0000f),    // T=  1800K P=1.081e+11
+    Color(1.0000f, 0.2434f, 0.0000f),    // T=  1900K P=2.224e+11
+    Color(1.0000f, 0.2647f, 0.0033f),    // T=  2000K P=4.268e+11
+    Color(1.0000f, 0.2889f, 0.0120f),    // T=  2100K P=7.710e+11
+    Color(1.0000f, 0.3126f, 0.0219f),    // T=  2200K P=1.322e+12
+    Color(1.0000f, 0.3360f, 0.0331f),    // T=  2300K P=2.166e+12
+    Color(1.0000f, 0.3589f, 0.0454f),    // T=  2400K P=3.408e+12
+    Color(1.0000f, 0.3814f, 0.0588f),    // T=  2500K P=5.178e+12
+    Color(1.0000f, 0.4034f, 0.0734f),    // T=  2600K P=7.624e+12
+    Color(1.0000f, 0.4250f, 0.0889f),    // T=  2700K P=1.092e+13
+    Color(1.0000f, 0.4461f, 0.1054f),    // T=  2800K P=1.524e+13
+    Color(1.0000f, 0.4668f, 0.1229f),    // T=  2900K P=2.081e+13
+    Color(1.0000f, 0.4870f, 0.1411f),    // T=  3000K P=2.784e+13
+    Color(1.0000f, 0.5067f, 0.1602f),    // T=  3100K P=3.657e+13
+    Color(1.0000f, 0.5259f, 0.1800f),    // T=  3200K P=4.725e+13
+    Color(1.0000f, 0.5447f, 0.2005f),    // T=  3300K P=6.012e+13
+    Color(1.0000f, 0.5630f, 0.2216f),    // T=  3400K P=7.545e+13
+    Color(1.0000f, 0.5809f, 0.2433f),    // T=  3500K P=9.349e+13
+    Color(1.0000f, 0.5983f, 0.2655f),    // T=  3600K P=1.145e+14
+    Color(1.0000f, 0.6153f, 0.2881f),    // T=  3700K P=1.387e+14
+    Color(1.0000f, 0.6318f, 0.3112f),    // T=  3800K P=1.665e+14
+    Color(1.0000f, 0.6480f, 0.3346f),    // T=  3900K P=1.979e+14
+    Color(1.0000f, 0.6636f, 0.3583f),    // T=  4000K P=2.333e+14
+    Color(1.0000f, 0.6789f, 0.3823f),    // T=  4100K P=2.729e+14
+    Color(1.0000f, 0.6938f, 0.4066f),    // T=  4200K P=3.169e+14
+    Color(1.0000f, 0.7083f, 0.4310f),    // T=  4300K P=3.654e+14
+    Color(1.0000f, 0.7223f, 0.4556f),    // T=  4400K P=4.188e+14
+    Color(1.0000f, 0.7360f, 0.4803f),    // T=  4500K P=4.771e+14
+    Color(1.0000f, 0.7494f, 0.5051f),    // T=  4600K P=5.406e+14
+    Color(1.0000f, 0.7623f, 0.5299f),    // T=  4700K P=6.093e+14
+    Color(1.0000f, 0.7750f, 0.5548f),    // T=  4800K P=6.835e+14
+    Color(1.0000f, 0.7872f, 0.5797f),    // T=  4900K P=7.632e+14
+    Color(1.0000f, 0.7992f, 0.6045f),    // T=  5000K P=8.485e+14
+    Color(1.0000f, 0.8108f, 0.6293f),    // T=  5100K P=9.396e+14
+    Color(1.0000f, 0.8221f, 0.6541f),    // T=  5200K P=1.036e+15
+    Color(1.0000f, 0.8330f, 0.6787f),    // T=  5300K P=1.139e+15
+    Color(1.0000f, 0.8437f, 0.7032f),    // T=  5400K P=1.248e+15
+    Color(1.0000f, 0.8541f, 0.7277f),    // T=  5500K P=1.363e+15
+    Color(1.0000f, 0.8642f, 0.7519f),    // T=  5600K P=1.484e+15
+    Color(1.0000f, 0.8740f, 0.7760f),    // T=  5700K P=1.611e+15
+    Color(1.0000f, 0.8836f, 0.8000f),    // T=  5800K P=1.744e+15
+    Color(1.0000f, 0.8929f, 0.8238f),    // T=  5900K P=1.883e+15
+    Color(1.0000f, 0.9019f, 0.8473f),    // T=  6000K P=2.028e+15
+    Color(1.0000f, 0.9107f, 0.8707f),    // T=  6100K P=2.179e+15
+    Color(1.0000f, 0.9193f, 0.8939f),    // T=  6200K P=2.337e+15
+    Color(1.0000f, 0.9276f, 0.9168f),    // T=  6300K P=2.500e+15
+    Color(1.0000f, 0.9357f, 0.9396f),    // T=  6400K P=2.669e+15
+    Color(1.0000f, 0.9436f, 0.9621f),    // T=  6500K P=2.845e+15
+    Color(1.0000f, 0.9513f, 0.9844f),    // T=  6600K P=3.026e+15
+    Color(0.9937f, 0.9526f, 1.0000f),    // T=  6700K P=3.214e+15
+    Color(0.9726f, 0.9395f, 1.0000f),    // T=  6800K P=3.407e+15
+    Color(0.9526f, 0.9270f, 1.0000f),    // T=  6900K P=3.606e+15
+    Color(0.9337f, 0.9150f, 1.0000f),    // T=  7000K P=3.811e+15
+    Color(0.9157f, 0.9035f, 1.0000f),    // T=  7100K P=4.022e+15
+    Color(0.8986f, 0.8925f, 1.0000f),    // T=  7200K P=4.238e+15
+    Color(0.8823f, 0.8819f, 1.0000f),    // T=  7300K P=4.460e+15
+    Color(0.8668f, 0.8718f, 1.0000f),    // T=  7400K P=4.688e+15
+    Color(0.8520f, 0.8621f, 1.0000f),    // T=  7500K P=4.920e+15
+    Color(0.8379f, 0.8527f, 1.0000f),    // T=  7600K P=5.159e+15
+    Color(0.8244f, 0.8437f, 1.0000f),    // T=  7700K P=5.402e+15
+    Color(0.8115f, 0.8351f, 1.0000f),    // T=  7800K P=5.651e+15
+    Color(0.7992f, 0.8268f, 1.0000f),    // T=  7900K P=5.906e+15
+    Color(0.7874f, 0.8187f, 1.0000f),    // T=  8000K P=6.165e+15
+    Color(0.7761f, 0.8110f, 1.0000f),    // T=  8100K P=6.429e+15
+    Color(0.7652f, 0.8035f, 1.0000f),    // T=  8200K P=6.698e+15
+    Color(0.7548f, 0.7963f, 1.0000f),    // T=  8300K P=6.973e+15
+    Color(0.7449f, 0.7894f, 1.0000f),    // T=  8400K P=7.252e+15
+    Color(0.7353f, 0.7827f, 1.0000f),    // T=  8500K P=7.535e+15
+    Color(0.7260f, 0.7762f, 1.0000f),    // T=  8600K P=7.824e+15
+    Color(0.7172f, 0.7699f, 1.0000f),    // T=  8700K P=8.117e+15
+    Color(0.7086f, 0.7638f, 1.0000f),    // T=  8800K P=8.415e+15
+    Color(0.7004f, 0.7579f, 1.0000f),    // T=  8900K P=8.717e+15
+    Color(0.6925f, 0.7522f, 1.0000f),    // T=  9000K P=9.023e+15
+    Color(0.6848f, 0.7467f, 1.0000f),    // T=  9100K P=9.334e+15
+    Color(0.6774f, 0.7414f, 1.0000f),    // T=  9200K P=9.649e+15
+    Color(0.6703f, 0.7362f, 1.0000f),    // T=  9300K P=9.969e+15
+    Color(0.6635f, 0.7311f, 1.0000f),    // T=  9400K P=1.029e+16
+    Color(0.6568f, 0.7263f, 1.0000f),    // T=  9500K P=1.062e+16
+    Color(0.6504f, 0.7215f, 1.0000f),    // T=  9600K P=1.095e+16
+    Color(0.6442f, 0.7169f, 1.0000f),    // T=  9700K P=1.129e+16
+    Color(0.6382f, 0.7124f, 1.0000f),    // T=  9800K P=1.163e+16
+    Color(0.6324f, 0.7081f, 1.0000f),    // T=  9900K P=1.197e+16
+    Color(0.6268f, 0.7039f, 1.0000f),    // T= 10000K P=1.231e+16
+    Color(0.6213f, 0.6998f, 1.0000f),    // T= 10100K P=1.267e+16
+    Color(0.6161f, 0.6958f, 1.0000f),    // T= 10200K P=1.302e+16
+    Color(0.6109f, 0.6919f, 1.0000f),    // T= 10300K P=1.338e+16
+    Color(0.6060f, 0.6881f, 1.0000f),    // T= 10400K P=1.374e+16
+    Color(0.6012f, 0.6844f, 1.0000f),    // T= 10500K P=1.410e+16
+    Color(0.5965f, 0.6808f, 1.0000f),    // T= 10600K P=1.447e+16
+    Color(0.5919f, 0.6773f, 1.0000f),    // T= 10700K P=1.484e+16
+    Color(0.5875f, 0.6739f, 1.0000f),    // T= 10800K P=1.521e+16
+    Color(0.5833f, 0.6706f, 1.0000f),    // T= 10900K P=1.559e+16
+    Color(0.5791f, 0.6674f, 1.0000f),    // T= 11000K P=1.597e+16
+    Color(0.5750f, 0.6642f, 1.0000f),    // T= 11100K P=1.636e+16
+    Color(0.5711f, 0.6611f, 1.0000f),    // T= 11200K P=1.674e+16
+    Color(0.5673f, 0.6581f, 1.0000f),    // T= 11300K P=1.713e+16
+    Color(0.5636f, 0.6552f, 1.0000f),    // T= 11400K P=1.752e+16
+    Color(0.5599f, 0.6523f, 1.0000f),    // T= 11500K P=1.792e+16
+    Color(0.5564f, 0.6495f, 1.0000f),    // T= 11600K P=1.832e+16
+    Color(0.5530f, 0.6468f, 1.0000f),    // T= 11700K P=1.872e+16
+    Color(0.5496f, 0.6441f, 1.0000f),    // T= 11800K P=1.912e+16
+    Color(0.5463f, 0.6415f, 1.0000f),    // T= 11900K P=1.953e+16
+    Color(0.5431f, 0.6389f, 1.0000f),    // T= 12000K P=1.994e+16
+    Color(0.5400f, 0.6364f, 1.0000f),    // T= 12100K P=2.035e+16
+    Color(0.5370f, 0.6340f, 1.0000f),    // T= 12200K P=2.076e+16
+    Color(0.5340f, 0.6316f, 1.0000f),    // T= 12300K P=2.118e+16
+    Color(0.5312f, 0.6293f, 1.0000f),    // T= 12400K P=2.160e+16
+    Color(0.5283f, 0.6270f, 1.0000f),    // T= 12500K P=2.202e+16
+    Color(0.5256f, 0.6247f, 1.0000f),    // T= 12600K P=2.244e+16
+    Color(0.5229f, 0.6225f, 1.0000f),    // T= 12700K P=2.287e+16
+    Color(0.5203f, 0.6204f, 1.0000f),    // T= 12800K P=2.330e+16
+    Color(0.5177f, 0.6183f, 1.0000f),    // T= 12900K P=2.373e+16
+    Color(0.5152f, 0.6162f, 1.0000f),    // T= 13000K P=2.416e+16
+    Color(0.5128f, 0.6142f, 1.0000f),    // T= 13100K P=2.459e+16
+    Color(0.5104f, 0.6122f, 1.0000f),    // T= 13200K P=2.503e+16
+    Color(0.5080f, 0.6103f, 1.0000f),    // T= 13300K P=2.547e+16
+    Color(0.5057f, 0.6084f, 1.0000f),    // T= 13400K P=2.591e+16
+    Color(0.5035f, 0.6065f, 1.0000f),    // T= 13500K P=2.635e+16
+    Color(0.5013f, 0.6047f, 1.0000f),    // T= 13600K P=2.680e+16
+    Color(0.4991f, 0.6029f, 1.0000f),    // T= 13700K P=2.724e+16
+    Color(0.4970f, 0.6012f, 1.0000f),    // T= 13800K P=2.769e+16
+    Color(0.4950f, 0.5994f, 1.0000f),    // T= 13900K P=2.814e+16
+    Color(0.4930f, 0.5978f, 1.0000f),    // T= 14000K P=2.860e+16
+    Color(0.4910f, 0.5961f, 1.0000f),    // T= 14100K P=2.905e+16
+    Color(0.4891f, 0.5945f, 1.0000f),    // T= 14200K P=2.951e+16
+    Color(0.4872f, 0.5929f, 1.0000f),    // T= 14300K P=2.997e+16
+    Color(0.4853f, 0.5913f, 1.0000f),    // T= 14400K P=3.043e+16
+    Color(0.4835f, 0.5898f, 1.0000f),    // T= 14500K P=3.089e+16
+    Color(0.4817f, 0.5882f, 1.0000f),    // T= 14600K P=3.135e+16
+    Color(0.4799f, 0.5868f, 1.0000f),    // T= 14700K P=3.182e+16
+    Color(0.4782f, 0.5853f, 1.0000f),    // T= 14800K P=3.228e+16
+    Color(0.4765f, 0.5839f, 1.0000f),    // T= 14900K P=3.275e+16
+    Color(0.4749f, 0.5824f, 1.0000f),    // T= 15000K P=3.322e+16
+    Color(0.4733f, 0.5811f, 1.0000f),    // T= 15100K P=3.369e+16
+    Color(0.4717f, 0.5797f, 1.0000f),    // T= 15200K P=3.416e+16
+    Color(0.4701f, 0.5784f, 1.0000f),    // T= 15300K P=3.464e+16
+    Color(0.4686f, 0.5770f, 1.0000f),    // T= 15400K P=3.511e+16
+    Color(0.4671f, 0.5757f, 1.0000f),    // T= 15500K P=3.559e+16
+    Color(0.4656f, 0.5745f, 1.0000f),    // T= 15600K P=3.607e+16
+    Color(0.4641f, 0.5732f, 1.0000f),    // T= 15700K P=3.655e+16
+    Color(0.4627f, 0.5720f, 1.0000f),    // T= 15800K P=3.703e+16
+    Color(0.4613f, 0.5708f, 1.0000f),    // T= 15900K P=3.751e+16
+    Color(0.4599f, 0.5696f, 1.0000f),    // T= 16000K P=3.800e+16
+    Color(0.4586f, 0.5684f, 1.0000f),    // T= 16100K P=3.848e+16
+    Color(0.4572f, 0.5673f, 1.0000f),    // T= 16200K P=3.897e+16
+    Color(0.4559f, 0.5661f, 1.0000f),    // T= 16300K P=3.946e+16
+    Color(0.4546f, 0.5650f, 1.0000f),    // T= 16400K P=3.995e+16
+    Color(0.4534f, 0.5639f, 1.0000f),    // T= 16500K P=4.044e+16
+    Color(0.4521f, 0.5628f, 1.0000f),    // T= 16600K P=4.093e+16
+    Color(0.4509f, 0.5617f, 1.0000f),    // T= 16700K P=4.143e+16
+    Color(0.4497f, 0.5607f, 1.0000f),    // T= 16800K P=4.192e+16
+    Color(0.4485f, 0.5597f, 1.0000f),    // T= 16900K P=4.241e+16
+    Color(0.4474f, 0.5586f, 1.0000f),    // T= 17000K P=4.291e+16
+    Color(0.4462f, 0.5576f, 1.0000f),    // T= 17100K P=4.341e+16
+    Color(0.4451f, 0.5566f, 1.0000f),    // T= 17200K P=4.391e+16
+    Color(0.4440f, 0.5557f, 1.0000f),    // T= 17300K P=4.441e+16
+    Color(0.4429f, 0.5547f, 1.0000f),    // T= 17400K P=4.491e+16
+    Color(0.4418f, 0.5538f, 1.0000f),    // T= 17500K P=4.541e+16
+    Color(0.4408f, 0.5528f, 1.0000f),    // T= 17600K P=4.592e+16
+    Color(0.4397f, 0.5519f, 1.0000f),    // T= 17700K P=4.642e+16
+    Color(0.4387f, 0.5510f, 1.0000f),    // T= 17800K P=4.693e+16
+    Color(0.4377f, 0.5501f, 1.0000f),    // T= 17900K P=4.743e+16
+    Color(0.4367f, 0.5492f, 1.0000f),    // T= 18000K P=4.794e+16
+    Color(0.4357f, 0.5483f, 1.0000f),    // T= 18100K P=4.845e+16
+    Color(0.4348f, 0.5475f, 1.0000f),    // T= 18200K P=4.896e+16
+    Color(0.4338f, 0.5466f, 1.0000f),    // T= 18300K P=4.947e+16
+    Color(0.4329f, 0.5458f, 1.0000f),    // T= 18400K P=4.998e+16
+    Color(0.4319f, 0.5450f, 1.0000f),    // T= 18500K P=5.049e+16
+    Color(0.4310f, 0.5442f, 1.0000f),    // T= 18600K P=5.100e+16
+    Color(0.4301f, 0.5434f, 1.0000f),    // T= 18700K P=5.152e+16
+    Color(0.4293f, 0.5426f, 1.0000f),    // T= 18800K P=5.203e+16
+    Color(0.4284f, 0.5418f, 1.0000f),    // T= 18900K P=5.255e+16
+    Color(0.4275f, 0.5410f, 1.0000f),    // T= 19000K P=5.307e+16
+    Color(0.4267f, 0.5403f, 1.0000f),    // T= 19100K P=5.358e+16
+    Color(0.4258f, 0.5395f, 1.0000f),    // T= 19200K P=5.410e+16
+    Color(0.4250f, 0.5388f, 1.0000f),    // T= 19300K P=5.462e+16
+    Color(0.4242f, 0.5381f, 1.0000f),    // T= 19400K P=5.514e+16
+    Color(0.4234f, 0.5373f, 1.0000f),    // T= 19500K P=5.566e+16
+    Color(0.4226f, 0.5366f, 1.0000f),    // T= 19600K P=5.618e+16
+    Color(0.4218f, 0.5359f, 1.0000f),    // T= 19700K P=5.671e+16
+    Color(0.4211f, 0.5352f, 1.0000f),    // T= 19800K P=5.723e+16
+    Color(0.4203f, 0.5345f, 1.0000f),    // T= 19900K P=5.775e+16
+    Color(0.4196f, 0.5339f, 1.0000f),    // T= 20000K P=5.828e+16
+    Color(0.4188f, 0.5332f, 1.0000f),    // T= 20100K P=5.880e+16
+    Color(0.4181f, 0.5325f, 1.0000f),    // T= 20200K P=5.933e+16
+    Color(0.4174f, 0.5319f, 1.0000f),    // T= 20300K P=5.986e+16
+    Color(0.4167f, 0.5312f, 1.0000f),    // T= 20400K P=6.038e+16
+    Color(0.4160f, 0.5306f, 1.0000f),    // T= 20500K P=6.091e+16
+    Color(0.4153f, 0.5300f, 1.0000f),    // T= 20600K P=6.144e+16
+    Color(0.4146f, 0.5293f, 1.0000f),    // T= 20700K P=6.197e+16
+    Color(0.4139f, 0.5287f, 1.0000f),    // T= 20800K P=6.250e+16
+    Color(0.4133f, 0.5281f, 1.0000f),    // T= 20900K P=6.303e+16
+    Color(0.4126f, 0.5275f, 1.0000f),    // T= 21000K P=6.357e+16
+    Color(0.4119f, 0.5269f, 1.0000f),    // T= 21100K P=6.410e+16
+    Color(0.4113f, 0.5264f, 1.0000f),    // T= 21200K P=6.463e+16
+    Color(0.4107f, 0.5258f, 1.0000f),    // T= 21300K P=6.517e+16
+    Color(0.4100f, 0.5252f, 1.0000f),    // T= 21400K P=6.570e+16
+    Color(0.4094f, 0.5246f, 1.0000f),    // T= 21500K P=6.623e+16
+    Color(0.4088f, 0.5241f, 1.0000f),    // T= 21600K P=6.677e+16
+    Color(0.4082f, 0.5235f, 1.0000f),    // T= 21700K P=6.731e+16
+    Color(0.4076f, 0.5230f, 1.0000f),    // T= 21800K P=6.784e+16
+    Color(0.4070f, 0.5224f, 1.0000f),    // T= 21900K P=6.838e+16
+    Color(0.4064f, 0.5219f, 1.0000f),    // T= 22000K P=6.892e+16
+    Color(0.4059f, 0.5214f, 1.0000f),    // T= 22100K P=6.946e+16
+    Color(0.4053f, 0.5209f, 1.0000f),    // T= 22200K P=7.000e+16
+    Color(0.4047f, 0.5203f, 1.0000f),    // T= 22300K P=7.054e+16
+    Color(0.4042f, 0.5198f, 1.0000f),    // T= 22400K P=7.108e+16
+    Color(0.4036f, 0.5193f, 1.0000f),    // T= 22500K P=7.162e+16
+    Color(0.4031f, 0.5188f, 1.0000f),    // T= 22600K P=7.216e+16
+    Color(0.4026f, 0.5183f, 1.0000f),    // T= 22700K P=7.270e+16
+    Color(0.4020f, 0.5178f, 1.0000f),    // T= 22800K P=7.325e+16
+    Color(0.4015f, 0.5174f, 1.0000f),    // T= 22900K P=7.379e+16
+    Color(0.4010f, 0.5169f, 1.0000f),    // T= 23000K P=7.433e+16
+    Color(0.4005f, 0.5164f, 1.0000f),    // T= 23100K P=7.488e+16
+    Color(0.4000f, 0.5159f, 1.0000f),    // T= 23200K P=7.542e+16
+    Color(0.3995f, 0.5155f, 1.0000f),    // T= 23300K P=7.597e+16
+    Color(0.3990f, 0.5150f, 1.0000f),    // T= 23400K P=7.651e+16
+    Color(0.3985f, 0.5146f, 1.0000f),    // T= 23500K P=7.706e+16
+    Color(0.3980f, 0.5141f, 1.0000f),    // T= 23600K P=7.760e+16
+    Color(0.3975f, 0.5137f, 1.0000f),    // T= 23700K P=7.815e+16
+    Color(0.3970f, 0.5132f, 1.0000f),    // T= 23800K P=7.870e+16
+    Color(0.3966f, 0.5128f, 1.0000f),    // T= 23900K P=7.925e+16
+    Color(0.3961f, 0.5123f, 1.0000f),    // T= 24000K P=7.980e+16
+    Color(0.3956f, 0.5119f, 1.0000f),    // T= 24100K P=8.035e+16
+    Color(0.3952f, 0.5115f, 1.0000f),    // T= 24200K P=8.089e+16
+    Color(0.3947f, 0.5111f, 1.0000f),    // T= 24300K P=8.144e+16
+    Color(0.3943f, 0.5107f, 1.0000f),    // T= 24400K P=8.199e+16
+    Color(0.3938f, 0.5103f, 1.0000f),    // T= 24500K P=8.255e+16
+    Color(0.3934f, 0.5098f, 1.0000f),    // T= 24600K P=8.310e+16
+    Color(0.3930f, 0.5094f, 1.0000f),    // T= 24700K P=8.365e+16
+    Color(0.3925f, 0.5090f, 1.0000f),    // T= 24800K P=8.420e+16
+    Color(0.3921f, 0.5086f, 1.0000f),    // T= 24900K P=8.475e+16
+    Color(0.3917f, 0.5083f, 1.0000f),    // T= 25000K P=8.531e+16
+    Color(0.3913f, 0.5079f, 1.0000f),    // T= 25100K P=8.586e+16
+    Color(0.3909f, 0.5075f, 1.0000f),    // T= 25200K P=8.641e+16
+    Color(0.3905f, 0.5071f, 1.0000f),    // T= 25300K P=8.697e+16
+    Color(0.3901f, 0.5067f, 1.0000f),    // T= 25400K P=8.752e+16
+    Color(0.3897f, 0.5064f, 1.0000f),    // T= 25500K P=8.808e+16
+    Color(0.3893f, 0.5060f, 1.0000f),    // T= 25600K P=8.863e+16
+    Color(0.3889f, 0.5056f, 1.0000f),    // T= 25700K P=8.919e+16
+    Color(0.3885f, 0.5053f, 1.0000f),    // T= 25800K P=8.974e+16
+    Color(0.3881f, 0.5049f, 1.0000f),    // T= 25900K P=9.030e+16
+    Color(0.3877f, 0.5045f, 1.0000f),    // T= 26000K P=9.086e+16
+    Color(0.3874f, 0.5042f, 1.0000f),    // T= 26100K P=9.141e+16
+    Color(0.3870f, 0.5038f, 1.0000f),    // T= 26200K P=9.197e+16
+    Color(0.3866f, 0.5035f, 1.0000f),    // T= 26300K P=9.253e+16
+    Color(0.3863f, 0.5032f, 1.0000f),    // T= 26400K P=9.309e+16
+    Color(0.3859f, 0.5028f, 1.0000f),    // T= 26500K P=9.365e+16
+    Color(0.3855f, 0.5025f, 1.0000f),    // T= 26600K P=9.421e+16
+    Color(0.3852f, 0.5021f, 1.0000f),    // T= 26700K P=9.476e+16
+    Color(0.3848f, 0.5018f, 1.0000f),    // T= 26800K P=9.532e+16
+    Color(0.3845f, 0.5015f, 1.0000f),    // T= 26900K P=9.588e+16
+    Color(0.3841f, 0.5012f, 1.0000f),    // T= 27000K P=9.644e+16
+    Color(0.3838f, 0.5008f, 1.0000f),    // T= 27100K P=9.701e+16
+    Color(0.3835f, 0.5005f, 1.0000f),    // T= 27200K P=9.757e+16
+    Color(0.3831f, 0.5002f, 1.0000f),    // T= 27300K P=9.813e+16
+    Color(0.3828f, 0.4999f, 1.0000f),    // T= 27400K P=9.869e+16
+    Color(0.3825f, 0.4996f, 1.0000f),    // T= 27500K P=9.925e+16
+    Color(0.3821f, 0.4993f, 1.0000f),    // T= 27600K P=9.981e+16
+    Color(0.3818f, 0.4990f, 1.0000f),    // T= 27700K P=1.004e+17
+    Color(0.3815f, 0.4987f, 1.0000f),    // T= 27800K P=1.009e+17
+    Color(0.3812f, 0.4984f, 1.0000f),    // T= 27900K P=1.015e+17
+    Color(0.3809f, 0.4981f, 1.0000f),    // T= 28000K P=1.021e+17
+    Color(0.3805f, 0.4978f, 1.0000f),    // T= 28100K P=1.026e+17
+    Color(0.3802f, 0.4975f, 1.0000f),    // T= 28200K P=1.032e+17
+    Color(0.3799f, 0.4972f, 1.0000f),    // T= 28300K P=1.038e+17
+    Color(0.3796f, 0.4969f, 1.0000f),    // T= 28400K P=1.043e+17
+    Color(0.3793f, 0.4966f, 1.0000f),    // T= 28500K P=1.049e+17
+    Color(0.3790f, 0.4963f, 1.0000f),    // T= 28600K P=1.055e+17
+    Color(0.3787f, 0.4960f, 1.0000f),    // T= 28700K P=1.060e+17
+    Color(0.3784f, 0.4958f, 1.0000f),    // T= 28800K P=1.066e+17
+    Color(0.3781f, 0.4955f, 1.0000f),    // T= 28900K P=1.072e+17
+    Color(0.3779f, 0.4952f, 1.0000f),    // T= 29000K P=1.077e+17
+    Color(0.3776f, 0.4949f, 1.0000f),    // T= 29100K P=1.083e+17
+    Color(0.3773f, 0.4947f, 1.0000f),    // T= 29200K P=1.089e+17
+    Color(0.3770f, 0.4944f, 1.0000f),    // T= 29300K P=1.094e+17
+    Color(0.3767f, 0.4941f, 1.0000f),    // T= 29400K P=1.100e+17
+    Color(0.3764f, 0.4939f, 1.0000f),    // T= 29500K P=1.106e+17
+    Color(0.3762f, 0.4936f, 1.0000f),    // T= 29600K P=1.111e+17
+    Color(0.3759f, 0.4934f, 1.0000f),    // T= 29700K P=1.117e+17
+    Color(0.3756f, 0.4931f, 1.0000f),    // T= 29800K P=1.123e+17
+    Color(0.3754f, 0.4928f, 1.0000f),    // T= 29900K P=1.128e+17
+    Color(0.3751f, 0.4926f, 1.0000f),    // T= 30000K P=1.134e+17
+    Color(0.3748f, 0.4923f, 1.0000f),    // T= 30100K P=1.140e+17
+    Color(0.3746f, 0.4921f, 1.0000f),    // T= 30200K P=1.145e+17
+    Color(0.3743f, 0.4918f, 1.0000f),    // T= 30300K P=1.151e+17
+    Color(0.3741f, 0.4916f, 1.0000f),    // T= 30400K P=1.157e+17
+    Color(0.3738f, 0.4914f, 1.0000f),    // T= 30500K P=1.162e+17
+    Color(0.3735f, 0.4911f, 1.0000f),    // T= 30600K P=1.168e+17
+    Color(0.3733f, 0.4909f, 1.0000f),    // T= 30700K P=1.174e+17
+    Color(0.3730f, 0.4906f, 1.0000f),    // T= 30800K P=1.180e+17
+    Color(0.3728f, 0.4904f, 1.0000f),    // T= 30900K P=1.185e+17
+    Color(0.3726f, 0.4902f, 1.0000f),    // T= 31000K P=1.191e+17
+    Color(0.3723f, 0.4899f, 1.0000f),    // T= 31100K P=1.197e+17
+    Color(0.3721f, 0.4897f, 1.0000f),    // T= 31200K P=1.202e+17
+    Color(0.3718f, 0.4895f, 1.0000f),    // T= 31300K P=1.208e+17
+    Color(0.3716f, 0.4893f, 1.0000f),    // T= 31400K P=1.214e+17
+    Color(0.3714f, 0.4890f, 1.0000f),    // T= 31500K P=1.220e+17
+    Color(0.3711f, 0.4888f, 1.0000f),    // T= 31600K P=1.225e+17
+    Color(0.3709f, 0.4886f, 1.0000f),    // T= 31700K P=1.231e+17
+    Color(0.3707f, 0.4884f, 1.0000f),    // T= 31800K P=1.237e+17
+    Color(0.3704f, 0.4881f, 1.0000f),    // T= 31900K P=1.242e+17
+    Color(0.3702f, 0.4879f, 1.0000f),    // T= 32000K P=1.248e+17
+    Color(0.3700f, 0.4877f, 1.0000f),    // T= 32100K P=1.254e+17
+    Color(0.3698f, 0.4875f, 1.0000f),    // T= 32200K P=1.260e+17
+    Color(0.3695f, 0.4873f, 1.0000f),    // T= 32300K P=1.265e+17
+    Color(0.3693f, 0.4871f, 1.0000f),    // T= 32400K P=1.271e+17
+    Color(0.3691f, 0.4869f, 1.0000f),    // T= 32500K P=1.277e+17
+    Color(0.3689f, 0.4867f, 1.0000f),    // T= 32600K P=1.283e+17
+    Color(0.3687f, 0.4864f, 1.0000f),    // T= 32700K P=1.288e+17
+    Color(0.3684f, 0.4862f, 1.0000f),    // T= 32800K P=1.294e+17
+    Color(0.3682f, 0.4860f, 1.0000f),    // T= 32900K P=1.300e+17
+    Color(0.3680f, 0.4858f, 1.0000f),    // T= 33000K P=1.306e+17
+    Color(0.3678f, 0.4856f, 1.0000f),    // T= 33100K P=1.311e+17
+    Color(0.3676f, 0.4854f, 1.0000f),    // T= 33200K P=1.317e+17
+    Color(0.3674f, 0.4852f, 1.0000f),    // T= 33300K P=1.323e+17
+    Color(0.3672f, 0.4850f, 1.0000f),    // T= 33400K P=1.329e+17
+    Color(0.3670f, 0.4848f, 1.0000f),    // T= 33500K P=1.334e+17
+    Color(0.3668f, 0.4847f, 1.0000f),    // T= 33600K P=1.340e+17
+    Color(0.3666f, 0.4845f, 1.0000f),    // T= 33700K P=1.346e+17
+    Color(0.3664f, 0.4843f, 1.0000f),    // T= 33800K P=1.352e+17
+    Color(0.3662f, 0.4841f, 1.0000f),    // T= 33900K P=1.358e+17
+    Color(0.3660f, 0.4839f, 1.0000f),    // T= 34000K P=1.363e+17
+    Color(0.3658f, 0.4837f, 1.0000f),    // T= 34100K P=1.369e+17
+    Color(0.3656f, 0.4835f, 1.0000f),    // T= 34200K P=1.375e+17
+    Color(0.3654f, 0.4833f, 1.0000f),    // T= 34300K P=1.381e+17
+    Color(0.3652f, 0.4831f, 1.0000f),    // T= 34400K P=1.386e+17
+    Color(0.3650f, 0.4830f, 1.0000f),    // T= 34500K P=1.392e+17
+    Color(0.3649f, 0.4828f, 1.0000f),    // T= 34600K P=1.398e+17
+    Color(0.3647f, 0.4826f, 1.0000f),    // T= 34700K P=1.404e+17
+    Color(0.3645f, 0.4824f, 1.0000f),    // T= 34800K P=1.410e+17
+    Color(0.3643f, 0.4822f, 1.0000f),    // T= 34900K P=1.415e+17
+    Color(0.3641f, 0.4821f, 1.0000f),    // T= 35000K P=1.421e+17
+    Color(0.3639f, 0.4819f, 1.0000f),    // T= 35100K P=1.427e+17
+    Color(0.3638f, 0.4817f, 1.0000f),    // T= 35200K P=1.433e+17
+    Color(0.3636f, 0.4815f, 1.0000f),    // T= 35300K P=1.439e+17
+    Color(0.3634f, 0.4814f, 1.0000f),    // T= 35400K P=1.444e+17
+    Color(0.3632f, 0.4812f, 1.0000f),    // T= 35500K P=1.450e+17
+    Color(0.3630f, 0.4810f, 1.0000f),    // T= 35600K P=1.456e+17
+    Color(0.3629f, 0.4809f, 1.0000f),    // T= 35700K P=1.462e+17
+    Color(0.3627f, 0.4807f, 1.0000f),    // T= 35800K P=1.468e+17
+    Color(0.3625f, 0.4805f, 1.0000f),    // T= 35900K P=1.473e+17
+    Color(0.3624f, 0.4804f, 1.0000f),    // T= 36000K P=1.479e+17
+    Color(0.3622f, 0.4802f, 1.0000f),    // T= 36100K P=1.485e+17
+    Color(0.3620f, 0.4800f, 1.0000f),    // T= 36200K P=1.491e+17
+    Color(0.3619f, 0.4799f, 1.0000f),    // T= 36300K P=1.497e+17
+    Color(0.3617f, 0.4797f, 1.0000f),    // T= 36400K P=1.502e+17
+    Color(0.3615f, 0.4796f, 1.0000f),    // T= 36500K P=1.508e+17
+    Color(0.3614f, 0.4794f, 1.0000f),    // T= 36600K P=1.514e+17
+    Color(0.3612f, 0.4792f, 1.0000f),    // T= 36700K P=1.520e+17
+    Color(0.3610f, 0.4791f, 1.0000f),    // T= 36800K P=1.526e+17
+    Color(0.3609f, 0.4789f, 1.0000f),    // T= 36900K P=1.531e+17
+    Color(0.3607f, 0.4788f, 1.0000f),    // T= 37000K P=1.537e+17
+    Color(0.3605f, 0.4786f, 1.0000f),    // T= 37100K P=1.543e+17
+    Color(0.3604f, 0.4785f, 1.0000f),    // T= 37200K P=1.549e+17
+    Color(0.3602f, 0.4783f, 1.0000f),    // T= 37300K P=1.555e+17
+    Color(0.3601f, 0.4782f, 1.0000f),    // T= 37400K P=1.561e+17
+    Color(0.3599f, 0.4780f, 1.0000f),    // T= 37500K P=1.566e+17
+    Color(0.3598f, 0.4779f, 1.0000f),    // T= 37600K P=1.572e+17
+    Color(0.3596f, 0.4777f, 1.0000f),    // T= 37700K P=1.578e+17
+    Color(0.3595f, 0.4776f, 1.0000f),    // T= 37800K P=1.584e+17
+    Color(0.3593f, 0.4774f, 1.0000f),    // T= 37900K P=1.590e+17
+    Color(0.3592f, 0.4773f, 1.0000f),    // T= 38000K P=1.595e+17
+    Color(0.3590f, 0.4771f, 1.0000f),    // T= 38100K P=1.601e+17
+    Color(0.3589f, 0.4770f, 1.0000f),    // T= 38200K P=1.607e+17
+    Color(0.3587f, 0.4768f, 1.0000f),    // T= 38300K P=1.613e+17
+    Color(0.3586f, 0.4767f, 1.0000f),    // T= 38400K P=1.619e+17
+    Color(0.3584f, 0.4766f, 1.0000f),    // T= 38500K P=1.625e+17
+    Color(0.3583f, 0.4764f, 1.0000f),    // T= 38600K P=1.630e+17
+    Color(0.3581f, 0.4763f, 1.0000f),    // T= 38700K P=1.636e+17
+    Color(0.3580f, 0.4761f, 1.0000f),    // T= 38800K P=1.642e+17
+    Color(0.3579f, 0.4760f, 1.0000f),    // T= 38900K P=1.648e+17
+    Color(0.3577f, 0.4759f, 1.0000f),    // T= 39000K P=1.654e+17
+    Color(0.3576f, 0.4757f, 1.0000f),    // T= 39100K P=1.660e+17
+    Color(0.3574f, 0.4756f, 1.0000f),    // T= 39200K P=1.666e+17
+    Color(0.3573f, 0.4755f, 1.0000f),    // T= 39300K P=1.671e+17
+    Color(0.3572f, 0.4753f, 1.0000f),    // T= 39400K P=1.677e+17
+    Color(0.3570f, 0.4752f, 1.0000f),    // T= 39500K P=1.683e+17
+    Color(0.3569f, 0.4751f, 1.0000f),    // T= 39600K P=1.689e+17
+    Color(0.3567f, 0.4749f, 1.0000f),    // T= 39700K P=1.695e+17
+    Color(0.3566f, 0.4748f, 1.0000f),    // T= 39800K P=1.701e+17
+    Color(0.3565f, 0.4747f, 1.0000f),    // T= 39900K P=1.707e+17
+    Color(0.3563f, 0.4745f, 1.0000f),    // T= 40000K P=1.712e+17
 };
 
 
diff --git a/src/celengine/stardb.cpp b/src/celengine/stardb.cpp
index 515696cb6..6f62a4546 100644
--- a/src/celengine/stardb.cpp
+++ b/src/celengine/stardb.cpp
@@ -238,7 +238,7 @@ uint32 StarDatabase::findCatalogNumberByName(const string& name) const
         if (catalogNumber != Star::InvalidCatalogNumber)
             return catalogNumber;
     }
-    
+
     if (parseCelestiaCatalogNumber(name, &catalogNumber))
     {
         return catalogNumber;
@@ -351,7 +351,7 @@ static void catalogNumberToString(uint32 catalogNumber, char* buf, unsigned int
         buf[0] = '\0';
     }
 
-	if (catalogNumber <= StarDatabase::MAX_HIPPARCOS_NUMBER)
+    if (catalogNumber <= StarDatabase::MAX_HIPPARCOS_NUMBER)
     {
         sprintf(buf, "HIP %d", catalogNumber);
     }
@@ -701,7 +701,7 @@ bool StarDatabase::loadBinary(istream& in)
         star.setDetails(details);
         star.setCatalogNumber(catNo);
         unsortedStars.add(star);
-        
+
         nStars++;
     }
 
@@ -710,7 +710,7 @@ bool StarDatabase::loadBinary(istream& in)
 
     DPRINTF(0, "StarDatabase::read: nStars = %d\n", nStarsInFile);
     clog << nStars << _(" stars in binary database\n");
-    
+
     // Create the temporary list of stars sorted by catalog number; this
     // will be used to lookup stars during file loading. After loading is
     // complete, the stars are sorted into an octree and this list gets
@@ -721,12 +721,12 @@ bool StarDatabase::loadBinary(istream& in)
         binFileCatalogNumberIndex = new Star*[binFileStarCount];
         for (unsigned int i = 0; i < binFileStarCount; i++)
         {
-            binFileCatalogNumberIndex[i] = &unsortedStars[i];    
+            binFileCatalogNumberIndex[i] = &unsortedStars[i];
         }
         sort(binFileCatalogNumberIndex, binFileCatalogNumberIndex + binFileStarCount,
              PtrCatalogNumberOrderingPredicate());
     }
-        
+
     return true;
 }
 
@@ -734,14 +734,14 @@ bool StarDatabase::loadBinary(istream& in)
 void StarDatabase::finish()
 {
     clog << _("Total star count: ") << nStars << endl;
-    
+
     buildOctree();
     buildIndexes();
 
     // Delete the temporary indices used only during loading
     delete[] binFileCatalogNumberIndex;
     stcFileCatalogNumberIndex.clear();
-    
+
     // Resolve all barycenters; this can't be done before star sorting. There's
     // still a bug here: final orbital radii aren't available until after
     // the barycenters have been resolved, and these are required when building
@@ -818,12 +818,12 @@ bool StarDatabase::createStar(Star* star,
             }
         }
     }
-    
+
     bool modifyExistingDetails = false;
     if (disposition == ModifyStar)
     {
         StarDetails* existingDetails = star->getDetails();
-        
+
         // If we're modifying an existing star and it already has a
         // customized details record, we'll just modify that.
         if (!existingDetails->shared())
@@ -842,7 +842,7 @@ bool StarDatabase::createStar(Star* star,
                     existingDetails->setRotationModel(details->getRotationModel());
                 existingDetails->setVisibility(details->getVisibility());
             }
-            
+
             details = existingDetails;
         }
         else if (details == NULL)
@@ -850,7 +850,7 @@ bool StarDatabase::createStar(Star* star,
             details = existingDetails;
         }
     }
-    
+
     string modelName;
     string textureName;
     bool hasTexture = starData->getString("Texture", textureName);
@@ -866,7 +866,7 @@ bool StarDatabase::createStar(Star* star,
 
     double radius;
     bool hasRadius = starData->getLength("Radius", radius);
-    
+
     double temperature = 0.0;
     bool hasTemperature = starData->getNumber("Temperature", temperature);
     // disallow unphysical temperature values
@@ -921,7 +921,7 @@ bool StarDatabase::createStar(Star* star,
             details->setRadius((float) radius);
             details->addKnowledge(StarDetails::KnowRadius);
         }
-        
+
         if (hasTemperature)
         {
             details->setTemperature((float) temperature);
@@ -991,7 +991,7 @@ bool StarDatabase::createStar(Star* star,
                     {
                         hasBarycenter = true;
                         barycenterPosition = barycenter->getPosition();
-                    }                    
+                    }
                 }
 
                 if (!hasBarycenter)
@@ -1022,7 +1022,7 @@ bool StarDatabase::createStar(Star* star,
         double ra = 0.0;
         double dec = 0.0;
         double distance = 0.0;
-        
+
         if (disposition == ModifyStar)
         {
             Vector3f pos = star->getPosition();
@@ -1039,7 +1039,7 @@ bool StarDatabase::createStar(Star* star,
                 dec = radToDeg(std::asin(v.z()));
             }
         }
-        
+
         bool modifyPosition = false;
         if (starData->getAngle("RA", ra, DEG_PER_HRA, 1.0))
         {
@@ -1180,7 +1180,7 @@ bool StarDatabase::load(istream& in, const string& resourcePath)
     while (tokenizer.nextToken() != Tokenizer::TokenEnd)
     {
         bool isStar = true;
-        
+
         // Parse the disposition--either Add, Replace, or Modify. The disposition
         // may be omitted. The default value is Add.
         StcDisposition disposition = AddStar;
@@ -1202,7 +1202,7 @@ bool StarDatabase::load(istream& in, const string& resourcePath)
                 tokenizer.nextToken();
             }
         }
-        
+
         // Parse the object type--either Star or Barycenter. The object type
         // may be omitted. The default is Star.
         if (tokenizer.getTokenType() == Tokenizer::TokenName)
@@ -1244,7 +1244,7 @@ bool StarDatabase::load(istream& in, const string& resourcePath)
                 firstName = objName.substr(0, next);
             }
         }
-        
+
         Star* star = NULL;
 
         switch (disposition)
@@ -1270,7 +1270,7 @@ bool StarDatabase::load(istream& in, const string& resourcePath)
                     catalogNumber = findCatalogNumberByName(firstName);
                 }
             }
-                
+
             if (catalogNumber == Star::InvalidCatalogNumber)
             {
                 catalogNumber = nextAutoCatalogNumber--;
@@ -1280,22 +1280,22 @@ bool StarDatabase::load(istream& in, const string& resourcePath)
                 star = findWhileLoading(catalogNumber);
             }
             break;
-                
+
         case ModifyStar:
             // If no catalog number was specified, try looking up the star by name
             if (catalogNumber == Star::InvalidCatalogNumber && !firstName.empty())
             {
                 catalogNumber = findCatalogNumberByName(firstName);
             }
-                
+
             if (catalogNumber != Star::InvalidCatalogNumber)
             {
                 star = findWhileLoading(catalogNumber);
             }
-                
+
             break;
         }
-        
+
         bool isNewStar = star == NULL;
 
         tokenizer.pushBack();
@@ -1306,7 +1306,7 @@ bool StarDatabase::load(istream& in, const string& resourcePath)
             clog << "Error reading star." << endl;
             return false;
         }
-        
+
         if (starDataValue->getType() != Value::HashType)
         {
             DPRINTF(0, "Bad star definition.\n");
@@ -1317,7 +1317,7 @@ bool StarDatabase::load(istream& in, const string& resourcePath)
 
         if (isNewStar)
             star = new Star();
-        
+
         bool ok = false;
         if (isNewStar && disposition == ModifyStar)
         {
@@ -1336,7 +1336,7 @@ bool StarDatabase::load(istream& in, const string& resourcePath)
                 unsortedStars.add(*star);
                 nStars++;
                 delete star;
-                
+
                 // Add the new star to the temporary (load time) index.
                 stcFileCatalogNumberIndex[catalogNumber] = &unsortedStars[unsortedStars.size() - 1];
             }
@@ -1394,7 +1394,7 @@ void StarDatabase::buildOctree()
     {
         root->insertObject(unsortedStars[i], STAR_OCTREE_ROOT_SIZE);
     }
-    
+
     DPRINTF(1, "Spatially sorting stars for improved locality of reference . . .\n");
     Star* sortedStars    = new Star[nStars];
     Star* firstStar      = sortedStars;
@@ -1459,23 +1459,23 @@ Star* StarDatabase::findWhileLoading(uint32 catalogNumber) const
     {
         Star refStar;
         refStar.setCatalogNumber(catalogNumber);
-        
+
         Star** star   = lower_bound(binFileCatalogNumberIndex,
                                     binFileCatalogNumberIndex + binFileStarCount,
                                     &refStar,
                                     PtrCatalogNumberOrderingPredicate());
-        
+
         if (star != binFileCatalogNumberIndex + binFileStarCount && (*star)->getCatalogNumber() == catalogNumber)
             return *star;
     }
-    
+
     // Next check for stars loaded from an stc file
     map<uint32, Star*>::const_iterator iter = stcFileCatalogNumberIndex.find(catalogNumber);
     if (iter != stcFileCatalogNumberIndex.end())
     {
         return iter->second;
     }
-    
+
     // Star not found
     return NULL;
 }
diff --git a/src/celengine/stardb.h b/src/celengine/stardb.h
index a31372bc1..fb5ffa3a8 100644
--- a/src/celengine/stardb.h
+++ b/src/celengine/stardb.h
@@ -42,17 +42,17 @@ public:
         m_elementCount(0)
     {
     }
-    
+
     ~BlockArray()
     {
         clear();
     }
-    
+
     unsigned int size() const
     {
         return m_elementCount;
     }
-    
+
     /*! Append an item to the BlockArray. */
     void add(T& element)
     {
@@ -62,13 +62,13 @@ public:
             T* newBlock = new T[m_blockSize];
             m_blocks.push_back(newBlock);
         }
-        
+
         unsigned int elementIndex = m_elementCount % m_blockSize;
         m_blocks.back()[elementIndex] = element;
-        
+
         ++m_elementCount;
     }
-    
+
     void clear()
     {
         for (typename std::vector<T*>::const_iterator iter = m_blocks.begin(); iter != m_blocks.end(); ++iter)
@@ -78,7 +78,7 @@ public:
         m_elementCount = 0;
         m_blocks.clear();
     }
-    
+
     T& operator[](int index)
     {
         unsigned int blockNumber = index / m_blockSize;
@@ -92,7 +92,7 @@ public:
         unsigned int elementNumber = index % m_blockSize;
         return m_blocks[blockNumber][elementNumber];
     }
-    
+
 private:
     unsigned int m_blockSize;
     unsigned int m_elementCount;
@@ -101,7 +101,7 @@ private:
 
 
 class StarDatabase
-{        
+{
  public:
     StarDatabase();
     ~StarDatabase();
@@ -133,7 +133,7 @@ class StarDatabase
 
     StarNameDatabase* getNameDatabase() const;
     void setNameDatabase(StarNameDatabase*);
-    
+
     bool load(std::istream&, const std::string& resourcePath);
     bool loadBinary(std::istream&);
 
@@ -151,10 +151,10 @@ class StarDatabase
         ReplaceStar,
         ModifyStar,
     };
-    
-	// Not exact, but any star with a catalog number greater than this is assumed to not be
-	// a HIPPARCOS stars.
-	static const uint32 MAX_HIPPARCOS_NUMBER = 999999;
+
+    // Not exact, but any star with a catalog number greater than this is assumed to not be
+    // a HIPPARCOS stars.
+    static const uint32 MAX_HIPPARCOS_NUMBER = 999999;
 
     struct CrossIndexEntry
     {
@@ -191,7 +191,7 @@ private:
     Star* findWhileLoading(uint32 catalogNumber) const;
 
     int nStars;
-        
+
     Star*             stars;
     StarNameDatabase* namesDB;
     Star**            catalogNumberIndex;
@@ -207,7 +207,7 @@ private:
     Star** binFileCatalogNumberIndex;
     unsigned int binFileStarCount;
     // Catalog number -> star mapping for stars loaded from stc files
-    std::map<uint32, Star*> stcFileCatalogNumberIndex;    
+    std::map<uint32, Star*> stcFileCatalogNumberIndex;
 
     struct BarycenterUsage
     {
diff --git a/src/celengine/starname.cpp b/src/celengine/starname.cpp
index 6e07ccc38..74a08e055 100644
--- a/src/celengine/starname.cpp
+++ b/src/celengine/starname.cpp
@@ -104,14 +104,14 @@ StarNameDatabase* StarNameDatabase::readNames(istream& in)
     {
         uint32 catalogNumber = Star::InvalidCatalogNumber;
 
-	in >> catalogNumber;
-	if (in.eof())
-	    break;
-	if (in.bad())
+        in >> catalogNumber;
+        if (in.eof())
+            break;
+        if (in.bad())
         {
-	    failed = true;
-	    break;
-	}
+            failed = true;
+            break;
+        }
 
         // in.get(); // skip a space (or colon);
 
@@ -126,7 +126,7 @@ StarNameDatabase* StarNameDatabase::readNames(istream& in)
         // Iterate through the string for names delimited
         // by ':', and insert them into the star database. Note that
         // db->add() will skip empty names.
-        string::size_type startPos = 0; 
+        string::size_type startPos = 0;
         while (startPos != string::npos)
         {
             ++startPos;
diff --git a/src/celengine/staroctree.cpp b/src/celengine/staroctree.cpp
index 94babe604..c998210f1 100644
--- a/src/celengine/staroctree.cpp
+++ b/src/celengine/staroctree.cpp
@@ -118,7 +118,7 @@ void StarOctree::processVisibleObjects(StarHandler&    processor,
         {
             float distance    = (obsPosition - obj.getPosition()).norm();
             float appMag      = astro::absToAppMag(obj.getAbsoluteMagnitude(), distance);
-            
+
             if (appMag < limitingFactor || (distance < MAX_STAR_ORBIT_RADIUS && obj.getOrbit()))
                 processor.process(obj, distance, appMag);
         }
diff --git a/src/celengine/stellarclass.cpp b/src/celengine/stellarclass.cpp
index 80f8193fd..4108948e9 100644
--- a/src/celengine/stellarclass.cpp
+++ b/src/celengine/stellarclass.cpp
@@ -86,39 +86,39 @@ char* StellarClass::str(char* buf, unsigned int buflen) const
     }
     else if (st == StellarClass::NormalStar)
     {
-	s0[0] = "OBAFGKMRSNWW?LTC"[(unsigned int) getSpectralClass()];
+        s0[0] = "OBAFGKMRSNWW?LTC"[(unsigned int) getSpectralClass()];
         s0[1] = '\0';
-	s1[0] = "0123456789"[getSubclass()];
+        s1[0] = "0123456789"[getSubclass()];
         s1[1] = '\0';
-	switch (getLuminosityClass())
+        switch (getLuminosityClass())
         {
-	case StellarClass::Lum_Ia0:
-	    s2 = " I-a0";
-	    break;
-	case StellarClass::Lum_Ia:
-	    s2 = " I-a";
-	    break;
-	case StellarClass::Lum_Ib:
-	    s2 = " I-b";
-	    break;
-	case StellarClass::Lum_II:
-	    s2 = " II";
-	    break;
-	case StellarClass::Lum_III:
-	    s2 = " III";
-	    break;
-	case StellarClass::Lum_IV:
-	    s2 = " IV";
-	    break;
-	case StellarClass::Lum_V:
-	    s2 = " V";
-	    break;
-	case StellarClass::Lum_VI:
-	    s2 = " VI";
-	    break;
+        case StellarClass::Lum_Ia0:
+            s2 = " I-a0";
+            break;
+        case StellarClass::Lum_Ia:
+            s2 = " I-a";
+            break;
+        case StellarClass::Lum_Ib:
+            s2 = " I-b";
+            break;
+        case StellarClass::Lum_II:
+            s2 = " II";
+            break;
+        case StellarClass::Lum_III:
+            s2 = " III";
+            break;
+        case StellarClass::Lum_IV:
+            s2 = " IV";
+            break;
+        case StellarClass::Lum_V:
+            s2 = " V";
+            break;
+        case StellarClass::Lum_VI:
+            s2 = " VI";
+            break;
 
         default: break;  // Do nothing, but prevent GCC4 warnings (Beware: potentially dangerous)
-	}
+        }
     }
     else
     {
@@ -149,9 +149,9 @@ uint16
 StellarClass::pack() const
 {
     return (((uint16) starType << 12) |
-	    (((uint16) specClass & 0xf) << 8) |
-	    ((uint16) subclass << 4) |
-	    ((uint16) lumClass));
+           (((uint16) specClass & 0xf) << 8) |
+           ((uint16) subclass << 4) |
+           ((uint16) lumClass));
 }
 
 
diff --git a/src/celengine/stellarclass.h b/src/celengine/stellarclass.h
index f151eab68..4a436f5a5 100644
--- a/src/celengine/stellarclass.h
+++ b/src/celengine/stellarclass.h
@@ -21,26 +21,26 @@ class StellarClass
 public:
     enum StarType
     {
-	NormalStar     = 0,
-	WhiteDwarf     = 1,
-	NeutronStar    = 2,
+        NormalStar     = 0,
+        WhiteDwarf     = 1,
+        NeutronStar    = 2,
         BlackHole      = 3,
     };
 
     enum SpectralClass
     {
-	Spectral_O     = 0,
-	Spectral_B     = 1,
-	Spectral_A     = 2,
-	Spectral_F     = 3,
-	Spectral_G     = 4,
-	Spectral_K     = 5,
-	Spectral_M     = 6,
-	Spectral_R     = 7, // superceded by class C
-	Spectral_S     = 8,
-	Spectral_N     = 9, // superceded by class C
-	Spectral_WC    = 10,
-	Spectral_WN    = 11,
+        Spectral_O     = 0,
+        Spectral_B     = 1,
+        Spectral_A     = 2,
+        Spectral_F     = 3,
+        Spectral_G     = 4,
+        Spectral_K     = 5,
+        Spectral_M     = 6,
+        Spectral_R     = 7, // superceded by class C
+        Spectral_S     = 8,
+        Spectral_N     = 9, // superceded by class C
+        Spectral_WC    = 10,
+        Spectral_WN    = 11,
         Spectral_Unknown = 12,
         Spectral_L     = 13,
         Spectral_T     = 14,
@@ -66,14 +66,14 @@ public:
 
     enum LuminosityClass
     {
-	Lum_Ia0     = 0,
-	Lum_Ia      = 1,
-	Lum_Ib      = 2,
-	Lum_II      = 3,
-	Lum_III     = 4,
-	Lum_IV      = 5,
-	Lum_V       = 6,
-	Lum_VI      = 7,
+        Lum_Ia0     = 0,
+        Lum_Ia      = 1,
+        Lum_Ib      = 2,
+        Lum_II      = 3,
+        Lum_III     = 4,
+        Lum_IV      = 5,
+        Lum_V       = 6,
+        Lum_VI      = 7,
         Lum_Unknown = 8,
         Lum_Count   = 9,
     };
@@ -85,9 +85,9 @@ public:
 
     inline StellarClass();
     inline StellarClass(StarType,
-			SpectralClass,
-			unsigned int,
-			LuminosityClass);
+                        SpectralClass,
+                        unsigned int,
+                        LuminosityClass);
 
     inline StarType getStarType() const;
     inline SpectralClass getSpectralClass() const;
@@ -122,9 +122,9 @@ std::ostream& operator<<(std::ostream& s, const StellarClass& sc);
 bool operator<(const StellarClass& sc0, const StellarClass& sc1);
 
 StellarClass::StellarClass(StarType t,
-			   SpectralClass sc,
-			   unsigned int ssub,
-			   LuminosityClass lum) :
+                           SpectralClass sc,
+                           unsigned int ssub,
+                           LuminosityClass lum) :
     starType(t),
     specClass(sc),
     lumClass(lum),
@@ -138,7 +138,7 @@ StellarClass::StellarClass() :
     lumClass(Lum_Unknown),
     subclass(Subclass_Unknown)
 {
-    
+
 }
 
 StellarClass::StarType StellarClass::getStarType() const
diff --git a/src/celengine/texture.cpp b/src/celengine/texture.cpp
index 3b65063fe..1e23b91af 100644
--- a/src/celengine/texture.cpp
+++ b/src/celengine/texture.cpp
@@ -460,7 +460,7 @@ ImageTexture::ImageTexture(Image& img,
     {
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, texCaps.preferredAnisotropy);
     }
-    
+
     if (mipMapMode == AutoMipMaps)
         glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP_SGIS, GL_TRUE);
 
diff --git a/src/celengine/texture.h b/src/celengine/texture.h
index 4de548e21..5e89c3aba 100644
--- a/src/celengine/texture.h
+++ b/src/celengine/texture.h
@@ -79,7 +79,7 @@ class Texture
      *  shader tricks to be used correctly.
      */
     unsigned int getFormatOptions() const;
-    
+
     //! Set the format options.
     void setFormatOptions(unsigned int opts);
 
diff --git a/src/celengine/timeline.cpp b/src/celengine/timeline.cpp
index e4b0f7cba..c6e732570 100644
--- a/src/celengine/timeline.cpp
+++ b/src/celengine/timeline.cpp
@@ -18,7 +18,7 @@
 using namespace std;
 
 
-/*! A Timeline is a list of TimelinePhases that covers a continuous 
+/*! A Timeline is a list of TimelinePhases that covers a continuous
  *  interval of time.
  */
 
@@ -57,7 +57,7 @@ Timeline::appendPhase(TimelinePhase* phase)
 
     return true;
 }
-                      
+
 
 const TimelinePhase*
 Timeline::findPhase(double t) const
diff --git a/src/celengine/trajmanager.cpp b/src/celengine/trajmanager.cpp
index cee7f8e82..487eebc9b 100644
--- a/src/celengine/trajmanager.cpp
+++ b/src/celengine/trajmanager.cpp
@@ -78,7 +78,7 @@ Orbit* TrajectoryInfo::load(const string& filename)
         }
     }
     else
-    {   
+    {
         switch (precision)
         {
         case TrajectoryPrecisionSingle:
diff --git a/src/celengine/univcoord.h b/src/celengine/univcoord.h
index 735868cd5..488c58f12 100644
--- a/src/celengine/univcoord.h
+++ b/src/celengine/univcoord.h
@@ -111,7 +111,7 @@ class UniversalCoord
 
     /** Get the offset in light years of this coordinate from a point (also with
       * units of light years.) The difference is calculated at high precision and
-      * the reduced to single precision. 
+      * the reduced to single precision.
       *
       * This method is only here to help in porting older code; it shouldn't be
       * necessary to use it in new code, where the use of the rather the rather
diff --git a/src/celengine/universe.cpp b/src/celengine/universe.cpp
index 2a6eb51a1..2fe4ecfef 100644
--- a/src/celengine/universe.cpp
+++ b/src/celengine/universe.cpp
@@ -496,21 +496,21 @@ Selection Universe::pickPlanet(SolarSystem& solarSystem,
         // Retain that body
         Body* closestBody = pickInfo.closestBody;
 
-	    // Check if there is a satellite in front of the primary body that is
-	    // sufficiently close to the pickRay
+        // Check if there is a satellite in front of the primary body that is
+        // sufficiently close to the pickRay
         traverseFrameTree(solarSystem.getFrameTree(), when, ApproxPlanetPickTraversal, (void*) &pickInfo);
 
         if (pickInfo.closestBody == closestBody)
-	        return  Selection(closestBody);
+            return  Selection(closestBody);
         // Nothing else around, select the body and return
 
         // Are we close enough to the satellite and is it in front of the body?
-    	if ((pickInfo.sinAngle2Closest <= sinTol2) &&
+        if ((pickInfo.sinAngle2Closest <= sinTol2) &&
             (pickInfo.closestDistance > pickInfo.closestApproxDistance))
             return Selection(pickInfo.closestBody);
             // Yes, select the satellite
-	    else
-	        return  Selection(closestBody);
+        else
+            return  Selection(closestBody);
            //  No, select the primary body
     }
 
diff --git a/src/celengine/vecgl.h b/src/celengine/vecgl.h
index b43623eba..9b0059830 100644
--- a/src/celengine/vecgl.h
+++ b/src/celengine/vecgl.h
@@ -114,13 +114,13 @@ inline void glLightColor(GLenum light, GLenum which, const Vec4f& color)
 
 inline void glLightColor(GLenum light, GLenum which, const Color& color)
 {
-	Eigen::Vector4f v(color.red(), color.green(), color.blue(), color.alpha());
+    Eigen::Vector4f v(color.red(), color.green(), color.blue(), color.alpha());
     glLightfv(light, which, v.data());
 }
 
 inline void glAmbientLightColor(const Color& color)
 {
-	Eigen::Vector4f v(color.red(), color.green(), color.blue(), color.alpha());
+    Eigen::Vector4f v(color.red(), color.green(), color.blue(), color.alpha());
     glLightModelfv(GL_LIGHT_MODEL_AMBIENT, v.data());
 }
 
@@ -155,14 +155,14 @@ inline void glTranslate(const Eigen::Vector3d& offset)
 inline void glRotate(const Eigen::Quaternionf& q)
 {
     Eigen::Matrix4f m = Eigen::Matrix4f::Identity();
-	m.topLeftCorner(3, 3) = q.toRotationMatrix();
+    m.topLeftCorner(3, 3) = q.toRotationMatrix();
     glMultMatrixf(m.data());
 }
 
 inline void glRotate(const Eigen::Quaterniond& q)
 {
     Eigen::Matrix4d m = Eigen::Matrix4d::Identity();
-	m.topLeftCorner(3, 3) = q.toRotationMatrix();
+    m.topLeftCorner(3, 3) = q.toRotationMatrix();
     glMultMatrixd(m.data());
 }
 
diff --git a/src/celengine/vertexprog.cpp b/src/celengine/vertexprog.cpp
index 81d054485..a8a7a5f14 100644
--- a/src/celengine/vertexprog.cpp
+++ b/src/celengine/vertexprog.cpp
@@ -191,7 +191,7 @@ static bool LoadARBVertexProgram(const string& filename, unsigned int& id)
         const char* errMsg = (const char*) glGetString(GL_PROGRAM_ERROR_STRING_ARB);
         if (errMsg == NULL)
             errMsg = "Unknown error";
-        
+
         cout << _("Error in vertex program ") << filename <<
             _(", line ") << findLineNumber(*source, errPos) << ": " << errMsg << '\n';
     }
@@ -390,7 +390,7 @@ void VertexProcessor::parameter(vp::Parameter param, const Color& c)
 
 // VertexProcessorNV implementation
 
-static unsigned int parameterMappings[] = 
+static unsigned int parameterMappings[] =
 {
     16, // LightDirection0
     15, // EyePosition
@@ -441,7 +441,7 @@ void VertexProcessorNV::use(unsigned int prog)
 void VertexProcessorNV::parameter(vp::Parameter param,
                                   float x, float y, float z, float w)
 {
-    glProgramParameter4fNV(GL_VERTEX_PROGRAM_NV, 
+    glProgramParameter4fNV(GL_VERTEX_PROGRAM_NV,
                                 parameterMappings[param], x, y, z, w);
 }
 
diff --git a/src/celengine/virtualtex.cpp b/src/celengine/virtualtex.cpp
index 8db1d312e..74f79866b 100644
--- a/src/celengine/virtualtex.cpp
+++ b/src/celengine/virtualtex.cpp
@@ -369,14 +369,14 @@ static VirtualTexture* CreateVirtualTexture(Hash* texParams,
 
     string tilePrefix = "tx_";
     texParams->getString("TilePrefix", tilePrefix);
-	
-    // if absolute directory notation for ImageDirectory used, 
-	// don't prepend the current add-on path.
-	string directory = imageDirectory + "/";
-	if (directory.substr(0,1) != "/" && directory.substr(1,1) !=":") 
+
+    // if absolute directory notation for ImageDirectory used,
+    // don't prepend the current add-on path.
+    string directory = imageDirectory + "/";
+    if (directory.substr(0,1) != "/" && directory.substr(1,1) !=":")
     {
-		directory = path + "/" + directory;
-	}					
+        directory = path + "/" + directory;
+    }
     return new VirtualTexture(directory,
                               (unsigned int) baseSplit,
                               (unsigned int) tileSize,
diff --git a/src/celengine/virtualtex.h b/src/celengine/virtualtex.h
index 2e0485a72..3b64b263e 100644
--- a/src/celengine/virtualtex.h
+++ b/src/celengine/virtualtex.h
@@ -51,7 +51,7 @@ class VirtualTexture : public Texture
             for (int i = 0; i < 4; i++)
                 children[i] = NULL;
         };
-                
+
         Tile* tile;
         TileQuadtreeNode* children[4];
     };
diff --git a/src/celengine/visibleregion.cpp b/src/celengine/visibleregion.cpp
index 2859b690f..850309c1e 100644
--- a/src/celengine/visibleregion.cpp
+++ b/src/celengine/visibleregion.cpp
@@ -30,7 +30,7 @@ using namespace Eigen;
  *  visible. The following are assumed:
  *     - target is a point
  *     - the body is an ellipsoid
- *  
+ *
  *  This reference mark is useful in a few situations. When the
  *  body is a planet or moon and target is the sun, the outline of
  *  the visible region is the terminator. If target is a satellite,
@@ -224,7 +224,7 @@ VisibleRegion::render(Renderer* /* renderer */,
     {
         double theta = (double) i / (double) (nSections) * 2.0 * PI;
         Vector3d w = cos(theta) * uAxis + sin(theta) * vAxis;
-        
+
         Vector3d toCenter = ellipsoidTangent(recipSemiAxes, w, e, e_, ee);
         toCenter *= maxSemiAxis * scale;
         glVertex3dv(toCenter.data());
diff --git a/src/celephem/customorbit.cpp b/src/celephem/customorbit.cpp
index 5c07c681d..19dffe276 100644
--- a/src/celephem/customorbit.cpp
+++ b/src/celephem/customorbit.cpp
@@ -43,85 +43,85 @@ static JPLEphemeris* jpleph = NULL;
 
 double gPlanetElements[8][9];
 double gElements[8][23] = {
-	{   /*     mercury... */
+    {   /*     mercury... */
 
-	    178.179078,	415.2057519,	3.011e-4,	0.0,
-	    75.899697,	1.5554889,	2.947e-4,	0.0,
-	    .20561421,	2.046e-5,	3e-8,		0.0,
-	    7.002881,	1.8608e-3,	-1.83e-5,	0.0,
-	    47.145944,	1.1852083,	1.739e-4,	0.0,
-	    .3870986,	6.74, 		-0.42
-	},
+        178.179078,    415.2057519,    3.011e-4,    0.0,
+        75.899697,    1.5554889,    2.947e-4,    0.0,
+        .20561421,    2.046e-5,    3e-8,        0.0,
+        7.002881,    1.8608e-3,    -1.83e-5,    0.0,
+        47.145944,    1.1852083,    1.739e-4,    0.0,
+        .3870986,    6.74,         -0.42
+    },
 
-	{   /*     venus... */
+    {   /*     venus... */
 
-	    342.767053,	162.5533664,	3.097e-4,	0.0,
-	    130.163833,	1.4080361,	-9.764e-4,	0.0,
-	    6.82069e-3,	-4.774e-5,	9.1e-8,		0.0,
-	    3.393631,	1.0058e-3,	-1e-6,		0.0,
-	    75.779647,	.89985,		4.1e-4,		0.0,
-	    .7233316,	16.92,		-4.4
-	},
+        342.767053,    162.5533664,    3.097e-4,    0.0,
+        130.163833,    1.4080361,    -9.764e-4,    0.0,
+        6.82069e-3,    -4.774e-5,    9.1e-8,        0.0,
+        3.393631,    1.0058e-3,    -1e-6,        0.0,
+        75.779647,    .89985,        4.1e-4,        0.0,
+        .7233316,    16.92,        -4.4
+    },
 
-	{   /*     mars... */
+    {   /*     mars... */
 
-	    293.737334,	53.17137642,	3.107e-4,	0.0,
-	    3.34218203e2, 1.8407584,	1.299e-4,	-1.19e-6,
-	    9.33129e-2,	9.2064e-5,	7.7e-8,		0.0,
-	    1.850333,	-6.75e-4,	1.26e-5,	0.0,
-	    48.786442,	.7709917,	-1.4e-6,	-5.33e-6,
-	    1.5236883,	9.36,		-1.52
-	},
+        293.737334,    53.17137642,    3.107e-4,    0.0,
+        3.34218203e2, 1.8407584,    1.299e-4,    -1.19e-6,
+        9.33129e-2,    9.2064e-5,    7.7e-8,        0.0,
+        1.850333,    -6.75e-4,    1.26e-5,    0.0,
+        48.786442,    .7709917,    -1.4e-6,    -5.33e-6,
+        1.5236883,    9.36,        -1.52
+    },
 
-	{   /*     jupiter... */
+    {   /*     jupiter... */
 
-	    238.049257,	8.434172183,	3.347e-4,	-1.65e-6,
-	    1.2720972e1, 1.6099617,	1.05627e-3,	-3.43e-6,
-	    4.833475e-2, 1.6418e-4,	-4.676e-7,	-1.7e-9,
-	    1.308736,	-5.6961e-3,	3.9e-6,		0.0,
-	    99.443414,	1.01053,	3.5222e-4,	-8.51e-6,
-	    5.202561,	196.74,		-9.4
-	},
+        238.049257,    8.434172183,    3.347e-4,    -1.65e-6,
+        1.2720972e1, 1.6099617,    1.05627e-3,    -3.43e-6,
+        4.833475e-2, 1.6418e-4,    -4.676e-7,    -1.7e-9,
+        1.308736,    -5.6961e-3,    3.9e-6,        0.0,
+        99.443414,    1.01053,    3.5222e-4,    -8.51e-6,
+        5.202561,    196.74,        -9.4
+    },
 
-	{   /*     saturn... */
+    {   /*     saturn... */
 
-	    266.564377,	3.398638567,	3.245e-4,	-5.8e-6,
-	    9.1098214e1, 1.9584158,	8.2636e-4,	4.61e-6,
-	    5.589232e-2, -3.455e-4,	-7.28e-7,	7.4e-10,
-	    2.492519,	-3.9189e-3,	-1.549e-5,	4e-8,
-	    112.790414,	.8731951,	-1.5218e-4,	-5.31e-6,
-	    9.554747,	165.6,		-8.88
-	},
+        266.564377,    3.398638567,    3.245e-4,    -5.8e-6,
+        9.1098214e1, 1.9584158,    8.2636e-4,    4.61e-6,
+        5.589232e-2, -3.455e-4,    -7.28e-7,    7.4e-10,
+        2.492519,    -3.9189e-3,    -1.549e-5,    4e-8,
+        112.790414,    .8731951,    -1.5218e-4,    -5.31e-6,
+        9.554747,    165.6,        -8.88
+    },
 
-	{   /*     uranus... */
+    {   /*     uranus... */
 
-	    244.19747,	1.194065406,	3.16e-4,	-6e-7,
-	    1.71548692e2, 1.4844328,	2.372e-4,	-6.1e-7,
-	    4.63444e-2,	-2.658e-5,	7.7e-8,		0.0,
-	    .772464,	6.253e-4,	3.95e-5,	0.0,
-	    73.477111,	.4986678,	1.3117e-3,	0.0,
-	    19.21814,	65.8,		-7.19
-	},
+        244.19747,    1.194065406,    3.16e-4,    -6e-7,
+        1.71548692e2, 1.4844328,    2.372e-4,    -6.1e-7,
+        4.63444e-2,    -2.658e-5,    7.7e-8,        0.0,
+        .772464,    6.253e-4,    3.95e-5,    0.0,
+        73.477111,    .4986678,    1.3117e-3,    0.0,
+        19.21814,    65.8,        -7.19
+    },
 
-	{   /*     neptune... */
+    {   /*     neptune... */
 
-	    84.457994,	.6107942056,	3.205e-4,	-6e-7,
-	    4.6727364e1, 1.4245744,	3.9082e-4,	-6.05e-7,
-	    8.99704e-3,	6.33e-6,	-2e-9,		0.0,
-	    1.779242,	-9.5436e-3,	-9.1e-6,	0.0,
-	    130.681389,	1.098935,	2.4987e-4,	-4.718e-6,
-	    30.10957,	62.2,		-6.87
-	},
+        84.457994,    .6107942056,    3.205e-4,    -6e-7,
+        4.6727364e1, 1.4245744,    3.9082e-4,    -6.05e-7,
+        8.99704e-3,    6.33e-6,    -2e-9,        0.0,
+        1.779242,    -9.5436e-3,    -9.1e-6,    0.0,
+        130.681389,    1.098935,    2.4987e-4,    -4.718e-6,
+        30.10957,    62.2,        -6.87
+    },
 
-	{   /*     pluto...(osculating 1984 jan 21) */
+    {   /*     pluto...(osculating 1984 jan 21) */
 
-	    95.3113544,	.3980332167,	0.0,		0.0,
-	    224.017,	0.0,		0.0,		0.0,
-	    .25515,	0.0,		0.0,		0.0,
-	    17.1329,	0.0,		0.0,		0.0,
-	    110.191,	0.0,		0.0,		0.0,
-	    39.8151,	8.2,		-1.0
-	}
+        95.3113544,    .3980332167,    0.0,        0.0,
+        224.017,    0.0,        0.0,        0.0,
+        .25515,    0.0,        0.0,        0.0,
+        17.1329,    0.0,        0.0,        0.0,
+        110.191,    0.0,        0.0,        0.0,
+        39.8151,    8.2,        -1.0
+    }
 };
 
 
@@ -151,11 +151,11 @@ static void Nutation(double t, double &deps, double& dpsi)
     // Parameter t represents the Julian centuries elapsed since 1900.
     // In other words, t = (jd - 2415020.0) / 36525.0
 
-    double ls, ld;	// sun's mean longitude, moon's mean longitude
-    double ms, md;	// sun's mean anomaly, moon's mean anomaly
-    double nm;	    // longitude of moon's ascending node
+    double ls, ld;    // sun's mean longitude, moon's mean longitude
+    double ms, md;    // sun's mean anomaly, moon's mean anomaly
+    double nm;        // longitude of moon's ascending node
     double t2;
-    double tls, tnm, tld;	// twice above
+    double tls, tnm, tld;    // twice above
     double a, b;
 
     t2 = t*t;
@@ -210,30 +210,30 @@ static void EclipticToEquatorial(double t, double fEclLat, double fEclLon,
     // Parameter t represents the Julian centuries elapsed since 1900.
     // In other words, t = (jd - 2415020.0) / 36525.0
 
-    double seps, ceps;	// sin and cos of mean obliquity
+    double seps, ceps;    // sin and cos of mean obliquity
     double sx, cx, sy, cy, ty;
     double eps;
     double deps, dpsi;
 
     t = (astro::J2000 - 2415020.0) / 36525.0;
     t = 0;
-    eps = Obliquity(t);		// mean obliquity for date
+    eps = Obliquity(t);        // mean obliquity for date
     Nutation(t, deps, dpsi);
     eps += deps;
     seps = sin(eps);
     ceps = cos(eps);
 
     sy = sin(fEclLat);
-    cy = cos(fEclLat);				// always non-negative
+    cy = cos(fEclLat);                // always non-negative
     if (fabs(cy)<1e-20)
-        cy = 1e-20;		// insure > 0
+        cy = 1e-20;        // insure > 0
     ty = sy/cy;
     cx = cos(fEclLon);
     sx = sin(fEclLon);
     dec = asin((sy*ceps)+(cy*seps*sx));
     RA = atan(((sx*ceps)-(ty*seps))/cx);
     if (cx<0)
-        RA += PI;		// account for atan quad ambiguity
+        RA += PI;        // account for atan quad ambiguity
     RA = pfmod(RA, TWOPI);
 }
 
@@ -272,9 +272,9 @@ double meanAnomalySun(double t)
 {
     double t2, a, b;
 
-	t2 = t*t;
-	a = 9.999736042e1*t;
-	b = 360*(a - (int)a);
+    t2 = t*t;
+    a = 9.999736042e1*t;
+    b = 360*(a - (int)a);
 
     return degToRad(3.5847583e2 - (1.5e-4 + 3.3e-6*t)*t2 + b);
 }
@@ -463,7 +463,7 @@ class VenusOrbit : public CachingOrbit
     dl = dr = dml = ds = dm = da = dhl = 0.0;
 
     //Calculate the Julian centuries elapsed since 1900
-	t = (jd - 2415020.0)/36525.0;
+    t = (jd - 2415020.0)/36525.0;
 
     mas = meanAnomalySun(t);
 
@@ -482,19 +482,19 @@ class VenusOrbit : public CachingOrbit
     dml = degToRad(7.7e-4*sin(4.1406+t*2.6227));
     dm = dml;
 
-	dl = 3.13e-3*cos(2*mas-2*map[1]-2.587)+
-	     1.98e-3*cos(3*mas-3*map[1]+4.4768e-2)+
-	     1.36e-3*cos(mas-map[1]-2.0788)+
-	     9.6e-4*cos(3*mas-2*map[1]-2.3721)+
-	     8.2e-4*cos(map[3]-map[1]-3.6318);
+    dl = 3.13e-3*cos(2*mas-2*map[1]-2.587)+
+         1.98e-3*cos(3*mas-3*map[1]+4.4768e-2)+
+         1.36e-3*cos(mas-map[1]-2.0788)+
+         9.6e-4*cos(3*mas-2*map[1]-2.3721)+
+         8.2e-4*cos(map[3]-map[1]-3.6318);
 
-	dr = 2.2501e-5*cos(2*mas-2*map[1]-1.01592)+
-	     1.9045e-5*cos(3*mas-3*map[1]+1.61577)+
-	     6.887e-6*cos(map[3]-map[1]-2.06106)+
-	     5.172e-6*cos(mas-map[1]-5.08065e-1)+
-	     3.62e-6*cos(5*mas-4*map[1]-1.81877)+
-	     3.283e-6*cos(4*mas-4*map[1]+1.10851)+
-	     3.074e-6*cos(2*map[3]-2*map[1]-9.62846e-1);
+    dr = 2.2501e-5*cos(2*mas-2*map[1]-1.01592)+
+         1.9045e-5*cos(3*mas-3*map[1]+1.61577)+
+         6.887e-6*cos(map[3]-map[1]-2.06106)+
+         5.172e-6*cos(mas-map[1]-5.08065e-1)+
+         3.62e-6*cos(5*mas-4*map[1]-1.81877)+
+         3.283e-6*cos(4*mas-4*map[1]+1.10851)+
+         3.074e-6*cos(2*map[3]-2*map[1]-9.62846e-1);
 
     computePlanetCoords(p, map[p], da, dhl, dl, dm, dml, dr, ds,
                         eclLong, eclLat, distance);
@@ -526,41 +526,41 @@ class EarthOrbit : public CachingOrbit
 
     Vector3d computePosition(double jd) const
     {
-   	double t, t2;
-	double ls, ms;    // mean longitude and mean anomaly
-	double s, nu, ea; // eccentricity, true anomaly, eccentric anomaly
-	double a, b, a1, b1, c1, d1, e1, h1, dl, dr;
+        double t, t2;
+        double ls, ms;    // mean longitude and mean anomaly
+        double s, nu, ea; // eccentricity, true anomaly, eccentric anomaly
+        double a, b, a1, b1, c1, d1, e1, h1, dl, dr;
         double eclLong, distance;
 
         // Calculate the Julian centuries elapsed since 1900
-	t = (jd - 2415020.0)/36525.0;
+        t = (jd - 2415020.0)/36525.0;
 
-	t2 = t*t;
-	a = 100.0021359*t;
-	b = 360.*(a-(int)a);
-	ls = 279.69668+.0003025*t2+b;
+        t2 = t*t;
+        a = 100.0021359*t;
+        b = 360.*(a-(int)a);
+        ls = 279.69668+.0003025*t2+b;
         ms = meanAnomalySun(t);
-	s = .016751-.0000418*t-1.26e-07*t2;
+        s = .016751-.0000418*t-1.26e-07*t2;
         astro::anomaly(degToRad(ms), s, nu, ea);
-	a = 62.55209472000015*t;
-	b = 360*(a-(int)a);
-	a1 = degToRad(153.23+b);
-	a = 125.1041894*t;
-	b = 360*(a-(int)a);
-	b1 = degToRad(216.57+b);
-	a = 91.56766028*t;
-	b = 360*(a-(int)a);
-	c1 = degToRad(312.69+b);
-	a = 1236.853095*t;
-	b = 360*(a-(int)a);
-	d1 = degToRad(350.74-.00144*t2+b);
-	e1 = degToRad(231.19+20.2*t);
-	a = 183.1353208*t;
-	b = 360*(a-(int)a);
-	h1 = degToRad(353.4+b);
-	dl = .00134*cos(a1)+.00154*cos(b1)+.002*cos(c1)+.00179*sin(d1)+
+        a = 62.55209472000015*t;
+        b = 360*(a-(int)a);
+        a1 = degToRad(153.23+b);
+        a = 125.1041894*t;
+        b = 360*(a-(int)a);
+        b1 = degToRad(216.57+b);
+        a = 91.56766028*t;
+        b = 360*(a-(int)a);
+        c1 = degToRad(312.69+b);
+        a = 1236.853095*t;
+        b = 360*(a-(int)a);
+        d1 = degToRad(350.74-.00144*t2+b);
+        e1 = degToRad(231.19+20.2*t);
+        a = 183.1353208*t;
+        b = 360*(a-(int)a);
+        h1 = degToRad(353.4+b);
+        dl = .00134*cos(a1)+.00154*cos(b1)+.002*cos(c1)+.00179*sin(d1)+
             .00178*sin(e1);
-	dr = 5.43e-06*sin(a1)+1.575e-05*sin(b1)+1.627e-05*sin(c1)+
+        dr = 5.43e-06*sin(a1)+1.575e-05*sin(b1)+1.627e-05*sin(c1)+
             3.076e-05*cos(d1)+9.27e-06*sin(h1);
 
         eclLong = nu+degToRad(ls-ms+dl) + PI;
@@ -594,124 +594,124 @@ class LunarOrbit : public CachingOrbit
 
     Vector3d computePosition(double jd) const
     {
-	double jd19, t, t2;
-	double ld, ms, md, de, f, n, hp;
-	double a, sa, sn, b, sb, c, sc, e, e2, l, g, w1, w2;
-	double m1, m2, m3, m4, m5, m6;
+        double jd19, t, t2;
+        double ld, ms, md, de, f, n, hp;
+        double a, sa, sn, b, sb, c, sc, e, e2, l, g, w1, w2;
+        double m1, m2, m3, m4, m5, m6;
         double eclLon, eclLat, horzPar, distance;
         double RA, dec;
 
         // Computation requires an abbreviated Julian day:
         // epoch January 0.5, 1900.
         jd19 = jd - 2415020.0;
-	t = jd19/36525;
-	t2 = t*t;
+        t = jd19/36525;
+        t2 = t*t;
 
-	m1 = jd19/27.32158213;
-	m1 = 360.0*(m1-(int)m1);
-	m2 = jd19/365.2596407;
-	m2 = 360.0*(m2-(int)m2);
-	m3 = jd19/27.55455094;
-	m3 = 360.0*(m3-(int)m3);
-	m4 = jd19/29.53058868;
-	m4 = 360.0*(m4-(int)m4);
-	m5 = jd19/27.21222039;
-	m5 = 360.0*(m5-(int)m5);
-	m6 = jd19/6798.363307;
-	m6 = 360.0*(m6-(int)m6);
+        m1 = jd19/27.32158213;
+        m1 = 360.0*(m1-(int)m1);
+        m2 = jd19/365.2596407;
+        m2 = 360.0*(m2-(int)m2);
+        m3 = jd19/27.55455094;
+        m3 = 360.0*(m3-(int)m3);
+        m4 = jd19/29.53058868;
+        m4 = 360.0*(m4-(int)m4);
+        m5 = jd19/27.21222039;
+        m5 = 360.0*(m5-(int)m5);
+        m6 = jd19/6798.363307;
+        m6 = 360.0*(m6-(int)m6);
 
-	ld = 270.434164+m1-(.001133-.0000019*t)*t2;
-	ms = 358.475833+m2-(.00015+.0000033*t)*t2;
-	md = 296.104608+m3+(.009192+.0000144*t)*t2;
-	de = 350.737486+m4-(.001436-.0000019*t)*t2;
-	f = 11.250889+m5-(.003211+.0000003*t)*t2;
-	n = 259.183275-m6+(.002078+.000022*t)*t2;
+        ld = 270.434164+m1-(.001133-.0000019*t)*t2;
+        ms = 358.475833+m2-(.00015+.0000033*t)*t2;
+        md = 296.104608+m3+(.009192+.0000144*t)*t2;
+        de = 350.737486+m4-(.001436-.0000019*t)*t2;
+        f = 11.250889+m5-(.003211+.0000003*t)*t2;
+        n = 259.183275-m6+(.002078+.000022*t)*t2;
 
-	a = degToRad(51.2+20.2*t);
-	sa = sin(a);
-	sn = sin(degToRad(n));
-	b = 346.56+(132.87-.0091731*t)*t;
-	sb = .003964*sin(degToRad(b));
-	c = degToRad(n+275.05-2.3*t);
-	sc = sin(c);
-	ld = ld+.000233*sa+sb+.001964*sn;
-	ms = ms-.001778*sa;
-	md = md+.000817*sa+sb+.002541*sn;
-	f = f+sb-.024691*sn-.004328*sc;
-	de = de+.002011*sa+sb+.001964*sn;
-	e = 1-(.002495+7.52e-06*t)*t;
-	e2 = e*e;
+        a = degToRad(51.2+20.2*t);
+        sa = sin(a);
+        sn = sin(degToRad(n));
+        b = 346.56+(132.87-.0091731*t)*t;
+        sb = .003964*sin(degToRad(b));
+        c = degToRad(n+275.05-2.3*t);
+        sc = sin(c);
+        ld = ld+.000233*sa+sb+.001964*sn;
+        ms = ms-.001778*sa;
+        md = md+.000817*sa+sb+.002541*sn;
+        f = f+sb-.024691*sn-.004328*sc;
+        de = de+.002011*sa+sb+.001964*sn;
+        e = 1-(.002495+7.52e-06*t)*t;
+        e2 = e*e;
 
-	ld = degToRad(ld);
-	ms = degToRad(ms);
-	n = degToRad(n);
-	de = degToRad(de);
-	f = degToRad(f);
-	md = degToRad(md);
+        ld = degToRad(ld);
+        ms = degToRad(ms);
+        n = degToRad(n);
+        de = degToRad(de);
+        f = degToRad(f);
+        md = degToRad(md);
 
-	l = 6.28875*sin(md)+1.27402*sin(2*de-md)+.658309*sin(2*de)+
-	    .213616*sin(2*md)-e*.185596*sin(ms)-.114336*sin(2*f)+
-	    .058793*sin(2*(de-md))+.057212*e*sin(2*de-ms-md)+
-	    .05332*sin(2*de+md)+.045874*e*sin(2*de-ms)+.041024*e*sin(md-ms);
-	l = l-.034718*sin(de)-e*.030465*sin(ms+md)+.015326*sin(2*(de-f))-
-	    .012528*sin(2*f+md)-.01098*sin(2*f-md)+.010674*sin(4*de-md)+
-	    .010034*sin(3*md)+.008548*sin(4*de-2*md)-e*.00791*sin(ms-md+2*de)-
-	    e*.006783*sin(2*de+ms);
-	l = l+.005162*sin(md-de)+e*.005*sin(ms+de)+.003862*sin(4*de)+
-	    e*.004049*sin(md-ms+2*de)+.003996*sin(2*(md+de))+
-	    .003665*sin(2*de-3*md)+e*.002695*sin(2*md-ms)+
-	    .002602*sin(md-2*(f+de))+e*.002396*sin(2*(de-md)-ms)-
-	    .002349*sin(md+de);
-	l = l+e2*.002249*sin(2*(de-ms))-e*.002125*sin(2*md+ms)-
-	    e2*.002079*sin(2*ms)+e2*.002059*sin(2*(de-ms)-md)-
-	    .001773*sin(md+2*(de-f))-.001595*sin(2*(f+de))+
-	    e*.00122*sin(4*de-ms-md)-.00111*sin(2*(md+f))+.000892*sin(md-3*de);
-	l = l-e*.000811*sin(ms+md+2*de)+e*.000761*sin(4*de-ms-2*md)+
+        l = 6.28875*sin(md)+1.27402*sin(2*de-md)+.658309*sin(2*de)+
+            .213616*sin(2*md)-e*.185596*sin(ms)-.114336*sin(2*f)+
+            .058793*sin(2*(de-md))+.057212*e*sin(2*de-ms-md)+
+            .05332*sin(2*de+md)+.045874*e*sin(2*de-ms)+.041024*e*sin(md-ms);
+        l = l-.034718*sin(de)-e*.030465*sin(ms+md)+.015326*sin(2*(de-f))-
+            .012528*sin(2*f+md)-.01098*sin(2*f-md)+.010674*sin(4*de-md)+
+            .010034*sin(3*md)+.008548*sin(4*de-2*md)-e*.00791*sin(ms-md+2*de)-
+            e*.006783*sin(2*de+ms);
+        l = l+.005162*sin(md-de)+e*.005*sin(ms+de)+.003862*sin(4*de)+
+            e*.004049*sin(md-ms+2*de)+.003996*sin(2*(md+de))+
+            .003665*sin(2*de-3*md)+e*.002695*sin(2*md-ms)+
+            .002602*sin(md-2*(f+de))+e*.002396*sin(2*(de-md)-ms)-
+            .002349*sin(md+de);
+        l = l+e2*.002249*sin(2*(de-ms))-e*.002125*sin(2*md+ms)-
+            e2*.002079*sin(2*ms)+e2*.002059*sin(2*(de-ms)-md)-
+            .001773*sin(md+2*(de-f))-.001595*sin(2*(f+de))+
+            e*.00122*sin(4*de-ms-md)-.00111*sin(2*(md+f))+.000892*sin(md-3*de);
+        l = l-e*.000811*sin(ms+md+2*de)+e*.000761*sin(4*de-ms-2*md)+
             e2*.000704*sin(md-2*(ms+de))+e*.000693*sin(ms-2*(md-de))+
             e*.000598*sin(2*(de-f)-ms)+.00055*sin(md+4*de)+.000538*sin(4*md)+
             e*.000521*sin(4*de-ms)+.000486*sin(2*md-de);
-	l = l+e2*.000717*sin(md-2*ms);
-        eclLon = ld+degToRad(l);
-        eclLon = pfmod(eclLon, TWOPI);
+        l = l+e2*.000717*sin(md-2*ms);
+            eclLon = ld+degToRad(l);
+            eclLon = pfmod(eclLon, TWOPI);
 
-	g = 5.12819*sin(f)+.280606*sin(md+f)+.277693*sin(md-f)+
-	    .173238*sin(2*de-f)+.055413*sin(2*de+f-md)+.046272*sin(2*de-f-md)+
-	    .032573*sin(2*de+f)+.017198*sin(2*md+f)+.009267*sin(2*de+md-f)+
-	    .008823*sin(2*md-f)+e*.008247*sin(2*de-ms-f);
-	g = g+.004323*sin(2*(de-md)-f)+.0042*sin(2*de+f+md)+
-	    e*.003372*sin(f-ms-2*de)+e*.002472*sin(2*de+f-ms-md)+
-	    e*.002222*sin(2*de+f-ms)+e*.002072*sin(2*de-f-ms-md)+
-	    e*.001877*sin(f-ms+md)+.001828*sin(4*de-f-md)-e*.001803*sin(f+ms)-
-	    .00175*sin(3*f);
-	g = g+e*.00157*sin(md-ms-f)-.001487*sin(f+de)-e*.001481*sin(f+ms+md)+
+        g = 5.12819*sin(f)+.280606*sin(md+f)+.277693*sin(md-f)+
+            .173238*sin(2*de-f)+.055413*sin(2*de+f-md)+.046272*sin(2*de-f-md)+
+            .032573*sin(2*de+f)+.017198*sin(2*md+f)+.009267*sin(2*de+md-f)+
+            .008823*sin(2*md-f)+e*.008247*sin(2*de-ms-f);
+        g = g+.004323*sin(2*(de-md)-f)+.0042*sin(2*de+f+md)+
+            e*.003372*sin(f-ms-2*de)+e*.002472*sin(2*de+f-ms-md)+
+            e*.002222*sin(2*de+f-ms)+e*.002072*sin(2*de-f-ms-md)+
+            e*.001877*sin(f-ms+md)+.001828*sin(4*de-f-md)-e*.001803*sin(f+ms)-
+            .00175*sin(3*f);
+        g = g+e*.00157*sin(md-ms-f)-.001487*sin(f+de)-e*.001481*sin(f+ms+md)+
             e*.001417*sin(f-ms-md)+e*.00135*sin(f-ms)+.00133*sin(f-de)+
             .001106*sin(f+3*md)+.00102*sin(4*de-f)+.000833*sin(f+4*de-md)+
             .000781*sin(md-3*f)+.00067*sin(f+4*de-2*md);
-	g = g+.000606*sin(2*de-3*f)+.000597*sin(2*(de+md)-f)+
-	    e*.000492*sin(2*de+md-ms-f)+.00045*sin(2*(md-de)-f)+
-	    .000439*sin(3*md-f)+.000423*sin(f+2*(de+md))+
-	    .000422*sin(2*de-f-3*md)-e*.000367*sin(ms+f+2*de-md)-
-	    e*.000353*sin(ms+f+2*de)+.000331*sin(f+4*de);
-	g = g+e*.000317*sin(2*de+f-ms+md)+e2*.000306*sin(2*(de-ms)-f)-
-	    .000283*sin(md+3*f);
-	w1 = .0004664*cos(n);
-	w2 = .0000754*cos(c);
-	eclLat = degToRad(g)*(1-w1-w2);
+        g = g+.000606*sin(2*de-3*f)+.000597*sin(2*(de+md)-f)+
+            e*.000492*sin(2*de+md-ms-f)+.00045*sin(2*(md-de)-f)+
+            .000439*sin(3*md-f)+.000423*sin(f+2*(de+md))+
+            .000422*sin(2*de-f-3*md)-e*.000367*sin(ms+f+2*de-md)-
+            e*.000353*sin(ms+f+2*de)+.000331*sin(f+4*de);
+        g = g+e*.000317*sin(2*de+f-ms+md)+e2*.000306*sin(2*(de-ms)-f)-
+            .000283*sin(md+3*f);
+        w1 = .0004664*cos(n);
+        w2 = .0000754*cos(c);
+        eclLat = degToRad(g)*(1-w1-w2);
 
-	hp = .950724+.051818*cos(md)+.009531*cos(2*de-md)+.007843*cos(2*de)+
-         .002824*cos(2*md)+.000857*cos(2*de+md)+e*.000533*cos(2*de-ms)+
-         e*.000401*cos(2*de-md-ms)+e*.00032*cos(md-ms)-.000271*cos(de)-
-         e*.000264*cos(ms+md)-.000198*cos(2*f-md);
-	hp = hp+.000173*cos(3*md)+.000167*cos(4*de-md)-e*.000111*cos(ms)+
-         .000103*cos(4*de-2*md)-.000084*cos(2*md-2*de)-
-         e*.000083*cos(2*de+ms)+.000079*cos(2*de+2*md)+.000072*cos(4*de)+
-         e*.000064*cos(2*de-ms+md)-e*.000063*cos(2*de+ms-md)+
-         e*.000041*cos(ms+de);
-	hp = hp+e*.000035*cos(2*md-ms)-.000033*cos(3*md-2*de)-
-         .00003*cos(md+de)-.000029*cos(2*(f-de))-e*.000029*cos(2*md+ms)+
-         e2*.000026*cos(2*(de-ms))-.000023*cos(2*(f-de)+md)+
-         e*.000019*cos(4*de-ms-md);
-	horzPar = degToRad(hp);
+        hp = .950724+.051818*cos(md)+.009531*cos(2*de-md)+.007843*cos(2*de)+
+             .002824*cos(2*md)+.000857*cos(2*de+md)+e*.000533*cos(2*de-ms)+
+             e*.000401*cos(2*de-md-ms)+e*.00032*cos(md-ms)-.000271*cos(de)-
+             e*.000264*cos(ms+md)-.000198*cos(2*f-md);
+        hp = hp+.000173*cos(3*md)+.000167*cos(4*de-md)-e*.000111*cos(ms)+
+             .000103*cos(4*de-2*md)-.000084*cos(2*md-2*de)-
+             e*.000083*cos(2*de+ms)+.000079*cos(2*de+2*md)+.000072*cos(4*de)+
+             e*.000064*cos(2*de-ms+md)-e*.000063*cos(2*de+ms-md)+
+             e*.000041*cos(ms+de);
+        hp = hp+e*.000035*cos(2*md-ms)-.000033*cos(3*md-2*de)-
+             .00003*cos(md+de)-.000029*cos(2*(f-de))-e*.000029*cos(2*md+ms)+
+             e2*.000026*cos(2*(de-ms))-.000023*cos(2*(f-de)+md)+
+             e*.000019*cos(4*de-ms-md);
+        horzPar = degToRad(hp);
 
         // At this point we have values of ecliptic longitude, latitude and
         // horizontal parallax (eclLong, eclLat, horzPar) in radians.
@@ -775,7 +775,7 @@ class MarsOrbit : public CachingOrbit
     dl = dr = dml = ds = dm = da = dhl = 0.0;
 
     //Calculate the Julian centuries elapsed since 1900
-	t = (jd - 2415020.0)/36525.0;
+    t = (jd - 2415020.0)/36525.0;
 
     mas = meanAnomalySun(t);
 
@@ -796,28 +796,28 @@ class MarsOrbit : public CachingOrbit
     dml = degToRad(-1*(1.133e-2*sin(a)+9.33e-3*cos(a)));
     dm = dml;
     dl = 7.05e-3*cos(map[3]-map[2]-8.5448e-1)+
-	     6.07e-3*cos(2*map[3]-map[2]-3.2873)+
-	     4.45e-3*cos(2*map[3]-2*map[2]-3.3492)+
-	     3.88e-3*cos(mas-2*map[2]+3.5771e-1)+
-	     2.38e-3*cos(mas-map[2]+6.1256e-1)+
-	     2.04e-3*cos(2*mas-3*map[2]+2.7688)+
-	     1.77e-3*cos(3*map[2]-map[2-1]-1.0053)+
-	     1.36e-3*cos(2*mas-4*map[2]+2.6894)+
-	     1.04e-3*cos(map[3]+3.0749e-1);
+         6.07e-3*cos(2*map[3]-map[2]-3.2873)+
+         4.45e-3*cos(2*map[3]-2*map[2]-3.3492)+
+         3.88e-3*cos(mas-2*map[2]+3.5771e-1)+
+         2.38e-3*cos(mas-map[2]+6.1256e-1)+
+         2.04e-3*cos(2*mas-3*map[2]+2.7688)+
+         1.77e-3*cos(3*map[2]-map[2-1]-1.0053)+
+         1.36e-3*cos(2*mas-4*map[2]+2.6894)+
+         1.04e-3*cos(map[3]+3.0749e-1);
 
     dr = 5.3227e-5*cos(map[3]-map[2]+7.17864e-1)+
-	     5.0989e-5*cos(2*map[3]-2*map[2]-1.77997)+
-	     3.8278e-5*cos(2*map[3]-map[2]-1.71617)+
-	     1.5996e-5*cos(mas-map[2]-9.69618e-1)+
-	     1.4764e-5*cos(2*mas-3*map[2]+1.19768)+
-	     8.966e-6*cos(map[3]-2*map[2]+7.61225e-1);
+         5.0989e-5*cos(2*map[3]-2*map[2]-1.77997)+
+         3.8278e-5*cos(2*map[3]-map[2]-1.71617)+
+         1.5996e-5*cos(mas-map[2]-9.69618e-1)+
+         1.4764e-5*cos(2*mas-3*map[2]+1.19768)+
+         8.966e-6*cos(map[3]-2*map[2]+7.61225e-1);
     dr += 7.914e-6*cos(3*map[3]-2*map[2]-2.43887)+
-	     7.004e-6*cos(2*map[3]-3*map[2]-1.79573)+
-	     6.62e-6*cos(mas-2*map[2]+1.97575)+
-	     4.93e-6*cos(3*map[3]-3*map[2]-1.33069)+
-	     4.693e-6*cos(3*mas-5*map[2]+3.32665)+
-	     4.571e-6*cos(2*mas-4*map[2]+4.27086)+
-	     4.409e-6*cos(3*map[3]-map[2]-2.02158);
+         7.004e-6*cos(2*map[3]-3*map[2]-1.79573)+
+         6.62e-6*cos(mas-2*map[2]+1.97575)+
+         4.93e-6*cos(3*map[3]-3*map[2]-1.33069)+
+         4.693e-6*cos(3*mas-5*map[2]+3.32665)+
+         4.571e-6*cos(2*mas-4*map[2]+4.27086)+
+         4.409e-6*cos(3*map[3]-map[2]-2.02158);
 
     computePlanetCoords(p, map[p], da, dhl, dl, dm, dml, dr, ds,
                         eclLong, eclLat, distance);
@@ -864,7 +864,7 @@ class JupiterOrbit : public CachingOrbit
     dl = dr = dml = ds = dm = da = dhl = 0.0;
 
     //Calculate the Julian centuries elapsed since 1900
-	t = (jd - 2415020.0)/36525.0;
+    t = (jd - 2415020.0)/36525.0;
 
     computePlanetElements(t, pList);
 
@@ -892,42 +892,42 @@ class JupiterOrbit : public CachingOrbit
     c4x7 = cos(4*x7);
     c5x7 = cos(5*x7);
     dml = (3.31364e-1-(1.0281e-2+4.692e-3*x1)*x1)*sx5+
-	      (3.228e-3-(6.4436e-2-2.075e-3*x1)*x1)*cx5-
-	      (3.083e-3+(2.75e-4-4.89e-4*x1)*x1)*s2x5+
-	      2.472e-3*sx6+1.3619e-2*sx7+1.8472e-2*s2x7+6.717e-3*s3x7+
-	      2.775e-3*s4x7+6.417e-3*s2x7*sx3+
-	      (7.275e-3-1.253e-3*x1)*sx7*sx3+
-	      2.439e-3*s3x7*sx3-(3.5681e-2+1.208e-3*x1)*sx7*cx3;
+          (3.228e-3-(6.4436e-2-2.075e-3*x1)*x1)*cx5-
+          (3.083e-3+(2.75e-4-4.89e-4*x1)*x1)*s2x5+
+          2.472e-3*sx6+1.3619e-2*sx7+1.8472e-2*s2x7+6.717e-3*s3x7+
+          2.775e-3*s4x7+6.417e-3*s2x7*sx3+
+          (7.275e-3-1.253e-3*x1)*sx7*sx3+
+          2.439e-3*s3x7*sx3-(3.5681e-2+1.208e-3*x1)*sx7*cx3;
     dml += -3.767e-3*c2x7*sx3-(3.3839e-2+1.125e-3*x1)*cx7*sx3-
-	      4.261e-3*s2x7*cx3+
-	      (1.161e-3*x1-6.333e-3)*cx7*cx3+
-	      2.178e-3*cx3-6.675e-3*c2x7*cx3-2.664e-3*c3x7*cx3-
-	      2.572e-3*sx7*s2x3-3.567e-3*s2x7*s2x3+2.094e-3*cx7*c2x3+
-	      3.342e-3*c2x7*c2x3;
+          4.261e-3*s2x7*cx3+
+          (1.161e-3*x1-6.333e-3)*cx7*cx3+
+          2.178e-3*cx3-6.675e-3*c2x7*cx3-2.664e-3*c3x7*cx3-
+          2.572e-3*sx7*s2x3-3.567e-3*s2x7*s2x3+2.094e-3*cx7*c2x3+
+          3.342e-3*c2x7*c2x3;
     dml = degToRad(dml);
     ds = (3606+(130-43*x1)*x1)*sx5+(1289-580*x1)*cx5-6764*sx7*sx3-
-	     1110*s2x7*sx3-224*s3x7*sx3-204*sx3+(1284+116*x1)*cx7*sx3+
-	     188*c2x7*sx3+(1460+130*x1)*sx7*cx3+224*s2x7*cx3-817*cx3+
-	     6074*cx3*cx7+992*c2x7*cx3+
-	     508*c3x7*cx3+230*c4x7*cx3+108*c5x7*cx3;
+         1110*s2x7*sx3-224*s3x7*sx3-204*sx3+(1284+116*x1)*cx7*sx3+
+         188*c2x7*sx3+(1460+130*x1)*sx7*cx3+224*s2x7*cx3-817*cx3+
+         6074*cx3*cx7+992*c2x7*cx3+
+         508*c3x7*cx3+230*c4x7*cx3+108*c5x7*cx3;
     ds += -(956+73*x1)*sx7*s2x3+448*s2x7*s2x3+137*s3x7*s2x3+
-	     (108*x1-997)*cx7*s2x3+480*c2x7*s2x3+148*c3x7*s2x3+
-	     (99*x1-956)*sx7*c2x3+490*s2x7*c2x3+
-	     158*s3x7*c2x3+179*c2x3+(1024+75*x1)*cx7*c2x3-
-	     437*c2x7*c2x3-132*c3x7*c2x3;
+         (108*x1-997)*cx7*s2x3+480*c2x7*s2x3+148*c3x7*s2x3+
+         (99*x1-956)*sx7*c2x3+490*s2x7*c2x3+
+         158*s3x7*c2x3+179*c2x3+(1024+75*x1)*cx7*c2x3-
+         437*c2x7*c2x3-132*c3x7*c2x3;
     ds *= 1e-7;
     dp = (7.192e-3-3.147e-3*x1)*sx5-4.344e-3*sx3+
-	     (x1*(1.97e-4*x1-6.75e-4)-2.0428e-2)*cx5+
-	     3.4036e-2*cx7*sx3+(7.269e-3+6.72e-4*x1)*sx7*sx3+
-	     5.614e-3*c2x7*sx3+2.964e-3*c3x7*sx3+3.7761e-2*sx7*cx3+
-	     6.158e-3*s2x7*cx3-
-	     6.603e-3*cx7*cx3-5.356e-3*sx7*s2x3+2.722e-3*s2x7*s2x3+
-	     4.483e-3*cx7*s2x3-2.642e-3*c2x7*s2x3+4.403e-3*sx7*c2x3-
-	     2.536e-3*s2x7*c2x3+5.547e-3*cx7*c2x3-2.689e-3*c2x7*c2x3;
+         (x1*(1.97e-4*x1-6.75e-4)-2.0428e-2)*cx5+
+         3.4036e-2*cx7*sx3+(7.269e-3+6.72e-4*x1)*sx7*sx3+
+         5.614e-3*c2x7*sx3+2.964e-3*c3x7*sx3+3.7761e-2*sx7*cx3+
+         6.158e-3*s2x7*cx3-
+         6.603e-3*cx7*cx3-5.356e-3*sx7*s2x3+2.722e-3*s2x7*s2x3+
+         4.483e-3*cx7*s2x3-2.642e-3*c2x7*s2x3+4.403e-3*sx7*c2x3-
+         2.536e-3*s2x7*c2x3+5.547e-3*cx7*c2x3-2.689e-3*c2x7*c2x3;
     dm = dml-(degToRad(dp)/s);
     da = 205*cx7-263*cx5+693*c2x7+312*c3x7+147*c4x7+299*sx7*sx3+
-	     181*c2x7*sx3+204*s2x7*cx3+111*s3x7*cx3-337*cx7*cx3-
-	     111*c2x7*cx3;
+         181*c2x7*sx3+204*s2x7*cx3+111*s3x7*cx3-337*cx7*cx3-
+         111*c2x7*cx3;
     da *= 1e-6;
 
     computePlanetCoords(p, map, da, dhl, dl, dm, dml, dr, ds,
@@ -976,7 +976,7 @@ class SaturnOrbit : public CachingOrbit
     dl = dr = dml = ds = dm = da = dhl = 0.0;
 
     //Calculate the Julian centuries elapsed since 1900
-	t = (jd - 2415020.0)/36525.0;
+    t = (jd - 2415020.0)/36525.0;
 
     computePlanetElements(t, pList);
 
@@ -1015,57 +1015,57 @@ class SaturnOrbit : public CachingOrbit
     s3x8 = sin(3*x8);
     c3x8 = cos(3*x8);
     dml = 7.581e-3*s2x5-7.986e-3*sx6-1.48811e-1*sx7-4.0786e-2*s2x7-
-	      (8.14181e-1-(1.815e-2-1.6714e-2*x1)*x1)*sx5-
-	      (1.0497e-2-(1.60906e-1-4.1e-3*x1)*x1)*cx5-1.5208e-2*s3x7-
-	      6.339e-3*s4x7-6.244e-3*sx3-1.65e-2*s2x7*sx3+
-	      (8.931e-3+2.728e-3*x1)*sx7*sx3-5.775e-3*s3x7*sx3+
-	      (8.1344e-2+3.206e-3*x1)*cx7*sx3+1.5019e-2*c2x7*sx3;
+          (8.14181e-1-(1.815e-2-1.6714e-2*x1)*x1)*sx5-
+          (1.0497e-2-(1.60906e-1-4.1e-3*x1)*x1)*cx5-1.5208e-2*s3x7-
+          6.339e-3*s4x7-6.244e-3*sx3-1.65e-2*s2x7*sx3+
+          (8.931e-3+2.728e-3*x1)*sx7*sx3-5.775e-3*s3x7*sx3+
+          (8.1344e-2+3.206e-3*x1)*cx7*sx3+1.5019e-2*c2x7*sx3;
     dml += (8.5581e-2+2.494e-3*x1)*sx7*cx3+1.4394e-2*c2x7*cx3+
-	      (2.5328e-2-3.117e-3*x1)*cx7*cx3+
-	      6.319e-3*c3x7*cx3+6.369e-3*sx7*s2x3+9.156e-3*s2x7*s2x3+
-	      7.525e-3*s3x8*s2x3-5.236e-3*cx7*c2x3-7.736e-3*c2x7*c2x3-
-	      7.528e-3*c3x8*c2x3;
+          (2.5328e-2-3.117e-3*x1)*cx7*cx3+
+          6.319e-3*c3x7*cx3+6.369e-3*sx7*s2x3+9.156e-3*s2x7*s2x3+
+          7.525e-3*s3x8*s2x3-5.236e-3*cx7*c2x3-7.736e-3*c2x7*c2x3-
+          7.528e-3*c3x8*c2x3;
     dml = degToRad(dml);
     ds = (-7927+(2548+91*x1)*x1)*sx5+(13381+(1226-253*x1)*x1)*cx5+
-	     (248-121*x1)*s2x5-(305+91*x1)*c2x5+412*s2x7+12415*sx3+
-	     (390-617*x1)*sx7*sx3+(165-204*x1)*s2x7*sx3+26599*cx7*sx3-
-	     4687*c2x7*sx3-1870*c3x7*sx3-821*c4x7*sx3-
-	     377*c5x7*sx3+497*c2x8*sx3+(163-611*x1)*cx3;
+         (248-121*x1)*s2x5-(305+91*x1)*c2x5+412*s2x7+12415*sx3+
+         (390-617*x1)*sx7*sx3+(165-204*x1)*s2x7*sx3+26599*cx7*sx3-
+         4687*c2x7*sx3-1870*c3x7*sx3-821*c4x7*sx3-
+         377*c5x7*sx3+497*c2x8*sx3+(163-611*x1)*cx3;
     ds += -12696*sx7*cx3-4200*s2x7*cx3-1503*s3x7*cx3-619*s4x7*cx3-
-	     268*s5x7*cx3-(282+1306*x1)*cx7*cx3+(-86+230*x1)*c2x7*cx3+
-	     461*s2x8*cx3-350*s2x3+(2211-286*x1)*sx7*s2x3-
-	     2208*s2x7*s2x3-568*s3x7*s2x3-346*s4x7*s2x3-
-	     (2780+222*x1)*cx7*s2x3+(2022+263*x1)*c2x7*s2x3+248*c3x7*s2x3+
-	     242*s3x8*s2x3+467*c3x8*s2x3-490*c2x3-(2842+279*x1)*sx7*c2x3;
+         268*s5x7*cx3-(282+1306*x1)*cx7*cx3+(-86+230*x1)*c2x7*cx3+
+         461*s2x8*cx3-350*s2x3+(2211-286*x1)*sx7*s2x3-
+         2208*s2x7*s2x3-568*s3x7*s2x3-346*s4x7*s2x3-
+         (2780+222*x1)*cx7*s2x3+(2022+263*x1)*c2x7*s2x3+248*c3x7*s2x3+
+         242*s3x8*s2x3+467*c3x8*s2x3-490*c2x3-(2842+279*x1)*sx7*c2x3;
     ds += (128+226*x1)*s2x7*c2x3+224*s3x7*c2x3+
-	     (-1594+282*x1)*cx7*c2x3+(2162-207*x1)*c2x7*c2x3+
-	     561*c3x7*c2x3+343*c4x7*c2x3+469*s3x8*c2x3-242*c3x8*c2x3-
-	     205*sx7*s3x3+262*s3x7*s3x3+208*cx7*c3x3-271*c3x7*c3x3-
-	     382*c3x7*s4x3-376*s3x7*c4x3;
+         (-1594+282*x1)*cx7*c2x3+(2162-207*x1)*c2x7*c2x3+
+         561*c3x7*c2x3+343*c4x7*c2x3+469*s3x8*c2x3-242*c3x8*c2x3-
+         205*sx7*s3x3+262*s3x7*s3x3+208*cx7*c3x3-271*c3x7*c3x3-
+         382*c3x7*s4x3-376*s3x7*c4x3;
     ds *= 1e-7;
     dp = (7.7108e-2+(7.186e-3-1.533e-3*x1)*x1)*sx5-7.075e-3*sx7+
-	     (4.5803e-2-(1.4766e-2+5.36e-4*x1)*x1)*cx5-7.2586e-2*cx3-
-	     7.5825e-2*sx7*sx3-2.4839e-2*s2x7*sx3-8.631e-3*s3x7*sx3-
-	     1.50383e-1*cx7*cx3+2.6897e-2*c2x7*cx3+1.0053e-2*c3x7*cx3-
-	     (1.3597e-2+1.719e-3*x1)*sx7*s2x3+1.1981e-2*s2x7*c2x3;
+         (4.5803e-2-(1.4766e-2+5.36e-4*x1)*x1)*cx5-7.2586e-2*cx3-
+         7.5825e-2*sx7*sx3-2.4839e-2*s2x7*sx3-8.631e-3*s3x7*sx3-
+         1.50383e-1*cx7*cx3+2.6897e-2*c2x7*cx3+1.0053e-2*c3x7*cx3-
+         (1.3597e-2+1.719e-3*x1)*sx7*s2x3+1.1981e-2*s2x7*c2x3;
     dp += -(7.742e-3-1.517e-3*x1)*cx7*s2x3+
-	     (1.3586e-2-1.375e-3*x1)*c2x7*c2x3-
-	     (1.3667e-2-1.239e-3*x1)*sx7*c2x3+
-	     (1.4861e-2+1.136e-3*x1)*cx7*c2x3-
-	     (1.3064e-2+1.628e-3*x1)*c2x7*c2x3;
+         (1.3586e-2-1.375e-3*x1)*c2x7*c2x3-
+         (1.3667e-2-1.239e-3*x1)*sx7*c2x3+
+         (1.4861e-2+1.136e-3*x1)*cx7*c2x3-
+         (1.3064e-2+1.628e-3*x1)*c2x7*c2x3;
     dm = dml-(degToRad(dp)/s);
     da = 572*sx5-1590*s2x7*cx3+2933*cx5-647*s3x7*cx3+33629*cx7-
-	     344*s4x7*cx3-3081*c2x7+2885*cx7*cx3-1423*c3x7+
-	     (2172+102*x1)*c2x7*cx3-671*c4x7+296*c3x7*cx3-320*c5x7-
-	     267*s2x7*s2x3+1098*sx3-778*cx7*s2x3-2812*sx7*sx3;
+         344*s4x7*cx3-3081*c2x7+2885*cx7*cx3-1423*c3x7+
+         (2172+102*x1)*c2x7*cx3-671*c4x7+296*c3x7*cx3-320*c5x7-
+         267*s2x7*s2x3+1098*sx3-778*cx7*s2x3-2812*sx7*sx3;
     da += 495*c2x7*s2x3+688*s2x7*sx3+250*c3x7*s2x3-393*s3x7*sx3-
-	     856*sx7*c2x3-228*s4x7*sx3+441*s2x7*c2x3+2138*cx7*sx3+
-	     296*c2x7*c2x3-999*c2x7*sx3+211*c3x7*c2x3-642*c3x7*sx3-
-	     427*sx7*s3x3-325*c4x7*sx3+398*s3x7*s3x3-890*cx3+
-	     344*cx7*c3x3+2206*sx7*cx3-427*c3x7*c3x3;
+         856*sx7*c2x3-228*s4x7*sx3+441*s2x7*c2x3+2138*cx7*sx3+
+         296*c2x7*c2x3-999*c2x7*sx3+211*c3x7*c2x3-642*c3x7*sx3-
+         427*sx7*s3x3-325*c4x7*sx3+398*s3x7*s3x3-890*cx3+
+         344*cx7*c3x3+2206*sx7*cx3-427*c3x7*c3x3;
     da *= 1e-6;
     dhl = 7.47e-4*cx7*sx3+1.069e-3*cx7*cx3+2.108e-3*s2x7*s2x3+
-	      1.261e-3*c2x7*s2x3+1.236e-3*s2x7*c2x3-2.075e-3*c2x7*c2x3;
+          1.261e-3*c2x7*s2x3+1.236e-3*s2x7*c2x3-2.075e-3*c2x7*c2x3;
     dhl = degToRad(dhl);
 
     computePlanetCoords(p, map, da, dhl, dl, dm, dml, dr, ds,
@@ -1113,7 +1113,7 @@ class UranusOrbit : public CachingOrbit
     dl = dr = dml = ds = dm = da = dhl = 0.0;
 
     //Calculate the Julian centuries elapsed since 1900
-	t = (jd - 2415020.0)/36525.0;
+    t = (jd - 2415020.0)/36525.0;
 
     computePlanetElements(t, pList);
 
@@ -1132,7 +1132,7 @@ class UranusOrbit : public CachingOrbit
     x11 = x4-x3;
     x12 = x8-x4;
     dml = (8.64319e-1-1.583e-3*x1)*sx9+(8.2222e-2-6.833e-3*x1)*cx9+
-	      3.6017e-2*s2x9-3.019e-3*c2x9+8.122e-3*sin(x6);
+          3.6017e-2*s2x9-3.019e-3*c2x9+8.122e-3*sin(x6);
     dml = degToRad(dml);
     dp = 1.20303e-1*sx9+6.197e-3*s2x9+(1.9472e-2-9.47e-4*x1)*cx9;
     dm = dml-(degToRad(dp)/s);
@@ -1140,11 +1140,11 @@ class UranusOrbit : public CachingOrbit
     ds *= 1e-7;
     da = -3.825e-3*cx9;
     dl = (1.0122e-2-9.88e-4*x1)*sin(x4+x11)+
-	     (-3.8581e-2+(2.031e-3-1.91e-3*x1)*x1)*cos(x4+x11)+
-	     (3.4964e-2-(1.038e-3-8.68e-4*x1)*x1)*cos(2*x4+x11)+
-	     5.594e-3*sin(x4+3*x12)-1.4808e-2*sin(x10)-
-	     5.794e-3*sin(x11)+2.347e-3*cos(x11)+9.872e-3*sin(x12)+
-	     8.803e-3*sin(2*x12)-4.308e-3*sin(3*x12);
+         (-3.8581e-2+(2.031e-3-1.91e-3*x1)*x1)*cos(x4+x11)+
+         (3.4964e-2-(1.038e-3-8.68e-4*x1)*x1)*cos(2*x4+x11)+
+         5.594e-3*sin(x4+3*x12)-1.4808e-2*sin(x10)-
+         5.794e-3*sin(x11)+2.347e-3*cos(x11)+9.872e-3*sin(x12)+
+         8.803e-3*sin(2*x12)-4.308e-3*sin(3*x12);
     sx11 = sin(x11);
     cx11 = cos(x11);
     sx4 = sin(x4);
@@ -1152,13 +1152,13 @@ class UranusOrbit : public CachingOrbit
     s2x4 = sin(2*x4);
     c2x4 = cos(2*x4);
     dhl = (4.58e-4*sx11-6.42e-4*cx11-5.17e-4*cos(4*x12))*sx4-
-	      (3.47e-4*sx11+8.53e-4*cx11+5.17e-4*sin(4*x11))*cx4+
-	      4.03e-4*(cos(2*x12)*s2x4+sin(2*x12)*c2x4);
+          (3.47e-4*sx11+8.53e-4*cx11+5.17e-4*sin(4*x11))*cx4+
+          4.03e-4*(cos(2*x12)*s2x4+sin(2*x12)*c2x4);
     dhl = degToRad(dhl);
 
     dr = -25948+4985*cos(x10)-1230*cx4+3354*cos(x11)+904*cos(2*x12)+
-	     894*(cos(x12)-cos(3*x12))+(5795*cx4-1165*sx4+1388*c2x4)*sx11+
-	     (1351*cx4+5702*sx4+1388*s2x4)*cos(x11);
+         894*(cos(x12)-cos(3*x12))+(5795*cx4-1165*sx4+1388*c2x4)*sx11+
+         (1351*cx4+5702*sx4+1388*s2x4)*cos(x11);
     dr *= 1e-6;
 
     computePlanetCoords(p, map, da, dhl, dl, dm, dml, dr, ds,
@@ -1206,7 +1206,7 @@ class NeptuneOrbit : public CachingOrbit
     dl = dr = dml = ds = dm = da = dhl = 0.0;
 
     //Calculate the Julian centuries elapsed since 1900
-	t = (jd - 2415020.0)/36525.0;
+    t = (jd - 2415020.0)/36525.0;
 
     computePlanetElements(t, pList);
 
@@ -1214,35 +1214,35 @@ class NeptuneOrbit : public CachingOrbit
 
     //Compute perturbations
     s = gPlanetElements[p][3];
-	auxJSun(t, &x1, &x2, &x3, &x4, &x5, &x6);
+    auxJSun(t, &x1, &x2, &x3, &x4, &x5, &x6);
     x8 = pfmod(1.46205+3.81337*t, TWOPI);
     x9 = 2*x8-x4;
-	sx9 = sin(x9);
-	cx9 = cos(x9);
+    sx9 = sin(x9);
+    cx9 = cos(x9);
     s2x9 = sin(2*x9);
-	c2x9 = cos(2*x9);
-	x10 = x8-x2;
-	x11 = x8-x3;
-	x12 = x8-x4;
-	dml = (1.089e-3*x1-5.89833e-1)*sx9+(4.658e-3*x1-5.6094e-2)*cx9-
-	      2.4286e-2*s2x9;
-	dml = degToRad(dml);
-	dp = 2.4039e-2*sx9-2.5303e-2*cx9+6.206e-3*s2x9-5.992e-3*c2x9;
-	dm = dml-(degToRad(dp)/s);
-	ds = 4389*sx9+1129*s2x9+4262*cx9+1089*c2x9;
-	ds *= 1e-7;
-	da = 8189*cx9-817*sx9+781*c2x9;
-	da *= 1e-6;
-	s2x12 = sin(2*x12);
-	c2x12 = cos(2*x12);
-	sx8 = sin(x8);
-	cx8 = cos(x8);
-	dl = -9.556e-3*sin(x10)-5.178e-3*sin(x11)+2.572e-3*s2x12-
-	     2.972e-3*c2x12*sx8-2.833e-3*s2x12*cx8;
-	dhl = 3.36e-4*c2x12*sx8+3.64e-4*s2x12*cx8;
-	dhl = degToRad(dhl);
-	dr = -40596+4992*cos(x10)+2744*cos(x11)+2044*cos(x12)+1051*c2x12;
-	dr *= 1e-6;
+    c2x9 = cos(2*x9);
+    x10 = x8-x2;
+    x11 = x8-x3;
+    x12 = x8-x4;
+    dml = (1.089e-3*x1-5.89833e-1)*sx9+(4.658e-3*x1-5.6094e-2)*cx9-
+          2.4286e-2*s2x9;
+    dml = degToRad(dml);
+    dp = 2.4039e-2*sx9-2.5303e-2*cx9+6.206e-3*s2x9-5.992e-3*c2x9;
+    dm = dml-(degToRad(dp)/s);
+    ds = 4389*sx9+1129*s2x9+4262*cx9+1089*c2x9;
+    ds *= 1e-7;
+    da = 8189*cx9-817*sx9+781*c2x9;
+    da *= 1e-6;
+    s2x12 = sin(2*x12);
+    c2x12 = cos(2*x12);
+    sx8 = sin(x8);
+    cx8 = cos(x8);
+    dl = -9.556e-3*sin(x10)-5.178e-3*sin(x11)+2.572e-3*s2x12-
+         2.972e-3*c2x12*sx8-2.833e-3*s2x12*cx8;
+    dhl = 3.36e-4*c2x12*sx8+3.64e-4*s2x12*cx8;
+    dhl = degToRad(dhl);
+    dr = -40596+4992*cos(x10)+2744*cos(x11)+2044*cos(x12)+1051*c2x12;
+    dr *= 1e-6;
 
     computePlanetCoords(p, map, da, dhl, dl, dm, dml, dr, ds,
                         eclLong, eclLat, distance);
@@ -2077,7 +2077,7 @@ class MimasOrbit : public CachingOrbit
 
     double getPeriod() const
     {
-	return 0.9424218;
+        return 0.9424218;
     };
 
     double getBoundingRadius() const
@@ -2118,7 +2118,7 @@ class EnceladusOrbit : public CachingOrbit
 
     double getPeriod() const
     {
-	return 1.370218;
+        return 1.370218;
     };
 
     double getBoundingRadius() const
@@ -2197,7 +2197,7 @@ class DioneOrbit : public CachingOrbit
 
     double getPeriod() const
     {
-	return 2.736915;
+        return 2.736915;
     };
 
     double getBoundingRadius() const
@@ -2726,7 +2726,7 @@ static UranianSatelliteOrbit* CreateUranianSatelliteOrbit(int n)
 
 /*! Orbit of Triton, from Seidelmann, _Explanatory Supplement to the
  *  Astronomical Almanac_ (1992), p.373-374. The position of Triton
- *  is calculated in Neptunocentric coordinates referred to the 
+ *  is calculated in Neptunocentric coordinates referred to the
  *  Earth equator/equinox of J2000.0.
  */
 class TritonOrbit : public CachingOrbit
@@ -2796,9 +2796,9 @@ class TritonOrbit : public CachingOrbit
  *  Translated to C++ by Chris Laurel from FORTRAN source available at:
  *    ftp://ftp.imcce.fr/pub/ephem/satel/htc20
  *
- *  Coordinates are Saturnocentric and referred to the ecliptic 
+ *  Coordinates are Saturnocentric and referred to the ecliptic
  *     and equinox of J2000.0.
- */    
+ */
 static const double HeleneTerms[24*5] =
 {
     0,0,0,0,1,
@@ -2827,8 +2827,8 @@ static const double HeleneTerms[24*5] =
     0,1,-1,0,1,
 };
 
-static const double HeleneAmps[24*6] = 
-{ 
+static const double HeleneAmps[24*6] =
+{
     -0.002396,-0.000399,0.000442,0.001278,-0.004939,0.002466,
      0.000557,-0.002152,0.001074,0.005500,0.000916,-0.001015,-0.000003,
      0.,0.,0.000003,-0.000011,0.000006,-0.000066,0.000265,-0.000133,
@@ -2943,8 +2943,8 @@ struct HTC20Angles
 
 
 static const HTC20Angles HeleneAngles =
-{ 
-    2.29427177, 
+{
+    2.29427177,
     -0.00802443,
     2.29714724,
     2.29571726,
@@ -3243,7 +3243,7 @@ Orbit* GetCustomOrbit(const string& name)
         return CreateJPLEphOrbit(JPLEph_Moon,    JPLEph_Earth,           27.321661,        5.0e5);
     if (name == "jpl-earth-emb") // Earth, barycentric
         return CreateJPLEphOrbit(JPLEph_Earth,   JPLEph_EarthMoonBary,   27.321,           1.0e5);
-                                 
+
     if (name == "jpl-sun-ssb")   // Position of Sun relative to SSB
         return CreateJPLEphOrbit(JPLEph_Sun,     JPLEph_SSB,             11.861773 * 365.25, 2000000);
 
diff --git a/src/celephem/customrotation.cpp b/src/celephem/customrotation.cpp
index 881956609..e9dabd1c2 100644
--- a/src/celephem/customrotation.cpp
+++ b/src/celephem/customrotation.cpp
@@ -48,12 +48,12 @@ public:
         period(_period), flipped(false)
     {
     }
-    
+
     virtual ~IAURotationModel() {}
-    
+
     bool isPeriodic() const { return true; }
     double getPeriod() const { return period; }
-    
+
     virtual Quaterniond computeSpin(double t) const
     {
         // Time argument of IAU rotation models is actually day since J2000.0 TT, but
@@ -64,26 +64,26 @@ public:
         else
             return YRotation(-degToRad(180.0 + meridian(t)));
     }
-    
+
     virtual Quaterniond computeEquatorOrientation(double t) const
     {
         double poleRA = 0.0;
         double poleDec = 0.0;
-        
+
         t = t - astro::J2000;
         pole(t, poleRA, poleDec);
         double node = poleRA + 90.0;
         double inclination = 90.0 - poleDec;
-        
+
         if (flipped)
             return XRotation(PI) * XRotation(degToRad(-inclination)) * YRotation(degToRad(-node));
         else
             return XRotation(degToRad(-inclination)) * YRotation(degToRad(-node));
     }
-    
+
     // Return the RA and declination (in degrees) of the rotation axis
     virtual void pole(double t, double& ra, double& dec) const = 0;
-    
+
     virtual double meridian(double t) const = 0;
 
 protected:
@@ -99,7 +99,7 @@ protected:
     {
         flipped = _flipped;
     }
-    
+
 private:
     double period;
     bool flipped;
@@ -115,11 +115,11 @@ public:
     EarthRotationModel()
     {
     }
-    
+
     ~EarthRotationModel()
     {
     }
-    
+
     Quaterniond computeSpin(double tjd) const
     {
         // TODO: Use a more accurate model for sidereal time
@@ -128,23 +128,23 @@ public:
 
         return YRotation(-theta);
     }
-    
+
     Quaterniond computeEquatorOrientation(double tjd) const
     {
         double T = (tjd - astro::J2000) / 36525.0;
-        
+
         // Clamp T to the valid time range of the precession theory.
         if (T < -P03LP_VALID_CENTURIES)
             T = -P03LP_VALID_CENTURIES;
         else if (T > P03LP_VALID_CENTURIES)
             T = P03LP_VALID_CENTURIES;
-        
+
         astro::PrecessionAngles prec = astro::PrecObliquity_P03LP(T);
         astro::EclipticPole pole = astro::EclipticPrecession_P03LP(T);
-        
+
         double obliquity = degToRad(prec.epsA / 3600);
         double precession = degToRad(prec.pA / 3600);
-        
+
         // Calculate the angles pi and Pi from the ecliptic pole coordinates
         // P and Q:
         //   P = sin(pi)*sin(Pi)
@@ -161,11 +161,11 @@ public:
         Quaterniond eclRotation = RPi.conjugate() * rpi * RPi;
 
         Quaterniond q = XRotation(obliquity) * ZRotation(-precession) * eclRotation.conjugate();
-        
+
         // convert to Celestia's coordinate system
         return XRotation(PI / 2.0) * q * XRotation(-PI / 2.0);
     }
-    
+
     double getPeriod() const
     {
         return 23.9344694 / 24.0;
@@ -188,7 +188,7 @@ public:
 class IAUPrecessingRotationModel : public IAURotationModel
 {
 public:
-    
+
     /*! rotationRate is in degrees per Julian day
      *  pole precession is in degrees per Julian century
      */
@@ -209,7 +209,7 @@ public:
         if (rotationRate < 0.0)
             setFlipped(true);
     }
-    
+
     void pole(double d, double& ra, double &dec) const
     {
         double T = d / 36525.0;
@@ -217,12 +217,12 @@ public:
         ra = poleRA + poleRARate * T;
         dec = poleDec + poleDecRate * T;
     }
-    
+
     double meridian(double d) const
     {
         return meridianAtEpoch + rotationRate * d;
     }
-    
+
 private:
     double poleRA;
     double poleRARate;
@@ -237,7 +237,7 @@ class IAUNeptuneRotationModel : public IAURotationModel
 {
 public:
     IAUNeptuneRotationModel() : IAURotationModel(360.0 / 536.3128492) {}
-    
+
     void pole(double d, double& ra, double &dec) const
     {
         double T = d / 36525.0;
@@ -245,13 +245,13 @@ public:
         ra = 299.36 + 0.70 * sin(N);
         dec = 43.46 - 0.51 * cos(N);
     }
-    
+
     double meridian(double d) const
     {
         double T = d / 36525.0;
         double N = degToRad(357.85 + 52.316 * T);
         return 253.18 + 536.3128492 * d - 0.48 * sin(N);
-    }    
+    }
 };
 
 
@@ -263,7 +263,7 @@ class IAULunarRotationModel : public IAURotationModel
 {
 public:
     IAULunarRotationModel() : IAURotationModel(360.0 / 13.17635815) {}
-    
+
     void calcArgs(double d, double E[14]) const
     {
         E[1]  = degToRad(125.045 -  0.0529921 * d);
@@ -280,7 +280,7 @@ public:
         E[12] = degToRad(239.961 +  0.1643573 * d);
         E[13] = degToRad( 25.053 + 12.9590088 * d);
     }
-    
+
     void pole(double d, double& ra, double& dec) const
     {
         double T = d / 36525.0;
@@ -288,7 +288,7 @@ public:
 
         double E[14];
         calcArgs(d, E);
-        
+
         ra = 269.9949
             + 0.0013*T
             - 3.8787 * sin(E[1])
@@ -298,7 +298,7 @@ public:
             + 0.0072 * sin(E[6])
             - 0.0052 * sin(E[10])
             + 0.0043 * sin(E[13]);
-            
+
         dec = 66.5392
             + 0.0130 * T
             + 1.5419 * cos(E[1])
@@ -309,10 +309,10 @@ public:
             + 0.0009 * cos(E[7])
             + 0.0008 * cos(E[10])
             - 0.0009 * cos(E[13]);
-            
-            
+
+
     }
-    
+
     double meridian(double d) const
     {
         double E[14];
@@ -342,7 +342,7 @@ public:
 };
 
 
-// Rotations of Martian, Jovian, and Uranian satellites from IAU/IAG Working group 
+// Rotations of Martian, Jovian, and Uranian satellites from IAU/IAG Working group
 // on Cartographic Coordinates and Rotational Elements (Corrected for known errata
 // as of 17 Feb 2006)
 // See: http://astrogeology.usgs.gov/Projects/WGCCRE/constants/iau2000_table2.html
@@ -351,7 +351,7 @@ class IAUPhobosRotationModel : public IAURotationModel
 {
 public:
     IAUPhobosRotationModel() : IAURotationModel(360.0 / 1128.8445850) {}
-    
+
     void pole(double t, double& ra, double& dec) const
     {
         double T = t / 36525.0;
@@ -360,7 +360,7 @@ public:
         ra  = 317.68 - 0.108 * T + 1.79 * sin(M1);
         dec =  52.90 - 0.061 * T - 1.08 * cos(M1);
     }
-    
+
     double meridian(double t) const
     {
         // Note: negative coefficient of T^2 term for meridian angle indicates faster
@@ -377,7 +377,7 @@ class IAUDeimosRotationModel : public IAURotationModel
 {
 public:
     IAUDeimosRotationModel() : IAURotationModel(360.0 / 285.1618970) {}
-    
+
     void pole(double t, double& ra, double& dec) const
     {
         double T = t / 36525.0;
@@ -386,7 +386,7 @@ public:
         ra  = 316.65 - 0.108 * T + 2.98 * sin(M3);
         dec =  53.52 - 0.061 * T - 1.78 * cos(M3);
     }
-    
+
     double meridian(double t) const
     {
         // Note: positive coefficient of T^2 term for meridian angle indicates slowing
@@ -399,12 +399,12 @@ public:
 
 
 /****** Satellites of Jupiter ******/
-        
+
 class IAUAmaltheaRotationModel : public IAURotationModel
 {
 public:
     IAUAmaltheaRotationModel() : IAURotationModel(360.0 / 722.6314560) {}
-    
+
     void pole(double t, double& ra, double& dec) const
     {
         double T = t / 36525.0;
@@ -413,7 +413,7 @@ public:
         ra = 268.05 - 0.009 * T - 0.84 * sin(J1) + 0.01 * sin(2.0 * J1);
         dec = 64.49 + 0.003 * T - 0.36 * cos(J1);
     }
-    
+
     double meridian(double t) const
     {
         double T = t / 36525.0;
@@ -427,22 +427,22 @@ class IAUThebeRotationModel : public IAURotationModel
 {
 public:
     IAUThebeRotationModel() : IAURotationModel(360.0 / 533.7004100) {}
-    
+
     void pole(double t, double& ra, double& dec) const
     {
         double T = t / 36525.0;
         double J2 = degToRad(24.62 + 45137.2 * T);
         clamp_centuries(T);
         ra = 268.05 - 0.009 * T - 2.11 * sin(J2) + 0.04 * sin(2.0 * J2);
-        dec = 64.49 + 0.003 * T - 0.91 * cos(J2) + 0.01 * cos(2.0 * J2);        
+        dec = 64.49 + 0.003 * T - 0.91 * cos(J2) + 0.01 * cos(2.0 * J2);
     }
-    
+
     double meridian(double t) const
     {
         double T = t / 36525.0;
         double J2 = degToRad(24.62 + 45137.2 * T);
         return 8.56 + 533.7004100 * t + 1.91 * sin(J2) - 0.04 * sin(2.0 * J2);
-    }    
+    }
 };
 
 
@@ -450,7 +450,7 @@ class IAUIoRotationModel : public IAURotationModel
 {
 public:
     IAUIoRotationModel() : IAURotationModel(360.0 / 203.4889538) {}
-    
+
     void pole(double t, double& ra, double& dec) const
     {
         double T = t / 36525.0;
@@ -458,16 +458,16 @@ public:
         double J4 = degToRad(355.80 + 1191.3 * T);
         clamp_centuries(T);
         ra = 268.05 - 0.009 * T + 0.094 * sin(J3) + 0.024 * sin(J4);
-        dec = 64.49 + 0.003 * T + 0.040 * cos(J3) + 0.011 * cos(J4);        
+        dec = 64.49 + 0.003 * T + 0.040 * cos(J3) + 0.011 * cos(J4);
     }
-    
+
     double meridian(double t) const
     {
         double T = t / 36525.0;
         double J3 = degToRad(283.90 + 4850.7 * T);
         double J4 = degToRad(355.80 + 1191.3 * T);
         return 200.39 + 203.4889538 * t - 0.085 * sin(J3) - 0.022 * sin(J4);
-    }    
+    }
 };
 
 
@@ -475,7 +475,7 @@ class IAUEuropaRotationModel : public IAURotationModel
 {
 public:
     IAUEuropaRotationModel() : IAURotationModel(360.0 / 101.3747235) {}
-    
+
     void pole(double t, double& ra, double& dec) const
     {
         double T = t / 36525.0;
@@ -485,9 +485,9 @@ public:
         double J7 = degToRad(352.35 + 2382.6 * T);
         clamp_centuries(T);
         ra = 268.05 - 0.009 * T + 1.086 * sin(J4) + 0.060 * sin(J5) + 0.015 * sin(J6) + 0.009 * sin(J7);
-        dec = 64.49 + 0.003 * T + 0.486 * cos(J4) + 0.026 * cos(J5) + 0.007 * cos(J6) + 0.002 * cos(J7);        
+        dec = 64.49 + 0.003 * T + 0.486 * cos(J4) + 0.026 * cos(J5) + 0.007 * cos(J6) + 0.002 * cos(J7);
     }
-    
+
     double meridian(double t) const
     {
         double T = t / 36525.0;
@@ -496,7 +496,7 @@ public:
         double J6 = degToRad(229.80 + 64.3 * T);
         double J7 = degToRad(352.35 + 2382.6 * T);
         return 36.022 + 101.3747235 * t - 0.980 * sin(J4) - 0.054 * sin(J5) - 0.014 * sin(J6) - 0.008 * sin(J7);
-    }    
+    }
 };
 
 
@@ -504,7 +504,7 @@ class IAUGanymedeRotationModel : public IAURotationModel
 {
 public:
     IAUGanymedeRotationModel() : IAURotationModel(360.0 / 50.3176081) {}
-    
+
     void pole(double t, double& ra, double& dec) const
     {
         double T = t / 36525.0;
@@ -513,9 +513,9 @@ public:
         double J6 = degToRad(229.80 + 64.3 * T);
         clamp_centuries(T);
         ra = 268.05 - 0.009 * T - 0.037 * sin(J4) + 0.431 * sin(J5) + 0.091 * sin(J6);
-        dec = 64.49 + 0.003 * T - 0.016 * cos(J4) + 0.186 * cos(J5) + 0.039 * cos(J6);        
+        dec = 64.49 + 0.003 * T - 0.016 * cos(J4) + 0.186 * cos(J5) + 0.039 * cos(J6);
     }
-    
+
     double meridian(double t) const
     {
         double T = t / 36525.0;
@@ -523,7 +523,7 @@ public:
         double J5 = degToRad(119.90 + 262.1 * T);
         double J6 = degToRad(229.80 + 64.3 * T);
         return 44.064 + 50.3176081 * t + 0.033 * sin(J4) - 0.389 * sin(J5) - 0.082 * sin(J6);
-    }    
+    }
 };
 
 
@@ -531,7 +531,7 @@ class IAUCallistoRotationModel : public IAURotationModel
 {
 public:
     IAUCallistoRotationModel() : IAURotationModel(360.0 / 21.5710715) {}
-    
+
     void pole(double t, double& ra, double& dec) const
     {
         double T = t / 36525.0;
@@ -540,9 +540,9 @@ public:
         double J8 = degToRad(113.35 + 6070.0 * T);
         clamp_centuries(T);
         ra = 268.05 - 0.009 * T - 0.068 * sin(J5) + 0.590 * sin(J6) + 0.010 * sin(J8);
-        dec = 64.49 + 0.003 * T - 0.029 * cos(J5) + 0.254 * cos(J6) - 0.004 * cos(J8);        
+        dec = 64.49 + 0.003 * T - 0.029 * cos(J5) + 0.254 * cos(J6) - 0.004 * cos(J8);
     }
-    
+
     double meridian(double t) const
     {
         double T = t / 36525.0;
@@ -550,7 +550,7 @@ public:
         double J6 = degToRad(229.80 + 64.3 * T);
         double J8 = degToRad(113.35 + 6070.0 * T);
         return 259.51 + 21.5710715 * t + 0.061 * sin(J5) - 0.533 * sin(J6) - 0.009 * sin(J8);
-    }    
+    }
 };
 
 
@@ -573,7 +573,7 @@ class IAUMimasRotationModel : public IAURotationModel
 {
 public:
     IAUMimasRotationModel() : IAURotationModel(360.0 / 381.9945550) {}
-    
+
     void pole(double t, double& ra, double& dec) const
     {
         double T = t / 36525.0;
@@ -582,13 +582,13 @@ public:
         ra = 40.66 - 0.036 * T + 13.56 * sin(S3);
         dec = 83.52 - 0.004 * T - 1.53 * cos(S3);
     }
-    
+
     double meridian(double t) const
     {
         double T = t / 36525.0;
         double S3 = degToRad(177.40 - 36505.5 * T);
         double S9 = degToRad(316.45 + 506.2 * T);
-        return 337.46 + 381.9945550 * t - 13.48 * sin(S3) - 44.85 * sin(S9);        
+        return 337.46 + 381.9945550 * t - 13.48 * sin(S3) - 44.85 * sin(S9);
     }
 };
 
@@ -597,7 +597,7 @@ class IAUEnceladusRotationModel : public IAURotationModel
 {
 public:
     IAUEnceladusRotationModel() : IAURotationModel(360.0 / 262.7318996) {}
-    
+
     void pole(double t, double& ra, double& dec) const
     {
         double T = t / 36525.0;
@@ -605,7 +605,7 @@ public:
         ra = 40.66 - 0.036 * T;
         dec = 83.52 - 0.004 * T;
     }
-    
+
     double meridian(double t) const
     {
         return 2.82 + 262.7318996 * t;
@@ -617,7 +617,7 @@ class IAUTethysRotationModel : public IAURotationModel
 {
 public:
     IAUTethysRotationModel() : IAURotationModel(360.0 / 190.6979085) {}
-    
+
     void pole(double t, double& ra, double& dec) const
     {
         double T = t / 36525.0;
@@ -626,13 +626,13 @@ public:
         ra = 40.66 - 0.036 * T - 9.66 * sin(S4);
         dec = 83.52 - 0.004 * T - 1.09 * cos(S4);
     }
-    
+
     double meridian(double t) const
     {
         double T = t / 36525.0;
         double S4 = degToRad(300.00 - 7225.9 * T);
         double S9 = degToRad(316.45 + 506.2 * T);
-        return 10.45 + 190.6979085 * t - 9.60 * sin(S4) + 2.23 * sin(S9);        
+        return 10.45 + 190.6979085 * t - 9.60 * sin(S4) + 2.23 * sin(S9);
     }
 };
 
@@ -641,7 +641,7 @@ class IAUTelestoRotationModel : public IAURotationModel
 {
 public:
     IAUTelestoRotationModel() : IAURotationModel(360.0 / 190.6979330) {}
-    
+
     void pole(double t, double& ra, double& dec) const
     {
         double T = t / 36525.0;
@@ -649,7 +649,7 @@ public:
         ra = 50.50 - 0.036 * T;
         dec = 84.06 - 0.004 * T;
     }
-    
+
     double meridian(double t) const
     {
         return 56.88 + 190.6979330 * t;
@@ -661,7 +661,7 @@ class IAUCalypsoRotationModel : public IAURotationModel
 {
 public:
     IAUCalypsoRotationModel() : IAURotationModel(360.0 / 190.6742373) {}
-    
+
     void pole(double t, double& ra, double& dec) const
     {
         double T = t / 36525.0;
@@ -670,7 +670,7 @@ public:
         ra = 40.58 - 0.036 * T - 13.943 * sin(S5) - 1.686 * sin(2.0 * S5);
         dec = 83.43 - 0.004 * T - 1.572 * cos(S5) + 0.095 * cos(2.0 * S5);
     }
-    
+
     double meridian(double t) const
     {
         double T = t / 36525.0;
@@ -684,7 +684,7 @@ class IAUDioneRotationModel : public IAURotationModel
 {
 public:
     IAUDioneRotationModel() : IAURotationModel(360.0 / 131.5349316) {}
-    
+
     void pole(double t, double& ra, double& dec) const
     {
         double T = t / 36525.0;
@@ -692,7 +692,7 @@ public:
         ra = 40.66 - 0.036 * T;
         dec = 83.52 - 0.004 * T;
     }
-    
+
     double meridian(double t) const
     {
         return 357.00 + 131.5349316 * t;
@@ -704,7 +704,7 @@ class IAUHeleneRotationModel : public IAURotationModel
 {
 public:
     IAUHeleneRotationModel() : IAURotationModel(360.0 / 131.6174056) {}
-    
+
     void pole(double t, double& ra, double& dec) const
     {
         double T = t / 36525.0;
@@ -713,7 +713,7 @@ public:
         ra = 40.58 - 0.036 * T + 1.662 * sin(S6) + 0.024 * sin(2.0 * S6);
         dec = 83.52 - 0.004 * T - 0.187 * cos(S6) + 0.095 * cos(2.0 * S6);
     }
-    
+
     double meridian(double t) const
     {
         double T = t / 36525.0;
@@ -727,7 +727,7 @@ class IAURheaRotationModel : public IAURotationModel
 {
 public:
     IAURheaRotationModel() : IAURotationModel(360.0 / 79.6900478) {}
-    
+
     void pole(double t, double& ra, double& dec) const
     {
         double T = t / 36525.0;
@@ -736,7 +736,7 @@ public:
         ra = 40.38 - 0.036 * T + 3.10 * sin(S7);
         dec = 83.55 - 0.004 * T - 0.35 * cos(S7);
     }
-    
+
     double meridian(double t) const
     {
         double T = t / 36525.0;
@@ -750,7 +750,7 @@ class IAUTitanRotationModel : public IAURotationModel
 {
 public:
     IAUTitanRotationModel() : IAURotationModel(360.0 / 22.5769768) {}
-    
+
     void pole(double t, double& ra, double& dec) const
     {
         double T = t / 36525.0;
@@ -759,7 +759,7 @@ public:
         ra = 36.41 - 0.036 * T + 2.66 * sin(S8);
         dec = 83.94 - 0.004 * T - 0.30 * cos(S8);
     }
-    
+
     double meridian(double t) const
     {
         double T = t / 36525.0;
@@ -773,7 +773,7 @@ class IAUIapetusRotationModel : public IAURotationModel
 {
 public:
     IAUIapetusRotationModel() : IAURotationModel(360.0 / 4.5379572) {}
-    
+
     void pole(double t, double& ra, double& dec) const
     {
         double T = t / 36525.0;
@@ -781,7 +781,7 @@ public:
         ra = 318.16 - 3.949 * T;
         dec = 75.03 - 1.142 * T;
     }
-    
+
     double meridian(double t) const
     {
         return 350.20 + 4.5379572 * t;
@@ -793,7 +793,7 @@ class IAUPhoebeRotationModel : public IAURotationModel
 {
 public:
     IAUPhoebeRotationModel() : IAURotationModel(360.0 / 22.5769768) {}
-    
+
     void pole(double t, double& ra, double& dec) const
     {
         double T = t / 36525.0;
@@ -801,7 +801,7 @@ public:
         ra = 355.16;
         dec = 68.70 - 1.143 * T;
     }
-    
+
     double meridian(double t) const
     {
         return 304.70 + 930.8338720 * t;
@@ -813,7 +813,7 @@ class IAUMirandaRotationModel : public IAURotationModel
 {
 public:
     IAUMirandaRotationModel() : IAURotationModel(360.0 / 254.6906892) { setFlipped(true); }
-    
+
     void pole(double t, double& ra, double& dec) const
     {
         double T = t / 36525.0;
@@ -821,7 +821,7 @@ public:
         ra =  257.43 + 4.41 * sin(U11) - 0.04 * sin(2.0 * U11);
         dec = -15.08 + 4.25 * cos(U11) - 0.02 * cos(2.0 * U11);
     }
-    
+
     double meridian(double t) const
     {
         double T = t / 36525.0;
@@ -838,7 +838,7 @@ class IAUArielRotationModel : public IAURotationModel
 {
 public:
     IAUArielRotationModel() : IAURotationModel(360.0 / 142.8356681) { setFlipped(true); }
-    
+
     void pole(double t, double& ra, double& dec) const
     {
         double T = t / 36525.0;
@@ -846,7 +846,7 @@ public:
         ra =  257.43 + 0.29 * sin(U13);
         dec = -15.10 + 0.28 * cos(U13);
     }
-    
+
     double meridian(double t) const
     {
         double T = t / 36525.0;
@@ -861,7 +861,7 @@ class IAUUmbrielRotationModel : public IAURotationModel
 {
 public:
     IAUUmbrielRotationModel() : IAURotationModel(360.0 / 86.8688923) { setFlipped(true); }
-    
+
     void pole(double t, double& ra, double& dec) const
     {
         double T = t / 36525.0;
@@ -869,7 +869,7 @@ public:
         ra =  257.43 + 0.21 * sin(U14);
         dec = -15.10 + 0.20 * cos(U14);
     }
-    
+
     double meridian(double t) const
     {
         double T = t / 36525.0;
@@ -884,7 +884,7 @@ class IAUTitaniaRotationModel : public IAURotationModel
 {
 public:
     IAUTitaniaRotationModel() : IAURotationModel(360.0 / 41.351431) { setFlipped(true); }
-    
+
     void pole(double t, double& ra, double& dec) const
     {
         double T = t / 36525.0;
@@ -892,7 +892,7 @@ public:
         ra =  257.43 + 0.29 * sin(U15);
         dec = -15.10 + 0.28 * cos(U15);
     }
-    
+
     double meridian(double t) const
     {
         double T = t / 36525.0;
@@ -906,7 +906,7 @@ class IAUOberonRotationModel : public IAURotationModel
 {
 public:
     IAUOberonRotationModel() : IAURotationModel(360.0 / 26.7394932) { setFlipped(true); }
-    
+
     void pole(double t, double& ra, double& dec) const
     {
         double T = t / 36525.0;
@@ -914,7 +914,7 @@ public:
         ra =  257.43 + 0.16 * sin(U16);
         dec = -15.10 + 0.16 * cos(U16);
     }
-    
+
     double meridian(double t) const
     {
         double T = t / 36525.0;
@@ -932,9 +932,9 @@ GetCustomRotationModel(const std::string& name)
     if (!CustomRotationModelsInitialized)
     {
         CustomRotationModelsInitialized = true;
-        
+
         CustomRotationModels["earth-p03lp"] = new EarthRotationModel();
-        
+
         // IAU rotation elements for the planets
         CustomRotationModels["iau-mercury"] = new IAUPrecessingRotationModel(281.01, -0.033,
                                                                              61.45, -0.005,
@@ -961,14 +961,14 @@ GetCustomRotationModel(const std::string& name)
         CustomRotationModels["iau-pluto"]   = new IAUPrecessingRotationModel(313.02, 0.0,
                                                                              9.09, 0.0,
                                                                              236.77, -56.3623195);
-       
+
         // IAU elements for satellite of Earth
         CustomRotationModels["iau-moon"] = new IAULunarRotationModel();
-        
+
         // IAU elements for satellites of Mars
         CustomRotationModels["iau-phobos"] = new IAUPhobosRotationModel();
         CustomRotationModels["iau-deimos"] = new IAUDeimosRotationModel();
-        
+
         // IAU elements for satellites of Jupiter
         CustomRotationModels["iau-metis"]    = new IAUPrecessingRotationModel(268.05, -0.009,
                                                                               64.49, 0.003,
@@ -982,7 +982,7 @@ GetCustomRotationModel(const std::string& name)
         CustomRotationModels["iau-europa"]   = new IAUEuropaRotationModel();
         CustomRotationModels["iau-ganymede"] = new IAUGanymedeRotationModel();
         CustomRotationModels["iau-callisto"] = new IAUCallistoRotationModel();
-        
+
         // IAU elements for satellites of Saturn
         CustomRotationModels["iau-pan"]        = new IAUPrecessingRotationModel(40.6, -0.036,
                                                                                 83.5, -0.004,
@@ -1007,7 +1007,7 @@ GetCustomRotationModel(const std::string& name)
         CustomRotationModels["iau-titan"]     = new IAUTitanRotationModel();
         CustomRotationModels["iau-iapetus"]   = new IAUIapetusRotationModel();
         CustomRotationModels["iau-phoebe"]    = new IAUPhoebeRotationModel();
-        
+
         CustomRotationModels["iau-miranda"]   = new IAUMirandaRotationModel();
         CustomRotationModels["iau-ariel"]     = new IAUArielRotationModel();
         CustomRotationModels["iau-umbriel"]   = new IAUUmbrielRotationModel();
diff --git a/src/celephem/jpleph.cpp b/src/celephem/jpleph.cpp
index b98c17714..f57a5946f 100644
--- a/src/celephem/jpleph.cpp
+++ b/src/celephem/jpleph.cpp
@@ -56,7 +56,7 @@ static double readDouble(istream& in)
 JPLEphRecord::~JPLEphRecord()
 {
     if (coeffs != NULL)
-	delete coeffs;
+    delete coeffs;
 }
 
 
@@ -115,7 +115,7 @@ Vector3d JPLEphemeris::getPlanetPosition(JPLEphemItem planet, double tjd) const
     if (tjd < startDate)
         tjd = startDate;
     else if (tjd > endDate)
-	tjd = endDate;
+    tjd = endDate;
 
     // recNo is always >= 0:
     unsigned int recNo = (unsigned int) ((tjd - startDate) / daysPerInterval);
@@ -136,17 +136,17 @@ Vector3d JPLEphemeris::getPlanetPosition(JPLEphemItem planet, double tjd) const
     // nGranules is unsigned int so it will be compared against FFFFFFFF:
     if (coeffInfo[planet].nGranules == (unsigned int) -1)
     {
-    	coeffs = rec->coeffs + coeffInfo[planet].offset;
-    	u = 2.0 * (tjd - rec->t0) / daysPerInterval - 1.0;
+        coeffs = rec->coeffs + coeffInfo[planet].offset;
+        u = 2.0 * (tjd - rec->t0) / daysPerInterval - 1.0;
     }
     else
     {
-	double daysPerGranule = daysPerInterval / coeffInfo[planet].nGranules;
-	int granule = (int) ((tjd - rec->t0) / daysPerGranule);
-	double granuleStartDate = rec->t0 + daysPerGranule * (double) granule;
-	coeffs = rec->coeffs + coeffInfo[planet].offset +
+    double daysPerGranule = daysPerInterval / coeffInfo[planet].nGranules;
+    int granule = (int) ((tjd - rec->t0) / daysPerGranule);
+    double granuleStartDate = rec->t0 + daysPerGranule * (double) granule;
+    coeffs = rec->coeffs + coeffInfo[planet].offset +
             granule * coeffInfo[planet].nCoeffs * 3;
-	u = 2.0 * (tjd - granuleStartDate) / daysPerGranule - 1.0;
+    u = 2.0 * (tjd - granuleStartDate) / daysPerGranule - 1.0;
     }
 
     // Evaluate the Chebyshev polynomials
@@ -155,11 +155,11 @@ Vector3d JPLEphemeris::getPlanetPosition(JPLEphemItem planet, double tjd) const
     unsigned int nCoeffs = coeffInfo[planet].nCoeffs;
     for (int i = 0; i < 3; i++)
     {
-    	cc[0] = 1.0;
-    	cc[1] = u;
-    	sum[i] = coeffs[i * nCoeffs] + coeffs[i * nCoeffs + 1] * u;
-    	for (unsigned int j = 2; j < nCoeffs; j++)
-    	{
+        cc[0] = 1.0;
+        cc[1] = u;
+        sum[i] = coeffs[i * nCoeffs] + coeffs[i * nCoeffs + 1] * u;
+        for (unsigned int j = 2; j < nCoeffs; j++)
+        {
             cc[j] = 2.0 * u * cc[j - 1] - cc[j - 2];
             sum[i] += coeffs[i * nCoeffs + j] * cc[j];
         }
@@ -255,25 +255,25 @@ JPLEphemeris* JPLEphemeris::load(istream& in)
     }
 
     unsigned int nRecords = (unsigned int) ((eph->endDate - eph->startDate) /
-					    eph->daysPerInterval);
+                        eph->daysPerInterval);
     eph->records.resize(nRecords);
     for (i = 0; i < nRecords; i++)
     {
-    	eph->records[i].t0 = readDouble(in);
-    	eph->records[i].t1 = readDouble(in);
+        eph->records[i].t0 = readDouble(in);
+        eph->records[i].t1 = readDouble(in);
 
-    	// Allocate coefficient array for this record; the first two
-    	// 'coefficients' are actually the start and end time (t0 and t1)
-    	eph->records[i].coeffs = new double[eph->recordSize - 2];
-    	for (unsigned int j = 0; j < eph->recordSize - 2; j++)
-    	    eph->records[i].coeffs[j] = readDouble(in);
+        // Allocate coefficient array for this record; the first two
+        // 'coefficients' are actually the start and end time (t0 and t1)
+        eph->records[i].coeffs = new double[eph->recordSize - 2];
+        for (unsigned int j = 0; j < eph->recordSize - 2; j++)
+            eph->records[i].coeffs[j] = readDouble(in);
 
-    	// Make sure that we read this record successfully
-    	if (!in.good())
-    	{
-    	    delete eph;
-    	    return NULL;
-    	}
+        // Make sure that we read this record successfully
+        if (!in.good())
+        {
+            delete eph;
+            return NULL;
+        }
     }
 
     return eph;
diff --git a/src/celephem/nutation.cpp b/src/celephem/nutation.cpp
index d9664d7b3..17ba8f1de 100644
--- a/src/celephem/nutation.cpp
+++ b/src/celephem/nutation.cpp
@@ -176,7 +176,7 @@ astro::Nutation_IAU2000B(double T)
     double F  = arcsecToRad(93.27209062
                             + 1739527262.8478 * T
                             - 12.7512         * T2
-                            - 0.001037        * T3 
+                            - 0.001037        * T3
                             + 0.00000417      * T4);
 
     // Mean elongation of the Moon from the Sun
diff --git a/src/celephem/orbit.cpp b/src/celephem/orbit.cpp
index 9580afeca..075685a69 100644
--- a/src/celephem/orbit.cpp
+++ b/src/celephem/orbit.cpp
@@ -273,7 +273,7 @@ Vector3d Orbit::velocityAtTime(double tdb) const
 {
     Vector3d p0 = positionAtTime(tdb);
     Vector3d p1 = positionAtTime(tdb + ORBITAL_VELOCITY_DIFF_DELTA);
-	return (p1 - p0) * (1.0 / ORBITAL_VELOCITY_DIFF_DELTA);
+    return (p1 - p0) * (1.0 / ORBITAL_VELOCITY_DIFF_DELTA);
 }
 
 
@@ -366,10 +366,10 @@ Vector3d EllipticalOrbit::velocityAtE(double E) const
     if (eccentricity < 1.0)
     {
         double a = pericenterDistance / (1.0 - eccentricity);
-		double b = a * sqrt(1 - square(eccentricity));
+        double b = a * sqrt(1 - square(eccentricity));
         double sinE = sin(E);
         double cosE = cos(E);
-        
+
         double meanMotion = 2.0 * PI / period;
         double edot = meanMotion / (1 - eccentricity * cosE);
 
@@ -435,9 +435,9 @@ double EllipticalOrbit::getBoundingRadius() const
 
 
 CachingOrbit::CachingOrbit() :
-	lastTime(-1.0e30),
-	positionCacheValid(false),
-	velocityCacheValid(false)
+    lastTime(-1.0e30),
+    positionCacheValid(false),
+    velocityCacheValid(false)
 {
 }
 
@@ -453,14 +453,14 @@ Vector3d CachingOrbit::positionAtTime(double jd) const
     {
         lastTime = jd;
         lastPosition = computePosition(jd);
-		positionCacheValid = true;
-		velocityCacheValid = false;
+        positionCacheValid = true;
+        velocityCacheValid = false;
+    }
+    else if (!positionCacheValid)
+    {
+        lastPosition = computePosition(jd);
+        positionCacheValid = true;
     }
-	else if (!positionCacheValid)
-	{
-		lastPosition = computePosition(jd);
-		positionCacheValid = true;
-	}
 
     return lastPosition;
 }
@@ -468,20 +468,20 @@ Vector3d CachingOrbit::positionAtTime(double jd) const
 
 Vector3d CachingOrbit::velocityAtTime(double jd) const
 {
-	if (jd != lastTime)
-	{
-		lastVelocity = computeVelocity(jd);
-		lastTime = jd;  // must be set *after* call to computeVelocity
-		positionCacheValid = false;
-		velocityCacheValid = true;
-	}
-	else if (!velocityCacheValid)
-	{
-		lastVelocity = computeVelocity(jd);
-		velocityCacheValid = true;
-	}
+    if (jd != lastTime)
+    {
+        lastVelocity = computeVelocity(jd);
+        lastTime = jd;  // must be set *after* call to computeVelocity
+        positionCacheValid = false;
+        velocityCacheValid = true;
+    }
+    else if (!velocityCacheValid)
+    {
+        lastVelocity = computeVelocity(jd);
+        velocityCacheValid = true;
+    }
 
-	return lastVelocity;
+    return lastVelocity;
 }
 
 
@@ -491,16 +491,16 @@ Vector3d CachingOrbit::velocityAtTime(double jd) const
  */
 Vector3d CachingOrbit::computeVelocity(double jd) const
 {
-	// Compute the velocity by differentiating.
+    // Compute the velocity by differentiating.
     Vector3d p0 = positionAtTime(jd);
 
-	// Call computePosition() instead of positionAtTime() so that we
-	// don't affect the cached value. 
-	// TODO: check the valid ranges of the orbit to make sure that
-	// jd+dt is still in range.
+    // Call computePosition() instead of positionAtTime() so that we
+    // don't affect the cached value.
+    // TODO: check the valid ranges of the orbit to make sure that
+    // jd+dt is still in range.
     Vector3d p1 = computePosition(jd + ORBITAL_VELOCITY_DIFF_DELTA);
 
-	return (p1 - p0) * (1.0 / ORBITAL_VELOCITY_DIFF_DELTA);
+    return (p1 - p0) * (1.0 / ORBITAL_VELOCITY_DIFF_DELTA);
 }
 
 
diff --git a/src/celephem/orbit.h b/src/celephem/orbit.h
index 8b2996abe..3c5877090 100644
--- a/src/celephem/orbit.h
+++ b/src/celephem/orbit.h
@@ -27,8 +27,8 @@ class Orbit
 
     /*! Return the orbital velocity in the orbit's reference frame at the
      * specified time (TDB). Units are kilometers per day. If the method
-	 * is not overridden, the velocity will be computed by differentiation
-	 * of position.
+     * is not overridden, the velocity will be computed by differentiation
+     * of position.
      */
     virtual Eigen::Vector3d velocityAtTime(double) const;
 
@@ -122,8 +122,8 @@ class CachingOrbit : public Orbit
     mutable Eigen::Vector3d lastPosition;
     mutable Eigen::Vector3d lastVelocity;
     mutable double lastTime;
-	mutable bool positionCacheValid;
-	mutable bool velocityCacheValid;
+    mutable bool positionCacheValid;
+    mutable bool velocityCacheValid;
 };
 
 
diff --git a/src/celephem/precession.cpp b/src/celephem/precession.cpp
index e2df95c3e..edb887909 100644
--- a/src/celephem/precession.cpp
+++ b/src/celephem/precession.cpp
@@ -168,14 +168,14 @@ astro::EquatorialPrecessionAngles_P03(double T)
     double T3 = T2 * T;
     double T4 = T3 * T;
     double T5 = T4 * T;
-    
+
     prec.zetaA =  (     2.650545
                    + 2306.083227 * T
                    +    0.2988499 * T2
                    +    0.01801828 * T3
                    -    0.000005971 * T4
                    -    0.0000003173 * T5);
-    prec.zA =     ( -    2.650545 
+    prec.zA =     ( -    2.650545
                     + 2306.077181 * T
                     +    1.0927348 * T2
                     +    0.01826837 * T3
@@ -186,7 +186,7 @@ astro::EquatorialPrecessionAngles_P03(double T)
                    -     0.04182264 * T3
                    -     0.000007089 * T4
                    -     0.0000001274 * T5);
-    
+
     return prec;
 }
 
@@ -203,7 +203,7 @@ astro::EclipticPrecession_P03(double T)
     double T3 = T2 * T;
     double T4 = T3 * T;
     double T5 = T4 * T;
-    
+
     pole.PA = (  4.199094 * T
               + 0.1939873 * T2
               - 0.00022466 * T3
@@ -214,7 +214,7 @@ astro::EclipticPrecession_P03(double T)
               + 0.00052413 * T3
               - 0.00000646 * T4
               - 0.0000000172 * T5);
-    
+
     return pole;
 }
 
@@ -230,7 +230,7 @@ astro::EclipticPrecessionAngles_P03(double T)
     double T3 = T2 * T;
     double T4 = T3 * T;
     double T5 = T4 * T;
-    
+
     ecl.piA = ( 46.998973 * T
                - 0.0334926 * T2
                - 0.00012559 * T3
@@ -242,7 +242,7 @@ astro::EclipticPrecessionAngles_P03(double T)
                 -   0.0005371 * T3
                 -   0.00004797 * T4
                 +   0.000000072 * T5);
-    
+
     return ecl;
 }
 
@@ -261,7 +261,7 @@ astro::PrecObliquity_P03(double T)
     double T3 = T2 * T;
     double T4 = T3 * T;
     double T5 = T4 * T;
-    
+
     prec.epsA = (eps0
                 - 46.836769 * T
                 -  0.0001831 * T2
@@ -280,7 +280,7 @@ astro::PrecObliquity_P03(double T)
                 +  0.000170663 * T4
                 -  0.0000000560 * T5);
 #endif
-    
+
     return prec;
 }
 
@@ -295,23 +295,23 @@ astro::PrecObliquity_P03(double T)
 int main(int argc, char* argv[])
 {
     double step = 10.0;
-    
+
     for (int i = -100; i <= 100; i++)
     {
         // Get time in Julian centuries from J2000
         double T = (double) i * step / 100;
-        
+
         astro::EclipticPole ecl = astro::EclipticPrecession_P03LP(T);
         astro::EclipticPole eclP03 = astro::EclipticPrecession_P03(T);
         astro::EclipticAngles eclAnglesP03 = astro::EclipticPrecessionAngles_P03(T);
-        
+
         //clog << ecl.PA - eclP03.PA << ", " << ecl.QA - eclP03.QA << endl;
         ecl = eclP03;
         Vec3d v(0.0, 0.0, 0.0);
         v.x =  ecl.PA * 2.0 * PI / 1296000;
         v.y = -ecl.QA * 2.0 * PI / 1296000;
         v.z = sqrt(1.0 - v.x * v.x - v.y * v.y);
-        
+
         Quatd eclRotation = Quatd::vecToVecRotation(Vec3d(0.0, 0.0, 1.0), v);
         Quatd eclRotation2 = Quatd::zrotation(-degToRad(eclAnglesP03.PiA / 3600.0)) *
                              Quatd::xrotation(degToRad(eclAnglesP03.piA / 3600.0)) *
@@ -326,43 +326,43 @@ int main(int argc, char* argv[])
             double Q = eclP03.QA * 2.0 * PI / 1296000;
             double piA = asin(sqrt(P * P + Q * Q));
             double PiA = atan2(P, Q);
-            
+
             // Calculate the rotation from the J2000 ecliptic to the ecliptic
             // of date.
             eclRotation3 = Quatd::zrotation(-PiA) *
                            Quatd::xrotation(piA) *
                            Quatd::zrotation(PiA);
-            
+
             piA = radToDeg(piA) * 3600;
             PiA = radToDeg(PiA) * 3600;
             clog << "Pi: " << PiA << ", " << eclAnglesP03.PiA << endl;
             clog << "pi: " << piA << ", " << eclAnglesP03.piA << endl;
         }
-        
+
         astro::PrecessionAngles prec = astro::PrecObliquity_P03LP(T);
         Quatd p03lpRot = Quatd::xrotation(degToRad(prec.epsA / 3600.0)) *
                          Quatd::zrotation(-degToRad(prec.pA / 3600.0));
         p03lpRot = p03lpRot * ~eclRotation3;
-                
+
         astro::PrecessionAngles prec2 = astro::PrecObliquity_P03(T);
         //clog << prec.epsA - prec2.epsA << ", " << prec.pA - prec2.pA << endl;
-        
+
         astro::EquatorialPrecessionAngles precP03 = astro::EquatorialPrecessionAngles_P03(T);
         Quatd p03Rot = Quatd::zrotation(-degToRad(precP03.zA / 3600.0)) *
                        Quatd::yrotation( degToRad(precP03.thetaA / 3600.0)) *
                        Quatd::zrotation(-degToRad(precP03.zetaA / 3600.0));
         p03Rot = p03Rot * Quatd::xrotation(degToRad(eps0 / 3600.0));
-        
+
         Vec3d xaxis(0, 0, 1);
         Vec3d v0 = xaxis * p03lpRot.toMatrix3();
         Vec3d v1 = xaxis * p03Rot.toMatrix3();
-        
+
         // Show the angle between the J2000 ecliptic pole and the ecliptic
         // pole at T centuries from J2000
         double theta0 = acos(xaxis * v0);
         double theta1 = acos(xaxis * v1);
-        
-        clog << T * 100 << ": " 
+
+        clog << T * 100 << ": "
             << radToDeg(acos(v0 * v1)) * 3600 << ", "
             << radToDeg(theta0) << ", "
             << radToDeg(theta1) << ", "
diff --git a/src/celephem/rotation.cpp b/src/celephem/rotation.cpp
index 753174b9e..5659c935f 100644
--- a/src/celephem/rotation.cpp
+++ b/src/celephem/rotation.cpp
@@ -51,8 +51,8 @@ RotationModel::angularVelocityAtTime(double tdb) const
     return dq.vec().normalized() * (2.0 * acos(dq.w()) / dt);
 #ifdef CELVEC
     Vector3d v(dq.x, dq.y, dq.z);
-	v.normalize();
-	return v * (2.0 * acos(dq.w) / dt);
+    v.normalize();
+    return v * (2.0 * acos(dq.w) / dt);
 #endif
 }
 
@@ -89,7 +89,7 @@ CachingRotationModel::spin(double tjd) const
         lastSpin = computeSpin(tjd);
         spinCacheValid = true;
     }
-    
+
     return lastSpin;
 }
 
@@ -110,8 +110,8 @@ CachingRotationModel::equatorOrientationAtTime(double tjd) const
         lastEquator = computeEquatorOrientation(tjd);
         equatorCacheValid = true;
     }
-    
-    return lastEquator;    
+
+    return lastEquator;
 }
 
 
@@ -131,8 +131,8 @@ CachingRotationModel::angularVelocityAtTime(double tjd) const
         lastAngularVelocity = computeAngularVelocity(tjd);
         angularVelocityCacheValid = true;
     }
-    
-    return lastAngularVelocity;    
+
+    return lastAngularVelocity;
 }
 
 
@@ -141,21 +141,21 @@ CachingRotationModel::computeAngularVelocity(double tjd) const
 {
     double dt = chooseDiffTimeDelta(*this);
     Quaterniond q0 = orientationAtTime(tjd);
-    
+
     // Call computeSpin/computeEquatorOrientation instead of orientationAtTime
     // in order to avoid affecting the cache.
     Quaterniond spin = computeSpin(tjd + dt);
     Quaterniond equator = computeEquatorOrientation(tjd + dt);
     Quaterniond q1 = spin * equator;
     Quaterniond dq = q1.conjugate() * q0;
-    
+
     if (std::abs(dq.w()) > 0.99999999)
         return Vector3d::Zero();
-    
+
     return dq.vec().normalized() * (2.0 * acos(dq.w()) / dt);
 #ifdef CELVEC
-	Vec3d v(dq.x, dq.y, dq.z);
-	v.normalize();
+    Vec3d v(dq.x, dq.y, dq.z);
+    v.normalize();
     return v * (2.0 * acos(dq.w) / dt);
 #endif
 }
@@ -235,7 +235,7 @@ UniformRotationModel::spin(double tjd) const
     // planet texture maps where zero deg long. is in the middle of
     // the texture.
     remainder += 0.5;
-    
+
     return YRotation(-remainder * 2 * PI - offset);
 }
 
@@ -251,7 +251,7 @@ Vector3d
 UniformRotationModel::angularVelocityAtTime(double tdb) const
 {
     Vector3d v = equatorOrientationAtTime(tdb).conjugate() * Vector3d::UnitY();;
-	return v * (2.0 * PI / period);
+    return v * (2.0 * PI / period);
 }
 
 
@@ -304,7 +304,7 @@ PrecessingRotationModel::spin(double tjd) const
     // planet texture maps where zero deg long. is in the middle of
     // the texture.
     remainder += 0.5;
-    
+
     return YRotation(-remainder * 2 * PI - offset);
 }
 
diff --git a/src/celephem/rotation.h b/src/celephem/rotation.h
index b66907b37..ace2910d0 100644
--- a/src/celephem/rotation.h
+++ b/src/celephem/rotation.h
@@ -91,17 +91,17 @@ class CachingRotationModel : public RotationModel
 
     CachingRotationModel();
     virtual ~CachingRotationModel();
-    
+
     Eigen::Quaterniond spin(double tjd) const;
     Eigen::Quaterniond equatorOrientationAtTime(double tjd) const;
     Eigen::Vector3d angularVelocityAtTime(double tjd) const;
-    
+
     virtual Eigen::Quaterniond computeEquatorOrientation(double tjd) const = 0;
     virtual Eigen::Quaterniond computeSpin(double tjd) const = 0;
     virtual Eigen::Vector3d computeAngularVelocity(double tjd) const;
     virtual double getPeriod() const = 0;
     virtual bool isPeriodic() const = 0;
-    
+
 private:
     mutable Eigen::Quaterniond lastSpin;
     mutable Eigen::Quaterniond lastEquator;
diff --git a/src/celephem/samporbit.cpp b/src/celephem/samporbit.cpp
index 2739a54e3..3a72f35ae 100644
--- a/src/celephem/samporbit.cpp
+++ b/src/celephem/samporbit.cpp
@@ -237,7 +237,7 @@ template <typename T> Vector3d SampledOrbit<T>::computePosition(double jd) const
                 Vector3d v32((double) s3.x - (double) s2.x,
                              (double) s3.y - (double) s2.y,
                              (double) s3.z - (double) s2.z);
-                
+
                 // Estimate velocities by averaging the differences at adjacent spans
                 // (except at the end spans, where we just use a single velocity.)
                 Vector3d v0;
@@ -250,7 +250,7 @@ template <typename T> Vector3d SampledOrbit<T>::computePosition(double jd) const
                 {
                     v0 = v21;
                 }
-                
+
                 Vector3d v1;
                 if (n < (int) samples.size() - 1)
                 {
@@ -260,7 +260,7 @@ template <typename T> Vector3d SampledOrbit<T>::computePosition(double jd) const
                 else
                 {
                     v1 = v21;
-                }                
+                }
 
                 pos = cubicInterpolate(p0, v0, p1, v1, t);
             }
@@ -349,7 +349,7 @@ template <typename T> Vector3d SampledOrbit<T>::computeVelocity(double jd) const
                 Vector3d v32((double) s3.x - (double) s2.x,
                              (double) s3.y - (double) s2.y,
                              (double) s3.z - (double) s2.z);
-                
+
                 // Estimate velocities by averaging the differences at adjacent spans
                 // (except at the end spans, where we just use a single velocity.)
                 Vector3d v0;
@@ -362,7 +362,7 @@ template <typename T> Vector3d SampledOrbit<T>::computeVelocity(double jd) const
                 {
                     v0 = v21;
                 }
-                
+
                 Vector3d v1;
                 if (n < (int) samples.size() - 1)
                 {
@@ -372,7 +372,7 @@ template <typename T> Vector3d SampledOrbit<T>::computeVelocity(double jd) const
                 else
                 {
                     v1 = v21;
-                }                
+                }
 
                 vel = cubicInterpolateVelocity(p0, v0, p1, v1, t);
                 vel *= 1.0 / h;
@@ -686,7 +686,7 @@ static bool SkipComments(istream& in)
         {
             done = true;
         }
-        else 
+        else
         {
             if (inComment)
             {
@@ -739,7 +739,7 @@ template <typename T> SampledOrbit<T>* LoadSampledOrbit(const string& filename,
         return NULL;
 
     SampledOrbit<T>* orbit = NULL;
-    
+
     orbit = new SampledOrbit<T>(interpolation);
 
     double lastSampleTime = -numeric_limits<double>::infinity();
@@ -794,7 +794,7 @@ template <typename T> SampledOrbitXYZV<T>* LoadSampledOrbitXYZV(const string& fi
         return NULL;
 
     SampledOrbitXYZV<T>* orbit = NULL;
-    
+
     orbit = new SampledOrbitXYZV<T>(interpolation);
 
     double lastSampleTime = -numeric_limits<double>::infinity();
diff --git a/src/celephem/samporient.cpp b/src/celephem/samporient.cpp
index 7681787af..525bc07e3 100644
--- a/src/celephem/samporient.cpp
+++ b/src/celephem/samporient.cpp
@@ -40,7 +40,7 @@ typedef vector<OrientationSample, aligned_allocator<OrientationSample> > Orienta
  * time stamped quaternion keys. Each record in the file has the form:
  *
  *   <time> <qw> <qx> <qy> <qz>
- *  
+ *
  * Where (qw qx qy qz) is a unit quaternion representing a rotation of
  *   theta = acos(qw)*2 radians about the axis (qx, qy, qz)*sin(theta/2).
  * The time values are Julian days in Barycentric Dynamical Time. The records
diff --git a/src/celephem/scriptobject.cpp b/src/celephem/scriptobject.cpp
index ebbd9a5aa..673a1e1c4 100644
--- a/src/celephem/scriptobject.cpp
+++ b/src/celephem/scriptobject.cpp
@@ -1,5 +1,5 @@
 // scriptobject.cpp
-// 
+//
 // Copyright (C) 2006, Chris Laurel <claurel@shatters.net>
 //
 // Helper functions for Celestia's interface to Lua scripts.
diff --git a/src/celephem/scriptobject.h b/src/celephem/scriptobject.h
index 5a272c626..a367d593c 100644
--- a/src/celephem/scriptobject.h
+++ b/src/celephem/scriptobject.h
@@ -1,5 +1,5 @@
 // scriptobject.h
-// 
+//
 // Copyright (C) 2006, Chris Laurel <claurel@shatters.net>
 //
 // Helper functions for Celestia's interface to Lua scripts.
diff --git a/src/celephem/scriptorbit.h b/src/celephem/scriptorbit.h
index c76e0b072..9c83503fc 100644
--- a/src/celephem/scriptorbit.h
+++ b/src/celephem/scriptorbit.h
@@ -1,5 +1,5 @@
 // scriptorbit.h
-// 
+//
 // Copyright (C) 2006, Chris Laurel <claurel@shatters.net>
 //
 // Interface for a Celestia trajectory implemented via a Lua script.
diff --git a/src/celephem/scriptrotation.cpp b/src/celephem/scriptrotation.cpp
index 9d94c93e6..32e9fd79f 100644
--- a/src/celephem/scriptrotation.cpp
+++ b/src/celephem/scriptrotation.cpp
@@ -1,5 +1,5 @@
 // scriptrotation.cpp
-// 
+//
 // Copyright (C) 2006, Chris Laurel <claurel@shatters.net>
 //
 // Interface for a Celestia rotation model implemented via a Lua script.
@@ -96,7 +96,7 @@ ScriptedRotation::initialize(const std::string& moduleName,
 
     if (lua_isfunction(luaState, -1) == 0)
     {
-        // No function with the requested name; pop whatever value we 
+        // No function with the requested name; pop whatever value we
         // did receive along with the table of arguments.
         lua_pop(luaState, 1);
         clog << "No Lua function named " << funcName << " found.\n";
@@ -198,7 +198,7 @@ ScriptedRotation::spin(double tjd) const
         {
             // The script rotation object disappeared. OOPS.
         }
-    
+
         // Pop the script rotation object
         lua_pop(luaState, 1);
     }
diff --git a/src/celephem/scriptrotation.h b/src/celephem/scriptrotation.h
index 689366d3d..d3f6b8970 100644
--- a/src/celephem/scriptrotation.h
+++ b/src/celephem/scriptrotation.h
@@ -1,5 +1,5 @@
 // scriptrotation.h
-// 
+//
 // Copyright (C) 2006, Chris Laurel <claurel@shatters.net>
 //
 // Interface for a Celestia rotation model implemented via a Lua script.
diff --git a/src/celephem/spiceinterface.cpp b/src/celephem/spiceinterface.cpp
index 73a645877..744072e48 100644
--- a/src/celephem/spiceinterface.cpp
+++ b/src/celephem/spiceinterface.cpp
@@ -76,7 +76,7 @@ bool GetNaifId(const string& name, int* id)
  */
 bool IsSpiceKernelLoaded(const string& filepath)
 {
-	return ResidentSpiceKernels.find(filepath) != ResidentSpiceKernels.end();
+    return ResidentSpiceKernels.find(filepath) != ResidentSpiceKernels.end();
 }
 
 
@@ -85,31 +85,31 @@ bool IsSpiceKernelLoaded(const string& filepath)
  */
 bool LoadSpiceKernel(const string& filepath)
 {
-	// Only load the kernel if it is not already resident. Note that this detection
+    // Only load the kernel if it is not already resident. Note that this detection
     // of duplicate kernels will not work if a file was originally loaded through
     // a metakernel.
-	if (IsSpiceKernelLoaded(filepath))
-		return true;
+    if (IsSpiceKernelLoaded(filepath))
+        return true;
 
-	ResidentSpiceKernels.insert(filepath);
-	furnsh_c(filepath.c_str());
+    ResidentSpiceKernels.insert(filepath);
+    furnsh_c(filepath.c_str());
 
-	// If there was an error loading the kernel, dump the error message.
-	if (failed_c())
-	{
-		char errMsg[1024];
-		getmsg_c("long", sizeof(errMsg), errMsg);
-		clog << errMsg << "\n";
+    // If there was an error loading the kernel, dump the error message.
+    if (failed_c())
+    {
+        char errMsg[1024];
+        getmsg_c("long", sizeof(errMsg), errMsg);
+        clog << errMsg << "\n";
 
-		// Reset the SPICE error state so that future calls to
-		// SPICE can still succeed.
-		reset_c();
+        // Reset the SPICE error state so that future calls to
+        // SPICE can still succeed.
+        reset_c();
 
-		return false;
-	}
-	else
-	{
-		clog << "Loaded SPK file " << filepath << "\n";
-		return true;
-	}
+        return false;
+    }
+    else
+    {
+        clog << "Loaded SPK file " << filepath << "\n";
+        return true;
+    }
 }
diff --git a/src/celephem/spiceorbit.cpp b/src/celephem/spiceorbit.cpp
index 6fe5950ee..c76c8d969 100644
--- a/src/celephem/spiceorbit.cpp
+++ b/src/celephem/spiceorbit.cpp
@@ -38,7 +38,7 @@ SpiceOrbit::SpiceOrbit(const std::string& _targetBodyName,
     spiceErr(false),
     validIntervalBegin(_beginning),
     validIntervalEnd(_ending),
-	useDefaultTimeInterval(false)
+    useDefaultTimeInterval(false)
 {
 }
 
@@ -51,17 +51,17 @@ SpiceOrbit::SpiceOrbit(const std::string& _targetBodyName,
  *  be constructed with an explicitly specified time range.
  */
 SpiceOrbit::SpiceOrbit(const std::string& _targetBodyName,
-	                   const std::string& _originName,
+                       const std::string& _originName,
                        double _period,
                        double _boundingRadius) :
-	targetBodyName(_targetBodyName),
-	originName(_originName),
-	period(_period),
-	boundingRadius(_boundingRadius),
-	spiceErr(false),
-	validIntervalBegin(0.0),
-	validIntervalEnd(0.0),
-	useDefaultTimeInterval(true)
+    targetBodyName(_targetBodyName),
+    originName(_originName),
+    period(_period),
+    boundingRadius(_boundingRadius),
+    spiceErr(false),
+    validIntervalBegin(0.0),
+    validIntervalEnd(0.0),
+    useDefaultTimeInterval(true)
 {
 }
 
@@ -102,9 +102,9 @@ SpiceOrbit::init(const string& path,
         for (list<string>::const_iterator iter = requiredKernels->begin(); iter != requiredKernels->end(); iter++)
         {
             string filepath = path + string("/data/") + *iter;
-	        if (!LoadSpiceKernel(filepath))
-            {    
-		        spiceErr = true;
+            if (!LoadSpiceKernel(filepath))
+            {
+                spiceErr = true;
                 break;
             }
         }
@@ -125,95 +125,95 @@ SpiceOrbit::init(const string& path,
         return false;
     }
 
-	SpiceInt spkCount = 0;
-	ktotal_c("spk", &spkCount);
+    SpiceInt spkCount = 0;
+    ktotal_c("spk", &spkCount);
 
     // Get coverage window for target and origin object
-	const int MaxIntervals = 10;
-	SPICEDOUBLE_CELL ( targetCoverage, MaxIntervals * 2 );
+    const int MaxIntervals = 10;
+    SPICEDOUBLE_CELL ( targetCoverage, MaxIntervals * 2 );
 
     // Clear the coverage window.
     scard_c(0, &targetCoverage);
 
-	for (SpiceInt i = 0; i < spkCount; i++)
-	{
-		SpiceChar filename[512];
-		SpiceChar filetype[32];
-		SpiceChar source[256];
-		SpiceInt handle;
-		SpiceBoolean found;
+    for (SpiceInt i = 0; i < spkCount; i++)
+    {
+        SpiceChar filename[512];
+        SpiceChar filetype[32];
+        SpiceChar source[256];
+        SpiceInt handle;
+        SpiceBoolean found;
 
-		kdata_c(i, "spk",
-				sizeof(filename), sizeof(filetype), sizeof(source),
-				filename, filetype, source, &handle, &found);
+        kdata_c(i, "spk",
+                sizeof(filename), sizeof(filetype), sizeof(source),
+                filename, filetype, source, &handle, &found);
 
-		// First check the coverage window of the target. No interval
-		// is required for ID 0 (the solar system barycenter) which is
-		// always at (0, 0, 0).
-		if (targetID != 0)
-		{
-			spkcov_c(filename, targetID, &targetCoverage);
-		}
-	}
-   
-	SpiceInt nIntervals = card_c(&targetCoverage) / 2;
-	if (nIntervals <= 0 && targetID != 0)
-	{
+        // First check the coverage window of the target. No interval
+        // is required for ID 0 (the solar system barycenter) which is
+        // always at (0, 0, 0).
+        if (targetID != 0)
+        {
+            spkcov_c(filename, targetID, &targetCoverage);
+        }
+    }
+
+    SpiceInt nIntervals = card_c(&targetCoverage) / 2;
+    if (nIntervals <= 0 && targetID != 0)
+    {
         clog << "Couldn't find object " << targetBodyName << " in SPICE kernel pool.\n";
         spiceErr = true;
-	    if (failed_c())
-		{
-			reset_c();
-		}
-		return false;
-	}
+        if (failed_c())
+        {
+            reset_c();
+        }
+        return false;
+    }
 
-	// TODO: need to consider the origin object as well as the target
-	if (useDefaultTimeInterval)
-	{
-		// Set the valid time interval for this orbit to the first interval
-		// in the coverage window for the target.
-		SpiceDouble targetBeginning = -1.0e50;
-		SpiceDouble targetEnding    = +1.0e50;
+    // TODO: need to consider the origin object as well as the target
+    if (useDefaultTimeInterval)
+    {
+        // Set the valid time interval for this orbit to the first interval
+        // in the coverage window for the target.
+        SpiceDouble targetBeginning = -1.0e50;
+        SpiceDouble targetEnding    = +1.0e50;
 
-		if (targetID == 0)
-		{
-			// Time range for solar system barycenter is infinite
-			validIntervalBegin = targetBeginning;
-			validIntervalEnd = targetEnding;
-		}
-		else
-		{
-			wnfetd_c(&targetCoverage, 0, &targetBeginning, &targetEnding);
+        if (targetID == 0)
+        {
+            // Time range for solar system barycenter is infinite
+            validIntervalBegin = targetBeginning;
+            validIntervalEnd = targetEnding;
+        }
+        else
+        {
+            wnfetd_c(&targetCoverage, 0, &targetBeginning, &targetEnding);
 
-			// SPICE times are seconds since J2000.0
-			validIntervalBegin = astro::secsToDays(targetBeginning) + astro::J2000;
-			validIntervalEnd = astro::secsToDays(targetEnding) + astro::J2000;
+            // SPICE times are seconds since J2000.0
+            validIntervalBegin = astro::secsToDays(targetBeginning) + astro::J2000;
+            validIntervalEnd = astro::secsToDays(targetEnding) + astro::J2000;
 
             // Reduce interval by a millisecond at each end; otherwise, rounding error
             // can cause us to get SPICE errors when computing states right at the edge
             // of the valid window.
             validIntervalBegin += MILLISEC;
             validIntervalEnd -= MILLISEC;
-		}
-	}
-	else
-	{
+        }
+    }
+    else
+    {
         // Reduce valid interval by a millisecond at each end.
         validIntervalBegin += MILLISEC;
         validIntervalEnd -= MILLISEC;
 
-		SpiceDouble beginningSecondsJ2000 = astro::daysToSecs(validIntervalBegin - astro::J2000);
-		SpiceDouble endingSecondsJ2000    = astro::daysToSecs(validIntervalEnd - astro::J2000);
+        SpiceDouble beginningSecondsJ2000 = astro::daysToSecs(validIntervalBegin - astro::J2000);
+        SpiceDouble endingSecondsJ2000    = astro::daysToSecs(validIntervalEnd - astro::J2000);
 
-		// A time interval was specified--make sure that it's covered in the SPICE kernel.
-		if (targetID != 0 &&
-			!wnincd_c(beginningSecondsJ2000, endingSecondsJ2000, &targetCoverage))
-		{
-			clog << "Specified time interval for target " << targetBodyName << " not available.\n";
-			return false;
-		}
-	}
+        // A time interval was specified--make sure that it's covered in the SPICE kernel.
+        if (targetID != 0 &&
+            !wnincd_c(beginningSecondsJ2000, endingSecondsJ2000, &targetCoverage))
+        {
+            clog << "Specified time interval for target " << targetBodyName << " not available.\n";
+            return false;
+        }
+    }
 
     // Test getting the position of the object to make sure that there's
     // adequate data in the kernel to compute the position of the target
diff --git a/src/celephem/spiceorbit.h b/src/celephem/spiceorbit.h
index 2e88ce090..25a9942a2 100644
--- a/src/celephem/spiceorbit.h
+++ b/src/celephem/spiceorbit.h
@@ -26,14 +26,14 @@ class SpiceOrbit : public CachingOrbit
                double _boundingRadius,
                double _beginning,
                double _ending);
-	SpiceOrbit(const std::string& _targetBodyName,
-			   const std::string& _originName,
-			   double _period,
-			   double _boundingRadius);
+    SpiceOrbit(const std::string& _targetBodyName,
+               const std::string& _originName,
+               double _period,
+               double _boundingRadius);
     virtual ~SpiceOrbit();
 
     bool init(const std::string& path,
-			  const std::list<std::string>* requiredKernels);
+              const std::list<std::string>* requiredKernels);
 
     virtual bool isPeriodic() const;
     virtual double getPeriod() const;
@@ -62,7 +62,7 @@ class SpiceOrbit : public CachingOrbit
     double validIntervalBegin;
     double validIntervalEnd;
 
-	bool useDefaultTimeInterval;
+    bool useDefaultTimeInterval;
 };
 
 #endif // _CELENGINE_SPICEORBIT_H_
diff --git a/src/celephem/spicerotation.cpp b/src/celephem/spicerotation.cpp
index 524b8c520..48c87e1df 100644
--- a/src/celephem/spicerotation.cpp
+++ b/src/celephem/spicerotation.cpp
@@ -27,7 +27,7 @@ static const double MILLISEC = astro::secsToDays(0.001);
 static const Quaterniond Rx90 = XRotation(PI / 2.0);
 static const Quaterniond Ry180 = YRotation(PI);
 
-/*! Create a new rotation model based on a SPICE frame. The 
+/*! Create a new rotation model based on a SPICE frame. The
  *  orientation of the rotation model is the orientation of the
  *  named SPICE frame relative to the base frame orientation.
  *  The rotation is valid during a time range between beginning
@@ -46,12 +46,12 @@ SpiceRotation::SpiceRotation(const std::string& frameName,
     m_spiceErr(false),
     m_validIntervalBegin(beginning),
     m_validIntervalEnd(ending),
-	m_useDefaultTimeInterval(false)
+    m_useDefaultTimeInterval(false)
 {
 }
 
 
-/*! Create a new rotation model based on a SPICE frame. The 
+/*! Create a new rotation model based on a SPICE frame. The
  *  orientation of the rotation model is the orientation of the
  *  named SPICE frame relative to the base frame orientation.
  *  The rotation is valid during a time range between beginning
@@ -60,15 +60,15 @@ SpiceRotation::SpiceRotation(const std::string& frameName,
  *  models.
  */
 SpiceRotation::SpiceRotation(const std::string& frameName,
-	                         const std::string& baseFrameName,
+                             const std::string& baseFrameName,
                              double period) :
-	m_frameName(frameName),
-	m_baseFrameName(baseFrameName),
-	m_period(period),
-	m_spiceErr(false),
+    m_frameName(frameName),
+    m_baseFrameName(baseFrameName),
+    m_period(period),
+    m_spiceErr(false),
     m_validIntervalBegin(-numeric_limits<double>::infinity()),
     m_validIntervalEnd(numeric_limits<double>::infinity()),
-	m_useDefaultTimeInterval(true)
+    m_useDefaultTimeInterval(true)
 {
 }
 
@@ -109,9 +109,9 @@ SpiceRotation::init(const string& path,
         for (list<string>::const_iterator iter = requiredKernels->begin(); iter != requiredKernels->end(); iter++)
         {
             string filepath = path + string("/data/") + *iter;
-	        if (!LoadSpiceKernel(filepath))
-            {    
-		        m_spiceErr = true;
+            if (!LoadSpiceKernel(filepath))
+            {
+                m_spiceErr = true;
                 break;
             }
         }
@@ -181,7 +181,7 @@ SpiceRotation::computeSpin(double jd) const
         };
 
         // ...but Celestia's rotations are reversed, thus the extra
-        // call to conjugate() 
+        // call to conjugate()
         Quaterniond q = Quaterniond(Map<Matrix3d>(matrixData)).conjugate();
 
         // Transform into Celestia's coordinate system
diff --git a/src/celephem/spicerotation.h b/src/celephem/spicerotation.h
index 53d3aee49..a04c03cbc 100644
--- a/src/celephem/spicerotation.h
+++ b/src/celephem/spicerotation.h
@@ -26,13 +26,13 @@ class SpiceRotation : public CachingRotationModel
                   double period,
                   double beginning,
                   double ending);
-	SpiceRotation(const std::string& frameName,
-			      const std::string& baseFrameName,
-			      double period);
+    SpiceRotation(const std::string& frameName,
+                  const std::string& baseFrameName,
+                  double period);
     virtual ~SpiceRotation();
 
     bool init(const std::string& path,
-			  const std::list<std::string>* requiredKernels);
+              const std::list<std::string>* requiredKernels);
 
     bool isPeriodic() const;
     double getPeriod() const;
@@ -52,7 +52,7 @@ class SpiceRotation : public CachingRotationModel
     bool m_spiceErr;
     double m_validIntervalBegin;
     double m_validIntervalEnd;
-	bool m_useDefaultTimeInterval;
+    bool m_useDefaultTimeInterval;
 };
 
 #endif // _CELENGINE_SPICEROTATION_H_
diff --git a/src/celephem/vsop87.cpp b/src/celephem/vsop87.cpp
index f7a3a8d60..0845e6b24 100644
--- a/src/celephem/vsop87.cpp
+++ b/src/celephem/vsop87.cpp
@@ -46,7 +46,7 @@ struct VSOPSeries
 // ftp://ftp.imcce.fr/pub/ephem/planets/vsop87/
 // They were processed with the tools vsoptrunc-rect and
 // vsoptrunc-sph. The source code for these tools is included
-// with the Celestia source package in the directory 
+// with the Celestia source package in the directory
 // src/tools/vsop.
 
 static VSOPTerm mercury_L0[] = {
diff --git a/src/celestia/avicapture.cpp b/src/celestia/avicapture.cpp
index 82b0dca5a..199c15050 100644
--- a/src/celestia/avicapture.cpp
+++ b/src/celestia/avicapture.cpp
@@ -59,7 +59,7 @@ bool AVICapture::start(const string& filename,
     // Compute the width of a row in bytes; pad so that rows are aligned on
     // 4 byte boundaries.
     int rowBytes = (width * 3 + 3) & ~0x3;
-    image = new unsigned char[rowBytes * height]; 
+    image = new unsigned char[rowBytes * height];
 
     HRESULT hr = AVIFileOpenA(&aviFile,
                               filename.c_str(),
@@ -92,7 +92,7 @@ bool AVICapture::start(const string& filename,
     AVICOMPRESSOPTIONS* arrOptions[1] = { &options };
     ZeroMemory(&options, sizeof options);
 
-    if (!AVISaveOptions(NULL, 0, 1, &aviStream, 
+    if (!AVISaveOptions(NULL, 0, 1, &aviStream,
                         (LPAVICOMPRESSOPTIONS*) &arrOptions))
     {
         // The user either clicked on cancel or there was an error
diff --git a/src/celestia/celestiacore.cpp b/src/celestia/celestiacore.cpp
index 89117a4e6..3c74a0bb9 100644
--- a/src/celestia/celestiacore.cpp
+++ b/src/celestia/celestiacore.cpp
@@ -437,7 +437,7 @@ void CelestiaCore::writeFavoritesFile()
     {
         ofstream out(config->favoritesFile.c_str(), ios::out);
         if (out.good())
-        WriteFavoritesList(*favorites, out);
+            WriteFavoritesList(*favorites, out);
     }
 }
 
@@ -788,9 +788,9 @@ void CelestiaCore::mouseButtonUp(float x, float y, int button)
             }
         }
         else if (button == MiddleButton)
-	    {
+        {
             if ((*activeView)->zoom != 1)
-	        {
+            {
                 (*activeView)->alternateZoom = (*activeView)->zoom;
                 (*activeView)->zoom = 1;
             }
@@ -802,8 +802,8 @@ void CelestiaCore::mouseButtonUp(float x, float y, int button)
 
             // If AutoMag, adapt the faintestMag to the new fov
             if((renderer->getRenderFlags() & Renderer::ShowAutoMag) != 0)
-	        setFaintestAutoMag();
-	    }
+                setFaintestAutoMag();
+        }
     }
 }
 
@@ -903,11 +903,11 @@ void CelestiaCore::mouseMove(float dx, float dy, int modifiers)
     }
 
 #ifdef CELX
-	if (luaHook &&
+    if (luaHook &&
             luaHook->callLuaHook(this,"mousebuttonmove", dx, dy, modifiers))
-        {
+    {
             return;
-        }
+    }
 #endif
 
     if ((modifiers & (LeftButton | RightButton)) != 0)
@@ -985,13 +985,13 @@ void CelestiaCore::mouseMove(float dx, float dy, int modifiers)
                 setZoomFromFOV();
             }
 
-    	    if ((renderer->getRenderFlags() & Renderer::ShowAutoMag))
-	        {
-	            setFaintestAutoMag();
-    		    char buf[128];
-        		sprintf(buf, _("Magnitude limit: %.2f"), sim->getFaintestVisible());
-        		flash(buf);
-	        }
+            if ((renderer->getRenderFlags() & Renderer::ShowAutoMag))
+            {
+                setFaintestAutoMag();
+                char buf[128];
+                sprintf(buf, _("Magnitude limit: %.2f"), sim->getFaintestVisible());
+                flash(buf);
+            }
         }
         else
         {
@@ -1036,7 +1036,7 @@ void CelestiaCore::pickView(float x, float y)
         {
                 activeView++;
         }
-        
+
         // Make sure that we're left with a valid view
         if (activeView == views.end())
         {
@@ -1422,9 +1422,9 @@ void CelestiaCore::charEntered(const char *c_p, int modifiers)
     case '\013': // Ctrl+K
         renderer->setRenderFlags(renderer->getRenderFlags() ^ Renderer::ShowMarkers);
         if (renderer->getRenderFlags() & Renderer::ShowMarkers)
-	{
+        {
             flash(_("Markers enabled"));
-	}
+        }
         else
             flash(_("Markers disabled"));
         notifyWatchers(RenderFlagsChanged);
@@ -1482,7 +1482,7 @@ void CelestiaCore::charEntered(const char *c_p, int modifiers)
                 MarkerRepresentation markerRep(MarkerRepresentation::Diamond);
                 markerRep.setSize(10.0f);
                 markerRep.setColor(Color(0.0f, 1.0f, 0.0f, 0.9f));
-    
+
                 sim->getUniverse()->markObject(sel, markerRep, 1);
             }
         }
@@ -1524,9 +1524,9 @@ void CelestiaCore::charEntered(const char *c_p, int modifiers)
     case '\024':  // Ctrl+T
         renderer->setRenderFlags(renderer->getRenderFlags() ^ Renderer::ShowCometTails);
         if (renderer->getRenderFlags() & Renderer::ShowCometTails)
-	{
+        {
             flash(_("Comet tails enabled"));
-	}
+        }
         else
             flash(_("Comet tails disabled"));
         notifyWatchers(RenderFlagsChanged);
@@ -1698,18 +1698,18 @@ void CelestiaCore::charEntered(const char *c_p, int modifiers)
     case '%':
         {
             const ColorTemperatureTable* current = renderer->getStarColorTable();
-			
+
             if (current == GetStarColorTable(ColorTable_Enhanced))
             {
                 renderer->setStarColorTable(GetStarColorTable(ColorTable_Blackbody_D65));
-				flash(_("Star color: Blackbody D65"));
-				notifyWatchers(RenderFlagsChanged);
+                flash(_("Star color: Blackbody D65"));
+                notifyWatchers(RenderFlagsChanged);
             }
             else if (current == GetStarColorTable(ColorTable_Blackbody_D65))
             {
                 renderer->setStarColorTable(GetStarColorTable(ColorTable_Enhanced));
-				flash(_("Star color: Enhanced"));
-				notifyWatchers(RenderFlagsChanged);
+                flash(_("Star color: Enhanced"));
+                notifyWatchers(RenderFlagsChanged);
             }
             else
             {
@@ -1731,7 +1731,7 @@ void CelestiaCore::charEntered(const char *c_p, int modifiers)
 
     case '*':
         addToHistory();
-	sim->reverseObserverOrientation();
+        sim->reverseObserverOrientation();
         break;
 
     case '?':
@@ -1793,37 +1793,37 @@ void CelestiaCore::charEntered(const char *c_p, int modifiers)
     case ',':
         addToHistory();
         if (observer->getFOV() > MinimumFOV)
-	{
-	    observer->setFOV(observer->getFOV() / 1.05f);
+        {
+            observer->setFOV(observer->getFOV() / 1.05f);
             setZoomFromFOV();
-	    if((renderer->getRenderFlags() & Renderer::ShowAutoMag))
-	    {
-	        setFaintestAutoMag();
-		char buf[128];
+            if((renderer->getRenderFlags() & Renderer::ShowAutoMag))
+            {
+                setFaintestAutoMag();
+                char buf[128];
                 setlocale(LC_NUMERIC, "");
-		sprintf(buf, _("Magnitude limit: %.2f"), sim->getFaintestVisible());
+                sprintf(buf, _("Magnitude limit: %.2f"), sim->getFaintestVisible());
                 setlocale(LC_NUMERIC, "C");
-		flash(buf);
-	    }
-	}
+                flash(buf);
+            }
+        }
         break;
 
     case '.':
         addToHistory();
         if (observer->getFOV() < MaximumFOV)
-	{
-	    observer->setFOV(observer->getFOV() * 1.05f);
+        {
+            observer->setFOV(observer->getFOV() * 1.05f);
             setZoomFromFOV();
-	    if((renderer->getRenderFlags() & Renderer::ShowAutoMag) != 0)
-	    {
-	        setFaintestAutoMag();
-		char buf[128];
+            if((renderer->getRenderFlags() & Renderer::ShowAutoMag) != 0)
+            {
+                setFaintestAutoMag();
+                char buf[128];
                 setlocale(LC_NUMERIC, "");
-		sprintf(buf, _("Magnitude limit: %.2f"), sim->getFaintestVisible());
+                sprintf(buf, _("Magnitude limit: %.2f"), sim->getFaintestVisible());
                 setlocale(LC_NUMERIC, "C");
-		flash(buf);
-	    }
-	}
+                flash(buf);
+            }
+        }
         break;
 
     case '+':
@@ -1893,13 +1893,13 @@ void CelestiaCore::charEntered(const char *c_p, int modifiers)
            runScript(config->demoScriptFile);
         break;
 
-	case 'E':
-		if (c == 'e')
-			renderer->setLabelMode(renderer->getLabelMode() ^ Renderer::GalaxyLabels);
-		else
-        	renderer->setLabelMode(renderer->getLabelMode() ^ Renderer::GlobularLabels);		
+    case 'E':
+        if (c == 'e')
+            renderer->setLabelMode(renderer->getLabelMode() ^ Renderer::GalaxyLabels);
+        else
+            renderer->setLabelMode(renderer->getLabelMode() ^ Renderer::GlobularLabels);
         notifyWatchers(LabelFlagsChanged);
-		break;
+        break;
 
     case 'F':
         addToHistory();
@@ -2008,7 +2008,7 @@ void CelestiaCore::charEntered(const char *c_p, int modifiers)
             flash(_("High res textures"));
             break;
         }
-		notifyWatchers(RenderFlagsChanged); //how to synchronize with menu?
+        notifyWatchers(RenderFlagsChanged); //how to synchronize with menu?
         break;
 
     case 'Q':
@@ -2027,11 +2027,11 @@ void CelestiaCore::charEntered(const char *c_p, int modifiers)
             sim->setTrackedObject(Selection());
         break;
 
-	case 'U':
-		if (c == 'u')
-			renderer->setRenderFlags(renderer->getRenderFlags() ^ Renderer::ShowGalaxies);
-		else
-			renderer->setRenderFlags(renderer->getRenderFlags() ^ Renderer::ShowGlobulars);
+    case 'U':
+        if (c == 'u')
+            renderer->setRenderFlags(renderer->getRenderFlags() ^ Renderer::ShowGalaxies);
+        else
+            renderer->setRenderFlags(renderer->getRenderFlags() ^ Renderer::ShowGlobulars);
         notifyWatchers(RenderFlagsChanged);
         break;
 
@@ -2069,8 +2069,6 @@ void CelestiaCore::charEntered(const char *c_p, int modifiers)
         sim->chase();
         break;
 
-
-
     case '[':
         if ((renderer->getRenderFlags() & Renderer::ShowAutoMag) == 0)
         {
@@ -2106,8 +2104,8 @@ void CelestiaCore::charEntered(const char *c_p, int modifiers)
         if((renderer->getRenderFlags() & Renderer::ShowAutoMag) == 0)
         {
             if (sim->getFaintestVisible() < 15.0f)
-	          {
-	              setFaintest(sim->getFaintestVisible() + 0.2f);
+            {
+                setFaintest(sim->getFaintestVisible() + 0.2f);
                 notifyWatchers(FaintestChanged);
                 char buf[128];
                 setlocale(LC_NUMERIC, "");
@@ -2195,6 +2193,7 @@ void CelestiaCore::charEntered(const char *c_p, int modifiers)
         // with a Lua script.
         editMode = !editMode;
         break;
+
 #ifdef USE_HDR
     case '|':
         renderer->setBloomEnabled(!renderer->getBloomEnabled());
@@ -2203,6 +2202,7 @@ void CelestiaCore::charEntered(const char *c_p, int modifiers)
         else
             flash(_("Bloom disabled"));
         break;
+
     case '<':
         {
             char buf[64];
@@ -2211,6 +2211,7 @@ void CelestiaCore::charEntered(const char *c_p, int modifiers)
             flash(buf);
         }
         break;
+
     case '>':
         {
             char buf[64];
@@ -2229,7 +2230,7 @@ void CelestiaCore::getLightTravelDelay(double distanceKm, int& hours, int& mins,
     // light travel time in hours
     double lt = distanceKm / (3600.0 * astro::speedOfLight);
     hours = (int) lt;
-    double mm    = (lt - hours) * 60;
+    double mm = (lt - hours) * 60;
     mins = (int) mm;
     secs = (float) ((mm  - mins) * 60);
 }
@@ -2315,12 +2316,14 @@ void CelestiaCore::tick()
     if (zoomMotion != 0.0f)
     {
         double span = 0.1;
+#if 0
         double fraction;
 
         if (currentTime - zoomTime >= span)
             fraction = (zoomTime + span) - (currentTime - dt);
         else
             fraction = dt / span;
+#endif
 
         // sim->changeOrbitDistance(zoomMotion * (float) fraction);
         if (currentTime - zoomTime >= span)
@@ -2539,7 +2542,7 @@ void CelestiaCore::draw()
         glDisable(GL_MULTISAMPLE_ARB);
 
     renderOverlay();
-	if (showConsole)
+    if (showConsole)
     {
         console.setFont(font);
         glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
@@ -2577,7 +2580,7 @@ void CelestiaCore::draw()
 void CelestiaCore::resize(GLsizei w, GLsizei h)
 {
     if (h == 0)
-	h = 1;
+        h = 1;
 
     glViewport(0, 0, w, h);
     if (renderer != NULL)
@@ -3122,7 +3125,7 @@ static void displayPlanetocentricCoords(Overlay& overlay,
             nsHemi = 'S';
         else if ((latitude > 0.0) ^ retrograde)
             nsHemi = 'N';
-        
+
         if (retrograde)
             ewHemi = 'E';
         else
@@ -3221,7 +3224,7 @@ static void displayStarInfo(Overlay& overlay,
 
         }
     }
-    
+
     if (detail > 1)
     {
         SolarSystem* sys = universe.getSolarSystem(&star);
@@ -3239,8 +3242,8 @@ static void displayDSOinfo(Overlay& overlay, const DeepSkyObject& dso, double di
     overlay << descBuf << '\n';
     if (distance >= 0)
     {
-    	overlay << _("Distance: ");
-    	displayDistanceLy(overlay, distance);
+        overlay << _("Distance: ");
+        displayDistanceLy(overlay, distance);
     }
     else
     {
@@ -3285,46 +3288,46 @@ static void displayPlanetInfo(Overlay& overlay,
 
     displayApparentDiameter(overlay, body.getRadius(), distanceKm);
 
-	// Display the phase angle
+    // Display the phase angle
 
-	// Find the parent star of the body. This can be slightly complicated if
-	// the body orbits a barycenter instead of a star.
-	Selection parent = Selection(&body).parent();
-	while (parent.body() != NULL)
-		parent = parent.parent();
+    // Find the parent star of the body. This can be slightly complicated if
+    // the body orbits a barycenter instead of a star.
+    Selection parent = Selection(&body).parent();
+    while (parent.body() != NULL)
+        parent = parent.parent();
 
-	if (parent.star() != NULL)
-	{
-		bool showPhaseAngle = false;
+    if (parent.star() != NULL)
+    {
+        bool showPhaseAngle = false;
 
-		Star* sun = parent.star();
-		if (sun->getVisibility())
-		{
-			showPhaseAngle = true;
-		}
-		else if (sun->getOrbitingStars())
-		{
-			// The planet's orbit is defined with respect to a barycenter. If there's
-			// a single star orbiting the barycenter, we'll compute the phase angle
-			// for the planet with respect to that star. If there are no stars, the
-			// planet is an orphan, drifting through space with no star. We also skip
-			// displaying the phase angle when there are multiple stars (for now.)
-			if (sun->getOrbitingStars()->size() == 1)
-			{
-				sun = sun->getOrbitingStars()->at(0);
-				showPhaseAngle = sun->getVisibility();
-			}
-		}
+        Star* sun = parent.star();
+        if (sun->getVisibility())
+        {
+            showPhaseAngle = true;
+        }
+        else if (sun->getOrbitingStars())
+        {
+            // The planet's orbit is defined with respect to a barycenter. If there's
+            // a single star orbiting the barycenter, we'll compute the phase angle
+            // for the planet with respect to that star. If there are no stars, the
+            // planet is an orphan, drifting through space with no star. We also skip
+            // displaying the phase angle when there are multiple stars (for now.)
+            if (sun->getOrbitingStars()->size() == 1)
+            {
+                sun = sun->getOrbitingStars()->at(0);
+                showPhaseAngle = sun->getVisibility();
+            }
+        }
 
-		if (showPhaseAngle)
-		{
-			Vector3d sunVec = Selection(&body).getPosition(t).offsetFromKm(Selection(sun).getPosition(t));
-			sunVec.normalize();
-			double cosPhaseAngle = sunVec.dot(viewVec.normalized());
-			double phaseAngle = acos(cosPhaseAngle);
-			overlay.oprintf(_("Phase angle: %.1f%s\n"), radToDeg(phaseAngle), UTF8_DEGREE_SIGN);
-		}
-	}
+        if (showPhaseAngle)
+        {
+            Vector3d sunVec = Selection(&body).getPosition(t).offsetFromKm(Selection(sun).getPosition(t));
+            sunVec.normalize();
+            double cosPhaseAngle = sunVec.dot(viewVec.normalized());
+            double phaseAngle = acos(cosPhaseAngle);
+            overlay.oprintf(_("Phase angle: %.1f%s\n"), radToDeg(phaseAngle), UTF8_DEGREE_SIGN);
+        }
+    }
 
     if (detail > 1)
     {
@@ -3474,7 +3477,7 @@ void CelestiaCore::renderOverlay()
                bottom = 0; // overlay pict locked at bottom of screen
 // Boux's code - end
             }
-            
+
         scriptImage->bind();
 
         glBegin(GL_QUADS);
@@ -3535,21 +3538,21 @@ void CelestiaCore::renderOverlay()
     if (hudDetail > 0 && (overlayElements & ShowTime))
     {
         double lt = 0.0;
- 
+
         if (sim->getSelection().getType() == Selection::Type_Body &&
             (sim->getTargetSpeed() < 0.99 * astro::speedOfLight))
         {
-    	    if (lightTravelFlag)
-    	    {
-    	        Vector3d v = sim->getSelection().getPosition(sim->getTime()).offsetFromKm(sim->getObserver().getPosition());
-    	        // light travel time in days
+            if (lightTravelFlag)
+            {
+                Vector3d v = sim->getSelection().getPosition(sim->getTime()).offsetFromKm(sim->getObserver().getPosition());
+                // light travel time in days
                 lt = v.norm() / (86400.0 * astro::speedOfLight);
-    	    }
-    	}
+            }
+        }
         else
-    	{
-    	    lt = 0.0;
-    	}
+        {
+            lt = 0.0;
+        }
 
         double tdb = sim->getTime() + lt;
         astro::Date d = timeZoneBias != 0?astro::TDBtoLocal(tdb):astro::TDBtoUTC(tdb);
@@ -3701,8 +3704,8 @@ void CelestiaCore::renderOverlay()
                                      *sim->getUniverse());
                 break;
 
-	    default:
-		break;
+            default:
+                break;
             }
 
             *overlay << '\n';
@@ -3852,11 +3855,11 @@ void CelestiaCore::renderOverlay()
                                 v.norm());
             break;
 
-	      default:
-	          break;
+        default:
+            break;
         }
 
-        
+
         // Display RA/Dec for the selection, but only when the observer is near
         // the Earth.
         Selection refObject = sim->getFrame()->getRefObject();
@@ -4275,27 +4278,27 @@ bool CelestiaCore::initSimulation(const string* configFileName,
     DSONameDatabase* dsoNameDB  = new DSONameDatabase;
     DSODatabase*     dsoDB      = new DSODatabase;
     dsoDB->setNameDatabase(dsoNameDB);
-	    
-	// Load first the vector of dsoCatalogFiles in the data directory (deepsky.dsc, globulars.dsc,...):
-	 
-	for (vector<string>::const_iterator iter = config->dsoCatalogFiles.begin();
+
+    // Load first the vector of dsoCatalogFiles in the data directory (deepsky.dsc, globulars.dsc,...):
+
+    for (vector<string>::const_iterator iter = config->dsoCatalogFiles.begin();
     iter != config->dsoCatalogFiles.end(); iter++)
     {
-    	if (progressNotifier)
-        	progressNotifier->update(*iter);
-	
-		ifstream dsoFile(iter->c_str(), ios::in);
+        if (progressNotifier)
+            progressNotifier->update(*iter);
+
+        ifstream dsoFile(iter->c_str(), ios::in);
         if (!dsoFile.good())
         {
-        	cerr<< _("Error opening deepsky catalog file.") << '\n';
+            cerr<< _("Error opening deepsky catalog file.") << '\n';
+            delete dsoDB;
+            return false;
+        }
+        else if (!dsoDB->load(dsoFile, ""))
+        {
+            cerr << "Cannot read Deep Sky Objects database." << '\n';
             delete dsoDB;
             return false;
-		}
-        else if (!dsoDB->load(dsoFile, ""))		
-	    {
-    		cerr << "Cannot read Deep Sky Objects database." << '\n';
-        	delete dsoDB;
-           	return false;
         }
     }
 
@@ -4557,7 +4560,7 @@ bool CelestiaCore::readStars(const CelestiaConfig& cfg,
     ifstream starNamesFile(cfg.starNamesFile.c_str(), ios::in);
     if (!starNamesFile.good())
     {
-	cerr << _("Error opening ") << cfg.starNamesFile << '\n';
+        cerr << _("Error opening ") << cfg.starNamesFile << '\n';
         return false;
     }
 
@@ -4981,7 +4984,7 @@ void CelestiaCore::toggleReferenceMark(const string& refMark, Selection sel)
         body = getSimulation()->getSelection().body();
     else
         body = sel.body();
-    
+
     // Reference marks can only be set for solar system bodies.
     if (body == NULL)
         return;
@@ -5059,7 +5062,7 @@ bool CelestiaCore::referenceMarkEnabled(const string& refMark, Selection sel) co
         body = getSimulation()->getSelection().body();
     else
         body = sel.body();
-    
+
     // Reference marks can only be set for solar system bodies.
     if (body == NULL)
         return false;
@@ -5095,7 +5098,7 @@ class LuaPathFinder : public EnumFilesHandler
                     }
                 }
             }
-	    }
+        }
         return true;
     };
 };
diff --git a/src/celestia/celestiacore.h b/src/celestia/celestiacore.h
index a083954d2..12da9bbd5 100644
--- a/src/celestia/celestiacore.h
+++ b/src/celestia/celestiacore.h
@@ -1,5 +1,5 @@
 // celestiacore.h
-// 
+//
 // Copyright (C) 2001-2009, the Celestia Development Team
 //
 // This program is free software; you can redistribute it and/or
@@ -43,7 +43,7 @@ class ProgressNotifier
 public:
     ProgressNotifier() {};
     virtual ~ProgressNotifier() {};
-    
+
     virtual void update(const std::string&) = 0;
 };
 
@@ -111,7 +111,7 @@ class CelestiaCore // : public Watchable<CelestiaCore>
         ForbiddenCursor     = 15,
         WhatsThisCursor     = 16,
     };
-    
+
     enum {
         Joy_XAxis           = 0,
         Joy_YAxis           = 1,
@@ -186,7 +186,7 @@ class CelestiaCore // : public Watchable<CelestiaCore>
         KbNormal         = 0,
         KbAutoComplete   = 1,
         KbPassToScript   = 2,
-    };        
+    };
 
     enum
     {
@@ -242,7 +242,7 @@ class CelestiaCore // : public Watchable<CelestiaCore>
     Renderer* getRenderer() const;
     void showText(std::string s,
                   int horig = 0, int vorig = 0,
-                  int hoff = 0, int voff = 0, 
+                  int hoff = 0, int voff = 0,
                   double duration = 1.0e9);
     int getTextWidth(string s) const;
 
@@ -290,7 +290,7 @@ class CelestiaCore // : public Watchable<CelestiaCore>
 
     void addWatcher(CelestiaWatcher*);
     void removeWatcher(CelestiaWatcher*);
-    
+
     void setFaintest(float);
     void setFaintestAutoMag();
 
@@ -337,13 +337,13 @@ class CelestiaCore // : public Watchable<CelestiaCore>
         virtual void setCursorShape(CursorShape) = 0;
         virtual CursorShape getCursorShape() const = 0;
     };
-    
+
     void setCursorHandler(CursorHandler*);
     CursorHandler* getCursorHandler() const;
 
     void toggleReferenceMark(const std::string& refMark, Selection sel = Selection());
     bool referenceMarkEnabled(const std::string& refMark, Selection sel = Selection()) const;
-    
+
  private:
     bool readStars(const CelestiaConfig&, ProgressNotifier*);
     void renderOverlay();
@@ -421,7 +421,7 @@ class CelestiaCore // : public Watchable<CelestiaCore>
     ScriptState scriptState;
 
     int timeZoneBias;              // Diff in secs between local time and GMT
-    std:: string timeZoneName;	   // Name of the current time zone
+    std:: string timeZoneName;     // Name of the current time zone
 
     // Frame rate counter variables
     bool showFPSCounter;
@@ -459,7 +459,7 @@ class CelestiaCore // : public Watchable<CelestiaCore>
     std::vector<CelestiaWatcher*> watchers;
     CursorHandler* cursorHandler;
     CursorShape defaultCursorShape;
-    
+
     std::vector<Url*> history;
     std::vector<Url*>::size_type historyCurrent;
     std::string startURL;
diff --git a/src/celestia/celx.cpp b/src/celestia/celx.cpp
index 13a5087db..06e19937c 100755
--- a/src/celestia/celx.cpp
+++ b/src/celestia/celx.cpp
@@ -110,8 +110,8 @@ void CelxLua::initRenderFlagMap()
     RenderFlagMap["cloudmaps"] = Renderer::ShowCloudMaps;
     RenderFlagMap["constellations"] = Renderer::ShowDiagrams;
     RenderFlagMap["galaxies"] = Renderer::ShowGalaxies;
-	RenderFlagMap["globulars"] = Renderer::ShowGlobulars;	    
-	RenderFlagMap["planets"] = Renderer::ShowPlanets;
+    RenderFlagMap["globulars"] = Renderer::ShowGlobulars;
+    RenderFlagMap["planets"] = Renderer::ShowPlanets;
     RenderFlagMap["stars"] = Renderer::ShowStars;
     RenderFlagMap["nightmaps"] = Renderer::ShowNightMaps;
     RenderFlagMap["eclipseshadows"] = Renderer::ShowEclipseShadows;
@@ -146,7 +146,7 @@ void CelxLua::initLabelFlagMap()
     LabelFlagMap["constellations"] = Renderer::ConstellationLabels;
     LabelFlagMap["stars"] = Renderer::StarLabels;
     LabelFlagMap["galaxies"] = Renderer::GalaxyLabels;
-	LabelFlagMap["globulars"] = Renderer::GlobularLabels;	
+    LabelFlagMap["globulars"] = Renderer::GlobularLabels;
     LabelFlagMap["locations"] = Renderer::LocationLabels;
     LabelFlagMap["nebulae"] = Renderer::NebulaLabels;
     LabelFlagMap["openclusters"] = Renderer::OpenClusterLabels;
@@ -231,7 +231,7 @@ void CelxLua::initLabelColorMap()
     LabelColorMap["spacecraft"]     = &Renderer::SpacecraftLabelColor;
     LabelColorMap["locations"]      = &Renderer::LocationLabelColor;
     LabelColorMap["galaxies"]       = &Renderer::GalaxyLabelColor;
-	LabelColorMap["globulars"]      = &Renderer::GlobularLabelColor;	
+    LabelColorMap["globulars"]      = &Renderer::GlobularLabelColor;
     LabelColorMap["nebulae"]        = &Renderer::NebulaLabelColor;
     LabelColorMap["openclusters"]   = &Renderer::OpenClusterLabelColor;
     LabelColorMap["constellations"] = &Renderer::ConstellationLabelColor;
@@ -482,7 +482,6 @@ void* Celx_CheckUserData(lua_State* l, int index, int id)
         return NULL;
 }
 
-
 // Return the CelestiaCore object stored in the globals table
 static CelestiaCore* getAppCore(lua_State* l, FatalErrors fatalErrors = NoErrors)
 {
@@ -797,7 +796,7 @@ bool LuaState::charEntered(const char* c_p)
         {
             result = (lua_toboolean(costate, -1) != 0);
         }
-		lua_pop(costate, 1);
+        lua_pop(costate, 1);
     }
 
 #if LUA_VER < 0x050100
@@ -978,7 +977,7 @@ int LuaState::loadScript(istream& in, const string& streamname)
 
 #if LUA_VER >= 0x050200
     int status = lua_load(state, readStreamChunk, &info, streamname.c_str(),
-			  NULL);
+                          NULL);
 #else
     int status = lua_load(state, readStreamChunk, &info, streamname.c_str());
 #endif
@@ -1219,8 +1218,8 @@ void Celx_CheckArgs(lua_State* l,
 
 static ObserverFrame::CoordinateSystem parseCoordSys(const string& name)
 {
-	// 'planetographic' is a deprecated name for bodyfixed, but maintained here
-	// for compatibility with older scripts.
+    // 'planetographic' is a deprecated name for bodyfixed, but maintained here
+    // for compatibility with older scripts.
 
     if (compareIgnoringCase(name, "universal") == 0)
         return ObserverFrame::Universal;
@@ -1378,7 +1377,7 @@ bool Celx_SafeGetBoolean(lua_State* l, int index, FatalErrors fatalErrors = AllE
             return defaultValue;
         }
     }
-    
+
     if (!lua_isboolean(l, index))
     {
         if (fatalErrors & WrongType)
@@ -1390,7 +1389,7 @@ bool Celx_SafeGetBoolean(lua_State* l, int index, FatalErrors fatalErrors = AllE
             return defaultValue;
         }
     }
-    
+
     return lua_toboolean(l, index) != 0;
 }
 
@@ -1953,7 +1952,7 @@ static int celestia_showconstellations(lua_State* l)
                  iter != asterisms->end(); iter++)
             {
                 Asterism* ast = *iter;
-  		          if (compareIgnoringCase(constellation, ast->getName(false)) == 0)
+                if (compareIgnoringCase(constellation, ast->getName(false)) == 0)
                     ast->setActive(true);
             }
             lua_pop(l,1);
@@ -2002,7 +2001,7 @@ static int celestia_hideconstellations(lua_State* l)
                  iter != asterisms->end(); iter++)
             {
                 Asterism* ast = *iter;
-  		          if (compareIgnoringCase(constellation, ast->getName(false)) == 0)
+                if (compareIgnoringCase(constellation, ast->getName(false)) == 0)
                     ast->setActive(false);
             }
             lua_pop(l,1);
@@ -2056,7 +2055,7 @@ static int celestia_setconstellationcolor(lua_State* l)
                  iter != asterisms->end(); iter++)
             {
                 Asterism* ast = *iter;
-  		          if (compareIgnoringCase(constellation, ast->getName(false)) == 0)
+                if (compareIgnoringCase(constellation, ast->getName(false)) == 0)
                     ast->setOverrideColor(constellationColor);
             }
             lua_pop(l,1);
@@ -2449,7 +2448,7 @@ static int celestia_mark(lua_State* l)
         MarkerRepresentation markerRep(MarkerRepresentation::Diamond);
         markerRep.setColor(Color(0.0f, 1.0f, 0.0f));
         markerRep.setSize(10.0f);
-        
+
         sim->getUniverse()->markObject(*sel, markerRep, 1);
     }
     else
@@ -2659,7 +2658,7 @@ static int celestia_tdbtoutc(lua_State* l)
 static int celestia_getsystemtime(lua_State* l)
 {
     Celx_CheckArgs(l, 1, 1, "No argument expected to function celestia:getsystemtime");
-    
+
     astro::Date d = astro::Date::systemDate();
     lua_pushnumber(l, astro::UTCtoTDB(d));
 
@@ -2981,7 +2980,7 @@ static int celestia_getstarcolor(lua_State* l)
     else
     {
         const ColorTemperatureTable* starColor = renderer->getStarColorTable();
-		
+
             if (starColor == GetStarColorTable(ColorTable_Enhanced))
             {
                 lua_pushstring(l, "enhanced");
@@ -3600,11 +3599,11 @@ static void CreateCelestiaMetaTable(lua_State* l)
     Celx_RegisterMethod(l, "setstardistancelimit", celestia_setstardistancelimit);
     Celx_RegisterMethod(l, "getstarstyle", celestia_getstarstyle);
     Celx_RegisterMethod(l, "setstarstyle", celestia_setstarstyle);
-	
-	// New CELX command for Star Color
+
+    // New CELX command for Star Color
     Celx_RegisterMethod(l, "getstarcolor", celestia_getstarcolor);
     Celx_RegisterMethod(l, "setstarcolor", celestia_setstarcolor);
-	
+
     Celx_RegisterMethod(l, "gettextureresolution", celestia_gettextureresolution);
     Celx_RegisterMethod(l, "settextureresolution", celestia_settextureresolution);
     Celx_RegisterMethod(l, "tojulianday", celestia_tojulianday);
@@ -3656,7 +3655,7 @@ bool LuaState::init(CelestiaCore* appCore)
     openLuaLibrary(state, LUA_STRLIBNAME, luaopen_string);
     // Make the package library, except the loadlib function, available
     // for celx regardless of script system access policy.
-		allowLuaPackageAccess();
+    allowLuaPackageAccess();
 #else
     lua_baselibopen(state);
     lua_mathlibopen(state);
@@ -3784,7 +3783,7 @@ static int font_render(lua_State* l)
 
     const char* s = Celx_SafeGetString(l, 2, AllErrors, "First argument to font:render must be a string");
     TextureFont* font = this_font(l);
-	font->render(s);
+    font->render(s);
 
     return 0;
 }
@@ -3990,8 +3989,8 @@ static int celestia_log(lua_State* l)
     Celx_CheckArgs(l, 2, 2, "One argument expected to function celestia:log");
 
     const char* s = Celx_SafeGetString(l, 2, AllErrors, "First argument to celestia:log must be a string");
-	clog << s << "\n"; clog.flush();
-	return 0;
+    clog << s << "\n"; clog.flush();
+    return 0;
 }
 
 static int celestia_getparamstring(lua_State* l)
@@ -4028,8 +4027,8 @@ static int celestia_loadfont(lua_State* l)
     string s = Celx_SafeGetString(l, 2, AllErrors, "Argument to celestia:loadfont() must be a string");
     TextureFont* font = LoadTextureFont(s);
     if (font == NULL) return 0;
-	font->buildTexture();
-	font_new(l, font);
+    font->buildTexture();
+    font_new(l, font);
     return 1;
 }
 
@@ -4051,7 +4050,7 @@ static int celestia_getfont(lua_State* l)
 
 TextureFont* getTitleFont(CelestiaCore* appCore)
 {
-	return appCore->titleFont;
+    return appCore->titleFont;
 }
 
 static int celestia_gettitlefont(lua_State* l)
@@ -4059,9 +4058,9 @@ static int celestia_gettitlefont(lua_State* l)
     Celx_CheckArgs(l, 1, 1, "No arguments expected to function celestia:getTitleFont");
 
     CelestiaCore* appCore = getAppCore(l, AllErrors);
-	TextureFont* font = getTitleFont(appCore);
+    TextureFont* font = getTitleFont(appCore);
     if (font == NULL) return 0;
-	font_new(l, font);
+    font_new(l, font);
     return 1;
 }
 
@@ -4341,7 +4340,7 @@ bool LuaState::callLuaHook(void* obj, const char* method, float x, float y)
         return false;
 
     lua_pushlightuserdata(costate, obj);
-	lua_gettable(costate, LUA_REGISTRYINDEX);
+    lua_gettable(costate, LUA_REGISTRYINDEX);
     if (!lua_istable(costate, -1))
     {
         lua_pop(costate, 1);
@@ -4385,7 +4384,7 @@ bool LuaState::callLuaHook(void* obj, const char* method, float x, float y, int
         return false;
 
     lua_pushlightuserdata(costate, obj);
-	lua_gettable(costate, LUA_REGISTRYINDEX);
+    lua_gettable(costate, LUA_REGISTRYINDEX);
     if (!lua_istable(costate, -1))
     {
         lua_pop(costate, 1);
@@ -4394,7 +4393,7 @@ bool LuaState::callLuaHook(void* obj, const char* method, float x, float y, int
     bool handled = false;
 
     lua_pushstring(costate, method);
-	lua_gettable(costate, -2);
+    lua_gettable(costate, -2);
     if (lua_isfunction(costate, -1))
     {
         lua_pushvalue(costate, -2);          // push the Lua object onto the stack
@@ -4530,9 +4529,9 @@ void CelxLua::registerMethod(const char* name, lua_CFunction fn)
 
 void CelxLua::registerValue(const char* name, float n)
 {
-	lua_pushstring(m_lua, name);
-	lua_pushnumber(m_lua, n);
-	lua_settable(m_lua, -3);
+    lua_pushstring(m_lua, name);
+    lua_pushnumber(m_lua, n);
+    lua_settable(m_lua, -3);
 }
 
 
@@ -4658,7 +4657,7 @@ CelestiaCore* CelxLua::appCore(FatalErrors fatalErrors)
 {
     push("celestia-appcore");
     lua_gettable(m_lua, LUA_REGISTRYINDEX);
-    
+
     if (!lua_islightuserdata(m_lua, -1))
     {
         if (fatalErrors == NoErrors)
@@ -4671,10 +4670,10 @@ CelestiaCore* CelxLua::appCore(FatalErrors fatalErrors)
             lua_error(m_lua);
         }
     }
-    
+
     CelestiaCore* appCore = static_cast<CelestiaCore*>(lua_touserdata(m_lua, -1));
     lua_pop(m_lua, 1);
-    
+
     return appCore;
 }
 
@@ -4685,7 +4684,7 @@ LuaState* CelxLua::getLuaStateObject()
     int stackSize = lua_gettop(m_lua);
     lua_pushstring(m_lua, "celestia-luastate");
     lua_gettable(m_lua, LUA_REGISTRYINDEX);
-    
+
     if (!lua_islightuserdata(m_lua, -1))
     {
         Celx_DoError(m_lua, "Internal Error: Invalid table entry for LuaState-pointer");
diff --git a/src/celestia/celx.h b/src/celestia/celx.h
index ce06e9ba5..65074cef0 100644
--- a/src/celestia/celx.h
+++ b/src/celestia/celx.h
@@ -1,5 +1,5 @@
 // celx.h
-// 
+//
 // Copyright (C) 2003, Chris Laurel <claurel@shatters.net>
 //
 // Lua script extensions for Celestia
@@ -76,7 +76,7 @@ public:
     bool callLuaHook(void* obj, const char* method, float x, float y);
     bool callLuaHook(void* obj, const char* method, float x, float y, int b);
     bool callLuaHook(void* obj, const char* method, double dt);
-    
+
     enum IOMode {
         NoIO = 1,
         Asking = 2,
diff --git a/src/celestia/celx_frame.cpp b/src/celestia/celx_frame.cpp
index 282260758..4e00c84c0 100644
--- a/src/celestia/celx_frame.cpp
+++ b/src/celestia/celx_frame.cpp
@@ -22,13 +22,13 @@ using namespace Eigen;
 int frame_new(lua_State* l, const ObserverFrame& f)
 {
     CelxLua celx(l);
-    
-	// Use placement new to put the new frame in the userdata block.
-	void* block = lua_newuserdata(l, sizeof(ObserverFrame));
-	new (block) ObserverFrame(f);
-    
+
+    // Use placement new to put the new frame in the userdata block.
+    void* block = lua_newuserdata(l, sizeof(ObserverFrame));
+    new (block) ObserverFrame(f);
+
     celx.setClass(Celx_Frame);
-    
+
     return 1;
 }
 
@@ -36,7 +36,7 @@ int frame_new(lua_State* l, const ObserverFrame& f)
 ObserverFrame* to_frame(lua_State* l, int index)
 {
     CelxLua celx(l);
-    
+
     return static_cast<ObserverFrame*>(celx.checkUserData(index, Celx_Frame));
 }
 
@@ -44,13 +44,13 @@ ObserverFrame* to_frame(lua_State* l, int index)
 static ObserverFrame* this_frame(lua_State* l)
 {
     CelxLua celx(l);
-    
+
     ObserverFrame* f = to_frame(l, 1);
     if (f == NULL)
     {
         celx.doError("Bad frame object!");
     }
-    
+
     return f;
 }
 
@@ -59,16 +59,16 @@ static ObserverFrame* this_frame(lua_State* l)
 static int frame_from(lua_State* l)
 {
     CelxLua celx(l);
-    
+
     celx.checkArgs(2, 3, "Two or three arguments required for frame:from");
-    
+
     ObserverFrame* frame = this_frame(l);
     CelestiaCore* appCore = celx.appCore(AllErrors);
-    
+
     UniversalCoord* uc = NULL;
     Quatd* q = NULL;
     double jd = 0.0;
-    
+
     if (celx.isType(2, Celx_Position))
     {
         uc = celx.toPosition(2);
@@ -81,9 +81,9 @@ static int frame_from(lua_State* l)
     {
         celx.doError("Position or rotation expected as second argument to frame:from()");
     }
-    
+
     jd = celx.safeGetNumber(3, WrongType, "Second arg to frame:from must be a number", appCore->getSimulation()->getTime());
-    
+
     if (uc != NULL)
     {
         UniversalCoord uc1 = frame->convertToUniversal(*uc, jd);
@@ -94,7 +94,7 @@ static int frame_from(lua_State* l)
         Quatd q1 = fromEigen(frame->convertToUniversal(toEigen(*q), jd));
         celx.newRotation(q1);
     }
-    
+
     return 1;
 }
 
@@ -104,14 +104,14 @@ static int frame_to(lua_State* l)
     CelxLua celx(l);
 
     celx.checkArgs(2, 3, "Two or three arguments required for frame:to");
-    
+
     ObserverFrame* frame = this_frame(l);
     CelestiaCore* appCore = celx.appCore(AllErrors);
-    
+
     UniversalCoord* uc = NULL;
     Quatd* q = NULL;
     double jd = 0.0;
-    
+
     if (celx.isType(2, Celx_Position))
     {
         uc = celx.toPosition(2);
@@ -120,14 +120,14 @@ static int frame_to(lua_State* l)
     {
         q = celx.toRotation(2);
     }
-    
+
     if (uc == NULL && q == NULL)
     {
         celx.doError("Position or rotation expected as second argument to frame:to()");
     }
-    
+
     jd = celx.safeGetNumber(3, WrongType, "Second arg to frame:to must be a number", appCore->getSimulation()->getTime());
-    
+
     if (uc != NULL)
     {
         UniversalCoord uc1 = frame->convertFromUniversal(*uc, jd);
@@ -138,7 +138,7 @@ static int frame_to(lua_State* l)
         Quaterniond q1 = frame->convertFromUniversal(toEigen(*q), jd);
         celx.newRotation(fromEigen(q1));
     }
-    
+
     return 1;
 }
 
@@ -147,7 +147,7 @@ static int frame_getrefobject(lua_State* l)
     CelxLua celx(l);
 
     celx.checkArgs(1, 1, "No arguments expected for frame:getrefobject()");
-    
+
     ObserverFrame* frame = this_frame(l);
     if (frame->getRefObject().getType() == Selection::Type_Nil)
     {
@@ -157,7 +157,7 @@ static int frame_getrefobject(lua_State* l)
     {
         celx.newObject(frame->getRefObject());
     }
-    
+
     return 1;
 }
 
@@ -166,7 +166,7 @@ static int frame_gettargetobject(lua_State* l)
     CelxLua celx(l);
 
     celx.checkArgs(1, 1, "No arguments expected for frame:gettarget()");
-    
+
     ObserverFrame* frame = this_frame(l);
     if (frame->getTargetObject().getType() == Selection::Type_Nil)
     {
@@ -184,7 +184,7 @@ static int frame_getcoordinatesystem(lua_State* l)
     CelxLua celx(l);
 
     celx.checkArgs(1, 1, "No arguments expected for frame:getcoordinatesystem()");
-    
+
     ObserverFrame* frame = this_frame(l);
     string coordsys;
     switch (frame->getCoordinateSystem())
@@ -206,19 +206,19 @@ static int frame_getcoordinatesystem(lua_State* l)
         default:
             coordsys = "invalid";
     }
-    
+
     celx.push(coordsys.c_str());
-    
+
     return 1;
 }
 
 static int frame_tostring(lua_State* l)
 {
     CelxLua celx(l);
-    
+
     // TODO: print out the actual information about the frame
     celx.push("[Frame]");
-    
+
     return 1;
 }
 
@@ -227,29 +227,29 @@ static int frame_tostring(lua_State* l)
 */
 static int frame_gc(lua_State* l)
 {
-	ObserverFrame* frame = this_frame(l);
-    
-	// Explicitly call the destructor since the object was created with placement new
-	frame->~ObserverFrame();
-    
-	return 0;
+    ObserverFrame* frame = this_frame(l);
+
+    // Explicitly call the destructor since the object was created with placement new
+    frame->~ObserverFrame();
+
+    return 0;
 }
 
 
 void CreateFrameMetaTable(lua_State* l)
 {
     CelxLua celx(l);
-    
+
     celx.createClassMetatable(Celx_Frame);
-    
+
     celx.registerMethod("__tostring", frame_tostring);
-	celx.registerMethod("__gc", frame_gc);
+    celx.registerMethod("__gc", frame_gc);
     celx.registerMethod("to", frame_to);
     celx.registerMethod("from", frame_from);
     celx.registerMethod("getcoordinatesystem", frame_getcoordinatesystem);
     celx.registerMethod("getrefobject", frame_getrefobject);
     celx.registerMethod("gettargetobject", frame_gettargetobject);
-    
+
     lua_pop(l, 1); // remove metatable from stack
 }
 
diff --git a/src/celestia/celx_gl.cpp b/src/celestia/celx_gl.cpp
index 04898cfb7..6085c698f 100644
--- a/src/celestia/celx_gl.cpp
+++ b/src/celestia/celx_gl.cpp
@@ -30,7 +30,7 @@ static int glu_LookAt(lua_State* l)
     float ux = (float)celx.safeGetNumber(7, WrongType, "argument 4 to gl.Frustum must be a number", 0.0);
     float uy = (float)celx.safeGetNumber(8, WrongType, "argument 5 to gl.Frustum must be a number", 0.0);
     float uz = (float)celx.safeGetNumber(9, WrongType, "argument 6 to gl.Frustum must be a number", 0.0);
-	gluLookAt(ix,iy,iz,cx,cy,cz,ux,uy,uz);
+    gluLookAt(ix,iy,iz,cx,cy,cz,ux,uy,uz);
     return 0;
 }
 
@@ -44,7 +44,7 @@ static int gl_Frustum(lua_State* l)
     float t = (float)celx.safeGetNumber(4, WrongType, "argument 4 to gl.Frustum must be a number", 0.0);
     float n = (float)celx.safeGetNumber(5, WrongType, "argument 5 to gl.Frustum must be a number", 0.0);
     float f = (float)celx.safeGetNumber(6, WrongType, "argument 6 to gl.Frustum must be a number", 0.0);
-	glFrustum(ll,r,b,t,n,f);
+    glFrustum(ll,r,b,t,n,f);
     return 0;
 }
 
@@ -58,7 +58,7 @@ static int gl_Ortho(lua_State* l)
     float t = (float)celx.safeGetNumber(4, WrongType, "argument 4 to gl.Ortho must be a number", 0.0);
     float n = (float)celx.safeGetNumber(5, WrongType, "argument 5 to gl.Ortho must be a number", 0.0);
     float f = (float)celx.safeGetNumber(6, WrongType, "argument 6 to gl.Ortho must be a number", 0.0);
-	glOrtho(ll,r,b,t,n,f);
+    glOrtho(ll,r,b,t,n,f);
     return 0;
 }
 
@@ -70,7 +70,7 @@ static int glu_Ortho2D(lua_State* l)
     float r = (float)celx.safeGetNumber(2, WrongType, "argument 2 to gl.Ortho must be a number", 0.0);
     float b = (float)celx.safeGetNumber(3, WrongType, "argument 3 to gl.Ortho must be a number", 0.0);
     float t = (float)celx.safeGetNumber(4, WrongType, "argument 4 to gl.Ortho must be a number", 0.0);
-	gluOrtho2D(ll,r,b,t);
+    gluOrtho2D(ll,r,b,t);
     return 0;
 }
 
@@ -80,7 +80,7 @@ static int gl_TexCoord(lua_State* l)
     celx.checkArgs(2, 2, "Two arguments expected for gl.TexCoord()");
     float x = (float)celx.safeGetNumber(1, WrongType, "argument 1 to gl.TexCoord must be a number", 0.0);
     float y = (float)celx.safeGetNumber(2, WrongType, "argument 2 to gl.TexCoord must be a number", 0.0);
-	glTexCoord2f(x,y);
+    glTexCoord2f(x,y);
     return 0;
 }
 
@@ -88,7 +88,7 @@ static int gl_TexParameter(lua_State* l)
 {
     CelxLua celx(l);
     celx.checkArgs(3, 3, "Three arguments expected for gl.TexParameter()");
-    
+
     // TODO: Need to ensure that these values are integers, or better yet use
     // names.
     float x = (float)celx.safeGetNumber(1, WrongType, "argument 1 to gl.TexParameter must be a number", 0.0);
@@ -104,7 +104,7 @@ static int gl_Vertex(lua_State* l)
     celx.checkArgs(2, 2, "Two arguments expected for gl.Vertex()");
     float x = (float)celx.safeGetNumber(1, WrongType, "argument 1 to gl.Vertex must be a number", 0.0);
     float y = (float)celx.safeGetNumber(2, WrongType, "argument 2 to gl.Vertex must be a number", 0.0);
-	glVertex2f(x,y);
+    glVertex2f(x,y);
     return 0;
 }
 
@@ -116,8 +116,8 @@ static int gl_Color(lua_State* l)
     float g = (float)celx.safeGetNumber(2, WrongType, "argument 2 to gl.Color must be a number", 0.0);
     float b = (float)celx.safeGetNumber(3, WrongType, "argument 3 to gl.Color must be a number", 0.0);
     float a = (float)celx.safeGetNumber(4, WrongType, "argument 4 to gl.Color must be a number", 0.0);
-	glColor4f(r,g,b,a);
-    //	glColor4f(0.8f, 0.5f, 0.5f, 1.0f);
+    glColor4f(r,g,b,a);
+    //    glColor4f(0.8f, 0.5f, 0.5f, 1.0f);
     return 0;
 }
 
@@ -136,7 +136,7 @@ static int gl_Translate(lua_State* l)
     celx.checkArgs(2, 2, "Two arguments expected for gl.Translate()");
     float x = (float)celx.safeGetNumber(1, WrongType, "argument 1 to gl.Translate must be a number", 0.0);
     float y = (float)celx.safeGetNumber(2, WrongType, "argument 2 to gl.Translate must be a number", 0.0);
-	glTranslatef(x,y,0.0f);
+    glTranslatef(x,y,0.0f);
     return 0;
 }
 
@@ -146,7 +146,7 @@ static int gl_BlendFunc(lua_State* l)
     celx.checkArgs(2, 2, "Two arguments expected for gl.BlendFunc()");
     int i = (int)celx.safeGetNumber(1, WrongType, "argument 1 to gl.BlendFunc must be a number", 0.0);
     int j = (int)celx.safeGetNumber(2, WrongType, "argument 2 to gl.BlendFunc must be a number", 0.0);
-	glBlendFunc(i,j);
+    glBlendFunc(i,j);
     return 0;
 }
 
@@ -155,7 +155,7 @@ static int gl_Begin(lua_State* l)
     CelxLua celx(l);
     celx.checkArgs(1, 1, "One argument expected for gl.Begin()");
     int i = (int)celx.safeGetNumber(1, WrongType, "argument 1 to gl.Begin must be a number", 0.0);
-	glBegin(i);
+    glBegin(i);
     return 0;
 }
 
@@ -172,7 +172,7 @@ static int gl_Enable(lua_State* l)
     CelxLua celx(l);
     celx.checkArgs(1, 1, "One argument expected for gl.Enable()");
     int i = (int)celx.safeGetNumber(1, WrongType, "argument 1 to gl.Enable must be a number", 0.0);
-	glEnable(i);
+    glEnable(i);
     return 0;
 }
 
@@ -181,7 +181,7 @@ static int gl_Disable(lua_State* l)
     CelxLua celx(l);
     celx.checkArgs(1, 1, "One argument expected for gl.Disable()");
     int i = (int)celx.safeGetNumber(1, WrongType, "argument 1 to gl.Disable must be a number", 0.0);
-	glDisable(i);
+    glDisable(i);
     return 0;
 }
 
@@ -190,7 +190,7 @@ static int gl_MatrixMode(lua_State* l)
     CelxLua celx(l);
     celx.checkArgs(1, 1, "One argument expected for gl.MatrixMode()");
     int i = (int) celx.safeGetNumber(1, WrongType, "argument 1 to gl.MatrixMode must be a number", 0.0);
-	glMatrixMode(i);
+    glMatrixMode(i);
     return 0;
 }
 
@@ -222,7 +222,7 @@ void LoadLuaGraphicsLibrary(lua_State* l)
 {
     CelxLua celx(l);
     lua_newtable(l);
-    
+
     celx.registerMethod("Frustum", gl_Frustum);
     celx.registerMethod("Ortho", gl_Ortho);
     celx.registerMethod("Color", gl_Color);
@@ -240,7 +240,7 @@ void LoadLuaGraphicsLibrary(lua_State* l)
     celx.registerMethod("PopMatrix", gl_PopMatrix);
     celx.registerMethod("LoadIdentity", gl_LoadIdentity);
     celx.registerMethod("PushMatrix", gl_PushMatrix);
-    
+
     celx.registerValue("QUADS", GL_QUADS);
     celx.registerValue("LIGHTING", GL_LIGHTING);
     celx.registerValue("POINTS", GL_POINTS);
@@ -259,7 +259,7 @@ void LoadLuaGraphicsLibrary(lua_State* l)
     celx.registerValue("SRC_ALPHA", GL_SRC_ALPHA);
     celx.registerValue("ONE_MINUS_SRC_ALPHA", GL_ONE_MINUS_SRC_ALPHA);
     lua_setglobal(l, "gl");
-    
+
     lua_newtable(l);
     celx.registerMethod("LookAt", glu_LookAt);
     celx.registerMethod("Ortho2D", glu_Ortho2D);
diff --git a/src/celestia/celx_internal.h b/src/celestia/celx_internal.h
index 28b1047fe..91a2214f0 100644
--- a/src/celestia/celx_internal.h
+++ b/src/celestia/celx_internal.h
@@ -61,11 +61,11 @@ public:
         Celx_String,
         Celx_Nil,
     };
-    
+
     CelxValue() : type(Celx_Nil) {}
     CelxValue(double d) : type(Celx_Number), value_number(d) {}
     CelxValue(const char* s) : type(Celx_String), value_cstring(s) {}
-    
+
     void push(lua_State* l) const
     {
         switch (type)
@@ -92,9 +92,9 @@ class CelxLua
 public:
     CelxLua(lua_State* l);
     ~CelxLua();
-    
+
     bool isType(int index, int type) const;
-    
+
     void setClass(int id);
     void pushClassName(int id);
     void* checkUserData(int index, int id);
@@ -103,10 +103,10 @@ public:
     void createClassMetatable(int id);
     void registerMethod(const char* name, lua_CFunction fn);
     void registerValue(const char* name, float value);
-    
+
     void setTable(const char* field, lua_Number value);
     void setTable(const char* field, const char* value);
-        
+
     void newFrame(const ObserverFrame& f);
     void newVector(const Vec3d& v);
     void newVector(const Eigen::Vector3d& v);
@@ -121,12 +121,12 @@ public:
     UniversalCoord* toPosition(int n);
     Selection* toObject(int n);
     ObserverFrame* toFrame(int n);
-    
+
     void push(const CelxValue& v1);
     void push(const CelxValue& v1, const CelxValue& v2);
-    
+
     CelestiaCore* appCore(FatalErrors fatalErrors = NoErrors);
-    
+
     lua_Number safeGetNumber(int index,
                              FatalErrors fatalErrors = AllErrors,
                              const char* errorMessage = "Numeric argument expected",
@@ -138,10 +138,10 @@ public:
                         FatalErrors fatalErrors = AllErrors,
                         const char* errorMsg = "Boolean argument expected",
                         bool defaultValue = false);
-    
+
     LuaState* getLuaStateObject();
 
-    
+
     // String to flag mappings
     typedef std::map<std::string, uint32> FlagMap;
     typedef std::map<std::string, Color*> ColorMap;
@@ -155,7 +155,7 @@ public:
     static void initOrbitVisibilityMap();
     static void initLabelColorMap();
     static void initLineColorMap();
-    
+
     static FlagMap RenderFlagMap;
     static FlagMap LabelFlagMap;
     static FlagMap LocationFlagMap;
@@ -165,9 +165,9 @@ public:
     static ColorMap LineColorMap;
     static ColorMap LabelColorMap;
     static bool mapsInitialized;
-    
+
     static const char* ClassNames[];
-    
+
 private:
     lua_State* m_lua;
 };
diff --git a/src/celestia/celx_object.cpp b/src/celestia/celx_object.cpp
index 76f30cfce..a047b661e 100644
--- a/src/celestia/celx_object.cpp
+++ b/src/celestia/celx_object.cpp
@@ -60,12 +60,12 @@ static MarkerRepresentation::Symbol parseMarkerSymbol(const string& name)
 int object_new(lua_State* l, const Selection& sel)
 {
     CelxLua celx(l);
-    
+
     Selection* ud = reinterpret_cast<Selection*>(lua_newuserdata(l, sizeof(Selection)));
     *ud = sel;
-    
+
     celx.setClass(Celx_Object);
-    
+
     return 1;
 }
 
@@ -84,7 +84,7 @@ static Selection* this_object(lua_State* l)
     {
         celx.doError("Bad position object!");
     }
-    
+
     return sel;
 }
 
@@ -92,7 +92,7 @@ static Selection* this_object(lua_State* l)
 static int object_tostring(lua_State* l)
 {
     lua_pushstring(l, "[Object]");
-    
+
     return 1;
 }
 
@@ -102,10 +102,10 @@ static int object_visible(lua_State* l)
 {
     CelxLua celx(l);
     celx.checkArgs(1, 1, "No arguments expected to function object:visible");
-    
+
     Selection* sel = this_object(l);
     lua_pushboolean(l, sel->isVisible());
-    
+
     return 1;
 }
 
@@ -115,7 +115,7 @@ static int object_setvisible(lua_State* l)
 {
     CelxLua celx(l);
     celx.checkArgs(2, 2, "One argument expected to object:setvisible()");
-    
+
     Selection* sel = this_object(l);
     bool visible = celx.safeGetBoolean(2, AllErrors, "Argument to object:setvisible() must be a boolean");
     if (sel->body() != NULL)
@@ -126,7 +126,7 @@ static int object_setvisible(lua_State* l)
     {
         sel->deepsky()->setVisible(visible);
     }
-    
+
     return 0;
 }
 
@@ -135,18 +135,18 @@ static int object_setorbitcolor(lua_State* l)
 {
     CelxLua celx(l);
     celx.checkArgs(4, 4, "Red, green, and blue color values exepected for object:setorbitcolor()");
-    
+
     Selection* sel = this_object(l);
     float r = (float) celx.safeGetNumber(2, WrongType, "Argument 1 to object:setorbitcolor() must be a number", 0.0);
     float g = (float) celx.safeGetNumber(3, WrongType, "Argument 2 to object:setorbitcolor() must be a number", 0.0);
     float b = (float) celx.safeGetNumber(4, WrongType, "Argument 3 to object:setorbitcolor() must be a number", 0.0);
     Color orbitColor(r, g, b);
-    
+
     if (sel->body() != NULL)
     {
         sel->body()->setOrbitColor(orbitColor);
     }
-    
+
     return 0;
 }
 
@@ -155,16 +155,16 @@ static int object_orbitcoloroverridden(lua_State* l)
 {
     CelxLua celx(l);
     celx.checkArgs(1, 1, "No arguments expected to object:orbitcoloroverridden");
-    
+
     bool isOverridden = false;
     Selection* sel = this_object(l);
     if (sel->body() != NULL)
     {
         isOverridden = sel->body()->isOrbitColorOverridden();
     }
-    
+
     lua_pushboolean(l, isOverridden);
-    
+
     return 1;
 }
 
@@ -173,15 +173,15 @@ static int object_setorbitcoloroverridden(lua_State* l)
 {
     CelxLua celx(l);
     celx.checkArgs(2, 2, "One argument expected to object:setorbitcoloroverridden");
-    
+
     Selection* sel = this_object(l);
     bool override = celx.safeGetBoolean(2, AllErrors, "Argument to object:setorbitcoloroverridden() must be a boolean");
-    
+
     if (sel->body() != NULL)
     {
         sel->body()->setOrbitColorOverridden(override);
     }
-    
+
     return 0;
 }
 
@@ -190,23 +190,23 @@ static int object_orbitvisibility(lua_State* l)
 {
     CelxLua celx(l);
     celx.checkArgs(1, 1, "No arguments expected to object:orbitvisibility");
-    
+
     Body::VisibilityPolicy visibility = Body::UseClassVisibility;
-    
+
     Selection* sel = this_object(l);
     if (sel->body() != NULL)
     {
         visibility = sel->body()->getOrbitVisibility();
     }
-    
+
     const char* s = "normal";
     if (visibility == Body::AlwaysVisible)
         s = "always";
     else if (visibility == Body::NeverVisible)
         s = "never";
-    
+
     lua_pushstring(l, s);
-    
+
     return 1;
 }
 
@@ -215,17 +215,17 @@ static int object_setorbitvisibility(lua_State* l)
 {
     CelxLua celx(l);
     celx.checkArgs(2, 2, "One argument expected to object:setorbitcoloroverridden");
-    
+
     if (!lua_isstring(l, 2))
     {
         celx.doError("First argument to object:setorbitvisibility() must be a string");
     }
-    
+
     Selection* sel = this_object(l);
-    
+
     string key;
     key = lua_tostring(l, 2);
-    
+
     if (CelxLua::OrbitVisibilityMap.count(key) == 0)
     {
         cerr << "Unknown visibility policy: " << key << endl;
@@ -233,13 +233,13 @@ static int object_setorbitvisibility(lua_State* l)
     else
     {
         Body::VisibilityPolicy visibility = static_cast<Body::VisibilityPolicy>(CelxLua::OrbitVisibilityMap[key]);
-        
+
         if (sel->body() != NULL)
         {
             sel->body()->setOrbitVisibility(visibility);
         }
     }
-    
+
     return 0;
 }
 
@@ -248,32 +248,32 @@ static int object_addreferencemark(lua_State* l)
 {
     CelxLua celx(l);
     celx.checkArgs(2, 2, "Expected one table as argument to object:addreferencemark()");
-    
+
     if (!lua_istable(l, 2))
     {
         celx.doError("Argument to object:addreferencemark() must be a table");
     }
-    
+
     Selection* sel = this_object(l);
     Body* body = sel->body();
-    
+
     lua_pushstring(l, "type");
     lua_gettable(l, 2);
     const char* rmtype = celx.safeGetString(3, NoErrors, "");
     lua_settop(l, 2);
-    
+
     lua_pushstring(l, "size");
     lua_gettable(l, 2);
     float rmsize = (float) celx.safeGetNumber(3, NoErrors, "", body->getRadius()) + body->getRadius();
     lua_settop(l, 2);
-    
+
     lua_pushstring(l, "opacity");
     lua_gettable(l, 2);
     // -1 indicates that the opacity wasn't set and the default value
     // should be used.
     float rmopacity = (float) celx.safeGetNumber(3, NoErrors, "", -1.0f);
     lua_settop(l, 2);
-    
+
     lua_pushstring(l, "color");
     lua_gettable(l, 2);
     const char* rmcolorstring = celx.safeGetString(3, NoErrors, "");
@@ -281,23 +281,23 @@ static int object_addreferencemark(lua_State* l)
     if (rmcolorstring != NULL)
         Color::parse(rmcolorstring, rmcolor);
     lua_settop(l, 2);
-    
+
     lua_pushstring(l, "tag");
     lua_gettable(l, 2);
     const char* rmtag = celx.safeGetString(3, NoErrors, "");
     if (rmtag == NULL)
         rmtag = rmtype;
     lua_settop(l, 2);
-    
+
     lua_pushstring(l, "target");
     lua_gettable(l, 2);
     Selection* rmtarget = to_object(l, 3);
     lua_settop(l, 2);
-    
+
     if (rmtype != NULL)
     {
         body->removeReferenceMark(rmtype);
-        
+
         if (compareIgnoringCase(rmtype, "body axes") == 0)
         {
             BodyAxisArrows* arrow = new BodyAxisArrows(*body);
@@ -368,7 +368,7 @@ static int object_addreferencemark(lua_State* l)
             body->addReferenceMark(grid);
         }
     }
-    
+
     return 0;
 }
 
@@ -378,19 +378,19 @@ static int object_removereferencemark(lua_State* l)
     CelxLua celx(l);
     celx.checkArgs(1, 1000, "Invalid number of arguments in object:removereferencemark");
     CelestiaCore* appCore = celx.appCore(AllErrors);
-    
+
     Selection* sel = this_object(l);
     Body* body = sel->body();
-    
+
     int argc = lua_gettop(l);
     for (int i = 2; i <= argc; i++)
     {
         string refMark = celx.safeGetString(i, AllErrors, "Arguments to object:removereferencemark() must be strings");
-        
+
         if (body->findReferenceMark(refMark))
             appCore->toggleReferenceMark(refMark, *sel);
     }
-    
+
     return 0;
 }
 
@@ -399,10 +399,10 @@ static int object_radius(lua_State* l)
 {
     CelxLua celx(l);
     celx.checkArgs(1, 1, "No arguments expected to function object:radius");
-    
+
     Selection* sel = this_object(l);
     lua_pushnumber(l, sel->radius());
-    
+
     return 1;
 }
 
@@ -410,7 +410,7 @@ static int object_setradius(lua_State* l)
 {
     CelxLua celx(l);
     celx.checkArgs(2, 2, "One argument expected to object:setradius()");
-    
+
     Selection* sel = this_object(l);
     if (sel->body() != NULL)
     {
@@ -421,7 +421,7 @@ static int object_setradius(lua_State* l)
         {
             body->setSemiAxes(body->getSemiAxes() * ((float) radius / iradius));
         }
-        
+
         if (body->getRings() != NULL)
         {
             RingSystem rings(0.0f, 0.0f);
@@ -433,7 +433,7 @@ static int object_setradius(lua_State* l)
             body->setRings(rings);
         }
     }
-    
+
     return 0;
 }
 
@@ -441,7 +441,7 @@ static int object_type(lua_State* l)
 {
     CelxLua celx(l);
     celx.checkArgs(1, 1, "No arguments expected to function object:type");
-    
+
     Selection* sel = this_object(l);
     const char* tname = "unknown";
     switch (sel->getType())
@@ -465,26 +465,26 @@ static int object_type(lua_State* l)
             }
         }
             break;
-            
+
         case Selection::Type_Star:
             tname = "star";
             break;
-            
+
         case Selection::Type_DeepSky:
             tname = sel->deepsky()->getObjTypeName();
             break;
-            
+
         case Selection::Type_Location:
             tname = "location";
             break;
-            
+
         case Selection::Type_Nil:
             tname = "null";
             break;
     }
-    
+
     lua_pushstring(l, tname);
-    
+
     return 1;
 }
 
@@ -492,7 +492,7 @@ static int object_name(lua_State* l)
 {
     CelxLua celx(l);
     celx.checkArgs(1, 1, "No arguments expected to function object:name");
-    
+
     Selection* sel = this_object(l);
     switch (sel->getType())
     {
@@ -514,7 +514,7 @@ static int object_name(lua_State* l)
             lua_pushstring(l, "?");
             break;
     }
-    
+
     return 1;
 }
 
@@ -522,7 +522,7 @@ static int object_localname(lua_State* l)
 {
     CelxLua celx(l);
     celx.checkArgs(1, 1, "No arguments expected to function object:localname");
-    
+
     Selection* sel = this_object(l);
     switch (sel->getType())
     {
@@ -541,7 +541,7 @@ static int object_localname(lua_State* l)
             lua_pushstring(l, "?");
             break;
     }
-    
+
     return 1;
 }
 
@@ -549,7 +549,7 @@ static int object_spectraltype(lua_State* l)
 {
     CelxLua celx(l);
     celx.checkArgs(1, 1, "No arguments expected to function object:spectraltype");
-    
+
     Selection* sel = this_object(l);
     if (sel->star() != NULL)
     {
@@ -562,7 +562,7 @@ static int object_spectraltype(lua_State* l)
     {
         lua_pushnil(l);
     }
-    
+
     return 1;
 }
 
@@ -570,9 +570,9 @@ static int object_getinfo(lua_State* l)
 {
     CelxLua celx(l);
     celx.checkArgs(1, 1, "No arguments expected to function object:getinfo");
-    
+
     lua_newtable(l);
-    
+
     Selection* sel = this_object(l);
     if (sel->star() != NULL)
     {
@@ -619,14 +619,14 @@ static int object_getinfo(lua_State* l)
             case Body::Component : tname = "component"; break;
             case Body::Diffuse : tname = "diffuse"; break;
         }
-        
+
         celx.setTable("type", tname);
         celx.setTable("name", body->getName().c_str());
         celx.setTable("mass", (lua_Number)body->getMass());
         celx.setTable("albedo", (lua_Number)body->getAlbedo());
         celx.setTable("infoURL", body->getInfoURL().c_str());
         celx.setTable("radius", (lua_Number)body->getRadius());
-        
+
         // TODO: add method to return semiaxes
         Vector3f semiAxes = body->getSemiAxes();
         // Note: oblateness is an obsolete field, replaced by semiaxes;
@@ -634,13 +634,13 @@ static int object_getinfo(lua_State* l)
         float polarRadius = semiAxes.y();
         float eqRadius = max(semiAxes.x(), semiAxes.z());
         celx.setTable("oblateness", (eqRadius - polarRadius) / eqRadius);
-        
+
         double lifespanStart, lifespanEnd;
         body->getLifespan(lifespanStart, lifespanEnd);
         celx.setTable("lifespanStart", (lua_Number)lifespanStart);
         celx.setTable("lifespanEnd", (lua_Number)lifespanEnd);
         // TODO: atmosphere, surfaces ?
-        
+
         PlanetarySystem* system = body->getSystem();
         if (system->getPrimaryBody() != NULL)
         {
@@ -656,18 +656,18 @@ static int object_getinfo(lua_State* l)
             object_new(l, parent);
             lua_settable(l, -3);
         }
-        
+
         lua_pushstring(l, "hasRings");
         lua_pushboolean(l, body->getRings() != NULL);
         lua_settable(l, -3);
-        
+
         // TIMELINE-TODO: The code to retrieve orbital and rotation periods only works
         // if the object has a single timeline phase. This should hardly ever
         // be a problem, but it still may be best to set the periods to zero
         // for objects with multiple phases.
         const RotationModel* rm = body->getRotationModel(0.0);
         celx.setTable("rotationPeriod", (double) rm->getPeriod());
-        
+
         const Orbit* orbit = body->getOrbit(0.0);
         celx.setTable("orbitPeriod", orbit->getPeriod());
         Atmosphere* atmosphere = body->getAtmosphere();
@@ -683,14 +683,14 @@ static int object_getinfo(lua_State* l)
         DeepSkyObject* deepsky = sel->deepsky();
         const char* objTypeName = deepsky->getObjTypeName();
         celx.setTable("type", objTypeName);
-        
+
         celx.setTable("name", celx.appCore(AllErrors)->getSimulation()->getUniverse()
                  ->getDSOCatalog()->getDSOName(deepsky).c_str());
         celx.setTable("catalogNumber", deepsky->getCatalogNumber());
-        
+
         if (!strcmp(objTypeName, "galaxy"))
             celx.setTable("hubbleType", deepsky->getType());
-        
+
         celx.setTable("absoluteMagnitude", (lua_Number)deepsky->getAbsoluteMagnitude());
         celx.setTable("radius", (lua_Number)deepsky->getRadius());
     }
@@ -702,7 +702,7 @@ static int object_getinfo(lua_State* l)
         celx.setTable("size", (lua_Number)location->getSize());
         celx.setTable("importance", (lua_Number)location->getImportance());
         celx.setTable("infoURL", location->getInfoURL().c_str());
-        
+
         uint32 featureType = location->getFeatureType();
         string featureName("Unknown");
         for (CelxLua::FlagMap::const_iterator it = CelxLua::LocationFlagMap.begin();
@@ -715,7 +715,7 @@ static int object_getinfo(lua_State* l)
             }
         }
         celx.setTable("featureType", featureName.c_str());
-        
+
         Body* parent = location->getParentBody();
         if (parent != NULL)
         {
@@ -736,13 +736,13 @@ static int object_absmag(lua_State* l)
 {
     CelxLua celx(l);
     celx.checkArgs(1, 1, "No arguments expected to function object:absmag");
-    
+
     Selection* sel = this_object(l);
     if (sel->star() != NULL)
         lua_pushnumber(l, sel->star()->getAbsoluteMagnitude());
     else
         lua_pushnil(l);
-    
+
     return 1;
 }
 
@@ -750,49 +750,49 @@ static int object_mark(lua_State* l)
 {
     CelxLua celx(l);
     celx.checkArgs(1, 7, "Need 0 to 6 arguments for object:mark");
-    
+
     Selection* sel = this_object(l);
     CelestiaCore* appCore = celx.appCore(AllErrors);
-    
+
     Color markColor(0.0f, 1.0f, 0.0f);
     const char* colorString = celx.safeGetString(2, WrongType, "First argument to object:mark must be a string");
     if (colorString != NULL)
         Color::parse(colorString, markColor);
-    
+
     MarkerRepresentation::Symbol markSymbol = MarkerRepresentation::Diamond;
     const char* markerString = celx.safeGetString(3, WrongType, "Second argument to object:mark must be a string");
     if (markerString != NULL)
         markSymbol = parseMarkerSymbol(markerString);
-    
+
     float markSize = (float)celx.safeGetNumber(4, WrongType, "Third arg to object:mark must be a number", 10.0);
     if (markSize < 1.0f)
         markSize = 1.0f;
     else if (markSize > 10000.0f)
         markSize = 10000.0f;
-    
+
     float markAlpha = (float)celx.safeGetNumber(5, WrongType, "Fourth arg to object:mark must be a number", 0.9);
     if (markAlpha < 0.0f)
         markAlpha = 0.0f;
     else if (markAlpha > 1.0f)
         markAlpha = 1.0f;
-    
+
     Color markColorAlpha(0.0f, 1.0f, 0.0f, 0.9f);
     markColorAlpha = Color(markColor, markAlpha);
-    
+
     const char* markLabel = celx.safeGetString(6, WrongType, "Fifth argument to object:mark must be a string");
     if (markLabel == NULL)
         markLabel = "";
-    
-    bool occludable = celx.safeGetBoolean(7, WrongType, "Sixth argument to object:mark must be a boolean", true);	
-    
+
+    bool occludable = celx.safeGetBoolean(7, WrongType, "Sixth argument to object:mark must be a boolean", true);
+
     Simulation* sim = appCore->getSimulation();
-    
+
     MarkerRepresentation markerRep(markSymbol);
     markerRep.setSize(markSize);
     markerRep.setColor(markColorAlpha);
     markerRep.setLabel(markLabel);
     sim->getUniverse()->markObject(*sel, markerRep, 1, occludable);
-    
+
     return 0;
 }
 
@@ -800,13 +800,13 @@ static int object_unmark(lua_State* l)
 {
     CelxLua celx(l);
     celx.checkArgs(1, 1, "No arguments expected to function object:unmark");
-    
+
     Selection* sel = this_object(l);
     CelestiaCore* appCore = celx.appCore(AllErrors);
-    
+
     Simulation* sim = appCore->getSimulation();
     sim->getUniverse()->unmarkObject(*sel, 1);
-    
+
     return 0;
 }
 
@@ -816,14 +816,14 @@ static int object_getposition(lua_State* l)
 {
     CelxLua celx(l);
     celx.checkArgs(1, 2, "Expected no or one argument to object:getposition");
-    
+
     Selection* sel = this_object(l);
     CelestiaCore* appCore = celx.appCore(AllErrors);
-    
+
     double t = celx.safeGetNumber(2, WrongType, "Time expected as argument to object:getposition",
                                   appCore->getSimulation()->getTime());
     celx.newPosition(sel->getPosition(t));
-    
+
     return 1;
 }
 
@@ -831,12 +831,12 @@ static int object_getchildren(lua_State* l)
 {
     CelxLua celx(l);
     celx.checkArgs(1, 1, "No arguments expected for object:getchildren()");
-    
+
     Selection* sel = this_object(l);
     CelestiaCore* appCore = celx.appCore(AllErrors);
-    
+
     Simulation* sim = appCore->getSimulation();
-    
+
     lua_newtable(l);
     if (sel->star() != NULL)
     {
@@ -868,7 +868,7 @@ static int object_getchildren(lua_State* l)
             }
         }
     }
-    
+
     return 1;
 }
 
@@ -877,7 +877,7 @@ static int object_preloadtexture(lua_State* l)
     CelxLua celx(l);
     celx.checkArgs(1, 1, "No argument expected to object:preloadtexture");
     CelestiaCore* appCore = celx.appCore(AllErrors);
-    
+
     Renderer* renderer = appCore->getRenderer();
     Selection* sel = this_object(l);
 
@@ -886,9 +886,9 @@ static int object_preloadtexture(lua_State* l)
         LuaState* luastate = celx.getLuaStateObject();
         // make sure we don't timeout because of texture-loading:
         double timeToTimeout = luastate->timeout - luastate->getTime();
-        
+
         renderer->loadTextures(sel->body());
-        
+
         // no matter how long it really took, make it look like 0.1s:
         luastate->timeout = luastate->getTime() + timeToTimeout - 0.1;
     }
@@ -918,59 +918,59 @@ static int object_preloadtexture(lua_State* l)
 static int object_catalognumber(lua_State* l)
 {
     CelxLua celx(l);
-	celx.checkArgs(2, 2, "One argument expected to object:catalognumber");
-	CelestiaCore* appCore = celx.appCore(AllErrors);
-    
-	Selection* sel = this_object(l);
+    celx.checkArgs(2, 2, "One argument expected to object:catalognumber");
+    CelestiaCore* appCore = celx.appCore(AllErrors);
+
+    Selection* sel = this_object(l);
     const char* catalogName = celx.safeGetString(2, WrongType, "Argument to object:catalognumber must be a string");
-    
-	// The argument is a string indicating the catalog.
-	bool validCatalog = false;
-	bool useHIPPARCOS = false;
-	StarDatabase::Catalog catalog = StarDatabase::HenryDraper;
-	if (catalogName != NULL)
-	{
-		if (compareIgnoringCase(catalogName, "HD") == 0)
-		{
-			catalog = StarDatabase::HenryDraper;
-			validCatalog = true;
-		}
-		else if (compareIgnoringCase(catalogName, "SAO") == 0)
-		{
-			catalog = StarDatabase::SAO;
-			validCatalog = true;
-		}
-		else if (compareIgnoringCase(catalogName, "HIP") == 0)
-		{
-			useHIPPARCOS = true;
-			validCatalog = true;
-		}
-	}
-    
-	uint32 catalogNumber = Star::InvalidCatalogNumber;
-	if (sel->star() != NULL && validCatalog)
-	{
-		uint32 internalNumber = sel->star()->getCatalogNumber();
-        
-		if (useHIPPARCOS)
-		{
-			// Celestia's internal catalog numbers /are/ HIPPARCOS numbers
-			if (internalNumber < StarDatabase::MAX_HIPPARCOS_NUMBER)
-				catalogNumber = internalNumber;
-		}
-		else
-		{
-			const StarDatabase* stardb = appCore->getSimulation()->getUniverse()->getStarCatalog();
-			catalogNumber = stardb->crossIndex(catalog, internalNumber);
-		}
-	}
-    
-	if (catalogNumber != Star::InvalidCatalogNumber)
-		lua_pushnumber(l, catalogNumber);
-	else
-		lua_pushnil(l);
-    
-	return 1;
+
+    // The argument is a string indicating the catalog.
+    bool validCatalog = false;
+    bool useHIPPARCOS = false;
+    StarDatabase::Catalog catalog = StarDatabase::HenryDraper;
+    if (catalogName != NULL)
+    {
+        if (compareIgnoringCase(catalogName, "HD") == 0)
+        {
+            catalog = StarDatabase::HenryDraper;
+            validCatalog = true;
+        }
+        else if (compareIgnoringCase(catalogName, "SAO") == 0)
+        {
+            catalog = StarDatabase::SAO;
+            validCatalog = true;
+        }
+        else if (compareIgnoringCase(catalogName, "HIP") == 0)
+        {
+            useHIPPARCOS = true;
+            validCatalog = true;
+        }
+    }
+
+    uint32 catalogNumber = Star::InvalidCatalogNumber;
+    if (sel->star() != NULL && validCatalog)
+    {
+        uint32 internalNumber = sel->star()->getCatalogNumber();
+
+        if (useHIPPARCOS)
+        {
+            // Celestia's internal catalog numbers /are/ HIPPARCOS numbers
+            if (internalNumber < StarDatabase::MAX_HIPPARCOS_NUMBER)
+                catalogNumber = internalNumber;
+        }
+        else
+        {
+            const StarDatabase* stardb = appCore->getSimulation()->getUniverse()->getStarCatalog();
+            catalogNumber = stardb->crossIndex(catalog, internalNumber);
+        }
+    }
+
+    if (catalogNumber != Star::InvalidCatalogNumber)
+        lua_pushnumber(l, catalogNumber);
+    else
+        lua_pushnil(l);
+
+    return 1;
 }
 
 
@@ -985,28 +985,28 @@ static int object_locations_iter(lua_State* l)
         celx.doError("Bad object!");
         return 0;
     }
-    
+
     // Get the current counter value
     uint32 i = (uint32) lua_tonumber(l, lua_upvalueindex(2));
-    
+
     vector<Location*>* locations = NULL;
     if (sel->body() != NULL)
     {
         locations = sel->body()->getLocations();
     }
-    
+
     if (locations != NULL && i < locations->size())
     {
         // Increment the counter
         lua_pushnumber(l, i + 1);
         lua_replace(l, lua_upvalueindex(2));
-        
+
         Location* loc = locations->at(i);
         if (loc == NULL)
             lua_pushnil(l);
         else
             object_new(l, Selection(loc));
-        
+
         return 1;
     }
     else
@@ -1040,7 +1040,7 @@ static int object_locations(lua_State* l)
     lua_pushvalue(l, 1);    // object
     lua_pushnumber(l, 0);   // counter
     lua_pushcclosure(l, object_locations_iter, 2);
-    
+
     return 1;
 }
 
@@ -1060,11 +1060,11 @@ static int object_locations(lua_State* l)
 static int object_bodyfixedframe(lua_State* l)
 {
     CelxLua celx(l);
-	celx.checkArgs(1, 1, "No arguments allowed for object:bodyfixedframe");
-    
-	Selection* sel = this_object(l);    
+    celx.checkArgs(1, 1, "No arguments allowed for object:bodyfixedframe");
+
+    Selection* sel = this_object(l);
     celx.newFrame(ObserverFrame(ObserverFrame::BodyFixed, *sel));
-    
+
     return 1;
 }
 
@@ -1085,11 +1085,11 @@ static int object_equatorialframe(lua_State* l)
 {
     // TODO: allow one argument specifying a freeze time
     CelxLua celx(l);
-	celx.checkArgs(1, 1, "No arguments allowed for to object:equatorialframe");
-    
-	Selection* sel = this_object(l);    
+    celx.checkArgs(1, 1, "No arguments allowed for to object:equatorialframe");
+
+    Selection* sel = this_object(l);
     celx.newFrame(ObserverFrame(ObserverFrame::Equatorial, *sel));
-    
+
     return 1;
 }
 
@@ -1105,39 +1105,39 @@ static int object_equatorialframe(lua_State* l)
 * -- Example: get the orbital frame for the Earth at the current time.
 * --
 * earth = celestia:find("Sol/Earth")
-* eof = earth:orbitframe() 
+* eof = earth:orbitframe()
 *
 * \endverbatim
 */
 static int object_orbitframe(lua_State* l)
 {
     CelxLua celx(l);
-	celx.checkArgs(1, 2, "One or no arguments allowed for to object:orbitframe");
-    
-	Selection* sel = this_object(l);
+    celx.checkArgs(1, 2, "One or no arguments allowed for to object:orbitframe");
+
+    Selection* sel = this_object(l);
     CelestiaCore* appCore = celx.appCore(AllErrors);
-    
+
     double t = celx.safeGetNumber(2, WrongType, "Time expected as argument to object:orbitframe",
                                   appCore->getSimulation()->getTime());
-    
+
     if (sel->body() == NULL)
     {
         // The default universal frame
         celx.newFrame(ObserverFrame());
     }
-    else 
+    else
     {
         const ReferenceFrame* f = sel->body()->getOrbitFrame(t);
         celx.newFrame(ObserverFrame(*f));
     }
-    
+
     return 1;
 }
 
 
 /*! object:bodyframe(time: t)
 *
-* Return the frame in which the orientation for an object is defined at a 
+* Return the frame in which the orientation for an object is defined at a
 * particular time. If time isn't specified, the current simulation time is
 * assumed. The positions of stars and deep sky objects are always defined
 * in the universal frame.
@@ -1146,32 +1146,32 @@ static int object_orbitframe(lua_State* l)
 * -- Example: get the curren body frame for the International Space Station.
 * --
 * iss = celestia:find("Sol/Earth/ISS")
-* f = iss:bodyframe() 
+* f = iss:bodyframe()
 *
 * \endverbatim
 */
 static int object_bodyframe(lua_State* l)
 {
     CelxLua celx(l);
-	celx.checkArgs(1, 2, "One or no arguments allowed for to object:bodyframe");
-    
-	Selection* sel = this_object(l);
+    celx.checkArgs(1, 2, "One or no arguments allowed for to object:bodyframe");
+
+    Selection* sel = this_object(l);
     CelestiaCore* appCore = celx.appCore(AllErrors);
-    
+
     double t = celx.safeGetNumber(2, WrongType, "Time expected as argument to object:orbitframe",
                                   appCore->getSimulation()->getTime());
-    
+
     if (sel->body() == NULL)
     {
         // The default universal frame
         celx.newFrame(ObserverFrame());
     }
-    else 
+    else
     {
         const ReferenceFrame* f = sel->body()->getBodyFrame(t);
         celx.newFrame(ObserverFrame(*f));
     }
-    
+
     return 1;
 }
 
@@ -1195,19 +1195,19 @@ static int object_bodyframe(lua_State* l)
 static int object_getphase(lua_State* l)
 {
     CelxLua celx(l);
-	celx.checkArgs(1, 2, "One or no arguments allowed for to object:getphase");
-    
-	Selection* sel = this_object(l);
+    celx.checkArgs(1, 2, "One or no arguments allowed for to object:getphase");
+
+    Selection* sel = this_object(l);
     CelestiaCore* appCore = celx.appCore(AllErrors);
-    
+
     double t = celx.safeGetNumber(2, WrongType, "Time expected as argument to object:getphase",
                                   appCore->getSimulation()->getTime());
-    
+
     if (sel->body() == NULL)
     {
         lua_pushnil(l);
     }
-    else 
+    else
     {
         const Timeline* timeline = sel->body()->getTimeline();
         if (timeline->includes(t))
@@ -1219,7 +1219,7 @@ static int object_getphase(lua_State* l)
             lua_pushnil(l);
         }
     }
-    
+
     return 1;
 }
 
@@ -1235,25 +1235,25 @@ static int object_phases_iter(lua_State* l)
         celx.doError("Bad object!");
         return 0;
     }
-    
+
     // Get the current counter value
     uint32 i = (uint32) lua_tonumber(l, lua_upvalueindex(2));
-    
+
     const Timeline* timeline = NULL;
     if (sel->body() != NULL)
     {
         timeline = sel->body()->getTimeline();
     }
-    
+
     if (timeline != NULL && i < timeline->phaseCount())
     {
         // Increment the counter
         lua_pushnumber(l, i + 1);
         lua_replace(l, lua_upvalueindex(2));
-        
+
         const TimelinePhase* phase = timeline->getPhase(i);
         celx.newPhase(*phase);
-        
+
         return 1;
     }
     else
@@ -1292,7 +1292,7 @@ static int object_phases(lua_State* l)
     lua_pushvalue(l, 1);    // object
     lua_pushnumber(l, 0);   // counter
     lua_pushcclosure(l, object_phases_iter, 2);
-    
+
     return 1;
 }
 
@@ -1300,7 +1300,7 @@ static int object_phases(lua_State* l)
 void CreateObjectMetaTable(lua_State* l)
 {
     CelxLua celx(l);
-    
+
     celx.createClassMetatable(Celx_Object);
 
     celx.registerMethod("__tostring", object_tostring);
@@ -1334,7 +1334,7 @@ void CreateObjectMetaTable(lua_State* l)
     celx.registerMethod("getphase", object_getphase);
     celx.registerMethod("phases", object_phases);
     celx.registerMethod("preloadtexture", object_preloadtexture);
-    
+
     lua_pop(l, 1); // pop metatable off the stack
 }
 
@@ -1347,10 +1347,10 @@ static int object_setatmosphere(lua_State* l)
     CelxLua celx(l);
 
     celx.checkArgs(23, 23, "22 arguments (!) expected to function object:setatmosphere");
-    
+
     Selection* sel = this_object(l);
     //CelestiaCore* appCore = getAppCore(l, AllErrors);
-    
+
     if (sel->body() != NULL)
     {
         Body* body = sel->body();
@@ -1360,7 +1360,7 @@ static int object_setatmosphere(lua_State* l)
             float r = (float) celx.safeGetNumber(2, AllErrors, "Arguments to observer:setatmosphere() must be numbers");
             float g = (float) celx.safeGetNumber(3, AllErrors, "Arguments to observer:setatmosphere() must be numbers");
             float b = (float) celx.safeGetNumber(4, AllErrors, "Arguments to observer:setatmosphere() must be numbers");
-            //			Color testColor(0.0f, 1.0f, 0.0f);
+            //            Color testColor(0.0f, 1.0f, 0.0f);
             Color testColor(r, g, b);
             atmosphere->lowerColor = testColor;
             r = (float) celx.safeGetNumber(5, AllErrors, "Arguments to observer:setatmosphere() must be numbers");
@@ -1378,11 +1378,11 @@ static int object_setatmosphere(lua_State* l)
             r = (float) celx.safeGetNumber(14, AllErrors, "Arguments to observer:setatmosphere() must be numbers");
             g = (float) celx.safeGetNumber(15, AllErrors, "Arguments to observer:setatmosphere() must be numbers");
             b = (float) celx.safeGetNumber(16, AllErrors, "Arguments to observer:setatmosphere() must be numbers");
-            //HWR			atmosphere->rayleighCoeff = Vector3(r, g, b);
+            //HWR            atmosphere->rayleighCoeff = Vector3(r, g, b);
             r = (float) celx.safeGetNumber(17, AllErrors, "Arguments to observer:setatmosphere() must be numbers");
             g = (float) celx.safeGetNumber(18, AllErrors, "Arguments to observer:setatmosphere() must be numbers");
             b = (float) celx.safeGetNumber(19, AllErrors, "Arguments to observer:setatmosphere() must be numbers");
-            //HWR			atmosphere->absorptionCoeff = Vector3(r, g, b);
+            //HWR            atmosphere->absorptionCoeff = Vector3(r, g, b);
             b = (float) celx.safeGetNumber(20, AllErrors, "Arguments to observer:setatmosphere() must be numbers");
             atmosphere->mieCoeff = b;
             b = (float) celx.safeGetNumber(21, AllErrors, "Arguments to observer:setatmosphere() must be numbers");
@@ -1391,12 +1391,12 @@ static int object_setatmosphere(lua_State* l)
             atmosphere->miePhaseAsymmetry = b;
             b = (float) celx.safeGetNumber(23, AllErrors, "Arguments to observer:setatmosphere() must be numbers");
             atmosphere->rayleighScaleHeight = b;
-            
+
             body->setAtmosphere(*atmosphere);
             cout << "set atmosphere\n";
         }
     }
-    
+
     return 0;
 }
 
@@ -1409,5 +1409,5 @@ void ExtendObjectMetaTable(lua_State* l)
     if (lua_type(l, -1) != LUA_TTABLE)
         cout << "Metatable for " << CelxLua::ClassNames[Celx_Object] << " not found!\n";
     celx.registerMethod("setatmosphere", object_setatmosphere);
-	lua_pop(l, 1);
+    lua_pop(l, 1);
 }
diff --git a/src/celestia/celx_observer.cpp b/src/celestia/celx_observer.cpp
index 6739d7c28..5253b4c63 100644
--- a/src/celestia/celx_observer.cpp
+++ b/src/celestia/celx_observer.cpp
@@ -25,12 +25,12 @@ using namespace Eigen;
 int observer_new(lua_State* l, Observer* o)
 {
     CelxLua celx(l);
-    
+
     Observer** ud = static_cast<Observer**>(lua_newuserdata(l, sizeof(Observer*)));
     *ud = o;
-    
+
     celx.setClass(Celx_Observer);
-    
+
     return 1;
 }
 
@@ -40,7 +40,7 @@ Observer* to_observer(lua_State* l, int index)
 
     Observer** o = static_cast<Observer**>(lua_touserdata(l, index));
     CelestiaCore* appCore = celx.appCore(AllErrors);
-    
+
     // Check if pointer is still valid, i.e. is used by a view:
     if (o != NULL && getViewByObserver(appCore, *o) != NULL)
     {
@@ -58,7 +58,7 @@ static Observer* this_observer(lua_State* l)
     {
         celx.doError("Bad observer object (maybe tried to access a deleted view?)!");
     }
-    
+
     return obs;
 }
 
@@ -75,7 +75,7 @@ static int observer_isvalid(lua_State* l)
 static int observer_tostring(lua_State* l)
 {
     lua_pushstring(l, "[Observer]");
-    
+
     return 1;
 }
 
@@ -83,9 +83,9 @@ static int observer_setposition(lua_State* l)
 {
     CelxLua celx(l);
     celx.checkArgs(2, 2, "One argument required for setpos");
-    
+
     Observer* o = this_observer(l);
-    
+
     UniversalCoord* uc = celx.toPosition(2);
     if (uc == NULL)
     {
@@ -99,9 +99,9 @@ static int observer_setorientation(lua_State* l)
 {
     CelxLua celx(l);
     celx.checkArgs(2, 2, "One argument required for setorientation");
-    
+
     Observer* o = this_observer(l);
-    
+
     Quatd* q = celx.toRotation(2);
     if (q == NULL)
     {
@@ -115,10 +115,10 @@ static int observer_getorientation(lua_State* l)
 {
     CelxLua celx(l);
     celx.checkArgs(1, 1, "No arguments expected to observer:getorientation()");
-    
+
     Observer* o = this_observer(l);
     celx.newRotation(fromEigen(o->getOrientation()));
-    
+
     return 1;
 }
 
@@ -126,9 +126,9 @@ static int observer_rotate(lua_State* l)
 {
     CelxLua celx(l);
     celx.checkArgs(2, 2, "One argument required for rotate");
-    
+
     Observer* o = this_observer(l);
-    
+
     Quatd* q = celx.toRotation(2);
     if (q == NULL)
     {
@@ -139,21 +139,21 @@ static int observer_rotate(lua_State* l)
     return 0;
 }
 
-static int observer_orbit(lua_State* l)
-{
-    CelxLua celx(l);
-    celx.checkArgs(2, 2, "One argument required for orbit");
-    
-    Observer* o = this_observer(l);
-
-    Quatd* q = celx.toRotation(2);
-    if (q == NULL)
-    {
-        celx.doError("Argument for observer:orbit must be a rotation");
-    }
-    Quatf qf((float) q->w, (float) q->x, (float) q->y, (float) q->z);
-    o->orbit(Selection(), toEigen(qf));
-    return 0;
+static int observer_orbit(lua_State* l)
+{
+    CelxLua celx(l);
+    celx.checkArgs(2, 2, "One argument required for orbit");
+
+    Observer* o = this_observer(l);
+
+    Quatd* q = celx.toRotation(2);
+    if (q == NULL)
+    {
+        celx.doError("Argument for observer:orbit must be a rotation");
+    }
+    Quatf qf((float) q->w, (float) q->x, (float) q->y, (float) q->z);
+    o->orbit(Selection(), toEigen(qf));
+    return 0;
 }
 
 static int observer_lookat(lua_State* l)
@@ -161,9 +161,9 @@ static int observer_lookat(lua_State* l)
     CelxLua celx(l);
     celx.checkArgs(3, 4, "Two or three arguments required for lookat");
     int argc = lua_gettop(l);
-    
+
     Observer* o = this_observer(l);
-    
+
     UniversalCoord* from = NULL;
     UniversalCoord* to = NULL;
     Vec3d* upd = NULL;
@@ -183,14 +183,14 @@ static int observer_lookat(lua_State* l)
             from = celx.toPosition(2);
             to = celx.toPosition(3);
             upd = celx.toVector(4);
-            
+
             if (to == NULL || from == NULL)
             {
                 celx.doError("Argument 1 and 2 (of 3) to observer:lookat must be of type position");
             }
         }
     }
-    
+
     if (upd == NULL)
     {
         celx.doError("Last argument to observer:lookat must be of type vector");
@@ -207,7 +207,7 @@ static int observer_lookat(lua_State* l)
     // need Vec3f instead:
     Vec3f up = Vec3f((float) upd->x, (float) upd->y, (float) upd->z);
     Vec3f n = fromEigen(nd.cast<float>());
-    
+
     n.normalize();
     Vec3f v = n ^ up;
     v.normalize();
@@ -221,13 +221,13 @@ static int observer_gototable(lua_State* l)
 {
     CelxLua celx(l);
     celx.checkArgs(2, 2, "Expected one table as argument to goto");
-    
+
     Observer* o = this_observer(l);
     if (!lua_istable(l, 2))
     {
         lua_pushstring(l, "Argument to goto must be a table");
     }
-    
+
     Observer::JourneyParams jparams;
     jparams.duration = 5.0;
     jparams.from = o->getPosition();
@@ -238,66 +238,66 @@ static int observer_gototable(lua_State* l)
     jparams.endInterpolation = 0.75;
     jparams.accelTime = 0.5;
     jparams.traj = Observer::Linear;
-    
+
     lua_pushstring(l, "duration");
     lua_gettable(l, 2);
     jparams.duration = celx.safeGetNumber(3, NoErrors, "", 5.0);
     lua_settop(l, 2);
-    
+
     lua_pushstring(l, "from");
     lua_gettable(l, 2);
     UniversalCoord* from = celx.toPosition(3);
     if (from != NULL)
         jparams.from = *from;
     lua_settop(l, 2);
-    
+
     lua_pushstring(l, "to");
     lua_gettable(l, 2);
     UniversalCoord* to = celx.toPosition(3);
     if (to != NULL)
         jparams.to = *to;
     lua_settop(l, 2);
-    
+
     lua_pushstring(l, "initialOrientation");
     lua_gettable(l, 2);
     Quatd* rot1 = celx.toRotation(3);
     if (rot1 != NULL)
         jparams.initialOrientation = toEigen(*rot1);
     lua_settop(l, 2);
-    
+
     lua_pushstring(l, "finalOrientation");
     lua_gettable(l, 2);
     Quatd* rot2 = celx.toRotation(3);
     if (rot2 != NULL)
         jparams.finalOrientation = toEigen(*rot2);
     lua_settop(l, 2);
-    
+
     lua_pushstring(l, "startInterpolation");
     lua_gettable(l, 2);
     jparams.startInterpolation = celx.safeGetNumber(3, NoErrors, "", 0.25);
     lua_settop(l, 2);
-    
+
     lua_pushstring(l, "endInterpolation");
     lua_gettable(l, 2);
     jparams.endInterpolation = celx.safeGetNumber(3, NoErrors, "", 0.75);
     lua_settop(l, 2);
-    
+
     lua_pushstring(l, "accelTime");
     lua_gettable(l, 2);
     jparams.accelTime = celx.safeGetNumber(3, NoErrors, "", 0.5);
     lua_settop(l, 2);
-    
+
     jparams.duration = max(0.0, jparams.duration);
     jparams.accelTime = min(1.0, max(0.1, jparams.accelTime));
     jparams.startInterpolation = min(1.0, max(0.0, jparams.startInterpolation));
     jparams.endInterpolation = min(1.0, max(0.0, jparams.endInterpolation));
-    
+
     // args are in universal coords, let setFrame handle conversion:
     ObserverFrame tmp = *(o->getFrame());
     o->setFrame(ObserverFrame::Universal, Selection());
     o->gotoJourney(jparams);
     o->setFrame(tmp);
-    
+
     return 0;
 }
 
@@ -312,22 +312,22 @@ static int observer_goto(lua_State* l)
         return observer_gototable(l);
     }
     celx.checkArgs(1, 5, "One to four arguments expected to observer:goto");
-    
+
     Observer* o = this_observer(l);
-    
+
     Selection* sel = celx.toObject(2);
     UniversalCoord* uc = celx.toPosition(2);
     if (sel == NULL && uc == NULL)
     {
         celx.doError("First arg to observer:goto must be object or position");
     }
-    
+
     double travelTime = celx.safeGetNumber(3, WrongType, "Second arg to observer:goto must be a number", 5.0);
     double startInter = celx.safeGetNumber(4, WrongType, "Third arg to observer:goto must be a number", 0.25);
     double endInter = celx.safeGetNumber(5, WrongType, "Fourth arg to observer:goto must be a number", 0.75);
     if (startInter < 0 || startInter > 1) startInter = 0.25;
     if (endInter < 0 || endInter > 1) startInter = 0.75;
-    
+
     // The first argument may be either an object or a position
     if (sel != NULL)
     {
@@ -337,7 +337,7 @@ static int observer_goto(lua_State* l)
     {
         o->gotoLocation(*uc, o->getOrientation(), travelTime);
     }
-    
+
     return 0;
 }
 
@@ -345,23 +345,23 @@ static int observer_gotolonglat(lua_State* l)
 {
     CelxLua celx(l);
     celx.checkArgs(2, 7, "One to five arguments expected to observer:gotolonglat");
-    
+
     Observer* o = this_observer(l);
-    
+
     Selection* sel = celx.toObject(2);
     if (sel == NULL)
     {
         celx.doError("First arg to observer:gotolonglat must be an object");
     }
     double defaultDistance = sel->radius() * 5.0;
-    
+
     double longitude  = celx.safeGetNumber(3, WrongType, "Second arg to observer:gotolonglat must be a number", 0.0);
     double latitude   = celx.safeGetNumber(4, WrongType, "Third arg to observer:gotolonglat must be a number", 0.0);
     double distance   = celx.safeGetNumber(5, WrongType, "Fourth arg to observer:gotolonglat must be a number", defaultDistance);
     double travelTime = celx.safeGetNumber(6, WrongType, "Fifth arg to observer:gotolonglat must be a number", 5.0);
-    
+
     //distance = distance / KM_PER_LY;
-    
+
     Vector3f up = Vector3f::UnitY();
     if (lua_gettop(l) >= 7)
     {
@@ -373,7 +373,7 @@ static int observer_gotolonglat(lua_State* l)
         up = toEigen(*uparg).cast<float>();
     }
     o->gotoSelectionLongLat(*sel, travelTime, distance, (float)longitude, (float)latitude, up);
-    
+
     return 0;
 }
 
@@ -382,13 +382,13 @@ static int observer_gotolocation(lua_State* l)
 {
     CelxLua celx(l);
     celx.checkArgs(2, 3,"Expected one or two arguments to observer:gotolocation");
-    
+
     Observer* o = this_observer(l);
-    
+
     double travelTime = celx.safeGetNumber(3, WrongType, "Second arg to observer:gotolocation must be a number", 5.0);
     if (travelTime < 0)
         travelTime = 0.0;
-    
+
     UniversalCoord* uc = celx.toPosition(2);
     if (uc != NULL)
     {
@@ -398,7 +398,7 @@ static int observer_gotolocation(lua_State* l)
     {
         celx.doError("First arg to observer:gotolocation must be a position");
     }
-    
+
     return 0;
 }
 
@@ -406,17 +406,17 @@ static int observer_gotodistance(lua_State* l)
 {
     CelxLua celx(l);
     celx.checkArgs(2, 5, "One to four arguments expected to observer:gotodistance");
-    
+
     Observer* o = this_observer(l);
     Selection* sel = celx.toObject(2);
     if (sel == NULL)
     {
         celx.doError("First arg to observer:gotodistance must be object");
     }
-    
+
     double distance = celx.safeGetNumber(3, WrongType, "Second arg to observer:gotodistance must be a number", 20000);
     double travelTime = celx.safeGetNumber(4, WrongType, "Third arg to observer:gotodistance must be a number", 5.0);
-    
+
     Vector3f up = Vector3f::UnitY();
     if (lua_gettop(l) > 4)
     {
@@ -428,9 +428,9 @@ static int observer_gotodistance(lua_State* l)
 
         up = toEigen(*up_arg).cast<float>();
     }
-    
+
     o->gotoSelection(*sel, travelTime, distance, up, ObserverFrame::Universal);
-    
+
     return 0;
 }
 
@@ -438,20 +438,20 @@ static int observer_gotosurface(lua_State* l)
 {
     CelxLua celx(l);
     celx.checkArgs(2, 3, "One to two arguments expected to observer:gotosurface");
-    
+
     Observer* o = this_observer(l);
     Selection* sel = celx.toObject(2);
     if (sel == NULL)
     {
         celx.doError("First arg to observer:gotosurface must be object");
     }
-    
+
     double travelTime = celx.safeGetNumber(3, WrongType, "Second arg to observer:gotosurface must be a number", 5.0);
-    
+
     // This is needed because gotoSurface expects frame to be geosync:
     o->geosynchronousFollow(*sel);
     o->gotoSurface(*sel, travelTime);
-    
+
     return 0;
 }
 
@@ -459,7 +459,7 @@ static int observer_center(lua_State* l)
 {
     CelxLua celx(l);
     celx.checkArgs(2, 3, "Expected one or two arguments for to observer:center");
-    
+
     Observer* o = this_observer(l);
     Selection* sel = celx.toObject(2);
     if (sel == NULL)
@@ -467,9 +467,9 @@ static int observer_center(lua_State* l)
         celx.doError("First argument to observer:center must be an object");
     }
     double travelTime = celx.safeGetNumber(3, WrongType, "Second arg to observer:center must be a number", 5.0);
-    
+
     o->centerSelection(*sel, travelTime);
-    
+
     return 0;
 }
 
@@ -477,7 +477,7 @@ static int observer_centerorbit(lua_State* l)
 {
     CelxLua celx(l);
     celx.checkArgs(2, 3, "Expected one or two arguments for to observer:center");
-    
+
     Observer* o = this_observer(l);
     Selection* sel = celx.toObject(2);
     if (sel == NULL)
@@ -485,9 +485,9 @@ static int observer_centerorbit(lua_State* l)
         celx.doError("First argument to observer:centerorbit must be an object");
     }
     double travelTime = celx.safeGetNumber(3, WrongType, "Second arg to observer:centerorbit must be a number", 5.0);
-    
+
     o->centerSelectionCO(*sel, travelTime);
-    
+
     return 0;
 }
 
@@ -495,10 +495,10 @@ static int observer_cancelgoto(lua_State* l)
 {
     CelxLua celx(l);
     celx.checkArgs(1, 1, "Expected no arguments to observer:cancelgoto");
-    
+
     Observer* o = this_observer(l);
     o->cancelMotion();
-    
+
     return 0;
 }
 
@@ -506,7 +506,7 @@ static int observer_follow(lua_State* l)
 {
     CelxLua celx(l);
     celx.checkArgs(2, 2, "One argument expected for observer:follow");
-    
+
     Observer* o = this_observer(l);
     Selection* sel = celx.toObject(2);
     if (sel == NULL)
@@ -514,7 +514,7 @@ static int observer_follow(lua_State* l)
         celx.doError("First argument to observer:follow must be an object");
     }
     o->follow(*sel);
-    
+
     return 0;
 }
 
@@ -522,7 +522,7 @@ static int observer_synchronous(lua_State* l)
 {
     CelxLua celx(l);
     celx.checkArgs(2, 2, "One argument expected for observer:synchronous");
-    
+
     Observer* o = this_observer(l);
     Selection* sel = celx.toObject(2);
     if (sel == NULL)
@@ -530,7 +530,7 @@ static int observer_synchronous(lua_State* l)
         celx.doError("First argument to observer:synchronous must be an object");
     }
     o->geosynchronousFollow(*sel);
-    
+
     return 0;
 }
 
@@ -538,7 +538,7 @@ static int observer_lock(lua_State* l)
 {
     CelxLua celx(l);
     celx.checkArgs(2, 2, "One argument expected for observer:lock");
-    
+
     Observer* o = this_observer(l);
     Selection* sel = celx.toObject(2);
     if (sel == NULL)
@@ -546,7 +546,7 @@ static int observer_lock(lua_State* l)
         celx.doError("First argument to observer:phaseLock must be an object");
     }
     o->phaseLock(*sel);
-    
+
     return 0;
 }
 
@@ -554,7 +554,7 @@ static int observer_chase(lua_State* l)
 {
     CelxLua celx(l);
     celx.checkArgs(2, 2, "One argument expected for observer:chase");
-    
+
     Observer* o = this_observer(l);
     Selection* sel = celx.toObject(2);
     if (sel == NULL)
@@ -562,7 +562,7 @@ static int observer_chase(lua_State* l)
         celx.doError("First argument to observer:chase must be an object");
     }
     o->chase(*sel);
-    
+
     return 0;
 }
 
@@ -570,9 +570,9 @@ static int observer_track(lua_State* l)
 {
     CelxLua celx(l);
     celx.checkArgs(2, 2, "One argument expected for observer:track");
-    
+
     Observer* o = this_observer(l);
-    
+
     // If the argument is nil, clear the tracked object
     if (lua_isnil(l, 2))
     {
@@ -588,7 +588,7 @@ static int observer_track(lua_State* l)
         }
         o->setTrackedObject(*sel);
     }
-    
+
     return 0;
 }
 
@@ -596,10 +596,10 @@ static int observer_gettrackedobject(lua_State* l)
 {
     CelxLua celx(l);
     celx.checkArgs(1, 1, "No arguments expected to observer:gettrackedobject");
-    
+
     Observer* o = this_observer(l);
     celx.newObject(o->getTrackedObject());
-    
+
     return 1;
 }
 
@@ -609,13 +609,13 @@ static int observer_travelling(lua_State* l)
 {
     CelxLua celx(l);
     celx.checkArgs(1, 1, "No arguments expected to observer:travelling");
-    
+
     Observer* o = this_observer(l);
     if (o->getMode() == Observer::Travelling)
         lua_pushboolean(l, 1);
     else
         lua_pushboolean(l, 0);
-    
+
     return 1;
 }
 
@@ -624,10 +624,10 @@ static int observer_gettime(lua_State* l)
 {
     CelxLua celx(l);
     celx.checkArgs(1, 1, "No arguments expected to observer:gettime");
-    
+
     Observer* o = this_observer(l);
     lua_pushnumber(l, o->getTime());
-    
+
     return 1;
 }
 
@@ -636,10 +636,10 @@ static int observer_getposition(lua_State* l)
 {
     CelxLua celx(l);
     celx.checkArgs(1, 1, "No arguments expected to observer:getposition");
-    
+
     Observer* o = this_observer(l);
     celx.newPosition(o->getPosition());
-    
+
     return 1;
 }
 
@@ -647,10 +647,10 @@ static int observer_getsurface(lua_State* l)
 {
     CelxLua celx(l);
     celx.checkArgs(1, 1, "One argument expected to observer:getsurface()");
-    
+
     Observer* obs = this_observer(l);
     lua_pushstring(l, obs->getDisplayedSurface().c_str());
-    
+
     return 1;
 }
 
@@ -658,15 +658,15 @@ static int observer_setsurface(lua_State* l)
 {
     CelxLua celx(l);
     celx.checkArgs(2, 2, "One argument expected to observer:setsurface()");
-    
+
     Observer* obs = this_observer(l);
     const char* s = lua_tostring(l, 2);
-    
+
     if (s == NULL)
         obs->setDisplayedSurface("");
     else
         obs->setDisplayedSurface(s);
-    
+
     return 0;
 }
 
@@ -674,9 +674,9 @@ static int observer_getframe(lua_State* l)
 {
     CelxLua celx(l);
     celx.checkArgs(1, 1, "No arguments expected for observer:getframe()");
-    
+
     Observer* obs = this_observer(l);
-    
+
     const ObserverFrame* frame = obs->getFrame();
     celx.newFrame(*frame);
     return 1;
@@ -686,9 +686,9 @@ static int observer_setframe(lua_State* l)
 {
     CelxLua celx(l);
     celx.checkArgs(2, 2, "One argument required for observer:setframe()");
-    
+
     Observer* obs = this_observer(l);
-    
+
     ObserverFrame* frame;
     frame = celx.toFrame(2);
     if (frame != NULL)
@@ -706,9 +706,9 @@ static int observer_setspeed(lua_State* l)
 {
     CelxLua celx(l);
     celx.checkArgs(2, 2, "One argument required for observer:setspeed()");
-    
+
     Observer* obs = this_observer(l);
-    
+
     double speed = celx.safeGetNumber(2, AllErrors, "First argument to observer:setspeed must be a number");
     obs->setTargetSpeed((float) astro::microLightYearsToKilometers(speed));
 
@@ -719,9 +719,9 @@ static int observer_getspeed(lua_State* l)
 {
     CelxLua celx(l);
     celx.checkArgs(1, 1, "No argument expected for observer:getspeed()");
-    
+
     Observer* obs = this_observer(l);
-    
+
     lua_pushnumber(l, (lua_Number) astro::kilometersToMicroLightYears(obs->getTargetSpeed()));
 
     return 1;
@@ -731,7 +731,7 @@ static int observer_setfov(lua_State* l)
 {
     CelxLua celx(l);
     celx.checkArgs(2, 2, "One argument expected to observer:setfov()");
-    
+
     Observer* obs = this_observer(l);
     double fov = celx.safeGetNumber(2, AllErrors, "Argument to observer:setfov() must be a number");
     if ((fov >= degToRad(0.001f)) && (fov <= degToRad(120.0f)))
@@ -746,7 +746,7 @@ static int observer_getfov(lua_State* l)
 {
     CelxLua celx(l);
     celx.checkArgs(1, 1, "No argument expected to observer:getfov()");
-    
+
     Observer* obs = this_observer(l);
     lua_pushnumber(l, obs->getFOV());
     return 1;
@@ -756,7 +756,7 @@ static int observer_splitview(lua_State* l)
 {
     CelxLua celx(l);
     celx.checkArgs(2, 3, "One or two arguments expected for observer:splitview()");
-    
+
     Observer* obs = this_observer(l);
     CelestiaCore* appCore = celx.appCore(AllErrors);
     const char* splitType = celx.safeGetString(2, AllErrors, "First argument to observer:splitview() must be a string");
@@ -775,7 +775,7 @@ static int observer_deleteview(lua_State* l)
 {
     CelxLua celx(l);
     celx.checkArgs(1, 1, "No argument expected for observer:deleteview()");
-    
+
     Observer* obs = this_observer(l);
     CelestiaCore* appCore = celx.appCore(AllErrors);
     View* view = getViewByObserver(appCore, obs);
@@ -787,7 +787,7 @@ static int observer_singleview(lua_State* l)
 {
     CelxLua celx(l);
     celx.checkArgs(1, 1, "No argument expected for observer:singleview()");
-    
+
     Observer* obs = this_observer(l);
     CelestiaCore* appCore = celx.appCore(AllErrors);
     View* view = getViewByObserver(appCore, obs);
@@ -811,10 +811,10 @@ static int observer_equal(lua_State* l)
 {
     CelxLua celx(l);
     celx.checkArgs(2, 2, "Wrong number of arguments for comparison!");
-    
+
     Observer* o1 = this_observer(l);
     Observer* o2 = to_observer(l, 2);
-    
+
     lua_pushboolean(l, (o1 == o2));
     return 1;
 }
@@ -828,7 +828,7 @@ static int observer_setlocationflags(lua_State* l)
     {
         celx.doError("Argument to observer:setlocationflags() must be a table");
     }
-    
+
     lua_pushnil(l);
     int locationFlags = obs->getLocationFilter();
     while (lua_next(l, -2) != 0)
@@ -896,7 +896,7 @@ void CreateObserverMetaTable(lua_State* l)
 {
     CelxLua celx(l);
     celx.createClassMetatable(Celx_Observer);
-    
+
     celx.registerMethod("__tostring", observer_tostring);
     celx.registerMethod("isvalid", observer_isvalid);
     celx.registerMethod("goto", observer_goto);
@@ -937,6 +937,6 @@ void CreateObserverMetaTable(lua_State* l)
     celx.registerMethod("getlocationflags", observer_getlocationflags);
     celx.registerMethod("setlocationflags", observer_setlocationflags);
     celx.registerMethod("__eq", observer_equal);
-    
+
     lua_pop(l, 1); // remove metatable from stack
 }
diff --git a/src/celestia/celx_phase.cpp b/src/celestia/celx_phase.cpp
index c1353a200..a028786a6 100644
--- a/src/celestia/celx_phase.cpp
+++ b/src/celestia/celx_phase.cpp
@@ -43,7 +43,7 @@ const TimelinePhase* phase;
 int phase_new(lua_State* l, const TimelinePhase& phase)
 {
     CelxLua celx(l);
-    
+
     // Use placement new to put the new phase reference in the userdata block.
     void* block = lua_newuserdata(l, sizeof(PhaseReference));
     new (block) PhaseReference(phase);
@@ -57,7 +57,7 @@ int phase_new(lua_State* l, const TimelinePhase& phase)
 static const TimelinePhase* to_phase(lua_State* l, int index)
 {
     CelxLua celx(l);
-    
+
     PhaseReference* ref = static_cast<PhaseReference*>(celx.checkUserData(index, Celx_Phase));
     return ref == NULL ? NULL : ref->phase;
 }
@@ -66,7 +66,7 @@ static const TimelinePhase* to_phase(lua_State* l, int index)
 static const TimelinePhase* this_phase(lua_State* l)
 {
     CelxLua celx(l);
-    
+
     const TimelinePhase* phase = to_phase(l, 1);
     if (phase == NULL)
     {
@@ -94,10 +94,10 @@ static const TimelinePhase* this_phase(lua_State* l)
 static int phase_timespan(lua_State* l)
 {
     CelxLua celx(l);
-    
+
     celx.checkArgs(1, 1, "No arguments allowed for to phase:timespan");
-        
-	const TimelinePhase* phase = this_phase(l);
+
+    const TimelinePhase* phase = this_phase(l);
     celx.push(phase->startTime(), phase->endTime());
     //lua_pushnumber(l, phase->startTime());
     //lua_pushnumber(l, phase->endTime());
@@ -113,13 +113,13 @@ static int phase_timespan(lua_State* l)
 static int phase_orbitframe(lua_State* l)
 {
     CelxLua celx(l);
-    
+
     celx.checkArgs(1, 1, "No arguments allowed for to phase:orbitframe");
-        
-	const TimelinePhase* phase = this_phase(l);
+
+    const TimelinePhase* phase = this_phase(l);
     const ReferenceFrame* f = phase->orbitFrame();
     celx.newFrame(ObserverFrame(*f));
-    
+
     return 1;
 }
 
@@ -131,13 +131,13 @@ static int phase_orbitframe(lua_State* l)
 static int phase_bodyframe(lua_State* l)
 {
     CelxLua celx(l);
-    
+
     celx.checkArgs(1, 1, "No arguments allowed for to phase:bodyframe");
-        
-	const TimelinePhase* phase = this_phase(l);
+
+    const TimelinePhase* phase = this_phase(l);
     const ReferenceFrame* f = phase->bodyFrame();
     celx.newFrame(ObserverFrame(*f));
-    
+
     return 1;
 }
 
@@ -151,7 +151,7 @@ static int phase_bodyframe(lua_State* l)
 static int phase_getposition(lua_State* l)
 {
     CelxLua celx(l);
-    
+
     celx.checkArgs(2, 2, "One argument required for phase:getposition");
 
     const TimelinePhase* phase = this_phase(l);
@@ -176,7 +176,7 @@ static int phase_getposition(lua_State* l)
 static int phase_getorientation(lua_State* l)
 {
     CelxLua celx(l);
-    
+
     celx.checkArgs(2, 2, "One argument required for phase:getorientation");
 
     const TimelinePhase* phase = this_phase(l);
@@ -203,13 +203,13 @@ static int phase_tostring(lua_State* l)
 }
 
 
-/*! __gc metamethod 
+/*! __gc metamethod
  * Garbage collection for phases.
  */
 static int phase_gc(lua_State* l)
 {
     CelxLua celx(l);
-    
+
     PhaseReference* ref = static_cast<PhaseReference*>(celx.checkUserData(1, Celx_Phase));
     if (ref == NULL)
     {
@@ -228,7 +228,7 @@ static int phase_gc(lua_State* l)
 void CreatePhaseMetaTable(lua_State* l)
 {
     CelxLua celx(l);
-    
+
     celx.createClassMetatable(Celx_Phase);
 
     celx.registerMethod("__tostring", phase_tostring);
diff --git a/src/celestia/celx_position.cpp b/src/celestia/celx_position.cpp
index 2aedd009b..1fbf14572 100644
--- a/src/celestia/celx_position.cpp
+++ b/src/celestia/celx_position.cpp
@@ -23,9 +23,9 @@ int position_new(lua_State* l, const UniversalCoord& uc)
 
     UniversalCoord* ud = reinterpret_cast<UniversalCoord*>(lua_newuserdata(l, sizeof(UniversalCoord)));
     *ud = uc;
-    
+
     celx.setClass(Celx_Position);
-    
+
     return 1;
 }
 
@@ -46,7 +46,7 @@ static UniversalCoord* this_position(lua_State* l)
     {
         celx.doError("Bad position object!");
     }
-    
+
     return uc;
 }
 
@@ -110,12 +110,12 @@ static int position_getx(lua_State* l)
     CelxLua celx(l);
 
     celx.checkArgs(1, 1, "No arguments expected for position:getx()");
-    
+
     UniversalCoord* uc = this_position(l);
     lua_Number x;
     x = uc->x;
     lua_pushnumber(l, x);
-    
+
     return 1;
 }
 
@@ -125,12 +125,12 @@ static int position_gety(lua_State* l)
     CelxLua celx(l);
 
     celx.checkArgs(1, 1, "No arguments expected for position:gety()");
-    
+
     UniversalCoord* uc = this_position(l);
     lua_Number y;
     y = uc->y;
     lua_pushnumber(l, y);
-    
+
     return 1;
 }
 
@@ -140,12 +140,12 @@ static int position_getz(lua_State* l)
     CelxLua celx(l);
 
     celx.checkArgs(1, 1, "No arguments expected for position:getz()");
-    
+
     UniversalCoord* uc = this_position(l);
     lua_Number z;
     z = uc->z;
     lua_pushnumber(l, z);
-    
+
     return 1;
 }
 
@@ -155,10 +155,10 @@ static int position_vectorto(lua_State* l)
     CelxLua celx(l);
 
     celx.checkArgs(2, 2, "One argument expected to position:vectorto");
-    
+
     UniversalCoord* uc = this_position(l);
     UniversalCoord* uc2 = to_position(l, 2);
-    
+
     if (uc2 == NULL)
     {
         celx.doError("Argument to position:vectorto must be a position");
@@ -175,21 +175,21 @@ static int position_orientationto(lua_State* l)
     CelxLua celx(l);
 
     celx.checkArgs(3, 3, "Two arguments expected for position:orientationto");
-    
+
     UniversalCoord* src = this_position(l);
     UniversalCoord* target = to_position(l, 2);
-    
+
     if (target == NULL)
     {
         celx.doError("First argument to position:orientationto must be a position");
     }
-    
+
     Vec3d* upd = celx.toVector(3);
     if (upd == NULL)
     {
         celx.doError("Second argument to position:orientationto must be a vector");
     }
-    
+
     Vec3d src2target = fromEigen(target->offsetFromKm(*src));
     src2target.normalize();
     Vec3d v = src2target ^ *upd;
@@ -197,7 +197,7 @@ static int position_orientationto(lua_State* l)
     Vec3d u = v ^ src2target;
     Quatd qd = Quatd(Mat3d(v, u, -src2target));
     celx.newRotation(qd);
-    
+
     return 1;
 }
 
@@ -206,7 +206,7 @@ static int position_tostring(lua_State* l)
 {
     // TODO: print out the coordinate as it would appear in a cel:// URL
     lua_pushstring(l, "[Position]");
-    
+
     return 1;
 }
 
@@ -216,16 +216,16 @@ static int position_distanceto(lua_State* l)
     CelxLua celx(l);
 
     celx.checkArgs(2, 2, "One argument expected to position:distanceto()");
-    
+
     UniversalCoord* uc = this_position(l);
     UniversalCoord* uc2 = to_position(l, 2);
     if (uc2 == NULL)
     {
         celx.doError("Position expected as argument to position:distanceto");
     }
-    
+
     lua_pushnumber(l, uc2->offsetFromKm(*uc).norm());
-    
+
     return 1;
 }
 
@@ -238,7 +238,7 @@ static int position_add(lua_State* l)
     UniversalCoord* p1 = NULL;
     UniversalCoord* p2 = NULL;
     Vec3d* v2 = NULL;
-    
+
     if (celx.isType(1, Celx_Position) && celx.isType(2, Celx_Position))
     {
         p1 = celx.toPosition(1);
@@ -269,7 +269,7 @@ static int position_sub(lua_State* l)
     UniversalCoord* p1 = NULL;
     UniversalCoord* p2 = NULL;
     Vec3d* v2 = NULL;
-    
+
     if (celx.isType(1, Celx_Position) && celx.isType(2, Celx_Position))
     {
         p1 = celx.toPosition(1);
@@ -317,7 +317,7 @@ void CreatePositionMetaTable(lua_State* l)
     CelxLua celx(l);
 
     celx.createClassMetatable(Celx_Position);
-    
+
     celx.registerMethod("__tostring", position_tostring);
     celx.registerMethod("distanceto", position_distanceto);
     celx.registerMethod("vectorto", position_vectorto);
@@ -330,6 +330,6 @@ void CreatePositionMetaTable(lua_State* l)
     celx.registerMethod("getx", position_getx);
     celx.registerMethod("gety", position_gety);
     celx.registerMethod("getz", position_getz);
-    
+
     lua_pop(l, 1); // remove metatable from stack
 }
diff --git a/src/celestia/celx_rotation.cpp b/src/celestia/celx_rotation.cpp
index 0af93fd84..9057a3dae 100644
--- a/src/celestia/celx_rotation.cpp
+++ b/src/celestia/celx_rotation.cpp
@@ -17,12 +17,12 @@
 int rotation_new(lua_State* l, const Quatd& qd)
 {
     CelxLua celx(l);
-    
+
     Quatd* q = reinterpret_cast<Quatd*>(lua_newuserdata(l, sizeof(Quatd)));
     *q = qd;
-    
+
     celx.setClass(Celx_Rotation);
-    
+
     return 1;
 }
 
@@ -44,7 +44,7 @@ static Quatd* this_rotation(lua_State* l)
     {
         celx.doError("Bad rotation object!");
     }
-    
+
     return q;
 }
 
@@ -251,9 +251,9 @@ static int rotation_tostring(lua_State* l)
 void CreateRotationMetaTable(lua_State* l)
 {
     CelxLua celx(l);
-    
+
     celx.createClassMetatable(Celx_Rotation);
-    
+
     celx.registerMethod("real", rotation_real);
     celx.registerMethod("imag", rotation_imag);
     celx.registerMethod("transform", rotation_transform);
@@ -264,7 +264,7 @@ void CreateRotationMetaTable(lua_State* l)
     celx.registerMethod("__mul", rotation_mult);
     celx.registerMethod("__index", rotation_get);
     celx.registerMethod("__newindex", rotation_set);
-    
+
     lua_pop(l, 1); // remove metatable from stack
 }
 
diff --git a/src/celestia/celx_vector.cpp b/src/celestia/celx_vector.cpp
index 052b93fc9..06454eb11 100644
--- a/src/celestia/celx_vector.cpp
+++ b/src/celestia/celx_vector.cpp
@@ -22,7 +22,7 @@ int vector_new(lua_State* l, const Vec3d& v)
     Vec3d* v3 = reinterpret_cast<Vec3d*>(lua_newuserdata(l, sizeof(Vec3d)));
     *v3 = v;
     celx.setClass(Celx_Vec3);
-    
+
     return 1;
 }
 
@@ -42,7 +42,7 @@ static Vec3d* this_vector(lua_State* l)
     {
         celx.doError("Bad vector object!");
     }
-    
+
     return v3;
 }
 
@@ -127,7 +127,7 @@ static int vector_getx(lua_State* l)
     lua_Number x;
     x = static_cast<lua_Number>(v3->x);
     lua_pushnumber(l, x);
-    
+
     return 1;
 }
 
@@ -140,7 +140,7 @@ static int vector_gety(lua_State* l)
     lua_Number y;
     y = static_cast<lua_Number>(v3->y);
     lua_pushnumber(l, y);
-    
+
     return 1;
 }
 
@@ -153,7 +153,7 @@ static int vector_getz(lua_State* l)
     lua_Number z;
     z = static_cast<lua_Number>(v3->z);
     lua_pushnumber(l, z);
-    
+
     return 1;
 }
 
@@ -188,7 +188,7 @@ static int vector_add(lua_State* l)
     Vec3d* v1 = NULL;
     Vec3d* v2 = NULL;
     UniversalCoord* p = NULL;
-    
+
     if (celx.isType(1, Celx_Vec3) && celx.isType(2, Celx_Vec3))
     {
         v1 = celx.toVector(1);
@@ -270,7 +270,7 @@ static int vector_cross(lua_State* l)
         celx.doError("Bad vector multiplication!");
     }
     return 1;
-    
+
 }
 
 static int vector_tostring(lua_State* l)
@@ -284,7 +284,7 @@ void CreateVectorMetaTable(lua_State* l)
     CelxLua celx(l);
 
     celx.createClassMetatable(Celx_Vec3);
-    
+
     celx.registerMethod("__tostring", vector_tostring);
     celx.registerMethod("__add", vector_add);
     celx.registerMethod("__sub", vector_sub);
@@ -297,7 +297,7 @@ void CreateVectorMetaTable(lua_State* l)
     celx.registerMethod("getz", vector_getz);
     celx.registerMethod("normalize", vector_normalize);
     celx.registerMethod("length", vector_length);
-    
+
     lua_pop(l, 1); // remove metatable from stack
 }
 
diff --git a/src/celestia/configfile.cpp b/src/celestia/configfile.cpp
index d2c828741..e369ba0ad 100644
--- a/src/celestia/configfile.cpp
+++ b/src/celestia/configfile.cpp
@@ -71,9 +71,9 @@ CelestiaConfig* ReadCelestiaConfig(string filename, CelestiaConfig *config)
         config = new CelestiaConfig();
 
 #ifdef CELX
-    config->configParams = configParams;  
-    configParams->getString("LuaHook", config->luaHook);    
-    config->luaHook = WordExp(config->luaHook);             
+    config->configParams = configParams;
+    configParams->getString("LuaHook", config->luaHook);
+    config->luaHook = WordExp(config->luaHook);
 #endif
 
     config->faintestVisible = 6.0f;
@@ -199,8 +199,8 @@ CelestiaConfig* ReadCelestiaConfig(string filename, CelestiaConfig *config)
             }
         }
     }
-	    
-	Value* dsoCatalogsVal = configParams->getValue("DeepSkyCatalogs");
+
+    Value* dsoCatalogsVal = configParams->getValue("DeepSkyCatalogs");
     if (dsoCatalogsVal != NULL)
     {
         if (dsoCatalogsVal->getType() != Value::ArrayType)
@@ -294,7 +294,7 @@ CelestiaConfig* ReadCelestiaConfig(string filename, CelestiaConfig *config)
             }
         }
     }
-    
+
     Value* starTexValue = configParams->getValue("StarTextures");
     if (starTexValue != NULL)
     {
@@ -322,24 +322,24 @@ CelestiaConfig* ReadCelestiaConfig(string filename, CelestiaConfig *config)
             starTexTable->getString("L", starTexNames[StellarClass::Spectral_L]);
             starTexTable->getString("T", starTexNames[StellarClass::Spectral_T]);
             starTexTable->getString("C", starTexNames[StellarClass::Spectral_C]);
-            
+
             // One texture for all white dwarf types; not sure if this needs to be
             // changed. White dwarfs vary widely in temperature, so texture choice
             // should probably be based on that instead of spectral type.
             starTexTable->getString("WD", starTexNames[StellarClass::Spectral_D]);
-            
+
             string neutronStarTexName;
             if (starTexTable->getString("NeutronStar", neutronStarTexName))
             {
                 config->starTextures.neutronStarTex.setTexture(neutronStarTexName, "textures");
             }
-            
+
             string defaultTexName;
             if (starTexTable->getString("Default", defaultTexName))
             {
                 config->starTextures.defaultTex.setTexture(defaultTexName, "textures");
             }
-            
+
             for (unsigned int i = 0; i < (unsigned int) StellarClass::Spectral_Count; i++)
             {
                 if (starTexNames[i] != "")
@@ -365,10 +365,10 @@ float
 CelestiaConfig::getFloatValue(const string& name)
 {
     assert(params != NULL);
-    
+
     double x = 0.0;
     params->getNumber(name, x);
-    
+
     return (float) x;
 }
 
@@ -377,7 +377,7 @@ const string
 CelestiaConfig::getStringValue(const string& name)
 {
     assert(params != NULL);
-    
+
     Value* v = params->getValue(name);
     if (v == NULL || v->getType() != Value::StringType)
         return string("");
diff --git a/src/celestia/configfile.h b/src/celestia/configfile.h
index 210c37e2b..bb212b7c1 100644
--- a/src/celestia/configfile.h
+++ b/src/celestia/configfile.h
@@ -23,7 +23,7 @@ public:
     std::string starNamesFile;
     std::vector<std::string> solarSystemFiles;
     std::vector<std::string> starCatalogFiles;
-	std::vector<std::string> dsoCatalogFiles;
+    std::vector<std::string> dsoCatalogFiles;
     std::vector<std::string> extrasDirs;
     std::string deepSkyCatalog;
     std::string asterismsFile;
@@ -55,7 +55,7 @@ public:
     std::string HDCrossIndexFile;
     std::string SAOCrossIndexFile;
     std::string GlieseCrossIndexFile;
-    
+
     StarDetails::StarTextureSet starTextures;
 
     // Renderer detail options
@@ -69,9 +69,9 @@ public:
     bool hdr;
 
     unsigned int consoleLogRows;
-    
+
     Hash* params;
-    
+
     float getFloatValue(const std::string& name);
     const std::string getStringValue(const std::string& name);
 };
diff --git a/src/celestia/destination.cpp b/src/celestia/destination.cpp
index bc23ea454..f463dfd48 100644
--- a/src/celestia/destination.cpp
+++ b/src/celestia/destination.cpp
@@ -57,7 +57,7 @@ DestinationList* ReadDestinationList(istream& in)
 
         Hash* destParams = destValue->getHash();
         Destination* dest = new Destination();
-        
+
         if (!destParams->getString("Name", dest->name))
         {
             DPRINTF(1, "Skipping unnamed destination\n");
diff --git a/src/celestia/eclipsefinder.cpp b/src/celestia/eclipsefinder.cpp
index 3f3808116..ec289bf31 100644
--- a/src/celestia/eclipsefinder.cpp
+++ b/src/celestia/eclipsefinder.cpp
@@ -1,6 +1,6 @@
 // eclipsefinder.cpp by Christophe Teyssier <chris@teyssier.org>
 // adapted form wineclipses.cpp by Kendrix <kendrix@wanadoo.fr>
-// 
+//
 // Copyright (C) 2001-2009, the Celestia Development Team
 //
 // Compute Solar Eclipses for our Solar System planets
@@ -118,17 +118,17 @@ double EclipseFinder::findEclipseSpan(const Body& receiver, const Body& caster,
 int EclipseFinder::CalculateEclipses()
 {
     Simulation* sim = appCore->getSimulation();
-    
+
     Eclipse* eclipse;
     double* JDback = NULL;
-    
+
     int nIDplanetetofindon = 0;
     int nSattelites = 0;
 
     const SolarSystem* sys = sim->getNearestSolarSystem();
-    
+
     toProcess = false;
-    
+
     if ((!sys))
     {
         eclipse = new Eclipse(0.);
diff --git a/src/celestia/eclipsefinder.h b/src/celestia/eclipsefinder.h
index d541d6745..ada9a301d 100644
--- a/src/celestia/eclipsefinder.h
+++ b/src/celestia/eclipsefinder.h
@@ -1,6 +1,6 @@
 // eclipsefinder.h by Christophe Teyssier <chris@teyssier.org>
 // adapted form wineclipses.h by Kendrix <kendrix@wanadoo.fr>
-// 
+//
 // Copyright (C) 2001, Chris Laurel <claurel@shatters.net>
 //
 // Compute Solar Eclipses for our Solar System planets
@@ -22,7 +22,7 @@ class Eclipse
 public:
     Eclipse(int Y, int M, int D);
     Eclipse(double JD);
-    
+
     enum Type {
         Solar = 0,
         Moon  = 1
@@ -40,10 +40,10 @@ public:
 class EclipseFinder
 {
  public:
-    EclipseFinder(CelestiaCore* core, 
-                  const std::string& strPlaneteToFindOn_, 
+    EclipseFinder(CelestiaCore* core,
+                  const std::string& strPlaneteToFindOn_,
                   Eclipse::Type type_,
-                  double from, 
+                  double from,
                   double to )
                    :appCore(core),
                     strPlaneteToFindOn(strPlaneteToFindOn_),
@@ -51,19 +51,19 @@ class EclipseFinder
                     JDfrom(from),
                     JDto(to),
                     toProcess(true) {};
-       
+
     const std::vector<Eclipse>& getEclipses() { if (toProcess) CalculateEclipses(); return Eclipses_; };
-    
+
  private:
     CelestiaCore* appCore;
     std::vector<Eclipse> Eclipses_;
 
-    std::string strPlaneteToFindOn;   
+    std::string strPlaneteToFindOn;
     Eclipse::Type type;
-    double JDfrom, JDto;  
-    
+    double JDfrom, JDto;
+
     bool toProcess;
-    
+
     int CalculateEclipses();
     bool testEclipse(const Body& receiver, const Body& caster, double now) const;
     double findEclipseSpan(const Body& receiver, const Body& caster, double now, double dt) const;
diff --git a/src/celestia/favorites.h b/src/celestia/favorites.h
index 6a60e1b57..c5299858c 100644
--- a/src/celestia/favorites.h
+++ b/src/celestia/favorites.h
@@ -23,7 +23,7 @@ struct FavoritesEntry
 
     std::string name;
     std::string selectionName;
-    
+
     UniversalCoord position;
     Eigen::Quaternionf orientation;
     double jd;
diff --git a/src/celestia/glutmain.cpp b/src/celestia/glutmain.cpp
index cf825b144..906aae148 100644
--- a/src/celestia/glutmain.cpp
+++ b/src/celestia/glutmain.cpp
@@ -1,5 +1,5 @@
 // glutmain.cpp
-// 
+//
 // Copyright (C) 2001, Chris Laurel <claurel@shatters.net>
 //
 // GLUT front-end for Celestia.
@@ -318,7 +318,7 @@ static void initMenus(void) {
     glutAddMenuEntry("Select the sun (Home)    H",001);
 /*    glutAddMenuEntry("Select by name       ENTER",002); */
     glutAddMenuEntry("Run demo                         D",003);
-/*   
+/*
     gMouse=glutCreateMenu(menuCallback);
     glutAddSubMenu("*Orient camera    CLICK+DRAG",000);
     glutAddSubMenu("*Orbit object    RCLICK+DRAG",000);
@@ -432,23 +432,23 @@ static void dirFixup(char *argv0) {
 
 int main(int argc, char* argv[])
 {
-	setlocale(LC_ALL, "");
-	setlocale(LC_NUMERIC, "C");
-	bindtextdomain(PACKAGE, LOCALEDIR);
-	bind_textdomain_codeset(PACKAGE, "UTF-8");
-	textdomain(PACKAGE);
-			
-   #ifdef MACOSX
-   #define BUNDLEONLY 1
-   #ifndef BUNDLEONLY
-   // for bundles only!
-   if (argc==2 && argv[1][0]=='-' && argv[1][1]=='p' && argv[1][2]=='s' && argv[1][3]=='n')
-   {
-   #endif /* !BUNDLEONLY */
+    setlocale(LC_ALL, "");
+    setlocale(LC_NUMERIC, "C");
+    bindtextdomain(PACKAGE, LOCALEDIR);
+    bind_textdomain_codeset(PACKAGE, "UTF-8");
+    textdomain(PACKAGE);
+
+    #ifdef MACOSX
+    #define BUNDLEONLY 1
+    #ifndef BUNDLEONLY
+    // for bundles only!
+    if (argc==2 && argv[1][0]=='-' && argv[1][1]=='p' && argv[1][2]=='s' && argv[1][3]=='n')
+    {
+    #endif /* !BUNDLEONLY */
         argc--;
         dirFixup(argv[0]);
     #ifndef BUNDLEONLY
-    } else  
+    } else
     /* BE REAL DAMN CAREFUL WITH THIS LINGERING IF! */
     #endif /* !BUNDLEONLY */
     #else /* MACOSX */
@@ -534,15 +534,15 @@ int main(int argc, char* argv[])
     appCore->setTimeZoneName(tzname[daylight?0:1]);
     #endif
 
-	if (startfile == 1) {
-		if (argv[argc - 1][0] == '-') {
-			cout << "Missing Filename.\n";
-			return 1;
-		}
-	
-		cout << "*** Using CEL File: " << argv[argc - 1] << endl;
-		appCore->runScript(argv[argc - 1]);
-	}
+    if (startfile == 1) {
+        if (argv[argc - 1][0] == '-') {
+            cout << "Missing Filename.\n";
+            return 1;
+        }
+
+        cout << "*** Using CEL File: " << argv[argc - 1] << endl;
+        appCore->runScript(argv[argc - 1]);
+    }
 
     ready = true;
     glutMainLoop();
diff --git a/src/celestia/gtk/actions.cpp b/src/celestia/gtk/actions.cpp
index e4ed033fe..de4a43d2b 100644
--- a/src/celestia/gtk/actions.cpp
+++ b/src/celestia/gtk/actions.cpp
@@ -68,1105 +68,1105 @@ static void setLabelMode(AppData* a, int mode, gboolean state);
 /* File -> Copy URL */
 void actionCopyURL(GtkAction*, AppData* app)
 {
-	GtkClipboard* cb = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
-	CelestiaState appState;
-	appState.captureState(app->core);
-	Url url(appState, Url::CurrentVersion);
-	gtk_clipboard_set_text(cb, url.getAsString().c_str(), -1);
+    GtkClipboard* cb = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
+    CelestiaState appState;
+    appState.captureState(app->core);
+    Url url(appState, Url::CurrentVersion);
+    gtk_clipboard_set_text(cb, url.getAsString().c_str(), -1);
 }
 
 
 /* File -> Open URL */
 void actionOpenURL(GtkAction*, AppData* app)
 {
-	GtkWidget* dialog = gtk_dialog_new_with_buttons("Enter cel:// URL",
-	                                                GTK_WINDOW(app->mainWindow),
-	                                                GTK_DIALOG_MODAL,
-	                                                GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
-	                                                GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
-	                                                NULL);
+    GtkWidget* dialog = gtk_dialog_new_with_buttons("Enter cel:// URL",
+                                                    GTK_WINDOW(app->mainWindow),
+                                                    GTK_DIALOG_MODAL,
+                                                    GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
+                                                    GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
+                                                    NULL);
 
-	/* Create a new entry box with default text, all selected */
-	GtkWidget* entry = gtk_entry_new();
-	gtk_entry_set_width_chars(GTK_ENTRY(entry), 80);
-	gtk_entry_set_text(GTK_ENTRY(entry), "cel://");
-	gtk_editable_select_region(GTK_EDITABLE(entry), 0, -1);
+    /* Create a new entry box with default text, all selected */
+    GtkWidget* entry = gtk_entry_new();
+    gtk_entry_set_width_chars(GTK_ENTRY(entry), 80);
+    gtk_entry_set_text(GTK_ENTRY(entry), "cel://");
+    gtk_editable_select_region(GTK_EDITABLE(entry), 0, -1);
 
-	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), entry, TRUE, TRUE, CELSPACING);
-	gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT);
-	gtk_widget_show_all(dialog);
+    gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), entry, TRUE, TRUE, CELSPACING);
+    gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT);
+    gtk_widget_show_all(dialog);
 
-	if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT)
-		app->core->goToUrl(gtk_entry_get_text(GTK_ENTRY(entry)));
+    if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT)
+        app->core->goToUrl(gtk_entry_get_text(GTK_ENTRY(entry)));
 
-	gtk_widget_destroy(dialog);
+    gtk_widget_destroy(dialog);
 }
 
 
 /* File -> Open Script... */
 void actionOpenScript(GtkAction*, AppData* app)
 {
-	GtkWidget* fs = gtk_file_chooser_dialog_new("Open Script.",
-	                                            GTK_WINDOW(app->mainWindow),
-	                                            GTK_FILE_CHOOSER_ACTION_OPEN,
-	                                            GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-	                                            GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
-	                                            NULL);
+    GtkWidget* fs = gtk_file_chooser_dialog_new("Open Script.",
+                                                GTK_WINDOW(app->mainWindow),
+                                                GTK_FILE_CHOOSER_ACTION_OPEN,
+                                                GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+                                                GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+                                                NULL);
 
-	#if GTK_CHECK_VERSION(2, 7, 0)
-	gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(fs), TRUE);
-	#endif /* GTK_CHECK_VERSION */
+    #if GTK_CHECK_VERSION(2, 7, 0)
+    gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(fs), TRUE);
+    #endif /* GTK_CHECK_VERSION */
 
-	gtk_dialog_set_default_response(GTK_DIALOG(fs), GTK_RESPONSE_ACCEPT);
-	gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(fs), g_get_home_dir());
+    gtk_dialog_set_default_response(GTK_DIALOG(fs), GTK_RESPONSE_ACCEPT);
+    gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(fs), g_get_home_dir());
 
-	GtkFileFilter* filter = gtk_file_filter_new();
-	gtk_file_filter_set_name(filter, "Celestia Scripts");
-	
-	gtk_file_filter_add_pattern(filter, "*.cel");
+    GtkFileFilter* filter = gtk_file_filter_new();
+    gtk_file_filter_set_name(filter, "Celestia Scripts");
 
-	#ifdef CELX
-	gtk_file_filter_add_pattern(filter, "*.celx");
-	gtk_file_filter_add_pattern(filter, "*.clx");
-	#endif /* CELX */
-	
-	gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(fs), filter);
-	
-	if (gtk_dialog_run(GTK_DIALOG(fs)) == GTK_RESPONSE_ACCEPT)
-	{
-		char* filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(fs));
-		openScript(filename, app);
-		g_free(filename);
-	}
+    gtk_file_filter_add_pattern(filter, "*.cel");
 
-	gtk_widget_destroy(fs);	
+    #ifdef CELX
+    gtk_file_filter_add_pattern(filter, "*.celx");
+    gtk_file_filter_add_pattern(filter, "*.clx");
+    #endif /* CELX */
+
+    gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(fs), filter);
+
+    if (gtk_dialog_run(GTK_DIALOG(fs)) == GTK_RESPONSE_ACCEPT)
+    {
+        char* filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(fs));
+        openScript(filename, app);
+        g_free(filename);
+    }
+
+    gtk_widget_destroy(fs);
 }
 
 
 /* File -> Capture Image... */
 void actionCaptureImage(GtkAction*, AppData* app)
 {
-	GtkWidget* fs = gtk_file_chooser_dialog_new("Save Image to File",
-	                                            GTK_WINDOW(app->mainWindow),
-	                                            GTK_FILE_CHOOSER_ACTION_SAVE,
-	                                            GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-	                                            GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
-	                                            NULL);
+    GtkWidget* fs = gtk_file_chooser_dialog_new("Save Image to File",
+                                                GTK_WINDOW(app->mainWindow),
+                                                GTK_FILE_CHOOSER_ACTION_SAVE,
+                                                GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+                                                GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
+                                                NULL);
 
-	GtkFileFilter* filter = gtk_file_filter_new();
-	gtk_file_filter_set_name(filter, "PNG and JPEG Images");
-	gtk_file_filter_add_pattern(filter, "*.jpeg");
-	gtk_file_filter_add_pattern(filter, "*.jpg");
-	gtk_file_filter_add_pattern(filter, "*.png");
-	gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(fs), filter);
+    GtkFileFilter* filter = gtk_file_filter_new();
+    gtk_file_filter_set_name(filter, "PNG and JPEG Images");
+    gtk_file_filter_add_pattern(filter, "*.jpeg");
+    gtk_file_filter_add_pattern(filter, "*.jpg");
+    gtk_file_filter_add_pattern(filter, "*.png");
+    gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(fs), filter);
 
-	#if GTK_CHECK_VERSION(2, 7, 0)
-	gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(fs), TRUE);
-	#endif /* GTK_CHECK_VERSION */
-	
-	gtk_dialog_set_default_response(GTK_DIALOG(fs), GTK_RESPONSE_ACCEPT);
-	gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(fs), g_get_home_dir());
+    #if GTK_CHECK_VERSION(2, 7, 0)
+    gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(fs), TRUE);
+    #endif /* GTK_CHECK_VERSION */
 
-	if (gtk_dialog_run(GTK_DIALOG(fs)) == GTK_RESPONSE_ACCEPT)
-	{
-		char* filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(fs));
-		gtk_widget_destroy(fs);
-		for (int i=0; i < 10 && gtk_events_pending ();i++)
-			gtk_main_iteration ();
-		captureImage(filename, app);
-		g_free(filename);
-	}
-	else
-	{
-		gtk_widget_destroy(fs);
-	}
+    gtk_dialog_set_default_response(GTK_DIALOG(fs), GTK_RESPONSE_ACCEPT);
+    gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(fs), g_get_home_dir());
+
+    if (gtk_dialog_run(GTK_DIALOG(fs)) == GTK_RESPONSE_ACCEPT)
+    {
+        char* filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(fs));
+        gtk_widget_destroy(fs);
+        for (int i=0; i < 10 && gtk_events_pending ();i++)
+            gtk_main_iteration ();
+        captureImage(filename, app);
+        g_free(filename);
+    }
+    else
+    {
+        gtk_widget_destroy(fs);
+    }
 }
 
 /* File -> Capture Movie... */
 void actionCaptureMovie(GtkAction*, AppData* app)
 {
 #ifdef THEORA
-	// TODO: The menu item should be disable so that the user doesn't even
-	// have the opportunity to record two movies simultaneously; the only
-	// thing missing to make this happen is notification when recording
-	// is complete.
-	if (app->core->isCaptureActive())
-	{
-		GtkWidget* errBox = gtk_message_dialog_new(GTK_WINDOW(app->mainWindow),
-							   GTK_DIALOG_DESTROY_WITH_PARENT,
-							   GTK_MESSAGE_ERROR,
-							   GTK_BUTTONS_OK,
-							   "Stop current movie capture before starting another one.");
-		gtk_dialog_run(GTK_DIALOG(errBox));
-		gtk_widget_destroy(errBox);
-		return;
-	}
+    // TODO: The menu item should be disable so that the user doesn't even
+    // have the opportunity to record two movies simultaneously; the only
+    // thing missing to make this happen is notification when recording
+    // is complete.
+    if (app->core->isCaptureActive())
+    {
+        GtkWidget* errBox = gtk_message_dialog_new(GTK_WINDOW(app->mainWindow),
+                               GTK_DIALOG_DESTROY_WITH_PARENT,
+                               GTK_MESSAGE_ERROR,
+                               GTK_BUTTONS_OK,
+                               "Stop current movie capture before starting another one.");
+        gtk_dialog_run(GTK_DIALOG(errBox));
+        gtk_widget_destroy(errBox);
+        return;
+    }
 
-	GtkWidget* fs = gtk_file_chooser_dialog_new("Save Ogg Theora Movie to File",
-	                                            GTK_WINDOW(app->mainWindow),
-	                                            GTK_FILE_CHOOSER_ACTION_SAVE,
-	                                            GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-	                                            GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
-	                                            NULL);
+    GtkWidget* fs = gtk_file_chooser_dialog_new("Save Ogg Theora Movie to File",
+                                                GTK_WINDOW(app->mainWindow),
+                                                GTK_FILE_CHOOSER_ACTION_SAVE,
+                                                GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+                                                GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
+                                                NULL);
 
-	GtkFileFilter* filter = gtk_file_filter_new();
-	gtk_file_filter_set_name(filter, "Ogg Files");
-	gtk_file_filter_add_pattern(filter, "*.ogg");
-	gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(fs), filter);
+    GtkFileFilter* filter = gtk_file_filter_new();
+    gtk_file_filter_set_name(filter, "Ogg Files");
+    gtk_file_filter_add_pattern(filter, "*.ogg");
+    gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(fs), filter);
 
-	#if GTK_CHECK_VERSION(2, 7, 0)
-	gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(fs), TRUE);
-	#endif /* GTK_CHECK_VERSION */
-	
-	gtk_dialog_set_default_response(GTK_DIALOG(fs), GTK_RESPONSE_ACCEPT);
-	gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(fs), g_get_home_dir());
+    #if GTK_CHECK_VERSION(2, 7, 0)
+    gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(fs), TRUE);
+    #endif /* GTK_CHECK_VERSION */
 
-	GtkWidget* hbox = gtk_hbox_new(FALSE, CELSPACING); 
-	gtk_container_set_border_width(GTK_CONTAINER(hbox), CELSPACING);
+    gtk_dialog_set_default_response(GTK_DIALOG(fs), GTK_RESPONSE_ACCEPT);
+    gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(fs), g_get_home_dir());
 
-	GtkWidget* rlabel = gtk_label_new("Aspect Ratio:");
-	gtk_box_pack_start(GTK_BOX(hbox), rlabel, TRUE, TRUE, 0);
+    GtkWidget* hbox = gtk_hbox_new(FALSE, CELSPACING);
+    gtk_container_set_border_width(GTK_CONTAINER(hbox), CELSPACING);
 
-	GtkWidget* aspectmenubox = gtk_combo_box_new_text();
-	gtk_combo_box_append_text(GTK_COMBO_BOX(aspectmenubox), "1:1");
-	gtk_combo_box_append_text(GTK_COMBO_BOX(aspectmenubox), "4:3");
-	gtk_combo_box_append_text(GTK_COMBO_BOX(aspectmenubox), "16:9");
-	gtk_combo_box_append_text(GTK_COMBO_BOX(aspectmenubox), "Display");
-	gtk_combo_box_set_active(GTK_COMBO_BOX(aspectmenubox), 0);
-	gtk_box_pack_start(GTK_BOX(hbox), aspectmenubox, FALSE, FALSE, 0);
+    GtkWidget* rlabel = gtk_label_new("Aspect Ratio:");
+    gtk_box_pack_start(GTK_BOX(hbox), rlabel, TRUE, TRUE, 0);
 
-	GtkWidget* flabel = gtk_label_new("Frame Rate:");
-	gtk_box_pack_start(GTK_BOX(hbox), flabel, TRUE, TRUE, 0);
+    GtkWidget* aspectmenubox = gtk_combo_box_new_text();
+    gtk_combo_box_append_text(GTK_COMBO_BOX(aspectmenubox), "1:1");
+    gtk_combo_box_append_text(GTK_COMBO_BOX(aspectmenubox), "4:3");
+    gtk_combo_box_append_text(GTK_COMBO_BOX(aspectmenubox), "16:9");
+    gtk_combo_box_append_text(GTK_COMBO_BOX(aspectmenubox), "Display");
+    gtk_combo_box_set_active(GTK_COMBO_BOX(aspectmenubox), 0);
+    gtk_box_pack_start(GTK_BOX(hbox), aspectmenubox, FALSE, FALSE, 0);
 
-	GtkWidget* fpsspin = gtk_spin_button_new_with_range(5.0, 30.0, 0.01);
-	gtk_box_pack_start(GTK_BOX(hbox), fpsspin, TRUE, TRUE, 0);
-	gtk_spin_button_set_value(GTK_SPIN_BUTTON(fpsspin), 12.0);
-	gtk_spin_button_set_increments(GTK_SPIN_BUTTON(fpsspin), 0.01, 1.0);
+    GtkWidget* flabel = gtk_label_new("Frame Rate:");
+    gtk_box_pack_start(GTK_BOX(hbox), flabel, TRUE, TRUE, 0);
 
-	GtkWidget* qlabel = gtk_label_new("Video Quality:");
-	gtk_box_pack_start(GTK_BOX(hbox), qlabel, TRUE, TRUE, 0);
+    GtkWidget* fpsspin = gtk_spin_button_new_with_range(5.0, 30.0, 0.01);
+    gtk_box_pack_start(GTK_BOX(hbox), fpsspin, TRUE, TRUE, 0);
+    gtk_spin_button_set_value(GTK_SPIN_BUTTON(fpsspin), 12.0);
+    gtk_spin_button_set_increments(GTK_SPIN_BUTTON(fpsspin), 0.01, 1.0);
 
-	GtkWidget* qspin = gtk_spin_button_new_with_range(0.0, 10.0, 1.0);
-	gtk_box_pack_start(GTK_BOX(hbox), qspin, TRUE, TRUE, 0);
-	gtk_spin_button_set_value(GTK_SPIN_BUTTON(qspin), 10.0);
+    GtkWidget* qlabel = gtk_label_new("Video Quality:");
+    gtk_box_pack_start(GTK_BOX(hbox), qlabel, TRUE, TRUE, 0);
 
-	gtk_widget_show_all(hbox);
-	gtk_file_chooser_set_extra_widget(GTK_FILE_CHOOSER(fs), hbox);
+    GtkWidget* qspin = gtk_spin_button_new_with_range(0.0, 10.0, 1.0);
+    gtk_box_pack_start(GTK_BOX(hbox), qspin, TRUE, TRUE, 0);
+    gtk_spin_button_set_value(GTK_SPIN_BUTTON(qspin), 10.0);
 
-	if (gtk_dialog_run(GTK_DIALOG(fs)) == GTK_RESPONSE_ACCEPT)
-	{
-		char* filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(fs));
-		int aspect = gtk_combo_box_get_active(GTK_COMBO_BOX(aspectmenubox));
-		double fps = gtk_spin_button_get_value(GTK_SPIN_BUTTON(fpsspin));
-		double quality = gtk_spin_button_get_value(GTK_SPIN_BUTTON(qspin));
+    gtk_widget_show_all(hbox);
+    gtk_file_chooser_set_extra_widget(GTK_FILE_CHOOSER(fs), hbox);
 
-		gtk_widget_destroy(fs);
-		for (int i=0; i < 10 && gtk_events_pending ();i++)
-			gtk_main_iteration ();
-		captureMovie(filename, aspect, fps, quality,  app);
-		g_free(filename);
-	}
-	else
-	{
-		gtk_widget_destroy(fs);
-	}
+    if (gtk_dialog_run(GTK_DIALOG(fs)) == GTK_RESPONSE_ACCEPT)
+    {
+        char* filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(fs));
+        int aspect = gtk_combo_box_get_active(GTK_COMBO_BOX(aspectmenubox));
+        double fps = gtk_spin_button_get_value(GTK_SPIN_BUTTON(fpsspin));
+        double quality = gtk_spin_button_get_value(GTK_SPIN_BUTTON(qspin));
+
+        gtk_widget_destroy(fs);
+        for (int i=0; i < 10 && gtk_events_pending ();i++)
+            gtk_main_iteration ();
+        captureMovie(filename, aspect, fps, quality,  app);
+        g_free(filename);
+    }
+    else
+    {
+        gtk_widget_destroy(fs);
+    }
 #else
-	GtkWidget* errBox = gtk_message_dialog_new(GTK_WINDOW(app->mainWindow),
-						   GTK_DIALOG_DESTROY_WITH_PARENT,
-						   GTK_MESSAGE_ERROR,
-						   GTK_BUTTONS_OK,
-						   "Movie support was not included. To use re-build with --enable-theora.");
-	gtk_dialog_run(GTK_DIALOG(errBox));
-	gtk_widget_destroy(errBox);
+    GtkWidget* errBox = gtk_message_dialog_new(GTK_WINDOW(app->mainWindow),
+                           GTK_DIALOG_DESTROY_WITH_PARENT,
+                           GTK_MESSAGE_ERROR,
+                           GTK_BUTTONS_OK,
+                           "Movie support was not included. To use re-build with --enable-theora.");
+    gtk_dialog_run(GTK_DIALOG(errBox));
+    gtk_widget_destroy(errBox);
 #endif
 }
 
 
 void actionQuit(GtkAction*, AppData* app)
 {
-	#ifdef GNOME
-	saveSettingsGConf(app);
-	#else
-	saveSettingsFile(app);
-	#endif /* GNOME */
+    #ifdef GNOME
+    saveSettingsGConf(app);
+    #else
+    saveSettingsFile(app);
+    #endif /* GNOME */
 
-	gtk_main_quit();
+    gtk_main_quit();
 }
 
 
 void actionSelectSol(GtkAction*, AppData* app)
 {
-	app->core->charEntered('H');
+    app->core->charEntered('H');
 }
 
 
 void actionTourGuide(GtkAction*, AppData* app)
 {
-	dialogTourGuide(app);
+    dialogTourGuide(app);
 }
 
 
 void actionSearchObject(GtkAction*, AppData* app)
 {
-	GtkWidget* dialog = gtk_dialog_new_with_buttons("Select Object",
-	                                                GTK_WINDOW(app->mainWindow),
-	                                                GTK_DIALOG_DESTROY_WITH_PARENT,
-	                                                GTK_STOCK_OK, GTK_RESPONSE_OK,
-	                                                GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-	                                                NULL);
+    GtkWidget* dialog = gtk_dialog_new_with_buttons("Select Object",
+                                                    GTK_WINDOW(app->mainWindow),
+                                                    GTK_DIALOG_DESTROY_WITH_PARENT,
+                                                    GTK_STOCK_OK, GTK_RESPONSE_OK,
+                                                    GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+                                                    NULL);
 
-	GtkWidget* box = gtk_hbox_new(FALSE, CELSPACING);
-	gtk_container_set_border_width(GTK_CONTAINER(box), CELSPACING);
-	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), box, TRUE, TRUE, 0);
+    GtkWidget* box = gtk_hbox_new(FALSE, CELSPACING);
+    gtk_container_set_border_width(GTK_CONTAINER(box), CELSPACING);
+    gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), box, TRUE, TRUE, 0);
 
-	GtkWidget* label = gtk_label_new("Object name");
-	gtk_box_pack_start(GTK_BOX(box), label, TRUE, TRUE, 0);
+    GtkWidget* label = gtk_label_new("Object name");
+    gtk_box_pack_start(GTK_BOX(box), label, TRUE, TRUE, 0);
 
-	GtkWidget* entry = gtk_entry_new();
-	gtk_box_pack_start(GTK_BOX(box), entry, TRUE, TRUE, 0);
+    GtkWidget* entry = gtk_entry_new();
+    gtk_box_pack_start(GTK_BOX(box), entry, TRUE, TRUE, 0);
 
-	gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK);
-	gtk_widget_show_all(GTK_WIDGET(dialog));
+    gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK);
+    gtk_widget_show_all(GTK_WIDGET(dialog));
 
-	if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_OK)
-	{
-		const gchar* name = gtk_entry_get_text(GTK_ENTRY(entry));
-		if (name != NULL)
-		{
-			Selection sel = app->simulation->findObject(name);
-			if (!sel.empty())
-				app->simulation->setSelection(sel);
-		}
-	}
+    if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_OK)
+    {
+        const gchar* name = gtk_entry_get_text(GTK_ENTRY(entry));
+        if (name != NULL)
+        {
+            Selection sel = app->simulation->findObject(name);
+            if (!sel.empty())
+                app->simulation->setSelection(sel);
+        }
+    }
 
-	gtk_widget_destroy(GTK_WIDGET(dialog));
+    gtk_widget_destroy(GTK_WIDGET(dialog));
 }
 
 
 void actionGotoObject(GtkAction*, AppData* app)
 {
-	dialogGotoObject(app);
+    dialogGotoObject(app);
 }
 
 
 void actionCenterSelection(GtkAction*, AppData* app)
 {
-	app->core->charEntered('c');
+    app->core->charEntered('c');
 }
 
 
 void actionGotoSelection(GtkAction*, AppData* app)
 {
-	app->core->charEntered('G');
+    app->core->charEntered('G');
 }
 
 
 void actionFollowSelection(GtkAction*, AppData* app)
 {
-	app->core->charEntered('F');
+    app->core->charEntered('F');
 }
 
 
 void actionSyncSelection(GtkAction*, AppData* app)
 {
-	app->core->charEntered('Y');
+    app->core->charEntered('Y');
 }
 
 
 void actionTrackSelection(GtkAction*, AppData* app)
 {
-	app->core->charEntered('T');
+    app->core->charEntered('T');
 }
 
 
 void actionSystemBrowser(GtkAction*, AppData* app)
 {
-	dialogSolarBrowser(app);
+    dialogSolarBrowser(app);
 }
 
 
 void actionStarBrowser(GtkAction*, AppData* app)
 {
-	dialogStarBrowser(app);
+    dialogStarBrowser(app);
 }
 
 
 void actionEclipseFinder(GtkAction*, AppData* app)
 {
-	dialogEclipseFinder(app);
+    dialogEclipseFinder(app);
 }
 
 
 void actionTimeFaster(GtkAction*, AppData* app)
 {
-	app->core->charEntered('L');
+    app->core->charEntered('L');
 }
 
 
 void actionTimeSlower(GtkAction*, AppData* app)
 {
-	app->core->charEntered('K');
+    app->core->charEntered('K');
 }
 
 
 void actionTimeFreeze(GtkAction*, AppData* app)
 {
-	app->core->charEntered(' ');
+    app->core->charEntered(' ');
 }
 
 
 void actionTimeReal(GtkAction*, AppData* app)
 {
-	app->core->charEntered('\\');
+    app->core->charEntered('\\');
 }
 
 
 void actionTimeReverse(GtkAction*, AppData* app)
 {
-	app->core->charEntered('J');
+    app->core->charEntered('J');
 }
 
 
 void actionTimeSet(GtkAction*, AppData* app)
 {
-	dialogSetTime(app);
+    dialogSetTime(app);
 }
 
 
 void actionTimeLocal(GtkAction* action, AppData* app)
 {
-	app->showLocalTime = gtk_toggle_action_get_active(GTK_TOGGLE_ACTION(action));
-	updateTimeZone(app, app->showLocalTime);
+    app->showLocalTime = gtk_toggle_action_get_active(GTK_TOGGLE_ACTION(action));
+    updateTimeZone(app, app->showLocalTime);
 
-	#ifdef GNOME
-	gconf_client_set_bool(app->client, "/apps/celestia/showLocalTime", app->showLocalTime, NULL);
-	#endif /* GNOME */
+    #ifdef GNOME
+    gconf_client_set_bool(app->client, "/apps/celestia/showLocalTime", app->showLocalTime, NULL);
+    #endif /* GNOME */
 }
 
 
 void actionViewerSize(GtkAction*, AppData* app)
 {
-	GtkWidget* dialog;
-	int newX, currentX, currentY, winX, winY, screenX, i = 1, position = -1;
-	char res[32];
-	
-	screenX = gdk_screen_get_width(gdk_screen_get_default());
-	currentX = app->glArea->allocation.width;
-	currentY = app->glArea->allocation.height;
+    GtkWidget* dialog;
+    int newX, currentX, currentY, winX, winY, screenX, i = 1, position = -1;
+    char res[32];
 
-	dialog = gtk_dialog_new_with_buttons("Set Viewer Size...",
-	                                     GTK_WINDOW(app->mainWindow),
-	                                     GTK_DIALOG_DESTROY_WITH_PARENT,
-	                                     GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-	                                     GTK_STOCK_OK, GTK_RESPONSE_OK,
-	                                     NULL);
+    screenX = gdk_screen_get_width(gdk_screen_get_default());
+    currentX = app->glArea->allocation.width;
+    currentY = app->glArea->allocation.height;
 
-	GtkWidget* vbox = gtk_vbox_new(FALSE, CELSPACING); 
-	gtk_container_set_border_width(GTK_CONTAINER(vbox), CELSPACING);
+    dialog = gtk_dialog_new_with_buttons("Set Viewer Size...",
+                                         GTK_WINDOW(app->mainWindow),
+                                         GTK_DIALOG_DESTROY_WITH_PARENT,
+                                         GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+                                         GTK_STOCK_OK, GTK_RESPONSE_OK,
+                                         NULL);
 
-	GtkWidget* label = gtk_label_new("Dimensions for Main Window:");
-	gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 0);
+    GtkWidget* vbox = gtk_vbox_new(FALSE, CELSPACING);
+    gtk_container_set_border_width(GTK_CONTAINER(vbox), CELSPACING);
 
-	GtkWidget* menubox = gtk_combo_box_new_text();
-	gtk_box_pack_start(GTK_BOX(vbox), menubox, FALSE, FALSE, 0);
+    GtkWidget* label = gtk_label_new("Dimensions for Main Window:");
+    gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 0);
 
-	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), vbox, TRUE, TRUE, 0);
+    GtkWidget* menubox = gtk_combo_box_new_text();
+    gtk_box_pack_start(GTK_BOX(vbox), menubox, FALSE, FALSE, 0);
 
-	while (resolutions[i] != -1)
-	{
-		if (position == -1 && resolutions[i-1] < currentX && resolutions[i] >= currentX)
-		{
-			sprintf(res, "%d x %d (current)", currentX, currentY);
-			position = i - 1;
-		}
-		else if (resolutions[i] < screenX)
-		{
-			sprintf(res, "%d x %d", resolutions[i], int(0.75 * resolutions[i]));
-			i++;
-		}
-		else
-			break;
-		
-		gtk_combo_box_append_text(GTK_COMBO_BOX(menubox), res);
-	}
+    gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), vbox, TRUE, TRUE, 0);
 
-	gtk_combo_box_set_active(GTK_COMBO_BOX(menubox), position);
+    while (resolutions[i] != -1)
+    {
+        if (position == -1 && resolutions[i-1] < currentX && resolutions[i] >= currentX)
+        {
+            sprintf(res, "%d x %d (current)", currentX, currentY);
+            position = i - 1;
+        }
+        else if (resolutions[i] < screenX)
+        {
+            sprintf(res, "%d x %d", resolutions[i], int(0.75 * resolutions[i]));
+            i++;
+        }
+        else
+            break;
 
-	gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK);
-	gtk_widget_show_all(dialog);
+        gtk_combo_box_append_text(GTK_COMBO_BOX(menubox), res);
+    }
 
-	if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_OK)
-	{
-		int active = gtk_combo_box_get_active(GTK_COMBO_BOX(menubox));
+    gtk_combo_box_set_active(GTK_COMBO_BOX(menubox), position);
 
-		if (active > -1 && active != position)
-		{
-			/* Adjust for default entry */
-			if (active > position) active--;
+    gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK);
+    gtk_widget_show_all(dialog);
 
-			newX = resolutions[active + 1];
-			gtk_window_get_size(GTK_WINDOW(app->mainWindow), &winX, &winY);
-			
-			/* Resizing takes into account border, titlebar, and menubar
-			   sizes. Without them only an allocation can be requested */
-			gtk_window_resize(GTK_WINDOW(app->mainWindow), newX + winX - currentX, int(0.75 * newX) + winY - currentY);
-		}
-	}
-	
-	gtk_widget_destroy(GTK_WIDGET(dialog));
+    if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_OK)
+    {
+        int active = gtk_combo_box_get_active(GTK_COMBO_BOX(menubox));
+
+        if (active > -1 && active != position)
+        {
+            /* Adjust for default entry */
+            if (active > position) active--;
+
+            newX = resolutions[active + 1];
+            gtk_window_get_size(GTK_WINDOW(app->mainWindow), &winX, &winY);
+
+            /* Resizing takes into account border, titlebar, and menubar
+               sizes. Without them only an allocation can be requested */
+            gtk_window_resize(GTK_WINDOW(app->mainWindow), newX + winX - currentX, int(0.75 * newX) + winY - currentY);
+        }
+    }
+
+    gtk_widget_destroy(GTK_WIDGET(dialog));
 }
 
 
 void actionFullScreen(GtkAction* action, AppData* app)
 {
-	int positionX, positionY;
-	app->fullScreen = gtk_toggle_action_get_active(GTK_TOGGLE_ACTION(action));
-	
-	if (app->fullScreen)
-	{
-		/* Save size/position, so original numbers are available for prefs */
-		g_object_set_data(G_OBJECT(app->mainWindow), "sizeX", GINT_TO_POINTER(app->glArea->allocation.width));
-		g_object_set_data(G_OBJECT(app->mainWindow), "sizeY", GINT_TO_POINTER(app->glArea->allocation.height));
-		gtk_window_get_position(GTK_WINDOW(app->mainWindow), &positionX, &positionY);
-		g_object_set_data(G_OBJECT(app->mainWindow), "positionX", GINT_TO_POINTER(positionX));
-		g_object_set_data(G_OBJECT(app->mainWindow), "positionY", GINT_TO_POINTER(positionY));
+    int positionX, positionY;
+    app->fullScreen = gtk_toggle_action_get_active(GTK_TOGGLE_ACTION(action));
 
-		gtk_window_fullscreen(GTK_WINDOW(app->mainWindow));
-	}
-	else
-		gtk_window_unfullscreen(GTK_WINDOW(app->mainWindow));
+    if (app->fullScreen)
+    {
+        /* Save size/position, so original numbers are available for prefs */
+        g_object_set_data(G_OBJECT(app->mainWindow), "sizeX", GINT_TO_POINTER(app->glArea->allocation.width));
+        g_object_set_data(G_OBJECT(app->mainWindow), "sizeY", GINT_TO_POINTER(app->glArea->allocation.height));
+        gtk_window_get_position(GTK_WINDOW(app->mainWindow), &positionX, &positionY);
+        g_object_set_data(G_OBJECT(app->mainWindow), "positionX", GINT_TO_POINTER(positionX));
+        g_object_set_data(G_OBJECT(app->mainWindow), "positionY", GINT_TO_POINTER(positionY));
 
-	/* Enable/Disable the Viewer Size action */
-	gtk_action_set_sensitive(gtk_action_group_get_action(app->agMain, "ViewerSize"), !app->fullScreen);
-	
-	#ifdef GNOME
-	gconf_client_set_bool(app->client, "/apps/celestia/fullScreen", app->fullScreen, NULL);
-	#endif
+        gtk_window_fullscreen(GTK_WINDOW(app->mainWindow));
+    }
+    else
+        gtk_window_unfullscreen(GTK_WINDOW(app->mainWindow));
+
+    /* Enable/Disable the Viewer Size action */
+    gtk_action_set_sensitive(gtk_action_group_get_action(app->agMain, "ViewerSize"), !app->fullScreen);
+
+    #ifdef GNOME
+    gconf_client_set_bool(app->client, "/apps/celestia/fullScreen", app->fullScreen, NULL);
+    #endif
 }
 
 
 void actionViewOptions(GtkAction*, AppData* app)
 {
-	dialogViewOptions(app);
+    dialogViewOptions(app);
 }
 
 
 void actionStarsMore(GtkAction*, AppData* app)
 {
-	app->core->charEntered(']');	
+    app->core->charEntered(']');
 
-	#ifdef GNOME
-	gconf_client_set_float(app->client, "/apps/celestia/visualMagnitude", app->simulation->getFaintestVisible(), NULL);
-	#endif
+    #ifdef GNOME
+    gconf_client_set_float(app->client, "/apps/celestia/visualMagnitude", app->simulation->getFaintestVisible(), NULL);
+    #endif
 }
 
 
 void actionStarsFewer(GtkAction*, AppData* app)
 {
-	app->core->charEntered('[');
+    app->core->charEntered('[');
 
-	#ifdef GNOME
-	gconf_client_set_float(app->client, "/apps/celestia/visualMagnitude", app->simulation->getFaintestVisible(), NULL);
-	#endif
+    #ifdef GNOME
+    gconf_client_set_float(app->client, "/apps/celestia/visualMagnitude", app->simulation->getFaintestVisible(), NULL);
+    #endif
 }
 
 
 void actionVideoSync(GtkToggleAction* action, AppData* app)
 {
-	app->renderer->setVideoSync(gtk_toggle_action_get_active(action));
+    app->renderer->setVideoSync(gtk_toggle_action_get_active(action));
 
-	#ifdef GNOME
-	gconf_client_set_bool(app->client, "/apps/celestia/videoSync", app->renderer->getVideoSync(), NULL);
-	#endif
+    #ifdef GNOME
+    gconf_client_set_bool(app->client, "/apps/celestia/videoSync", app->renderer->getVideoSync(), NULL);
+    #endif
 }
 
 
 void actionMenuBarVisible(GtkToggleAction* action, AppData* app)
 {
-	g_object_set(G_OBJECT(app->mainMenu), "visible", gtk_toggle_action_get_active(action), NULL);
+    g_object_set(G_OBJECT(app->mainMenu), "visible", gtk_toggle_action_get_active(action), NULL);
 }
 
 
 void actionMultiSplitH(GtkAction*, AppData* app)
 {
-	app->core->splitView(View::HorizontalSplit);
+    app->core->splitView(View::HorizontalSplit);
 }
 
 
 void actionMultiSplitV(GtkAction*, AppData* app)
 {
-	app->core->splitView(View::VerticalSplit);
+    app->core->splitView(View::VerticalSplit);
 }
 
 
 void actionMultiCycle(GtkAction*, AppData* app)
 {
-	/* Pass a Tab character */
-	app->core->charEntered('\011');
+    /* Pass a Tab character */
+    app->core->charEntered('\011');
 }
 
 
 void actionMultiDelete(GtkAction*, AppData* app)
 {
-	app->core->deleteView();
+    app->core->deleteView();
 }
 
 
 void actionMultiSingle(GtkAction*, AppData* app)
 {
-	app->core->singleView();
+    app->core->singleView();
 }
 
 
 void actionMultiShowFrames(GtkToggleAction* action, AppData* app)
 {
-	app->core->setFramesVisible(gtk_toggle_action_get_active(action));
+    app->core->setFramesVisible(gtk_toggle_action_get_active(action));
 }
 
 
 void actionMultiShowActive(GtkToggleAction* action, AppData* app)
 {
-	app->core->setActiveFrameVisible(gtk_toggle_action_get_active(action));
+    app->core->setActiveFrameVisible(gtk_toggle_action_get_active(action));
 }
 
 
 void actionMultiSyncTime(GtkToggleAction* action, AppData* app)
 {
-	app->simulation->setSyncTime(gtk_toggle_action_get_active(action));
+    app->simulation->setSyncTime(gtk_toggle_action_get_active(action));
 }
 
 
 void actionRunDemo(GtkAction*, AppData* app)
 {
-	app->core->charEntered('D');
+    app->core->charEntered('D');
 }
 
 
 void actionHelpControls(GtkAction*, AppData* app)
 {
-	char *txt = readFromFile("controls.txt");
-	textInfoDialog(txt, "Mouse and Keyboard Controls", app);
-	g_free(txt);
+    char *txt = readFromFile("controls.txt");
+    textInfoDialog(txt, "Mouse and Keyboard Controls", app);
+    g_free(txt);
 }
 
 
 void actionHelpOpenGL(GtkAction*, AppData* app)
 {
-	/* Code grabbed from winmain.cpp */
-	char* vendor = (char*) glGetString(GL_VENDOR);
-	char* render = (char*) glGetString(GL_RENDERER);
-	char* version = (char*) glGetString(GL_VERSION);
-	char* ext = (char*) glGetString(GL_EXTENSIONS);
-	
-	string s;
-	s = "Vendor: ";
-	if (vendor != NULL)
-		s += vendor;
-	s += "\n";
+    /* Code grabbed from winmain.cpp */
+    char* vendor = (char*) glGetString(GL_VENDOR);
+    char* render = (char*) glGetString(GL_RENDERER);
+    char* version = (char*) glGetString(GL_VERSION);
+    char* ext = (char*) glGetString(GL_EXTENSIONS);
 
-	s += "Renderer: ";
-	if (render != NULL)
-		s += render;
-	s += "\n";
+    string s;
+    s = "Vendor: ";
+    if (vendor != NULL)
+        s += vendor;
+    s += "\n";
 
-	s += "Version: ";
-	if (version != NULL)
-		s += version;
-	s += "\n";
+    s += "Renderer: ";
+    if (render != NULL)
+        s += render;
+    s += "\n";
 
-	char buf[100];
-	GLint simTextures = 1;
-	if (glewIsExtensionSupported("GL_ARB_multitexture"))
-		glGetIntegerv(GL_MAX_TEXTURE_UNITS_ARB, &simTextures);
-	sprintf(buf, "Max simultaneous textures: %d\n", simTextures);
-	s += buf;
+    s += "Version: ";
+    if (version != NULL)
+        s += version;
+    s += "\n";
 
-	GLint maxTextureSize = 0;
-	glGetIntegerv(GL_MAX_TEXTURE_SIZE, &maxTextureSize);
-	sprintf(buf, "Max texture size: %d\n\n", maxTextureSize);
-	s += buf;
+    char buf[100];
+    GLint simTextures = 1;
+    if (glewIsExtensionSupported("GL_ARB_multitexture"))
+        glGetIntegerv(GL_MAX_TEXTURE_UNITS_ARB, &simTextures);
+    sprintf(buf, "Max simultaneous textures: %d\n", simTextures);
+    s += buf;
 
-	s += "Supported Extensions:\n    ";
-	if (ext != NULL)
-	{
-		string extString(ext);
-		unsigned int pos = extString.find(' ', 0);
-		while (pos != (unsigned int)string::npos)
-		{
-			extString.replace(pos, 1, "\n    ");
-			pos = extString.find(' ', pos + 5);
-		}
-		s += extString;
-	}
+    GLint maxTextureSize = 0;
+    glGetIntegerv(GL_MAX_TEXTURE_SIZE, &maxTextureSize);
+    sprintf(buf, "Max texture size: %d\n\n", maxTextureSize);
+    s += buf;
 
-	textInfoDialog(s.c_str(), "Open GL Info", app);
+    s += "Supported Extensions:\n    ";
+    if (ext != NULL)
+    {
+        string extString(ext);
+        unsigned int pos = extString.find(' ', 0);
+        while (pos != (unsigned int)string::npos)
+        {
+            extString.replace(pos, 1, "\n    ");
+            pos = extString.find(' ', pos + 5);
+        }
+        s += extString;
+    }
+
+    textInfoDialog(s.c_str(), "Open GL Info", app);
 }
 
 
 void actionHelpAbout(GtkAction*, AppData* app)
 {
-	const gchar* authors[] = {
-		"Chris Laurel <claurel@shatters.net>",
-		"Clint Weisbrod <cweisbrod@cogeco.ca>",
-		"Fridger Schrempp <fridger.schrempp@desy.de>",
-		"Bob Ippolito <bob@redivi.com>",
-		"Christophe Teyssier <chris@teyssier.org>",
-		"Hank Ramsey <hramsey@users.sourceforce.net>",
-		"Grant Hutchison <grantcelestia@xemaps.com>",
-		"Pat Suwalski <pat@suwalski.net>",
-		"Toti <>",
-		"Da-Woon Jung <dirkpitt2050@users.sf.net>",
-		"Vincent Giangiulio <vince.gian@free.fr>",
-		NULL
+    const gchar* authors[] = {
+        "Chris Laurel <claurel@shatters.net>",
+        "Clint Weisbrod <cweisbrod@cogeco.ca>",
+        "Fridger Schrempp <fridger.schrempp@desy.de>",
+        "Bob Ippolito <bob@redivi.com>",
+        "Christophe Teyssier <chris@teyssier.org>",
+        "Hank Ramsey <hramsey@users.sourceforce.net>",
+        "Grant Hutchison <grantcelestia@xemaps.com>",
+        "Pat Suwalski <pat@suwalski.net>",
+        "Toti <>",
+        "Da-Woon Jung <dirkpitt2050@users.sf.net>",
+        "Vincent Giangiulio <vince.gian@free.fr>",
+        NULL
     };
 
-	GdkPixbuf *logo = gdk_pixbuf_new_from_file ("celestia-logo.png", NULL);
-	
-	gtk_show_about_dialog(GTK_WINDOW(app->mainWindow),
-	                     "name", "Celestia",
-	                     "version", VERSION,
-	                     "copyright", "Copyright \xc2\xa9 2001-2011 Celestia Development Team",
-	                     "comments", FRONTEND " Front-End",
-	                     "website", "http://celestia.sf.net",
-	                     "authors", authors,
-	                     "license", readFromFile("COPYING"),
-	                     "logo", logo,
-	                     NULL);
-	gdk_pixbuf_unref(logo);
+    GdkPixbuf *logo = gdk_pixbuf_new_from_file ("celestia-logo.png", NULL);
+
+    gtk_show_about_dialog(GTK_WINDOW(app->mainWindow),
+                         "name", "Celestia",
+                         "version", VERSION,
+                         "copyright", "Copyright \xc2\xa9 2001-2011 Celestia Development Team",
+                         "comments", FRONTEND " Front-End",
+                         "website", "http://celestia.sf.net",
+                         "authors", authors,
+                         "license", readFromFile("COPYING"),
+                         "logo", logo,
+                         NULL);
+    gdk_pixbuf_unref(logo);
 }
 
 
 void actionVerbosity(GtkRadioAction* action, GtkRadioAction*, AppData* app)
 {
-	int value = gtk_radio_action_get_current_value(action);
-	app->core->setHudDetail(value);
-	
-	#ifdef GNOME
-	gconf_client_set_int(app->client, "/apps/celestia/verbosity", value, NULL);
-	#endif
+    int value = gtk_radio_action_get_current_value(action);
+    app->core->setHudDetail(value);
+
+    #ifdef GNOME
+    gconf_client_set_int(app->client, "/apps/celestia/verbosity", value, NULL);
+    #endif
 }
 
 
 void actionStarStyle(GtkRadioAction* action, GtkRadioAction*, AppData* app)
 {
-	int value = gtk_radio_action_get_current_value(action);
-	app->renderer->setStarStyle((Renderer::StarStyle)value);
-	
-	#ifdef GNOME
-	gconf_client_set_int(app->client, "/apps/celestia/starStyle", value, NULL);
-	#endif
+    int value = gtk_radio_action_get_current_value(action);
+    app->renderer->setStarStyle((Renderer::StarStyle)value);
+
+    #ifdef GNOME
+    gconf_client_set_int(app->client, "/apps/celestia/starStyle", value, NULL);
+    #endif
 }
 
 
 void actionAmbientLight(GtkRadioAction* action, GtkRadioAction*, AppData* app)
 {
-	float value = amLevels[gtk_radio_action_get_current_value(action)];
-	app->renderer->setAmbientLightLevel(value);
+    float value = amLevels[gtk_radio_action_get_current_value(action)];
+    app->renderer->setAmbientLightLevel(value);
 
-	#ifdef GNOME
-	gconf_client_set_float(app->client, "/apps/celestia/ambientLight", value, NULL);
-	#endif
+    #ifdef GNOME
+    gconf_client_set_float(app->client, "/apps/celestia/ambientLight", value, NULL);
+    #endif
 }
 
 /* Render-Flag Actions */
 void actionRenderAA(GtkToggleAction* action, AppData* app)
 {
-	setRenderFlag(app, Renderer::ShowSmoothLines, gtk_toggle_action_get_active(action));
+    setRenderFlag(app, Renderer::ShowSmoothLines, gtk_toggle_action_get_active(action));
 }
 
 
 void actionRenderAtmospheres(GtkToggleAction* action, AppData* app)
 {
-	setRenderFlag(app, Renderer::ShowAtmospheres, gtk_toggle_action_get_active(action));
+    setRenderFlag(app, Renderer::ShowAtmospheres, gtk_toggle_action_get_active(action));
 }
 
 
 void actionRenderAutoMagnitude(GtkToggleAction* action, AppData* app)
 {
-	setRenderFlag(app, Renderer::ShowAutoMag, gtk_toggle_action_get_active(action));
+    setRenderFlag(app, Renderer::ShowAutoMag, gtk_toggle_action_get_active(action));
 }
 
 
 void actionRenderCelestialGrid(GtkToggleAction* action, AppData* app)
 {
-	setRenderFlag(app, Renderer::ShowCelestialSphere, gtk_toggle_action_get_active(action));
+    setRenderFlag(app, Renderer::ShowCelestialSphere, gtk_toggle_action_get_active(action));
 }
 
 
 void actionRenderClouds(GtkToggleAction* action, AppData* app)
 {
-	setRenderFlag(app, Renderer::ShowCloudMaps, gtk_toggle_action_get_active(action));
+    setRenderFlag(app, Renderer::ShowCloudMaps, gtk_toggle_action_get_active(action));
 }
 
 
 void actionRenderCometTails(GtkToggleAction* action, AppData* app)
 {
-	setRenderFlag(app, Renderer::ShowCometTails, gtk_toggle_action_get_active(action));
+    setRenderFlag(app, Renderer::ShowCometTails, gtk_toggle_action_get_active(action));
 }
 
 
 void actionRenderConstellationBoundaries(GtkToggleAction* action, AppData* app)
 {
-	setRenderFlag(app, Renderer::ShowBoundaries, gtk_toggle_action_get_active(action));
+    setRenderFlag(app, Renderer::ShowBoundaries, gtk_toggle_action_get_active(action));
 }
 
 
 void actionRenderConstellations(GtkToggleAction* action, AppData* app)
 {
-	setRenderFlag(app, Renderer::ShowDiagrams, gtk_toggle_action_get_active(action));
+    setRenderFlag(app, Renderer::ShowDiagrams, gtk_toggle_action_get_active(action));
 }
 
 
 void actionRenderEclipticGrid(GtkToggleAction* action, AppData* app)
 {
-	setRenderFlag(app, Renderer::ShowEclipticGrid, gtk_toggle_action_get_active(action));
+    setRenderFlag(app, Renderer::ShowEclipticGrid, gtk_toggle_action_get_active(action));
 }
 
 
 void actionRenderEclipseShadows(GtkToggleAction* action, AppData* app)
 {
-	setRenderFlag(app, Renderer::ShowEclipseShadows, gtk_toggle_action_get_active(action));
+    setRenderFlag(app, Renderer::ShowEclipseShadows, gtk_toggle_action_get_active(action));
 }
 
 
 void actionRenderGalacticGrid(GtkToggleAction* action, AppData* app)
 {
-	setRenderFlag(app, Renderer::ShowGalacticGrid, gtk_toggle_action_get_active(action));
+    setRenderFlag(app, Renderer::ShowGalacticGrid, gtk_toggle_action_get_active(action));
 }
 
 
 void actionRenderGalaxies(GtkToggleAction* action, AppData* app)
 {
-	setRenderFlag(app, Renderer::ShowGalaxies, gtk_toggle_action_get_active(action));
+    setRenderFlag(app, Renderer::ShowGalaxies, gtk_toggle_action_get_active(action));
 }
 
 
 void actionRenderGlobulars(GtkToggleAction* action, AppData* app)
 {
-	setRenderFlag(app, Renderer::ShowGlobulars, gtk_toggle_action_get_active(action));
+    setRenderFlag(app, Renderer::ShowGlobulars, gtk_toggle_action_get_active(action));
 }
 
 
 void actionRenderHorizontalGrid(GtkToggleAction* action, AppData* app)
 {
-	setRenderFlag(app, Renderer::ShowHorizonGrid, gtk_toggle_action_get_active(action));
+    setRenderFlag(app, Renderer::ShowHorizonGrid, gtk_toggle_action_get_active(action));
 }
 
 
 void actionRenderMarkers(GtkToggleAction* action, AppData* app)
 {
-	setRenderFlag(app, Renderer::ShowMarkers, gtk_toggle_action_get_active(action));
+    setRenderFlag(app, Renderer::ShowMarkers, gtk_toggle_action_get_active(action));
 }
 
 
 void actionRenderNebulae(GtkToggleAction* action, AppData* app)
 {
-	setRenderFlag(app, Renderer::ShowNebulae, gtk_toggle_action_get_active(action));
+    setRenderFlag(app, Renderer::ShowNebulae, gtk_toggle_action_get_active(action));
 }
 
 
 void actionRenderNightLights(GtkToggleAction* action, AppData* app)
 {
-	setRenderFlag(app, Renderer::ShowNightMaps, gtk_toggle_action_get_active(action));
+    setRenderFlag(app, Renderer::ShowNightMaps, gtk_toggle_action_get_active(action));
 }
 
 
 void actionRenderOpenClusters(GtkToggleAction* action, AppData* app)
 {
-	setRenderFlag(app, Renderer::ShowOpenClusters, gtk_toggle_action_get_active(action));
+    setRenderFlag(app, Renderer::ShowOpenClusters, gtk_toggle_action_get_active(action));
 }
 
 
 void actionRenderOrbits(GtkToggleAction* action, AppData* app)
 {
-	setRenderFlag(app, Renderer::ShowOrbits, gtk_toggle_action_get_active(action));
+    setRenderFlag(app, Renderer::ShowOrbits, gtk_toggle_action_get_active(action));
 }
 
 
 void actionRenderPlanets(GtkToggleAction* action, AppData* app)
 {
-	setRenderFlag(app, Renderer::ShowPlanets, gtk_toggle_action_get_active(action));
+    setRenderFlag(app, Renderer::ShowPlanets, gtk_toggle_action_get_active(action));
 }
 
 
 void actionRenderRingShadows(GtkToggleAction* action, AppData* app)
 {
-	setRenderFlag(app, Renderer::ShowRingShadows, gtk_toggle_action_get_active(action));
+    setRenderFlag(app, Renderer::ShowRingShadows, gtk_toggle_action_get_active(action));
 }
 
 
 void actionRenderStars(GtkToggleAction* action, AppData* app)
 {
-	setRenderFlag(app, Renderer::ShowStars, gtk_toggle_action_get_active(action));
+    setRenderFlag(app, Renderer::ShowStars, gtk_toggle_action_get_active(action));
 }
 
 
 void actionOrbitAsteroids(GtkToggleAction* action, AppData* app)
 {
-	setOrbitMask(app, Body::Asteroid, gtk_toggle_action_get_active(action));
+    setOrbitMask(app, Body::Asteroid, gtk_toggle_action_get_active(action));
 }
 
 
 void actionOrbitComets(GtkToggleAction* action, AppData* app)
 {
-	setOrbitMask(app, Body::Comet, gtk_toggle_action_get_active(action));
+    setOrbitMask(app, Body::Comet, gtk_toggle_action_get_active(action));
 }
 
 
 void actionOrbitMoons(GtkToggleAction* action, AppData* app)
 {
-	setOrbitMask(app, Body::Moon, gtk_toggle_action_get_active(action));
+    setOrbitMask(app, Body::Moon, gtk_toggle_action_get_active(action));
 }
 
 
 void actionOrbitPlanets(GtkToggleAction* action, AppData* app)
 {
-	setOrbitMask(app, Body::Planet, gtk_toggle_action_get_active(action));
+    setOrbitMask(app, Body::Planet, gtk_toggle_action_get_active(action));
 }
 
 
 void actionOrbitSpacecraft(GtkToggleAction* action, AppData* app)
 {
-	setOrbitMask(app, Body::Spacecraft, gtk_toggle_action_get_active(action));
+    setOrbitMask(app, Body::Spacecraft, gtk_toggle_action_get_active(action));
 }
 
 
 void actionLabelAsteroids(GtkToggleAction* action, AppData* app)
 {
-	setLabelMode(app, Renderer::AsteroidLabels, gtk_toggle_action_get_active(action));
+    setLabelMode(app, Renderer::AsteroidLabels, gtk_toggle_action_get_active(action));
 }
 
 
 void actionLabelComets(GtkToggleAction* action, AppData* app)
 {
-	setLabelMode(app, Renderer::CometLabels, gtk_toggle_action_get_active(action));
+    setLabelMode(app, Renderer::CometLabels, gtk_toggle_action_get_active(action));
 }
 
 
 void actionLabelConstellations(GtkToggleAction* action, AppData* app)
 {
-	setLabelMode(app, Renderer::ConstellationLabels, gtk_toggle_action_get_active(action));
+    setLabelMode(app, Renderer::ConstellationLabels, gtk_toggle_action_get_active(action));
 }
 
 
 void actionLabelGalaxies(GtkToggleAction* action, AppData* app)
 {
-	setLabelMode(app, Renderer::GalaxyLabels, gtk_toggle_action_get_active(action));
+    setLabelMode(app, Renderer::GalaxyLabels, gtk_toggle_action_get_active(action));
 }
 
 
 void actionLabelGlobulars(GtkToggleAction* action, AppData* app)
 {
-	setLabelMode(app, Renderer::GlobularLabels, gtk_toggle_action_get_active(action));
+    setLabelMode(app, Renderer::GlobularLabels, gtk_toggle_action_get_active(action));
 }
 
 
 void actionLabelLocations(GtkToggleAction* action, AppData* app)
 {
-	setLabelMode(app, Renderer::LocationLabels, gtk_toggle_action_get_active(action));
+    setLabelMode(app, Renderer::LocationLabels, gtk_toggle_action_get_active(action));
 }
 
 
 void actionLabelMoons(GtkToggleAction* action, AppData* app)
 {
-	setLabelMode(app, Renderer::MoonLabels, gtk_toggle_action_get_active(action));
+    setLabelMode(app, Renderer::MoonLabels, gtk_toggle_action_get_active(action));
 }
 
 
 void actionLabelNebulae(GtkToggleAction* action, AppData* app)
 {
-	setLabelMode(app, Renderer::NebulaLabels, gtk_toggle_action_get_active(action));
+    setLabelMode(app, Renderer::NebulaLabels, gtk_toggle_action_get_active(action));
 }
 
 
 void actionLabelOpenClusters(GtkToggleAction* action, AppData* app)
 {
-	setLabelMode(app, Renderer::OpenClusterLabels, gtk_toggle_action_get_active(action));
+    setLabelMode(app, Renderer::OpenClusterLabels, gtk_toggle_action_get_active(action));
 }
 
 
 void actionLabelPlanets(GtkToggleAction* action, AppData* app)
 {
-	setLabelMode(app, Renderer::PlanetLabels, gtk_toggle_action_get_active(action));
+    setLabelMode(app, Renderer::PlanetLabels, gtk_toggle_action_get_active(action));
 }
 
 
 void actionLabelSpacecraft(GtkToggleAction* action, AppData* app)
 {
-	setLabelMode(app, Renderer::SpacecraftLabels, gtk_toggle_action_get_active(action));
+    setLabelMode(app, Renderer::SpacecraftLabels, gtk_toggle_action_get_active(action));
 }
 
 
 void actionLabelStars(GtkToggleAction* action, AppData* app)
 {
-	setLabelMode(app, Renderer::StarLabels, gtk_toggle_action_get_active(action));
+    setLabelMode(app, Renderer::StarLabels, gtk_toggle_action_get_active(action));
 }
 
 
 /* Script opening helper called by actionOpenScript() */
 static void openScript(const char* filename, AppData* app)
 {
-	/* Modified From Win32 HandleOpenScript */
-	if (filename)
-	{
-		/* If you got here, a path and file has been specified.
-		 * filename contains full path to specified file. */
-		ContentType type = DetermineFileType(filename);
+    /* Modified From Win32 HandleOpenScript */
+    if (filename)
+    {
+        /* If you got here, a path and file has been specified.
+         * filename contains full path to specified file. */
+        ContentType type = DetermineFileType(filename);
 
-		if (type == Content_CelestiaScript)
-		{
-			app->core->runScript(filename);
-		}
-		else if (type == Content_CelestiaLegacyScript)
-		{
-			ifstream scriptfile(filename);
-			if (!scriptfile.good())
-			{
-				GtkWidget* errBox = gtk_message_dialog_new(GTK_WINDOW(app->mainWindow),
-				                                           GTK_DIALOG_DESTROY_WITH_PARENT,
-				                                           GTK_MESSAGE_ERROR,
-				                                           GTK_BUTTONS_OK,
-				                                           "Error opening script file.");
-				gtk_dialog_run(GTK_DIALOG(errBox));
-				gtk_widget_destroy(errBox);
-			}
-			else
-			{
-				CommandParser parser(scriptfile);
-				CommandSequence* script = parser.parse();
-				if (script == NULL)
-				{
-					const vector<string>* errors = parser.getErrors();
-					const char* errorMsg = "";
-					if (errors->size() > 0)
-						errorMsg = (*errors)[0].c_str();
-					GtkWidget* errBox = gtk_message_dialog_new(GTK_WINDOW(app->mainWindow),
-					                                           GTK_DIALOG_DESTROY_WITH_PARENT,
-					                                           GTK_MESSAGE_ERROR,
-					                                           GTK_BUTTONS_OK, "%s",
-					                                           errorMsg);
-					gtk_dialog_run(GTK_DIALOG(errBox));
-					gtk_widget_destroy(errBox);
-				}
-				else
-				{
-					/* Cancel any running script */
-					app->core->cancelScript();
-					app->core->runScript(script);
-				}
-			}
-		}
-		else
-		{
-			GtkWidget* errBox = gtk_message_dialog_new(GTK_WINDOW(app->mainWindow),
-			                                           GTK_DIALOG_DESTROY_WITH_PARENT,
-			                                           GTK_MESSAGE_ERROR,
-			                                           GTK_BUTTONS_OK,
-			                                           "Bad File Type. Use *.(cel|celx|clx).");
-			gtk_dialog_run(GTK_DIALOG(errBox));
-			gtk_widget_destroy(errBox);
-		}
-	}
+        if (type == Content_CelestiaScript)
+        {
+            app->core->runScript(filename);
+        }
+        else if (type == Content_CelestiaLegacyScript)
+        {
+            ifstream scriptfile(filename);
+            if (!scriptfile.good())
+            {
+                GtkWidget* errBox = gtk_message_dialog_new(GTK_WINDOW(app->mainWindow),
+                                                           GTK_DIALOG_DESTROY_WITH_PARENT,
+                                                           GTK_MESSAGE_ERROR,
+                                                           GTK_BUTTONS_OK,
+                                                           "Error opening script file.");
+                gtk_dialog_run(GTK_DIALOG(errBox));
+                gtk_widget_destroy(errBox);
+            }
+            else
+            {
+                CommandParser parser(scriptfile);
+                CommandSequence* script = parser.parse();
+                if (script == NULL)
+                {
+                    const vector<string>* errors = parser.getErrors();
+                    const char* errorMsg = "";
+                    if (errors->size() > 0)
+                        errorMsg = (*errors)[0].c_str();
+                    GtkWidget* errBox = gtk_message_dialog_new(GTK_WINDOW(app->mainWindow),
+                                                               GTK_DIALOG_DESTROY_WITH_PARENT,
+                                                               GTK_MESSAGE_ERROR,
+                                                               GTK_BUTTONS_OK, "%s",
+                                                               errorMsg);
+                    gtk_dialog_run(GTK_DIALOG(errBox));
+                    gtk_widget_destroy(errBox);
+                }
+                else
+                {
+                    /* Cancel any running script */
+                    app->core->cancelScript();
+                    app->core->runScript(script);
+                }
+            }
+        }
+        else
+        {
+            GtkWidget* errBox = gtk_message_dialog_new(GTK_WINDOW(app->mainWindow),
+                                                       GTK_DIALOG_DESTROY_WITH_PARENT,
+                                                       GTK_MESSAGE_ERROR,
+                                                       GTK_BUTTONS_OK,
+                                                       "Bad File Type. Use *.(cel|celx|clx).");
+            gtk_dialog_run(GTK_DIALOG(errBox));
+            gtk_widget_destroy(errBox);
+        }
+    }
 }
 
 
 /* Image capturing helper called by actionCaptureImage() */
 static void captureImage(const char* filename, AppData* app)
 {
-	/* Get the dimensions of the current viewport */
-	int viewport[4];
-	glGetIntegerv(GL_VIEWPORT, viewport);
+    /* Get the dimensions of the current viewport */
+    int viewport[4];
+    glGetIntegerv(GL_VIEWPORT, viewport);
 
-	bool success = false;
-	ContentType type = DetermineFileType(filename);
-	if (type == Content_Unknown)
-	{
-		GtkWidget* errBox = gtk_message_dialog_new(GTK_WINDOW(app->mainWindow),
-		                                           GTK_DIALOG_DESTROY_WITH_PARENT,
-		                                           GTK_MESSAGE_ERROR,
-		                                           GTK_BUTTONS_OK,
-		                                           "Unable to determine image file type from name, please use a name ending in '.jpg' or '.png'.");
-		gtk_dialog_run(GTK_DIALOG(errBox));
-		gtk_widget_destroy(errBox);
-		return;
-	}
-	else if (type == Content_JPEG)
-	{
-		success = CaptureGLBufferToJPEG(filename,
-		                                viewport[0], viewport[1],
-		                                viewport[2], viewport[3]);
-	}
-	else if (type == Content_PNG)
-	{
-		success = CaptureGLBufferToPNG(filename,
-		                               viewport[0], viewport[1],
-		                               viewport[2], viewport[3]);
-	}
-	else
-	{
-		GtkWidget* errBox = gtk_message_dialog_new(GTK_WINDOW(app->mainWindow),
-		                                           GTK_DIALOG_DESTROY_WITH_PARENT,
-		                                           GTK_MESSAGE_ERROR,
-		                                           GTK_BUTTONS_OK,
-		                                           "Currently screen capturing to only JPEG or PNG files is supported.");
-		gtk_dialog_run(GTK_DIALOG(errBox));
-		gtk_widget_destroy(errBox);
-		return;
-	}
+    bool success = false;
+    ContentType type = DetermineFileType(filename);
+    if (type == Content_Unknown)
+    {
+        GtkWidget* errBox = gtk_message_dialog_new(GTK_WINDOW(app->mainWindow),
+                                                   GTK_DIALOG_DESTROY_WITH_PARENT,
+                                                   GTK_MESSAGE_ERROR,
+                                                   GTK_BUTTONS_OK,
+                                                   "Unable to determine image file type from name, please use a name ending in '.jpg' or '.png'.");
+        gtk_dialog_run(GTK_DIALOG(errBox));
+        gtk_widget_destroy(errBox);
+        return;
+    }
+    else if (type == Content_JPEG)
+    {
+        success = CaptureGLBufferToJPEG(filename,
+                                        viewport[0], viewport[1],
+                                        viewport[2], viewport[3]);
+    }
+    else if (type == Content_PNG)
+    {
+        success = CaptureGLBufferToPNG(filename,
+                                       viewport[0], viewport[1],
+                                       viewport[2], viewport[3]);
+    }
+    else
+    {
+        GtkWidget* errBox = gtk_message_dialog_new(GTK_WINDOW(app->mainWindow),
+                                                   GTK_DIALOG_DESTROY_WITH_PARENT,
+                                                   GTK_MESSAGE_ERROR,
+                                                   GTK_BUTTONS_OK,
+                                                   "Currently screen capturing to only JPEG or PNG files is supported.");
+        gtk_dialog_run(GTK_DIALOG(errBox));
+        gtk_widget_destroy(errBox);
+        return;
+    }
 
-	if (!success)
-	{
-		GtkWidget* errBox = gtk_message_dialog_new(GTK_WINDOW(app->mainWindow),
-		                                           GTK_DIALOG_DESTROY_WITH_PARENT,
-		                                           GTK_MESSAGE_ERROR,
-		                                           GTK_BUTTONS_OK,
-		                                           "Error writing captured image.");
-		gtk_dialog_run(GTK_DIALOG(errBox));
-		gtk_widget_destroy(errBox);
-	}
+    if (!success)
+    {
+        GtkWidget* errBox = gtk_message_dialog_new(GTK_WINDOW(app->mainWindow),
+                                                   GTK_DIALOG_DESTROY_WITH_PARENT,
+                                                   GTK_MESSAGE_ERROR,
+                                                   GTK_BUTTONS_OK,
+                                                   "Error writing captured image.");
+        gtk_dialog_run(GTK_DIALOG(errBox));
+        gtk_widget_destroy(errBox);
+    }
 }
 
 /* Image capturing helper called by actionCaptureImage() */
 #ifdef THEORA
 static void captureMovie(const char* filename, int aspect, float fps, float quality, AppData* app)
 {
-	/* Get the dimensions of the current viewport */
-	int viewport[4];
-	glGetIntegerv(GL_VIEWPORT, viewport);
+    /* Get the dimensions of the current viewport */
+    int viewport[4];
+    glGetIntegerv(GL_VIEWPORT, viewport);
 
-	MovieCapture* movieCapture = new OggTheoraCapture();
-	switch (aspect)
-	{
-	case 0:
-		movieCapture->setAspectRatio(1, 1);
-		break;
-	case 1:
-		movieCapture->setAspectRatio(4, 3);
-		break;
-	case 2:
-		movieCapture->setAspectRatio(16, 9);
-		break;
-	default:
-		movieCapture->setAspectRatio(viewport[2], viewport[3]);
-		break;
-	}
-	movieCapture->setQuality(quality);
-	
-	bool success = movieCapture->start(filename, viewport[2], viewport[3], fps);
-	if (success)
-		app->core->initMovieCapture(movieCapture);
-	else
-	{
-		delete movieCapture;
+    MovieCapture* movieCapture = new OggTheoraCapture();
+    switch (aspect)
+    {
+    case 0:
+        movieCapture->setAspectRatio(1, 1);
+        break;
+    case 1:
+        movieCapture->setAspectRatio(4, 3);
+        break;
+    case 2:
+        movieCapture->setAspectRatio(16, 9);
+        break;
+    default:
+        movieCapture->setAspectRatio(viewport[2], viewport[3]);
+        break;
+    }
+    movieCapture->setQuality(quality);
 
-		GtkWidget* errBox = gtk_message_dialog_new(GTK_WINDOW(app->mainWindow),
-		                                           GTK_DIALOG_DESTROY_WITH_PARENT,
-		                                           GTK_MESSAGE_ERROR,
-		                                           GTK_BUTTONS_OK,
-		                                           "Error initializing movie capture.");
-		gtk_dialog_run(GTK_DIALOG(errBox));
-		gtk_widget_destroy(errBox);
-	}
+    bool success = movieCapture->start(filename, viewport[2], viewport[3], fps);
+    if (success)
+        app->core->initMovieCapture(movieCapture);
+    else
+    {
+        delete movieCapture;
+
+        GtkWidget* errBox = gtk_message_dialog_new(GTK_WINDOW(app->mainWindow),
+                                                   GTK_DIALOG_DESTROY_WITH_PARENT,
+                                                   GTK_MESSAGE_ERROR,
+                                                   GTK_BUTTONS_OK,
+                                                   "Error initializing movie capture.");
+        gtk_dialog_run(GTK_DIALOG(errBox));
+        gtk_widget_destroy(errBox);
+    }
 }
 #endif
 
@@ -1174,299 +1174,299 @@ static void captureMovie(const char* filename, int aspect, float fps, float qual
    a more elegant solution. */
 static void textInfoDialog(const char *txt, const char *title, AppData* app)
 {
-	/* I would use a gnome_message_box dialog for this, except they don't seem
-	 * to notice that the texts are so big that they create huge windows, and
-	 * would work better with a scrolled window. Deon */
-	GtkWidget* dialog = gtk_dialog_new_with_buttons(title,
-	                                                GTK_WINDOW(app->mainWindow),
-	                                                GTK_DIALOG_DESTROY_WITH_PARENT,
-	                                                GTK_STOCK_OK, GTK_RESPONSE_OK,
-	                                                NULL);
+    /* I would use a gnome_message_box dialog for this, except they don't seem
+     * to notice that the texts are so big that they create huge windows, and
+     * would work better with a scrolled window. Deon */
+    GtkWidget* dialog = gtk_dialog_new_with_buttons(title,
+                                                    GTK_WINDOW(app->mainWindow),
+                                                    GTK_DIALOG_DESTROY_WITH_PARENT,
+                                                    GTK_STOCK_OK, GTK_RESPONSE_OK,
+                                                    NULL);
 
-	GtkWidget* scrolled_window = gtk_scrolled_window_new (NULL, NULL);
-	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), scrolled_window, TRUE, TRUE, 0);
-	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW (scrolled_window),
-	                               GTK_POLICY_AUTOMATIC,
-	                               GTK_POLICY_AUTOMATIC);
-	gtk_widget_show(scrolled_window);
+    GtkWidget* scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+    gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), scrolled_window, TRUE, TRUE, 0);
+    gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW (scrolled_window),
+                                   GTK_POLICY_AUTOMATIC,
+                                   GTK_POLICY_AUTOMATIC);
+    gtk_widget_show(scrolled_window);
 
-	GtkWidget *text = gtk_label_new(txt);
-	gtk_widget_modify_font(text, pango_font_description_from_string("mono"));
-	gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled_window), GTK_WIDGET(text));
-	gtk_widget_show(text);
-	
-	gtk_window_set_default_size(GTK_WINDOW(dialog), 600, 400); /* Absolute Size, urghhh */
-	gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK);
+    GtkWidget *text = gtk_label_new(txt);
+    gtk_widget_modify_font(text, pango_font_description_from_string("mono"));
+    gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled_window), GTK_WIDGET(text));
+    gtk_widget_show(text);
 
-	gtk_dialog_run(GTK_DIALOG(dialog));
-	gtk_widget_destroy(dialog);
+    gtk_window_set_default_size(GTK_WINDOW(dialog), 600, 400); /* Absolute Size, urghhh */
+    gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK);
+
+    gtk_dialog_run(GTK_DIALOG(dialog));
+    gtk_widget_destroy(dialog);
 }
 
 
 /* Calculates and sets the render-flag int */
 static void setRenderFlag(AppData* a, int flag, gboolean state)
 {
-	int rf = (a->renderer->getRenderFlags() & ~flag) | (state ? flag : 0);
-	a->renderer->setRenderFlags(rf);
-	
-	#ifdef GNOME
-	/* Update GConf */
-	gcSetRenderFlag(flag, state, a->client);
-	#endif /* GNOME */
+    int rf = (a->renderer->getRenderFlags() & ~flag) | (state ? flag : 0);
+    a->renderer->setRenderFlags(rf);
+
+    #ifdef GNOME
+    /* Update GConf */
+    gcSetRenderFlag(flag, state, a->client);
+    #endif /* GNOME */
 }
 
 
 /* Calculates and sets the orbit-mask int */
 static void setOrbitMask(AppData* a, int mask, gboolean state)
 {
-	int om = (a->renderer->getOrbitMask() & ~mask) | (state ? mask : 0);
-	a->renderer->setOrbitMask(om);
-	
-	#ifdef GNOME
-	/* Update GConf */
-	gcSetOrbitMask(mask, state, a->client);
-	#endif /* GNOME */
+    int om = (a->renderer->getOrbitMask() & ~mask) | (state ? mask : 0);
+    a->renderer->setOrbitMask(om);
+
+    #ifdef GNOME
+    /* Update GConf */
+    gcSetOrbitMask(mask, state, a->client);
+    #endif /* GNOME */
 }
 
 
 /* Calculates and sets the label-mode int */
 static void setLabelMode(AppData* a, int mode, gboolean state)
 {
-	int lm = (a->renderer->getLabelMode() & ~mode) | (state ? mode : 0);
-	a->renderer->setLabelMode(lm);
-	
-	#ifdef GNOME
-	/* Update GConf */
-	gcSetLabelMode(mode, state, a->client);
-	#endif /* GNOME */
+    int lm = (a->renderer->getLabelMode() & ~mode) | (state ? mode : 0);
+    a->renderer->setLabelMode(lm);
+
+    #ifdef GNOME
+    /* Update GConf */
+    gcSetLabelMode(mode, state, a->client);
+    #endif /* GNOME */
 }
 
 
 /* Synchronizes the Label Actions with the state of the core */
 void resyncLabelActions(AppData* app)
 {
-	GtkAction* action;
-	const char* actionName;
-	
-	/* Simply for readability */
-	int f = app->renderer->getLabelMode();
-	
-	for (int i = Renderer::StarLabels; i <= Renderer::GlobularLabels; i *= 2)
-	{
-		switch (i)
-		{
-			case Renderer::StarLabels: actionName = "LabelStars"; break;
-			case Renderer::PlanetLabels: actionName = "LabelPlanets"; break;
-			case Renderer::MoonLabels: actionName = "LabelMoons"; break;
-			case Renderer::ConstellationLabels: actionName = "LabelConstellations"; break;
-			case Renderer::GalaxyLabels: actionName = "LabelGalaxies"; break;
-			case Renderer::AsteroidLabels: actionName = "LabelAsteroids"; break;
-			case Renderer::SpacecraftLabels: actionName = "LabelSpacecraft"; break;
-			case Renderer::LocationLabels: actionName = "LabelLocations"; break;
-			case Renderer::CometLabels: actionName = "LabelComets"; break;
-			case Renderer::NebulaLabels: actionName = "LabelNebulae"; break;
-			case Renderer::OpenClusterLabels: actionName = "LabelOpenClusters"; break;
-			case Renderer::GlobularLabels: actionName = "LabelGlobulars"; break;
-			case Renderer::I18nConstellationLabels: /* Not used yet */
-			default: actionName = NULL;
-		}
-		
-		if (actionName != NULL)
-		{
-			/* Get the action */
-			action = gtk_action_group_get_action(app->agLabel, actionName);
-			
-			/* The current i anded with the labelMode gives state of flag */
-			gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), (i & f));
-		}
-	}
+    GtkAction* action;
+    const char* actionName;
+
+    /* Simply for readability */
+    int f = app->renderer->getLabelMode();
+
+    for (int i = Renderer::StarLabels; i <= Renderer::GlobularLabels; i *= 2)
+    {
+        switch (i)
+        {
+            case Renderer::StarLabels: actionName = "LabelStars"; break;
+            case Renderer::PlanetLabels: actionName = "LabelPlanets"; break;
+            case Renderer::MoonLabels: actionName = "LabelMoons"; break;
+            case Renderer::ConstellationLabels: actionName = "LabelConstellations"; break;
+            case Renderer::GalaxyLabels: actionName = "LabelGalaxies"; break;
+            case Renderer::AsteroidLabels: actionName = "LabelAsteroids"; break;
+            case Renderer::SpacecraftLabels: actionName = "LabelSpacecraft"; break;
+            case Renderer::LocationLabels: actionName = "LabelLocations"; break;
+            case Renderer::CometLabels: actionName = "LabelComets"; break;
+            case Renderer::NebulaLabels: actionName = "LabelNebulae"; break;
+            case Renderer::OpenClusterLabels: actionName = "LabelOpenClusters"; break;
+            case Renderer::GlobularLabels: actionName = "LabelGlobulars"; break;
+            case Renderer::I18nConstellationLabels: /* Not used yet */
+            default: actionName = NULL;
+        }
+
+        if (actionName != NULL)
+        {
+            /* Get the action */
+            action = gtk_action_group_get_action(app->agLabel, actionName);
+
+            /* The current i anded with the labelMode gives state of flag */
+            gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), (i & f));
+        }
+    }
 }
 
 
 /* Synchronizes the Render Actions with the state of the core */
 void resyncRenderActions(AppData* app)
 {
-	GtkAction* action;
-	const char* actionName;
-	
-	/* Simply for readability */
-	int rf = app->renderer->getRenderFlags();
-	
-	/* Unlike the other interfaces, which go through each menu item and set
-	 * the corresponding renderFlag, we go the other way and set the menu
-	 * based on the renderFlag. Last one is ShowEcliptic. */
-	
-	for (int i = Renderer::ShowStars; i <= Renderer::ShowEcliptic; i *= 2)
-	{
-		switch (i)
-		{
-			case Renderer::ShowStars: actionName = "RenderStars"; break;
-			case Renderer::ShowPlanets: actionName = "RenderPlanets"; break;
-			case Renderer::ShowGalaxies: actionName = "RenderGalaxies"; break;
-			case Renderer::ShowDiagrams: actionName = "RenderConstellations"; break;
-			case Renderer::ShowCloudMaps: actionName = "RenderClouds"; break;
-			case Renderer::ShowOrbits: actionName = "RenderOrbits"; break;
-			case Renderer::ShowCelestialSphere: actionName = "RenderCelestialGrid"; break;
-			case Renderer::ShowNightMaps: actionName = "RenderNightLights"; break;
-			case Renderer::ShowAtmospheres: actionName = "RenderAtmospheres"; break;
-			case Renderer::ShowSmoothLines: actionName = "RenderAA"; break;
-			case Renderer::ShowEclipseShadows: actionName = "RenderEclipseShadows"; break;
-			case Renderer::ShowStarsAsPoints: actionName = NULL; break; /* Deprecated */
-			case Renderer::ShowRingShadows: actionName = "RenderRingShadows"; break;
-			case Renderer::ShowBoundaries: actionName = "RenderConstellationBoundaries"; break;
-			case Renderer::ShowAutoMag: actionName = "RenderAutoMagnitude"; break;
-			case Renderer::ShowCometTails: actionName = "RenderCometTails"; break;
-			case Renderer::ShowMarkers: actionName = "RenderMarkers"; break;
-			case Renderer::ShowPartialTrajectories: actionName = NULL; break; /* Not useful yet */
-			case Renderer::ShowNebulae: actionName = "RenderNebulae"; break;
-			case Renderer::ShowOpenClusters: actionName = "RenderOpenClusters"; break;
-			case Renderer::ShowGlobulars: actionName = "RenderGlobulars"; break;
-			case Renderer::ShowCloudShadows: actionName = NULL; break; /* Not implemented yet */
-			case Renderer::ShowGalacticGrid: actionName = "RenderGalacticGrid"; break;
-			case Renderer::ShowEclipticGrid: actionName = "RenderEclipticGrid"; break;
-			case Renderer::ShowHorizonGrid: actionName = "RenderHorizontalGrid"; break;
-			case Renderer::ShowEcliptic: actionName = NULL; break; /* Not implemented yet */
-			default: actionName = NULL;
-		}
-		
-		if (actionName != NULL)
-		{
-			/* Get the action */
-			action = gtk_action_group_get_action(app->agRender, actionName);
-			
-			/* The current i anded with the renderFlags gives state of flag */
-			gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), (i & rf));
-		}
-	}
+    GtkAction* action;
+    const char* actionName;
+
+    /* Simply for readability */
+    int rf = app->renderer->getRenderFlags();
+
+    /* Unlike the other interfaces, which go through each menu item and set
+     * the corresponding renderFlag, we go the other way and set the menu
+     * based on the renderFlag. Last one is ShowEcliptic. */
+
+    for (int i = Renderer::ShowStars; i <= Renderer::ShowEcliptic; i *= 2)
+    {
+        switch (i)
+        {
+            case Renderer::ShowStars: actionName = "RenderStars"; break;
+            case Renderer::ShowPlanets: actionName = "RenderPlanets"; break;
+            case Renderer::ShowGalaxies: actionName = "RenderGalaxies"; break;
+            case Renderer::ShowDiagrams: actionName = "RenderConstellations"; break;
+            case Renderer::ShowCloudMaps: actionName = "RenderClouds"; break;
+            case Renderer::ShowOrbits: actionName = "RenderOrbits"; break;
+            case Renderer::ShowCelestialSphere: actionName = "RenderCelestialGrid"; break;
+            case Renderer::ShowNightMaps: actionName = "RenderNightLights"; break;
+            case Renderer::ShowAtmospheres: actionName = "RenderAtmospheres"; break;
+            case Renderer::ShowSmoothLines: actionName = "RenderAA"; break;
+            case Renderer::ShowEclipseShadows: actionName = "RenderEclipseShadows"; break;
+            case Renderer::ShowStarsAsPoints: actionName = NULL; break; /* Deprecated */
+            case Renderer::ShowRingShadows: actionName = "RenderRingShadows"; break;
+            case Renderer::ShowBoundaries: actionName = "RenderConstellationBoundaries"; break;
+            case Renderer::ShowAutoMag: actionName = "RenderAutoMagnitude"; break;
+            case Renderer::ShowCometTails: actionName = "RenderCometTails"; break;
+            case Renderer::ShowMarkers: actionName = "RenderMarkers"; break;
+            case Renderer::ShowPartialTrajectories: actionName = NULL; break; /* Not useful yet */
+            case Renderer::ShowNebulae: actionName = "RenderNebulae"; break;
+            case Renderer::ShowOpenClusters: actionName = "RenderOpenClusters"; break;
+            case Renderer::ShowGlobulars: actionName = "RenderGlobulars"; break;
+            case Renderer::ShowCloudShadows: actionName = NULL; break; /* Not implemented yet */
+            case Renderer::ShowGalacticGrid: actionName = "RenderGalacticGrid"; break;
+            case Renderer::ShowEclipticGrid: actionName = "RenderEclipticGrid"; break;
+            case Renderer::ShowHorizonGrid: actionName = "RenderHorizontalGrid"; break;
+            case Renderer::ShowEcliptic: actionName = NULL; break; /* Not implemented yet */
+            default: actionName = NULL;
+        }
+
+        if (actionName != NULL)
+        {
+            /* Get the action */
+            action = gtk_action_group_get_action(app->agRender, actionName);
+
+            /* The current i anded with the renderFlags gives state of flag */
+            gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), (i & rf));
+        }
+    }
 }
 
 
 /* Synchronizes the Orbit Actions with the state of the core */
 void resyncOrbitActions(AppData* app)
 {
-	GtkAction* action;
-	const char* actionName;
-	
-	/* Simply for readability */
-	int om = app->renderer->getOrbitMask();
-	
-	for (int i = Body::Planet; i <= Body::Spacecraft; i *= 2)
-	{
-		switch (i)
-		{
-			case Body::Planet: actionName = "OrbitPlanets"; break;
-			case Body::Moon: actionName = "OrbitMoons"; break;
-			case Body::Asteroid: actionName = "OrbitAsteroids"; break;
-			case Body::Comet: actionName = "OrbitComets"; break;
-			case Body::Spacecraft: actionName = "OrbitSpacecraft"; break;
-			default: actionName = NULL;
-		}
-		
-		if (actionName != NULL)
-		{
-			/* Get the action */
-			action = gtk_action_group_get_action(app->agOrbit, actionName);
-			
-			/* The current i anded with the orbitMask gives state of flag */
-			gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), (i & om));
-		}
-	}
+    GtkAction* action;
+    const char* actionName;
+
+    /* Simply for readability */
+    int om = app->renderer->getOrbitMask();
+
+    for (int i = Body::Planet; i <= Body::Spacecraft; i *= 2)
+    {
+        switch (i)
+        {
+            case Body::Planet: actionName = "OrbitPlanets"; break;
+            case Body::Moon: actionName = "OrbitMoons"; break;
+            case Body::Asteroid: actionName = "OrbitAsteroids"; break;
+            case Body::Comet: actionName = "OrbitComets"; break;
+            case Body::Spacecraft: actionName = "OrbitSpacecraft"; break;
+            default: actionName = NULL;
+        }
+
+        if (actionName != NULL)
+        {
+            /* Get the action */
+            action = gtk_action_group_get_action(app->agOrbit, actionName);
+
+            /* The current i anded with the orbitMask gives state of flag */
+            gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), (i & om));
+        }
+    }
 }
 
 
 /* Synchronizes the Verbosity Actions with the state of the core */
 void resyncVerbosityActions(AppData* app)
 {
-	GtkAction* action;
-	const char* actionName;
-	
-	switch (app->core->getHudDetail())
-	{
-		case 0: actionName = "HudNone"; break;
-		case 1: actionName = "HudTerse"; break;
-		case 2: actionName = "HudVerbose"; break;
-		default: return;
-	}
-	
-	/* Get the action, set the widget */
-	action = gtk_action_group_get_action(app->agVerbosity, actionName);
-	gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), TRUE);
+    GtkAction* action;
+    const char* actionName;
+
+    switch (app->core->getHudDetail())
+    {
+        case 0: actionName = "HudNone"; break;
+        case 1: actionName = "HudTerse"; break;
+        case 2: actionName = "HudVerbose"; break;
+        default: return;
+    }
+
+    /* Get the action, set the widget */
+    action = gtk_action_group_get_action(app->agVerbosity, actionName);
+    gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), TRUE);
 }
 
 
 /* Synchronizes the TimeZone Action with the state of the core */
 void resyncTimeZoneAction(AppData* app)
 {
-	/* Get the action, set the widget */
-	GtkAction* action = gtk_action_group_get_action(app->agMain, "TimeLocal");
-	gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), app->showLocalTime);
+    /* Get the action, set the widget */
+    GtkAction* action = gtk_action_group_get_action(app->agMain, "TimeLocal");
+    gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), app->showLocalTime);
 }
 
 
 /* Synchronizes the Ambient Light Actions with the state of the core */
 void resyncAmbientActions(AppData* app)
 {
-	GtkAction* action;
+    GtkAction* action;
 
-	float ambient = app->renderer->getAmbientLightLevel();
-	
-	/* Try to be smart about being close to the value of a float */
-	if (ambient > amLevels[0] && ambient < (amLevels[1] / 2.0))
-		action = gtk_action_group_get_action(app->agAmbient, "AmbientNone");
-	
-	else if (ambient < amLevels[1] + ((amLevels[2] - amLevels[1]) / 2.0))
-		action = gtk_action_group_get_action(app->agAmbient, "AmbientLow");
-	
-	else
-		action = gtk_action_group_get_action(app->agAmbient, "AmbientMedium");
-	
-	gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), TRUE);
-	
-	#ifdef GNOME
-	/* The action callback only occurs when one of the None/Low/Medium barriers
-	 * is surpassed, so an update is forced. */
-	gconf_client_set_float(app->client, "/apps/celestia/ambientLight", ambient, NULL);
-	#endif
+    float ambient = app->renderer->getAmbientLightLevel();
+
+    /* Try to be smart about being close to the value of a float */
+    if (ambient > amLevels[0] && ambient < (amLevels[1] / 2.0))
+        action = gtk_action_group_get_action(app->agAmbient, "AmbientNone");
+
+    else if (ambient < amLevels[1] + ((amLevels[2] - amLevels[1]) / 2.0))
+        action = gtk_action_group_get_action(app->agAmbient, "AmbientLow");
+
+    else
+        action = gtk_action_group_get_action(app->agAmbient, "AmbientMedium");
+
+    gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), TRUE);
+
+    #ifdef GNOME
+    /* The action callback only occurs when one of the None/Low/Medium barriers
+     * is surpassed, so an update is forced. */
+    gconf_client_set_float(app->client, "/apps/celestia/ambientLight", ambient, NULL);
+    #endif
 }
 
 
 /* Synchronizes the Verbosity Actions with the state of the core */
 void resyncStarStyleActions(AppData* app)
 {
-	GtkAction* action;
-	const char* actionName;
-	
-	switch (app->renderer->getStarStyle())
-	{
-		case Renderer::FuzzyPointStars: actionName = "StarsFuzzy"; break;
-		case Renderer::PointStars: actionName = "StarsPoints"; break;
-		case Renderer::ScaledDiscStars: actionName = "StarsDiscs"; break;
-		default: return;
-	}
-	
-	/* Get the action, set the widget */
-	action = gtk_action_group_get_action(app->agStarStyle, actionName);
-	gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), TRUE);
+    GtkAction* action;
+    const char* actionName;
+
+    switch (app->renderer->getStarStyle())
+    {
+        case Renderer::FuzzyPointStars: actionName = "StarsFuzzy"; break;
+        case Renderer::PointStars: actionName = "StarsPoints"; break;
+        case Renderer::ScaledDiscStars: actionName = "StarsDiscs"; break;
+        default: return;
+    }
+
+    /* Get the action, set the widget */
+    action = gtk_action_group_get_action(app->agStarStyle, actionName);
+    gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), TRUE);
 }
 
 
 /* Placeholder for when galaxy brightness is added as an action */
 void resyncGalaxyGainActions(AppData* app)
 {
-	float gain = Galaxy::getLightGain();
-	
-	#ifdef GNOME
-	gconf_client_set_float(app->client, "/apps/celestia/galaxyLightGain", gain, NULL);
-	#endif
+    float gain = Galaxy::getLightGain();
+
+    #ifdef GNOME
+    gconf_client_set_float(app->client, "/apps/celestia/galaxyLightGain", gain, NULL);
+    #endif
 }
 
 
 /* Synchronizes the Texture Resolution with the state of the core */
 void resyncTextureResolutionActions(AppData* app)
 {
-	int resolution = app->renderer->getResolution();
+    int resolution = app->renderer->getResolution();
 
-	#ifdef GNOME
-	gconf_client_set_int(app->client, "/apps/celestia/textureResolution", resolution, NULL);
-	#endif /* GNOME */
+    #ifdef GNOME
+    gconf_client_set_int(app->client, "/apps/celestia/textureResolution", resolution, NULL);
+    #endif /* GNOME */
 }
diff --git a/src/celestia/gtk/common.cpp b/src/celestia/gtk/common.cpp
index e77d5673e..eed379297 100644
--- a/src/celestia/gtk/common.cpp
+++ b/src/celestia/gtk/common.cpp
@@ -25,266 +25,266 @@
 /* Returns the offset of the timezone at date */
 gint tzOffsetAtDate(astro::Date date)
 {
-	#ifdef WIN32
-	/* This does not correctly handle DST. Unfortunately, no way to find
-	 * out what UTC offset is at specified date in Windows */
-	return -timezone;
-	#else
-	time_t time = (time_t)astro::julianDateToSeconds(date - astro::Date(1970, 1, 1));
-	struct tm *d = localtime(&time);
-	
-	return (gint)d->tm_gmtoff;
-	#endif
+    #ifdef WIN32
+    /* This does not correctly handle DST. Unfortunately, no way to find
+     * out what UTC offset is at specified date in Windows */
+    return -timezone;
+    #else
+    time_t time = (time_t)astro::julianDateToSeconds(date - astro::Date(1970, 1, 1));
+    struct tm *d = localtime(&time);
+
+    return (gint)d->tm_gmtoff;
+    #endif
 }
 
 
 /* Updates the time zone in the core based on valid timezone data */
 void updateTimeZone(AppData* app, gboolean local)
 {
-	if (local)
-		/* Always base current time zone on simulation date */
-		app->core->setTimeZoneBias(tzOffsetAtDate(app->simulation->getTime()));
-	else
-		app->core->setTimeZoneBias(0);
+    if (local)
+        /* Always base current time zone on simulation date */
+        app->core->setTimeZoneBias(tzOffsetAtDate(app->simulation->getTime()));
+    else
+        app->core->setTimeZoneBias(0);
 }
 
 
 /* Creates a button. Used in several dialogs. */
 gint buttonMake(GtkWidget *hbox, const char *txt, GtkSignalFunc func, gpointer data)
 {
-	GtkWidget* button = gtk_button_new_with_label(txt);
+    GtkWidget* button = gtk_button_new_with_label(txt);
 
-	gtk_box_pack_start(GTK_BOX (hbox), button, TRUE, TRUE, 0);
-	g_signal_connect(GTK_OBJECT(button), "pressed", func, data);
-	
-	return 0;
+    gtk_box_pack_start(GTK_BOX (hbox), button, TRUE, TRUE, 0);
+    g_signal_connect(GTK_OBJECT(button), "pressed", func, data);
+
+    return 0;
 }
 
 
 /* creates a group of radioButtons. Used in several dialogs. */
 void makeRadioItems(const char* const *labels, GtkWidget *box, GtkSignalFunc sigFunc, GtkToggleButton **gads, gpointer data)
 {
-	GSList *group = NULL;
+    GSList *group = NULL;
 
-	for (gint i=0; labels[i]; i++)
-	{
-		GtkWidget *button = gtk_radio_button_new_with_label(group, labels[i]);
+    for (gint i=0; labels[i]; i++)
+    {
+        GtkWidget *button = gtk_radio_button_new_with_label(group, labels[i]);
 
-		if (gads)
-			gads[i] = GTK_TOGGLE_BUTTON(button);
+        if (gads)
+            gads[i] = GTK_TOGGLE_BUTTON(button);
 
-		group = gtk_radio_button_group(GTK_RADIO_BUTTON(button));
-		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), (i == 0)?1:0);
+        group = gtk_radio_button_group(GTK_RADIO_BUTTON(button));
+        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), (i == 0)?1:0);
 
-		gtk_box_pack_start(GTK_BOX(box), button, TRUE, TRUE, 0);
-		gtk_widget_show (button);
-		g_signal_connect(GTK_OBJECT(button), "pressed", sigFunc, GINT_TO_POINTER(i));
+        gtk_box_pack_start(GTK_BOX(box), button, TRUE, TRUE, 0);
+        gtk_widget_show (button);
+        g_signal_connect(GTK_OBJECT(button), "pressed", sigFunc, GINT_TO_POINTER(i));
 
-		if (data != NULL)
-			g_object_set_data(G_OBJECT(button), "data", data);
-	}
+        if (data != NULL)
+            g_object_set_data(G_OBJECT(button), "data", data);
+    }
 }
 
 
 /* Gets the contents of a file and sanitizes formatting */
 char *readFromFile(const char *fname)
 {
-	ifstream textFile(fname, ios::in);
-	string s("");
-	if (!textFile.is_open())
-	{
-		s = "Unable to open file '";
-		s += fname ;
-		s += "', probably due to improper installation !\n";
-	}
+    ifstream textFile(fname, ios::in);
+    string s("");
+    if (!textFile.is_open())
+    {
+        s = "Unable to open file '";
+        s += fname ;
+        s += "', probably due to improper installation !\n";
+    }
 
-	char c;
-	while(textFile.get(c))
-	{
-		if (c == '\t')
-			s += "        ";  /* 8 spaces */
-		else if (c == '\014')     /* Ctrl+L (form feed) */
-			s += "\n\n\n\n";
-		else
-			s += c;
-	}
-	return g_strdup(s.c_str());
+    char c;
+    while(textFile.get(c))
+    {
+        if (c == '\t')
+            s += "        ";  /* 8 spaces */
+        else if (c == '\014')     /* Ctrl+L (form feed) */
+            s += "\n\n\n\n";
+        else
+            s += c;
+    }
+    return g_strdup(s.c_str());
 }
 
 
 /* Returns width of the non-fullscreen window */
 int getWinWidth(AppData* app)
 {
-	if (app->fullScreen)
-		return GPOINTER_TO_INT(g_object_get_data(G_OBJECT(app->mainWindow), "sizeX"));
-	else
-		return app->glArea->allocation.width;
+    if (app->fullScreen)
+        return GPOINTER_TO_INT(g_object_get_data(G_OBJECT(app->mainWindow), "sizeX"));
+    else
+        return app->glArea->allocation.width;
 }
 
 
 /* Returns height of the non-fullscreen window */
 int getWinHeight(AppData* app)
 {
-	if (app->fullScreen)
-		return GPOINTER_TO_INT(g_object_get_data(G_OBJECT(app->mainWindow), "sizeY"));
-	else
-		return app->glArea->allocation.height;
+    if (app->fullScreen)
+        return GPOINTER_TO_INT(g_object_get_data(G_OBJECT(app->mainWindow), "sizeY"));
+    else
+        return app->glArea->allocation.height;
 }
 
 
 /* Returns X-position of the non-fullscreen window */
 int getWinX(AppData* app)
 {
-	int positionX;
-	
-	if (app->fullScreen)
-		return GPOINTER_TO_INT(g_object_get_data(G_OBJECT(app->mainWindow), "positionX"));
-	else
-	{
-		gtk_window_get_position(GTK_WINDOW(app->mainWindow), &positionX, NULL);
-		return positionX;
-	}
+    int positionX;
+
+    if (app->fullScreen)
+        return GPOINTER_TO_INT(g_object_get_data(G_OBJECT(app->mainWindow), "positionX"));
+    else
+    {
+        gtk_window_get_position(GTK_WINDOW(app->mainWindow), &positionX, NULL);
+        return positionX;
+    }
 }
 
 
 /* Returns Y-position of the non-fullscreen window */
 int getWinY(AppData* app)
 {
-	int positionY;
-	
-	if (app->fullScreen)
-		return GPOINTER_TO_INT(g_object_get_data(G_OBJECT(app->mainWindow), "positionY"));
-	else
-	{
-		gtk_window_get_position(GTK_WINDOW(app->mainWindow), NULL, &positionY);
-		return positionY;
-	}
+    int positionY;
+
+    if (app->fullScreen)
+        return GPOINTER_TO_INT(g_object_get_data(G_OBJECT(app->mainWindow), "positionY"));
+    else
+    {
+        gtk_window_get_position(GTK_WINDOW(app->mainWindow), NULL, &positionY);
+        return positionY;
+    }
 }
 
 
 /* Sanitizes and sets Ambient Light */
 void setSaneAmbientLight(AppData* app, float value)
 {
-	if (value < 0.0 || value > 1.0)
-		value = amLevels[1]; /* Default to "Low" */
-	
-	app->renderer->setAmbientLightLevel(value);
+    if (value < 0.0 || value > 1.0)
+        value = amLevels[1]; /* Default to "Low" */
+
+    app->renderer->setAmbientLightLevel(value);
 }
 
 
 /* Sanitizes and sets Visual Magnitude */
 void setSaneVisualMagnitude(AppData* app, float value)
 {
-	if (value < 0.0 || value > 100.0)
-		value = 8.5f; /* Default from Simulation::Simulation() */
-	
-	app->simulation->setFaintestVisible(value);
+    if (value < 0.0 || value > 100.0)
+        value = 8.5f; /* Default from Simulation::Simulation() */
+
+    app->simulation->setFaintestVisible(value);
 }
 
 
 /* Sanitizes and sets Galaxy Light Gain */
 void setSaneGalaxyLightGain(float value)
 {
-	if (value < 0.0 || value > 1.0)
-		value = 0.0f; /* Default */
-	
-	Galaxy::setLightGain(value);
+    if (value < 0.0 || value > 1.0)
+        value = 0.0f; /* Default */
+
+    Galaxy::setLightGain(value);
 }
 
 
 /* Sanitizes and sets Distance Limit */
 void setSaneDistanceLimit(AppData* app, int value)
 {
-	if (value < 0 || value > 1000000)
-		value = 1000000; /* Default to maximum */
+    if (value < 0 || value > 1000000)
+        value = 1000000; /* Default to maximum */
 
-	app->renderer->setDistanceLimit(value);
+    app->renderer->setDistanceLimit(value);
 }
 
 /* Sanitizes and sets HUD Verbosity */
 void setSaneVerbosity(AppData* app, int value)
 {
-	if (value < 0 || value > 2)
-		value = 1; /* Default to "Terse" */
-	
-	app->core->setHudDetail(value);
+    if (value < 0 || value > 2)
+        value = 1; /* Default to "Terse" */
+
+    app->core->setHudDetail(value);
 }
 
 
 /* Sanitizes and sets Star Style */
 void setSaneStarStyle(AppData* app, Renderer::StarStyle value)
 {
-	if (value < Renderer::FuzzyPointStars || value > Renderer::ScaledDiscStars)
-		value = Renderer::FuzzyPointStars;
-	
-	app->renderer->setStarStyle(value);
+    if (value < Renderer::FuzzyPointStars || value > Renderer::ScaledDiscStars)
+        value = Renderer::FuzzyPointStars;
+
+    app->renderer->setStarStyle(value);
 }
 
 
 /* Sanitizes and sets Texture Resolution */
 void setSaneTextureResolution(AppData* app, int value)
 {
-	if (value < 0 || value > TEXTURE_RESOLUTION)
-		value = 1; /* Default to "Medium" */
+    if (value < 0 || value > TEXTURE_RESOLUTION)
+        value = 1; /* Default to "Medium" */
 
-	app->renderer->setResolution(value);
+    app->renderer->setResolution(value);
 }
 
 
 /* Sanitizes and sets Altername Surface Name */
 void setSaneAltSurface(AppData* app, char* value)
 {
-	if (value == NULL)
-		value = (char*)"";
-	
-	app->simulation->getActiveObserver()->setDisplayedSurface(value);
+    if (value == NULL)
+        value = (char*)"";
+
+    app->simulation->getActiveObserver()->setDisplayedSurface(value);
 }
 
 
 /* Sanitizes and sets Window Size */
 void setSaneWinSize(AppData* app, int x, int y)
 {
-	int screenX = gdk_screen_get_width(gdk_screen_get_default());
-	int screenY = gdk_screen_get_height(gdk_screen_get_default());
-	
-	if (x < 320 || x > screenX || y < 240 || y > screenY)
-	{
-		x = 640;
-		y = 480;
-	}
-	
-	gtk_widget_set_size_request(app->glArea, x, y);
+    int screenX = gdk_screen_get_width(gdk_screen_get_default());
+    int screenY = gdk_screen_get_height(gdk_screen_get_default());
+
+    if (x < 320 || x > screenX || y < 240 || y > screenY)
+    {
+        x = 640;
+        y = 480;
+    }
+
+    gtk_widget_set_size_request(app->glArea, x, y);
 }
 
 
 /* Sanitizes and sets Window Position */
 void setSaneWinPosition(AppData* app, int x, int y)
 {
-	int screenX = gdk_screen_get_width(gdk_screen_get_default());
-	int screenY = gdk_screen_get_height(gdk_screen_get_default());
+    int screenX = gdk_screen_get_width(gdk_screen_get_default());
+    int screenY = gdk_screen_get_height(gdk_screen_get_default());
 
-	/* This one is different than the others because we don't have a default */
-	if (x > 0 && x < screenX && y > 0 && y < screenY)
-	{
-		gtk_window_move(GTK_WINDOW(app->mainWindow), x, y);
-	}
+    /* This one is different than the others because we don't have a default */
+    if (x > 0 && x < screenX && y > 0 && y < screenY)
+    {
+        gtk_window_move(GTK_WINDOW(app->mainWindow), x, y);
+    }
 }
 
 
 /* Sets default render flags. Exists because the defaults are a little lame. */
 void setDefaultRenderFlags(AppData* app)
 {
-	app->renderer->setRenderFlags(Renderer::ShowAtmospheres |
-	                              Renderer::ShowAutoMag |
-	                              Renderer::ShowStars |
-	                              Renderer::ShowPlanets |
-	                              Renderer::ShowSmoothLines |
-	                              Renderer::ShowCometTails |
-	                              Renderer::ShowRingShadows |
-	                              Renderer::ShowCloudMaps |
-	                              Renderer::ShowRingShadows |
-	                              Renderer::ShowEclipseShadows |
-	                              Renderer::ShowGalaxies |
-	                              Renderer::ShowNebulae |
-	                              Renderer::ShowNightMaps);
+    app->renderer->setRenderFlags(Renderer::ShowAtmospheres |
+                                  Renderer::ShowAutoMag |
+                                  Renderer::ShowStars |
+                                  Renderer::ShowPlanets |
+                                  Renderer::ShowSmoothLines |
+                                  Renderer::ShowCometTails |
+                                  Renderer::ShowRingShadows |
+                                  Renderer::ShowCloudMaps |
+                                  Renderer::ShowRingShadows |
+                                  Renderer::ShowEclipseShadows |
+                                  Renderer::ShowGalaxies |
+                                  Renderer::ShowNebulae |
+                                  Renderer::ShowNightMaps);
 }
diff --git a/src/celestia/gtk/common.h b/src/celestia/gtk/common.h
index 8ed1de8dc..621b8fbb7 100644
--- a/src/celestia/gtk/common.h
+++ b/src/celestia/gtk/common.h
@@ -30,47 +30,47 @@
 
 typedef struct _AppData AppData;
 struct _AppData {
-	/* Core Pointers */
-	CelestiaCore* core;
-	Renderer* renderer;
-	Simulation* simulation;
+    /* Core Pointers */
+    CelestiaCore* core;
+    Renderer* renderer;
+    Simulation* simulation;
 
-	/* Important Widgets */
-	GtkWidget* mainWindow;
-	GtkWidget* mainMenu;
-	GtkWidget* glArea;
-	GtkWidget* optionDialog;
-	GtkWidget* contextMenu;
-	
-	/* Action Groups */
-	GtkActionGroup* agMain;
-	GtkActionGroup* agRender;
-	GtkActionGroup* agOrbit;
-	GtkActionGroup* agLabel;
-	GtkActionGroup* agVerbosity;
-	GtkActionGroup* agStarStyle;
-	GtkActionGroup* agAmbient;
-	
-	/* Settings */
-	#ifdef GNOME
-	GConfClient* client;
-	#else
-	GKeyFile* settingsFile;
-	#endif /* GNOME */
-	
-	/* Ready to render? */
-	gboolean bReady;
-	
-	/* Mouse motion tracking */
-	int lastX;
-	int lastY;
-	
-	/* Starting URL */
-	char* startURL;
-	
-	/* A few preferences not tracked by the core */
-	gboolean showLocalTime;
-	gboolean fullScreen;
+    /* Important Widgets */
+    GtkWidget* mainWindow;
+    GtkWidget* mainMenu;
+    GtkWidget* glArea;
+    GtkWidget* optionDialog;
+    GtkWidget* contextMenu;
+
+    /* Action Groups */
+    GtkActionGroup* agMain;
+    GtkActionGroup* agRender;
+    GtkActionGroup* agOrbit;
+    GtkActionGroup* agLabel;
+    GtkActionGroup* agVerbosity;
+    GtkActionGroup* agStarStyle;
+    GtkActionGroup* agAmbient;
+
+    /* Settings */
+    #ifdef GNOME
+    GConfClient* client;
+    #else
+    GKeyFile* settingsFile;
+    #endif /* GNOME */
+
+    /* Ready to render? */
+    gboolean bReady;
+
+    /* Mouse motion tracking */
+    int lastX;
+    int lastY;
+
+    /* Starting URL */
+    char* startURL;
+
+    /* A few preferences not tracked by the core */
+    gboolean showLocalTime;
+    gboolean fullScreen;
 };
 
 
@@ -102,7 +102,7 @@ void setDefaultRenderFlags(AppData* app);
 
 
 /* Constants used throughout */
-const char * const monthOptions[] = 
+const char * const monthOptions[] =
 {
     "January",
     "February",
@@ -121,22 +121,22 @@ const char * const monthOptions[] =
 
 static const float amLevels[] =
 {
-    0.0, 
+    0.0,
     0.1,
     0.25
 };
 
 static const int resolutions[] =
 {
-	0,        /* Must start with 0 */
-	640,
-	800,
-	1024,
-	1152,
-	1280,
-	1400,
-	1600,
-	-1        /* Must end with -1 */
+    0,        /* Must start with 0 */
+    640,
+    800,
+    1024,
+    1152,
+    1280,
+    1400,
+    1600,
+    -1        /* Must end with -1 */
 };
 
 /* This is the spacing used for widgets throughout the program */
diff --git a/src/celestia/gtk/dialog-eclipse.cpp b/src/celestia/gtk/dialog-eclipse.cpp
index 6e7c7fb91..65f562e52 100644
--- a/src/celestia/gtk/dialog-eclipse.cpp
+++ b/src/celestia/gtk/dialog-eclipse.cpp
@@ -42,439 +42,439 @@ static void setButtonDateString(GtkToggleButton *button, int year, int month, in
 /* ENTRY: Navigation -> Eclipse Finder */
 void dialogEclipseFinder(AppData* app)
 {
-	EclipseData* ed = g_new0(EclipseData, 1);
-	selDate* d1 = g_new0(selDate, 1);
-	selDate* d2 = g_new0(selDate, 1);
-	ed->d1 = d1;
-	ed->d2 = d2;
-	ed->app = app;
-	ed->eclipseList = NULL;
-	ed->eclipseListStore = NULL;
-	ed->bSolar = TRUE;
-	sprintf(ed->body, "%s", eclipsePlanetTitles[0]);
-	ed->sel = NULL;
+    EclipseData* ed = g_new0(EclipseData, 1);
+    selDate* d1 = g_new0(selDate, 1);
+    selDate* d2 = g_new0(selDate, 1);
+    ed->d1 = d1;
+    ed->d2 = d2;
+    ed->app = app;
+    ed->eclipseList = NULL;
+    ed->eclipseListStore = NULL;
+    ed->bSolar = TRUE;
+    sprintf(ed->body, "%s", eclipsePlanetTitles[0]);
+    ed->sel = NULL;
 
-	ed->window = GTK_DIALOG(gtk_dialog_new_with_buttons("Eclipse Finder",
-	                                                    GTK_WINDOW(app->mainWindow),
-	                                                    GTK_DIALOG_DESTROY_WITH_PARENT,
-	                                                    GTK_STOCK_OK,
-	                                                    GTK_RESPONSE_OK,
-	                                                    NULL));
-	gtk_window_set_modal(GTK_WINDOW(ed->window), FALSE);
- 
-	GtkWidget *mainbox = gtk_vbox_new(FALSE, CELSPACING);
-	gtk_container_set_border_width(GTK_CONTAINER(mainbox), CELSPACING);
-	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(ed->window)->vbox), mainbox, TRUE, TRUE, 0);
+    ed->window = GTK_DIALOG(gtk_dialog_new_with_buttons("Eclipse Finder",
+                                                        GTK_WINDOW(app->mainWindow),
+                                                        GTK_DIALOG_DESTROY_WITH_PARENT,
+                                                        GTK_STOCK_OK,
+                                                        GTK_RESPONSE_OK,
+                                                        NULL));
+    gtk_window_set_modal(GTK_WINDOW(ed->window), FALSE);
 
-	GtkWidget *scrolled_win = gtk_scrolled_window_new (NULL, NULL);
+    GtkWidget *mainbox = gtk_vbox_new(FALSE, CELSPACING);
+    gtk_container_set_border_width(GTK_CONTAINER(mainbox), CELSPACING);
+    gtk_box_pack_start(GTK_BOX(GTK_DIALOG(ed->window)->vbox), mainbox, TRUE, TRUE, 0);
 
-	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW (scrolled_win),
-	                               GTK_POLICY_AUTOMATIC,
-	                               GTK_POLICY_ALWAYS);
-	gtk_box_pack_start(GTK_BOX(mainbox), scrolled_win, TRUE, TRUE, 0);
+    GtkWidget *scrolled_win = gtk_scrolled_window_new (NULL, NULL);
 
-	/* Create listbox list.
-	 * Six invisible ints at the end to hold actual time.
-	 * This will save string parsing like in KDE version.
-	 * Last field holds pointer to selected Body. */
-	ed->eclipseListStore = gtk_list_store_new(12,
-	                                   G_TYPE_STRING,
-	                                   G_TYPE_STRING,
-	                                   G_TYPE_STRING,
-	                                   G_TYPE_STRING,
-	                                   G_TYPE_STRING,
-	                                   G_TYPE_INT,
-	                                   G_TYPE_INT,
-	                                   G_TYPE_INT,
-	                                   G_TYPE_INT,
-	                                   G_TYPE_INT,
-	                                   G_TYPE_INT,
-	                                   G_TYPE_POINTER);
-	ed->eclipseList = gtk_tree_view_new_with_model(GTK_TREE_MODEL(ed->eclipseListStore));
+    gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW (scrolled_win),
+                                   GTK_POLICY_AUTOMATIC,
+                                   GTK_POLICY_ALWAYS);
+    gtk_box_pack_start(GTK_BOX(mainbox), scrolled_win, TRUE, TRUE, 0);
 
-	gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(ed->eclipseList), TRUE);
-	gtk_container_add(GTK_CONTAINER(scrolled_win), ed->eclipseList);
+    /* Create listbox list.
+     * Six invisible ints at the end to hold actual time.
+     * This will save string parsing like in KDE version.
+     * Last field holds pointer to selected Body. */
+    ed->eclipseListStore = gtk_list_store_new(12,
+                                       G_TYPE_STRING,
+                                       G_TYPE_STRING,
+                                       G_TYPE_STRING,
+                                       G_TYPE_STRING,
+                                       G_TYPE_STRING,
+                                       G_TYPE_INT,
+                                       G_TYPE_INT,
+                                       G_TYPE_INT,
+                                       G_TYPE_INT,
+                                       G_TYPE_INT,
+                                       G_TYPE_INT,
+                                       G_TYPE_POINTER);
+    ed->eclipseList = gtk_tree_view_new_with_model(GTK_TREE_MODEL(ed->eclipseListStore));
 
-	GtkCellRenderer *renderer;
-	GtkTreeViewColumn *column;
+    gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(ed->eclipseList), TRUE);
+    gtk_container_add(GTK_CONTAINER(scrolled_win), ed->eclipseList);
 
-	/* Add the columns */
-	for (int i=0; i<5; i++) {
-		renderer = gtk_cell_renderer_text_new();
-		column = gtk_tree_view_column_new_with_attributes (eclipseTitles[i], renderer, "text", i, NULL);
-		gtk_tree_view_append_column(GTK_TREE_VIEW(ed->eclipseList), column);
-	}
+    GtkCellRenderer *renderer;
+    GtkTreeViewColumn *column;
 
-	/* Set up callback for when an eclipse is selected */
-	GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(ed->eclipseList));
-	g_signal_connect(selection, "changed", G_CALLBACK(listEclipseSelect), ed);
+    /* Add the columns */
+    for (int i=0; i<5; i++) {
+        renderer = gtk_cell_renderer_text_new();
+        column = gtk_tree_view_column_new_with_attributes (eclipseTitles[i], renderer, "text", i, NULL);
+        gtk_tree_view_append_column(GTK_TREE_VIEW(ed->eclipseList), column);
+    }
 
-	/* From now on, it's the bottom-of-the-window controls */
-	GtkWidget *label;
-	GtkWidget *hbox;
+    /* Set up callback for when an eclipse is selected */
+    GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(ed->eclipseList));
+    g_signal_connect(selection, "changed", G_CALLBACK(listEclipseSelect), ed);
 
-	/* -------------------------------- */
-	hbox = gtk_hbox_new(FALSE, CELSPACING);
-	
-	label = gtk_label_new("Find");
-	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
-	
-	GtkWidget* menuTypeBox = gtk_option_menu_new();
-	gtk_box_pack_start(GTK_BOX(hbox), menuTypeBox, FALSE, FALSE, 0);
+    /* From now on, it's the bottom-of-the-window controls */
+    GtkWidget *label;
+    GtkWidget *hbox;
 
-	label = gtk_label_new("eclipse on");
-	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
+    /* -------------------------------- */
+    hbox = gtk_hbox_new(FALSE, CELSPACING);
 
-	GtkWidget* menuBodyBox = gtk_option_menu_new();
-	gtk_box_pack_start(GTK_BOX(hbox), menuBodyBox, FALSE, FALSE, 0);
+    label = gtk_label_new("Find");
+    gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
 
-	gtk_box_pack_start(GTK_BOX(mainbox), hbox, FALSE, FALSE, 0);
-	/* -------------------------------- */
-	hbox = gtk_hbox_new(FALSE, CELSPACING);
+    GtkWidget* menuTypeBox = gtk_option_menu_new();
+    gtk_box_pack_start(GTK_BOX(hbox), menuTypeBox, FALSE, FALSE, 0);
 
-	label = gtk_label_new("From");
-	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
+    label = gtk_label_new("eclipse on");
+    gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
 
-	/* Get current date */
-	astro::Date datenow(app->simulation->getTime());
+    GtkWidget* menuBodyBox = gtk_option_menu_new();
+    gtk_box_pack_start(GTK_BOX(hbox), menuBodyBox, FALSE, FALSE, 0);
 
-	/* Set current time */
-	ed->d1->year = datenow.year - 1;
-	ed->d1->month = datenow.month;
-	ed->d1->day = datenow.day;
+    gtk_box_pack_start(GTK_BOX(mainbox), hbox, FALSE, FALSE, 0);
+    /* -------------------------------- */
+    hbox = gtk_hbox_new(FALSE, CELSPACING);
 
-	/* Set time a year from now */
-	ed->d2->year = ed->d1->year + 2;
-	ed->d2->month = ed->d1->month;
-	ed->d2->day = ed->d1->day;
+    label = gtk_label_new("From");
+    gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
 
-	GtkWidget* date1Button = gtk_toggle_button_new();
-	setButtonDateString(GTK_TOGGLE_BUTTON(date1Button), ed->d1->year, ed->d1->month, ed->d1->day);
-	g_object_set_data(G_OBJECT(date1Button), "eclipsedata", ed->d1);
-	gtk_box_pack_start(GTK_BOX(hbox), date1Button, FALSE, FALSE, 0);
+    /* Get current date */
+    astro::Date datenow(app->simulation->getTime());
 
-	label = gtk_label_new("to");
-	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
+    /* Set current time */
+    ed->d1->year = datenow.year - 1;
+    ed->d1->month = datenow.month;
+    ed->d1->day = datenow.day;
 
-	GtkWidget* date2Button = gtk_toggle_button_new();
-	setButtonDateString(GTK_TOGGLE_BUTTON(date2Button), ed->d2->year, ed->d2->month, ed->d2->day);
-	g_object_set_data(G_OBJECT(date2Button), "eclipsedata", ed->d2);
-	gtk_box_pack_start(GTK_BOX(hbox), date2Button, FALSE, FALSE, 0);
+    /* Set time a year from now */
+    ed->d2->year = ed->d1->year + 2;
+    ed->d2->month = ed->d1->month;
+    ed->d2->day = ed->d1->day;
 
-	gtk_box_pack_start(GTK_BOX(mainbox), hbox, FALSE, FALSE, 0);
-	/* -------------------------------- */
+    GtkWidget* date1Button = gtk_toggle_button_new();
+    setButtonDateString(GTK_TOGGLE_BUTTON(date1Button), ed->d1->year, ed->d1->month, ed->d1->day);
+    g_object_set_data(G_OBJECT(date1Button), "eclipsedata", ed->d1);
+    gtk_box_pack_start(GTK_BOX(hbox), date1Button, FALSE, FALSE, 0);
 
-	/* Common Buttons */
-	hbox = gtk_hbox_new(TRUE, CELSPACING);
-	if (buttonMake(hbox, "Compute", (GtkSignalFunc)eclipseCompute, ed))
-		return;
-	if (buttonMake(hbox, "Set Date and Go to Planet", (GtkSignalFunc)eclipseGoto, ed))
-		return;
-	gtk_box_pack_start(GTK_BOX(mainbox), hbox, FALSE, FALSE, 0);
+    label = gtk_label_new("to");
+    gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
 
-	/* Set up the drop-down boxes */
-	GtkWidget *item;
+    GtkWidget* date2Button = gtk_toggle_button_new();
+    setButtonDateString(GTK_TOGGLE_BUTTON(date2Button), ed->d2->year, ed->d2->month, ed->d2->day);
+    g_object_set_data(G_OBJECT(date2Button), "eclipsedata", ed->d2);
+    gtk_box_pack_start(GTK_BOX(hbox), date2Button, FALSE, FALSE, 0);
 
-	GtkWidget* menuType = gtk_menu_new();
-	for (int i = 0; eclipseTypeTitles[i] != NULL; i++)
-	{
-		item = gtk_menu_item_new_with_label(eclipseTypeTitles[i]);
-		gtk_menu_append(GTK_MENU(menuType), item);
-		gtk_widget_show(item);
-	}
-	gtk_option_menu_set_menu(GTK_OPTION_MENU(menuTypeBox), menuType);
+    gtk_box_pack_start(GTK_BOX(mainbox), hbox, FALSE, FALSE, 0);
+    /* -------------------------------- */
 
-	GtkWidget* menuBody = gtk_menu_new();
-	for (int i = 0; eclipsePlanetTitles[i] != NULL; i++)
-	{
-		item = gtk_menu_item_new_with_label(eclipsePlanetTitles[i]);
-		gtk_menu_append(GTK_MENU(menuBody), item);
-		gtk_widget_show(item);
-	}
-	gtk_option_menu_set_menu(GTK_OPTION_MENU(menuBodyBox), menuBody);
+    /* Common Buttons */
+    hbox = gtk_hbox_new(TRUE, CELSPACING);
+    if (buttonMake(hbox, "Compute", (GtkSignalFunc)eclipseCompute, ed))
+        return;
+    if (buttonMake(hbox, "Set Date and Go to Planet", (GtkSignalFunc)eclipseGoto, ed))
+        return;
+    gtk_box_pack_start(GTK_BOX(mainbox), hbox, FALSE, FALSE, 0);
 
-	/* Hook up all the signals */
-	g_signal_connect(GTK_OBJECT(menuType), "selection-done", G_CALLBACK(eclipseTypeSelect), ed);
+    /* Set up the drop-down boxes */
+    GtkWidget *item;
+
+    GtkWidget* menuType = gtk_menu_new();
+    for (int i = 0; eclipseTypeTitles[i] != NULL; i++)
+    {
+        item = gtk_menu_item_new_with_label(eclipseTypeTitles[i]);
+        gtk_menu_append(GTK_MENU(menuType), item);
+        gtk_widget_show(item);
+    }
+    gtk_option_menu_set_menu(GTK_OPTION_MENU(menuTypeBox), menuType);
+
+    GtkWidget* menuBody = gtk_menu_new();
+    for (int i = 0; eclipsePlanetTitles[i] != NULL; i++)
+    {
+        item = gtk_menu_item_new_with_label(eclipsePlanetTitles[i]);
+        gtk_menu_append(GTK_MENU(menuBody), item);
+        gtk_widget_show(item);
+    }
+    gtk_option_menu_set_menu(GTK_OPTION_MENU(menuBodyBox), menuBody);
+
+    /* Hook up all the signals */
+    g_signal_connect(GTK_OBJECT(menuType), "selection-done", G_CALLBACK(eclipseTypeSelect), ed);
     g_signal_connect(GTK_OBJECT(menuBody), "selection-done", G_CALLBACK(eclipseBodySelect), ed);
 
-	/* Double-click handler */
-	g_signal_connect(GTK_OBJECT(ed->eclipseList), "button-press-event", G_CALLBACK(eclipse2Click), ed);
+    /* Double-click handler */
+    g_signal_connect(GTK_OBJECT(ed->eclipseList), "button-press-event", G_CALLBACK(eclipse2Click), ed);
 
-	g_signal_connect(GTK_OBJECT(date1Button), "toggled", G_CALLBACK(showCalPopup), ed);
-	g_signal_connect(GTK_OBJECT(date2Button), "toggled", G_CALLBACK(showCalPopup), ed);
-	g_signal_connect(ed->window, "response", G_CALLBACK(eclipseDestroy), ed);
+    g_signal_connect(GTK_OBJECT(date1Button), "toggled", G_CALLBACK(showCalPopup), ed);
+    g_signal_connect(GTK_OBJECT(date2Button), "toggled", G_CALLBACK(showCalPopup), ed);
+    g_signal_connect(ed->window, "response", G_CALLBACK(eclipseDestroy), ed);
 
-	gtk_widget_set_usize(GTK_WIDGET(ed->window), 400, 400); /* Absolute Size, urghhh */
-	gtk_widget_show_all(GTK_WIDGET(ed->window));
+    gtk_widget_set_usize(GTK_WIDGET(ed->window), 400, 400); /* Absolute Size, urghhh */
+    gtk_widget_show_all(GTK_WIDGET(ed->window));
 }
 
 
 /* CALLBACK: When the GtkCalendar date is selected */
 static void calDateSelect(GtkCalendar *calendar, GtkToggleButton *button)
 {
-	/* Set the selected date */
-	guint year, month, day; 
-	gtk_calendar_get_date(calendar, &year, &month, &day);
+    /* Set the selected date */
+    guint year, month, day;
+    gtk_calendar_get_date(calendar, &year, &month, &day);
 
-	/* A button stores its own date */
-	selDate* date = (selDate *)g_object_get_data(G_OBJECT(button), "eclipsedata");
-	date->year = year;
-	date->month = month + 1;
-	date->day = day;
+    /* A button stores its own date */
+    selDate* date = (selDate *)g_object_get_data(G_OBJECT(button), "eclipsedata");
+    date->year = year;
+    date->month = month + 1;
+    date->day = day;
 
-	/* Update the button text */
-	setButtonDateString(button, year, month + 1, day);
+    /* Update the button text */
+    setButtonDateString(button, year, month + 1, day);
 
-	/* Close the calendar window */
-	gtk_toggle_button_set_active(button, !gtk_toggle_button_get_active(button));
+    /* Close the calendar window */
+    gtk_toggle_button_set_active(button, !gtk_toggle_button_get_active(button));
 }
 
 
 /* CALLBACK: When a button is clicked to show a GtkCalendar */
 static void showCalPopup(GtkToggleButton *button, EclipseData *ed)
 {
-	GtkWidget* calwindow = GTK_WIDGET(g_object_get_data(G_OBJECT(button), "calendar"));
+    GtkWidget* calwindow = GTK_WIDGET(g_object_get_data(G_OBJECT(button), "calendar"));
 
-	if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button)))
-	{
-		/* Pushed in */
-		if (!calwindow)
-		{
-			calwindow = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+    if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button)))
+    {
+        /* Pushed in */
+        if (!calwindow)
+        {
+            calwindow = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 
-			/* FIXME: should be a transient, but then there are focus issues */
-			gtk_window_set_modal(GTK_WINDOW(calwindow), TRUE);
-			gtk_window_set_type_hint(GTK_WINDOW(calwindow), GDK_WINDOW_TYPE_HINT_DOCK);
-			gtk_window_set_decorated(GTK_WINDOW(calwindow), FALSE);
-			gtk_window_set_resizable(GTK_WINDOW(calwindow), FALSE);
-			gtk_window_stick(GTK_WINDOW(calwindow));
+            /* FIXME: should be a transient, but then there are focus issues */
+            gtk_window_set_modal(GTK_WINDOW(calwindow), TRUE);
+            gtk_window_set_type_hint(GTK_WINDOW(calwindow), GDK_WINDOW_TYPE_HINT_DOCK);
+            gtk_window_set_decorated(GTK_WINDOW(calwindow), FALSE);
+            gtk_window_set_resizable(GTK_WINDOW(calwindow), FALSE);
+            gtk_window_stick(GTK_WINDOW(calwindow));
 
-			GtkWidget* calendar = gtk_calendar_new();
+            GtkWidget* calendar = gtk_calendar_new();
 
-			/* Load date structure stored in the button's data */
-			selDate* date = (selDate *)g_object_get_data(G_OBJECT(button), "eclipsedata");
-		
-			gtk_calendar_select_month(GTK_CALENDAR(calendar), date->month - 1, date->year);
-			gtk_calendar_select_day(GTK_CALENDAR(calendar), date->day);
-	
-			gtk_container_add(GTK_CONTAINER(calwindow), calendar);
-			gtk_widget_show(calendar);
+            /* Load date structure stored in the button's data */
+            selDate* date = (selDate *)g_object_get_data(G_OBJECT(button), "eclipsedata");
 
-			int x, y, i, j;
-			gdk_window_get_origin(GDK_WINDOW(GTK_WIDGET(button)->window), &x, &y);
-			gtk_widget_translate_coordinates(GTK_WIDGET(button), GTK_WIDGET(ed->window), 10, 10, &i, &j);
+            gtk_calendar_select_month(GTK_CALENDAR(calendar), date->month - 1, date->year);
+            gtk_calendar_select_day(GTK_CALENDAR(calendar), date->day);
 
-			gtk_window_move(GTK_WINDOW(calwindow), x + i, y + j);
+            gtk_container_add(GTK_CONTAINER(calwindow), calendar);
+            gtk_widget_show(calendar);
 
-			g_signal_connect(calendar, "day-selected-double-click", G_CALLBACK(calDateSelect), button);
+            int x, y, i, j;
+            gdk_window_get_origin(GDK_WINDOW(GTK_WIDGET(button)->window), &x, &y);
+            gtk_widget_translate_coordinates(GTK_WIDGET(button), GTK_WIDGET(ed->window), 10, 10, &i, &j);
 
-			gtk_window_present(GTK_WINDOW(calwindow));
+            gtk_window_move(GTK_WINDOW(calwindow), x + i, y + j);
 
-			g_object_set_data_full(G_OBJECT (button), "calendar",
-			                       calwindow, (GDestroyNotify)gtk_widget_destroy);
-		}
-	}
-	else
-	{
-		/* Pushed out */
-		if (calwindow)
-		{
-			/* Destroys the calendar */
-			g_object_set_data(G_OBJECT (button), "calendar", NULL);
-			calwindow = NULL;
-		}
-	}
+            g_signal_connect(calendar, "day-selected-double-click", G_CALLBACK(calDateSelect), button);
+
+            gtk_window_present(GTK_WINDOW(calwindow));
+
+            g_object_set_data_full(G_OBJECT (button), "calendar",
+                                   calwindow, (GDestroyNotify)gtk_widget_destroy);
+        }
+    }
+    else
+    {
+        /* Pushed out */
+        if (calwindow)
+        {
+            /* Destroys the calendar */
+            g_object_set_data(G_OBJECT (button), "calendar", NULL);
+            calwindow = NULL;
+        }
+    }
 }
 
 
 /* CALLBACK: "SetTime/Goto" in Eclipse Finder */
 static gint eclipseGoto(GtkButton*, EclipseData* ed)
 {
-	GValue value = { 0, {{0}} }; /* Initialize GValue to 0 */
-	GtkTreeIter iter;
-	GtkTreeModel* model;
-	int time[6];
-	Simulation* sim = ed->app->simulation;
+    GValue value = { 0, {{0}} }; /* Initialize GValue to 0 */
+    GtkTreeIter iter;
+    GtkTreeModel* model;
+    int time[6];
+    Simulation* sim = ed->app->simulation;
 
-	/* Nothing selected */
-	if (ed->sel == NULL)
-		return FALSE;
+    /* Nothing selected */
+    if (ed->sel == NULL)
+        return FALSE;
 
-	/* IF prevents selection while list is being updated */
-	if (!gtk_tree_selection_get_selected(ed->sel, &model, &iter))
-		return FALSE;
+    /* IF prevents selection while list is being updated */
+    if (!gtk_tree_selection_get_selected(ed->sel, &model, &iter))
+        return FALSE;
 
-	/* Tedious method of extracting the desired time.
-	 * However, still better than parsing a single string. */
-	for (int i = 0; i < 6; i++)
-	{
-		gtk_tree_model_get_value(model, &iter, i+5, &value);
-		time[i] = g_value_get_int(&value);
-		g_value_unset(&value);
-	}	
+    /* Tedious method of extracting the desired time.
+     * However, still better than parsing a single string. */
+    for (int i = 0; i < 6; i++)
+    {
+        gtk_tree_model_get_value(model, &iter, i+5, &value);
+        time[i] = g_value_get_int(&value);
+        g_value_unset(&value);
+    }
 
-	/* Retrieve the selected body */
-	gtk_tree_model_get_value(model, &iter, 11, &value);
-	Body* body  = (Body *)g_value_get_pointer(&value);
-	g_value_unset(&value);
-			
-	/* Set time based on retrieved values */
-	astro::Date d(time[0], time[1], time[2]);
-	d.hour = time[3];
-	d.minute = time[4];
-	d.seconds = (double)time[5];
-	sim->setTime((double)d);
+    /* Retrieve the selected body */
+    gtk_tree_model_get_value(model, &iter, 11, &value);
+    Body* body  = (Body *)g_value_get_pointer(&value);
+    g_value_unset(&value);
 
-	/* The rest is directly from the Windows eclipse code */
-	Selection target(body);
-	Selection ref(body->getSystem()->getStar());
-	
-	/* Use the phase lock coordinate system to set a position
-	 * on the line between the sun and the body where the eclipse
-	 * is occurring. */
-	sim->setFrame(ObserverFrame::PhaseLock, target, ref);
-	sim->update(0.0);
+    /* Set time based on retrieved values */
+    astro::Date d(time[0], time[1], time[2]);
+    d.hour = time[3];
+    d.minute = time[4];
+    d.seconds = (double)time[5];
+    sim->setTime((double)d);
 
-	double distance = target.radius() * 4.0;
-	sim->gotoLocation(UniversalCoord::Zero().offsetKm(Vector3d::UnitX() * distance),
+    /* The rest is directly from the Windows eclipse code */
+    Selection target(body);
+    Selection ref(body->getSystem()->getStar());
+
+    /* Use the phase lock coordinate system to set a position
+     * on the line between the sun and the body where the eclipse
+     * is occurring. */
+    sim->setFrame(ObserverFrame::PhaseLock, target, ref);
+    sim->update(0.0);
+
+    double distance = target.radius() * 4.0;
+    sim->gotoLocation(UniversalCoord::Zero().offsetKm(Vector3d::UnitX() * distance),
                                   (YRotation(-PI / 2) * XRotation(-PI / 2)), 2.5);
 
-	return TRUE;
+    return TRUE;
 }
 
 
 /* CALLBACK: Double-click on the Eclipse Finder Listbox */
 static gint eclipse2Click(GtkWidget*, GdkEventButton* event, EclipseData* ed)
 {
-	if (event->type == GDK_2BUTTON_PRESS) {
-		/* Double-click, same as hitting the select and go button */
-		return eclipseGoto(NULL, ed);
-	}
+    if (event->type == GDK_2BUTTON_PRESS) {
+        /* Double-click, same as hitting the select and go button */
+        return eclipseGoto(NULL, ed);
+    }
 
-	return FALSE;
+    return FALSE;
 }
 
 
 /* CALLBACK: Compute button in Eclipse Finder */
 static void eclipseCompute(GtkButton* button, EclipseData* ed)
 {
-	GtkTreeIter iter;
+    GtkTreeIter iter;
 
-	/* Set the cursor to a watch and force redraw */
-	gdk_window_set_cursor(GTK_WIDGET(button)->window, gdk_cursor_new(GDK_WATCH));
-	gtk_main_iteration();
+    /* Set the cursor to a watch and force redraw */
+    gdk_window_set_cursor(GTK_WIDGET(button)->window, gdk_cursor_new(GDK_WATCH));
+    gtk_main_iteration();
 
-	/* Clear the listbox */
-	gtk_list_store_clear(ed->eclipseListStore);
+    /* Clear the listbox */
+    gtk_list_store_clear(ed->eclipseListStore);
 
-	/* Create the dates in a more suitable format */
-	astro::Date from(ed->d1->year, ed->d1->month, ed->d1->day);
-	astro::Date to(ed->d2->year, ed->d2->month, ed->d2->day);
+    /* Create the dates in a more suitable format */
+    astro::Date from(ed->d1->year, ed->d1->month, ed->d1->day);
+    astro::Date to(ed->d2->year, ed->d2->month, ed->d2->day);
 
-	/* Initialize the eclipse finder */
-	EclipseFinder ef(ed->app->core, ed->body, ed->bSolar ? Eclipse::Solar : Eclipse::Moon, (double)from, (double)to);
-	vector<Eclipse> eclipseListRaw = ef.getEclipses();
+    /* Initialize the eclipse finder */
+    EclipseFinder ef(ed->app->core, ed->body, ed->bSolar ? Eclipse::Solar : Eclipse::Moon, (double)from, (double)to);
+    vector<Eclipse> eclipseListRaw = ef.getEclipses();
 
-	for (std::vector<Eclipse>::iterator i = eclipseListRaw.begin();
-		i != eclipseListRaw.end();
-		i++)
-	{
+    for (std::vector<Eclipse>::iterator i = eclipseListRaw.begin();
+        i != eclipseListRaw.end();
+        i++)
+    {
 
-		/* Handle 0 case */
-		if ((*i).planete == "None") {
-			gtk_list_store_append(ed->eclipseListStore, &iter);
-			gtk_list_store_set(ed->eclipseListStore, &iter, 0, (*i).planete.c_str(), -1);
-			continue;
-		}
+        /* Handle 0 case */
+        if ((*i).planete == "None") {
+            gtk_list_store_append(ed->eclipseListStore, &iter);
+            gtk_list_store_set(ed->eclipseListStore, &iter, 0, (*i).planete.c_str(), -1);
+            continue;
+        }
 
-		char d[12], strStart[10], strEnd[10];
-		astro::Date start((*i).startTime);
-		astro::Date end((*i).endTime);
+        char d[12], strStart[10], strEnd[10];
+        astro::Date start((*i).startTime);
+        astro::Date end((*i).endTime);
 
-		sprintf(d, "%d-%02d-%02d", (*i).date->year, (*i).date->month, (*i).date->day);
-		sprintf(strStart, "%02d:%02d:%02d", start.hour, start.minute, (int)start.seconds);
-		sprintf(strEnd, "%02d:%02d:%02d", end.hour, end.minute, (int)end.seconds);
+        sprintf(d, "%d-%02d-%02d", (*i).date->year, (*i).date->month, (*i).date->day);
+        sprintf(strStart, "%02d:%02d:%02d", start.hour, start.minute, (int)start.seconds);
+        sprintf(strEnd, "%02d:%02d:%02d", end.hour, end.minute, (int)end.seconds);
 
-		/* Set time to middle time so that eclipse it right on earth */
-		astro::Date timeToSet = (start + end) / 2.0f;
+        /* Set time to middle time so that eclipse it right on earth */
+        astro::Date timeToSet = (start + end) / 2.0f;
 
-		/* Add item to the list.
-		 * Entries 5-11 are not displayed and store data. */
-		gtk_list_store_append(ed->eclipseListStore, &iter);
-		gtk_list_store_set(ed->eclipseListStore, &iter,
-		                   0, (*i).planete.c_str(),
-		                   1, (*i).sattelite.c_str(),
-		                   2, d,
-		                   3, strStart,
-		                   4, strEnd,
-		                   5, timeToSet.year,
-		                   6, timeToSet.month,
-		                   7, timeToSet.day,
-		                   8, timeToSet.hour,
-		                   9, timeToSet.minute,
-		                   10, (int)timeToSet.seconds,
-		                   11, (*i).body,
-		                   -1);
-	}
+        /* Add item to the list.
+         * Entries 5-11 are not displayed and store data. */
+        gtk_list_store_append(ed->eclipseListStore, &iter);
+        gtk_list_store_set(ed->eclipseListStore, &iter,
+                           0, (*i).planete.c_str(),
+                           1, (*i).sattelite.c_str(),
+                           2, d,
+                           3, strStart,
+                           4, strEnd,
+                           5, timeToSet.year,
+                           6, timeToSet.month,
+                           7, timeToSet.day,
+                           8, timeToSet.hour,
+                           9, timeToSet.minute,
+                           10, (int)timeToSet.seconds,
+                           11, (*i).body,
+                           -1);
+    }
 
-	/* Set the cursor back */
-	gdk_window_set_cursor(GTK_WIDGET(button)->window, gdk_cursor_new(GDK_LEFT_PTR));
+    /* Set the cursor back */
+    gdk_window_set_cursor(GTK_WIDGET(button)->window, gdk_cursor_new(GDK_LEFT_PTR));
 }
 
 
 /* CALLBACK: When Eclipse Body is selected */
 static void eclipseBodySelect(GtkMenuShell* menu, EclipseData* ed)
 {
-	GtkWidget* item = gtk_menu_get_active(GTK_MENU(menu));
+    GtkWidget* item = gtk_menu_get_active(GTK_MENU(menu));
 
-	GList* list = gtk_container_children(GTK_CONTAINER(menu));
-	int itemIndex = g_list_index(list, item);
+    GList* list = gtk_container_children(GTK_CONTAINER(menu));
+    int itemIndex = g_list_index(list, item);
 
-	/* Set string according to body array */
-	sprintf(ed->body, "%s", eclipsePlanetTitles[itemIndex]);
+    /* Set string according to body array */
+    sprintf(ed->body, "%s", eclipsePlanetTitles[itemIndex]);
 }
 
 
 /* CALLBACK: When Eclipse Type (Solar:Moon) is selected */
 static void eclipseTypeSelect(GtkMenuShell* menu, EclipseData* ed)
 {
-	GtkWidget* item = gtk_menu_get_active(GTK_MENU(menu));
+    GtkWidget* item = gtk_menu_get_active(GTK_MENU(menu));
 
-	GList* list = gtk_container_children(GTK_CONTAINER(menu));
-	int itemIndex = g_list_index(list, item);
+    GList* list = gtk_container_children(GTK_CONTAINER(menu));
+    int itemIndex = g_list_index(list, item);
 
-	/* Solar eclipse */
-	if (itemIndex == 0)
-		ed->bSolar = 1;
-	/* Moon eclipse */
-	else
-		ed->bSolar = 0;
+    /* Solar eclipse */
+    if (itemIndex == 0)
+        ed->bSolar = 1;
+    /* Moon eclipse */
+    else
+        ed->bSolar = 0;
 }
 
 
 /* CALLBACK: When Eclipse is selected in Eclipse Finder */
 static void listEclipseSelect(GtkTreeSelection* sel, EclipseData* ed)
 {
-	/* Simply set the selection pointer to this data item */
-	ed->sel = sel;
+    /* Simply set the selection pointer to this data item */
+    ed->sel = sel;
 }
 
 
 /* CALLBACK: Destroy Window */
 static void eclipseDestroy(GtkWidget* w, gint, EclipseData* ed)
 {
-	gtk_widget_destroy(GTK_WIDGET(w));
-	g_free(ed->d1);
-	g_free(ed->d2);
-	g_free(ed);
+    gtk_widget_destroy(GTK_WIDGET(w));
+    g_free(ed->d1);
+    g_free(ed->d2);
+    g_free(ed);
 }
 
 
 /* HELPER: set a date string in a button */
 static void setButtonDateString(GtkToggleButton *button, int year, int month, int day)
 {
-	char date[50];
-	sprintf(date, "%d %s %d", day, monthOptions[month - 1], year);
+    char date[50];
+    sprintf(date, "%d %s %d", day, monthOptions[month - 1], year);
 
-	gtk_button_set_label(GTK_BUTTON(button), date);
+    gtk_button_set_label(GTK_BUTTON(button), date);
 }
diff --git a/src/celestia/gtk/dialog-eclipse.h b/src/celestia/gtk/dialog-eclipse.h
index 4f784c18b..f7ea2c031 100644
--- a/src/celestia/gtk/dialog-eclipse.h
+++ b/src/celestia/gtk/dialog-eclipse.h
@@ -27,58 +27,58 @@ void dialogEclipseFinder(AppData* app);
 /* Date selection data type */
 typedef struct _selDate selDate;
 struct _selDate {
-	int year;
-	int month;
-	int day;
+    int year;
+    int month;
+    int day;
 };
 
 typedef struct _EclipseData EclipseData;
 struct _EclipseData {
-	AppData* app;
-	
-	/* Start Time */
-	selDate* d1;
+    AppData* app;
 
-	/* End Time */
-	selDate* d2;
+    /* Start Time */
+    selDate* d1;
 
-	bool bSolar;
-	char body[7];
-	GtkTreeSelection* sel;
+    /* End Time */
+    selDate* d2;
 
-	GtkWidget *eclipseList;
-	GtkListStore *eclipseListStore;
+    bool bSolar;
+    char body[7];
+    GtkTreeSelection* sel;
 
-	GtkDialog* window;
+    GtkWidget *eclipseList;
+    GtkListStore *eclipseListStore;
+
+    GtkDialog* window;
 };
 
 
 const char * const eclipseTitles[] =
 {
-	"Planet",
-	"Satellite",
-	"Date",
-	"Start",
-	"End",
-	NULL
+    "Planet",
+    "Satellite",
+    "Date",
+    "Start",
+    "End",
+    NULL
 };
 
 const char * const eclipseTypeTitles[] =
 {
-	"solar",
-	"moon",
-	NULL
+    "solar",
+    "moon",
+    NULL
 };
 
 const char * const eclipsePlanetTitles[] =
 {
-	"Earth",
-	"Jupiter",
-	"Saturn",
-	"Uranus",
-	"Neptune",
-	"Pluto",
-	NULL
+    "Earth",
+    "Jupiter",
+    "Saturn",
+    "Uranus",
+    "Neptune",
+    "Pluto",
+    NULL
 };
 
 #endif /* GTK_DIALOG_ECLIPSE_H */
diff --git a/src/celestia/gtk/dialog-goto.cpp b/src/celestia/gtk/dialog-goto.cpp
index 94afc8968..077b195b0 100644
--- a/src/celestia/gtk/dialog-goto.cpp
+++ b/src/celestia/gtk/dialog-goto.cpp
@@ -35,115 +35,115 @@ static void GotoObject(gotoObjectData* gotoObjectDlg);
 /* ENTRY: Navigation->Goto Object */
 void dialogGotoObject(AppData* app)
 {
-	gotoObjectData *data = g_new0(gotoObjectData, 1);
-	data->app = app;
+    gotoObjectData *data = g_new0(gotoObjectData, 1);
+    data->app = app;
 
-	data->dialog = gtk_dialog_new_with_buttons("Goto Object",
-	                                           GTK_WINDOW(app->mainWindow),
-	                                           GTK_DIALOG_DESTROY_WITH_PARENT,
-	                                           "Go To",
-	                                           GTK_RESPONSE_OK,
-	                                           GTK_STOCK_CLOSE,
-	                                           GTK_RESPONSE_CLOSE,
-	                                           NULL);
-	data->nameEntry = gtk_entry_new();
-	data->latEntry = gtk_entry_new();
-	data->longEntry = gtk_entry_new();
-	data->distEntry = gtk_entry_new();
+    data->dialog = gtk_dialog_new_with_buttons("Goto Object",
+                                               GTK_WINDOW(app->mainWindow),
+                                               GTK_DIALOG_DESTROY_WITH_PARENT,
+                                               "Go To",
+                                               GTK_RESPONSE_OK,
+                                               GTK_STOCK_CLOSE,
+                                               GTK_RESPONSE_CLOSE,
+                                               NULL);
+    data->nameEntry = gtk_entry_new();
+    data->latEntry = gtk_entry_new();
+    data->longEntry = gtk_entry_new();
+    data->distEntry = gtk_entry_new();
 
-	if (data->dialog == NULL ||
-	    data->nameEntry == NULL ||
-	    data->latEntry == NULL ||
-	    data->longEntry == NULL ||
-	    data->distEntry == NULL)
-	{
-		/* Potential memory leak here ... */
-		return;
-	}
+    if (data->dialog == NULL ||
+        data->nameEntry == NULL ||
+        data->latEntry == NULL ||
+        data->longEntry == NULL ||
+        data->distEntry == NULL)
+    {
+        /* Potential memory leak here ... */
+        return;
+    }
 
-	/* Set up the values (from windows cpp file) */
-	double distance, longitude, latitude;
-	app->simulation->getSelectionLongLat(distance, longitude, latitude);
+    /* Set up the values (from windows cpp file) */
+    double distance, longitude, latitude;
+    app->simulation->getSelectionLongLat(distance, longitude, latitude);
 
-	/* Display information in format appropriate for object */
-	if (app->simulation->getSelection().body() != NULL)
-	{
-		char temp[20];
-		distance = distance - (double) app->simulation->getSelection().body()->getRadius();
-		sprintf(temp, "%.1f", (float)distance);
-		gtk_entry_set_text(GTK_ENTRY(data->distEntry), temp);
-		sprintf(temp, "%.5f", (float)longitude);
-		gtk_entry_set_text(GTK_ENTRY(data->longEntry), temp);
-		sprintf(temp, "%.5f", (float)latitude);
-		gtk_entry_set_text(GTK_ENTRY(data->latEntry), temp);
-		gtk_entry_set_text(GTK_ENTRY(data->nameEntry), (char*) app->simulation->getSelection().body()->getName().c_str());
-	}
+    /* Display information in format appropriate for object */
+    if (app->simulation->getSelection().body() != NULL)
+    {
+        char temp[20];
+        distance = distance - (double) app->simulation->getSelection().body()->getRadius();
+        sprintf(temp, "%.1f", (float)distance);
+        gtk_entry_set_text(GTK_ENTRY(data->distEntry), temp);
+        sprintf(temp, "%.5f", (float)longitude);
+        gtk_entry_set_text(GTK_ENTRY(data->longEntry), temp);
+        sprintf(temp, "%.5f", (float)latitude);
+        gtk_entry_set_text(GTK_ENTRY(data->latEntry), temp);
+        gtk_entry_set_text(GTK_ENTRY(data->nameEntry), (char*) app->simulation->getSelection().body()->getName().c_str());
+    }
 
-	GtkWidget* vbox = gtk_vbox_new(TRUE, CELSPACING);
-	gtk_container_set_border_width(GTK_CONTAINER(vbox), CELSPACING);
-	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(data->dialog)->vbox), vbox, TRUE, TRUE, 0);
+    GtkWidget* vbox = gtk_vbox_new(TRUE, CELSPACING);
+    gtk_container_set_border_width(GTK_CONTAINER(vbox), CELSPACING);
+    gtk_box_pack_start(GTK_BOX(GTK_DIALOG(data->dialog)->vbox), vbox, TRUE, TRUE, 0);
 
-	GtkWidget* align = NULL;
-	GtkWidget* hbox = NULL;
-	GtkWidget* label = NULL;
+    GtkWidget* align = NULL;
+    GtkWidget* hbox = NULL;
+    GtkWidget* label = NULL;
 
-	/* Object name label and entry */
-	align = gtk_alignment_new(1, 0, 0, 0);
-	hbox = gtk_hbox_new(FALSE, CELSPACING);
-	label = gtk_label_new("Object name:");
-	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, TRUE, 0);
-	gtk_box_pack_start(GTK_BOX(hbox), data->nameEntry, FALSE, TRUE, 0);
-	gtk_container_add(GTK_CONTAINER(align), hbox);
-	gtk_box_pack_start(GTK_BOX(vbox), align, FALSE, TRUE, 0);
+    /* Object name label and entry */
+    align = gtk_alignment_new(1, 0, 0, 0);
+    hbox = gtk_hbox_new(FALSE, CELSPACING);
+    label = gtk_label_new("Object name:");
+    gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, TRUE, 0);
+    gtk_box_pack_start(GTK_BOX(hbox), data->nameEntry, FALSE, TRUE, 0);
+    gtk_container_add(GTK_CONTAINER(align), hbox);
+    gtk_box_pack_start(GTK_BOX(vbox), align, FALSE, TRUE, 0);
 
-	/* Latitude and longitude */
-	align = gtk_alignment_new(1, 0, 0, 0);
-	hbox = gtk_hbox_new(FALSE, CELSPACING);
-	label = gtk_label_new("Latitude:");
-	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, TRUE, 0);
-	gtk_box_pack_start(GTK_BOX(hbox), data->latEntry, FALSE, TRUE, 0);
-	gtk_container_add(GTK_CONTAINER(align), hbox);
-	gtk_box_pack_start(GTK_BOX(vbox), align, FALSE, TRUE, 0);
+    /* Latitude and longitude */
+    align = gtk_alignment_new(1, 0, 0, 0);
+    hbox = gtk_hbox_new(FALSE, CELSPACING);
+    label = gtk_label_new("Latitude:");
+    gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, TRUE, 0);
+    gtk_box_pack_start(GTK_BOX(hbox), data->latEntry, FALSE, TRUE, 0);
+    gtk_container_add(GTK_CONTAINER(align), hbox);
+    gtk_box_pack_start(GTK_BOX(vbox), align, FALSE, TRUE, 0);
 
-	align = gtk_alignment_new(1, 0, 0, 0);
-	hbox = gtk_hbox_new(FALSE, CELSPACING);
-	label = gtk_label_new("Longitude:");
-	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, TRUE, 0);
-	gtk_box_pack_start(GTK_BOX(hbox), data->longEntry, FALSE, TRUE, 0);
-	gtk_container_add(GTK_CONTAINER(align), hbox);
-	gtk_box_pack_start(GTK_BOX(vbox), align, FALSE, TRUE, 0);
+    align = gtk_alignment_new(1, 0, 0, 0);
+    hbox = gtk_hbox_new(FALSE, CELSPACING);
+    label = gtk_label_new("Longitude:");
+    gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, TRUE, 0);
+    gtk_box_pack_start(GTK_BOX(hbox), data->longEntry, FALSE, TRUE, 0);
+    gtk_container_add(GTK_CONTAINER(align), hbox);
+    gtk_box_pack_start(GTK_BOX(vbox), align, FALSE, TRUE, 0);
 
-	/* Distance */
-	align = gtk_alignment_new(1, 0, 0, 0);
-	hbox = gtk_hbox_new(FALSE, CELSPACING);
-	label = gtk_label_new("Distance:");
-	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, TRUE, 0);
-	gtk_box_pack_start(GTK_BOX(hbox), data->distEntry, FALSE, TRUE, 0);
-	gtk_container_add(GTK_CONTAINER(align), hbox);
-	gtk_box_pack_start(GTK_BOX(vbox), align, FALSE, TRUE, 0);
+    /* Distance */
+    align = gtk_alignment_new(1, 0, 0, 0);
+    hbox = gtk_hbox_new(FALSE, CELSPACING);
+    label = gtk_label_new("Distance:");
+    gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, TRUE, 0);
+    gtk_box_pack_start(GTK_BOX(hbox), data->distEntry, FALSE, TRUE, 0);
+    gtk_container_add(GTK_CONTAINER(align), hbox);
+    gtk_box_pack_start(GTK_BOX(vbox), align, FALSE, TRUE, 0);
 
-	/* Distance Options */
-	data->units = 0;
-	hbox = gtk_hbox_new(FALSE, CELSPACING);
-	makeRadioItems(unitLabels, hbox, GTK_SIGNAL_FUNC(changeGotoUnits), NULL, data);
-	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0);
-	
-	g_signal_connect(data->dialog, "response",
-	                 G_CALLBACK(responseGotoObject), data);
-	
-	gtk_widget_show_all(data->dialog);
+    /* Distance Options */
+    data->units = 0;
+    hbox = gtk_hbox_new(FALSE, CELSPACING);
+    makeRadioItems(unitLabels, hbox, GTK_SIGNAL_FUNC(changeGotoUnits), NULL, data);
+    gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0);
+
+    g_signal_connect(data->dialog, "response",
+                     G_CALLBACK(responseGotoObject), data);
+
+    gtk_widget_show_all(data->dialog);
 }
 
 
 /* CALLBACK: for km|radii|au in Goto Object dialog */
 static int changeGotoUnits(GtkButton* w, gpointer choice)
 {
-	gotoObjectData* data = (gotoObjectData *)g_object_get_data(G_OBJECT(w), "data");
-	gint selection = GPOINTER_TO_INT(choice);
+    gotoObjectData* data = (gotoObjectData *)g_object_get_data(G_OBJECT(w), "data");
+    gint selection = GPOINTER_TO_INT(choice);
 
-	data->units = selection;
-	
-	return TRUE;
+    data->units = selection;
+
+    return TRUE;
 }
 
 
@@ -151,80 +151,80 @@ static int changeGotoUnits(GtkButton* w, gpointer choice)
  * Need this because gtk_dialog_run produces a modal window. */
 static void responseGotoObject(GtkDialog* w, gint response, gotoObjectData* d)
 {
-	switch (response) {
-		case GTK_RESPONSE_OK:
-			GotoObject(d);
-			break;
-		case GTK_RESPONSE_CLOSE:
-			gtk_widget_destroy(GTK_WIDGET(w));
-			g_free(d);
-	}
+    switch (response) {
+        case GTK_RESPONSE_OK:
+            GotoObject(d);
+            break;
+        case GTK_RESPONSE_CLOSE:
+            gtk_widget_destroy(GTK_WIDGET(w));
+            g_free(d);
+    }
 }
 
 
 /* HELPER: Get the float value from one of the GtkEntrys */
 static gboolean GetEntryFloat(GtkWidget* w, float& f)
 {
-	GtkEntry* entry = GTK_ENTRY(w);
-	bool tmp;
-	if (entry == NULL)
-		return false;
+    GtkEntry* entry = GTK_ENTRY(w);
+    bool tmp;
+    if (entry == NULL)
+        return false;
 
-	gchar* text = gtk_editable_get_chars(GTK_EDITABLE(entry), 0, -1);
-	f = 0.0;
-	if (text == NULL)
-		return false;
+    gchar* text = gtk_editable_get_chars(GTK_EDITABLE(entry), 0, -1);
+    f = 0.0;
+    if (text == NULL)
+        return false;
 
-	tmp = sscanf(text, " %f", &f) == 1;
-	g_free(text);
-	return tmp;
+    tmp = sscanf(text, " %f", &f) == 1;
+    g_free(text);
+    return tmp;
 }
 
 
 /* HELPER: Goes to the object specified by gotoObjectData */
 static void GotoObject(gotoObjectData* gotoObjectDlg)
 {
-	const gchar* objectName = gtk_entry_get_text(GTK_ENTRY(gotoObjectDlg->nameEntry));
-	
-	if (objectName != NULL)
-	{
-		Simulation* simulation = gotoObjectDlg->app->simulation;
-		Selection sel = simulation->findObjectFromPath(objectName);
-		
-		if (!sel.empty())
-		{
-			simulation->setSelection(sel);
-			simulation->follow();
+    const gchar* objectName = gtk_entry_get_text(GTK_ENTRY(gotoObjectDlg->nameEntry));
 
-			float distance = (float) (sel.radius() * 5.0f);
-			if (GetEntryFloat(gotoObjectDlg->distEntry, distance))
-			{
-				/* Adjust for km (0), radii (1), au (2) */
-				if (gotoObjectDlg->units == 2)
-					distance = astro::AUtoKilometers(distance);
-				else if (gotoObjectDlg->units == 1)
-					distance = distance * (float) sel.radius();
+    if (objectName != NULL)
+    {
+        Simulation* simulation = gotoObjectDlg->app->simulation;
+        Selection sel = simulation->findObjectFromPath(objectName);
 
-				distance += (float) sel.radius();
-			}
+        if (!sel.empty())
+        {
+            simulation->setSelection(sel);
+            simulation->follow();
 
-			float longitude, latitude;
-			if (GetEntryFloat(gotoObjectDlg->latEntry, latitude) &&
-			    GetEntryFloat(gotoObjectDlg->longEntry, longitude))
-			{
-				simulation->gotoSelectionLongLat(5.0,
-				                                 distance,
-				                                 degToRad(longitude),
-				                                 degToRad(latitude),
-				                                 Vector3f::UnitY());
-			}
-			else
-			{
-				simulation->gotoSelection(5.0,
-				                          distance,
-				                          Vector3f::UnitY(),
-				                          ObserverFrame::ObserverLocal);
-			}
-		}
-	}
+            float distance = (float) (sel.radius() * 5.0f);
+            if (GetEntryFloat(gotoObjectDlg->distEntry, distance))
+            {
+                /* Adjust for km (0), radii (1), au (2) */
+                if (gotoObjectDlg->units == 2)
+                    distance = astro::AUtoKilometers(distance);
+                else if (gotoObjectDlg->units == 1)
+                    distance = distance * (float) sel.radius();
+
+                distance += (float) sel.radius();
+            }
+
+            float longitude, latitude;
+            if (GetEntryFloat(gotoObjectDlg->latEntry, latitude) &&
+                GetEntryFloat(gotoObjectDlg->longEntry, longitude))
+            {
+                simulation->gotoSelectionLongLat(5.0,
+                                                 distance,
+                                                 degToRad(longitude),
+                                                 degToRad(latitude),
+                                                 Vector3f::UnitY());
+            }
+            else
+            {
+                simulation->gotoSelection(5.0,
+                                          distance,
+                                          Vector3f::UnitY(),
+                                          ObserverFrame::ObserverLocal);
+            }
+        }
+    }
 }
diff --git a/src/celestia/gtk/dialog-goto.h b/src/celestia/gtk/dialog-goto.h
index 0a1a0284c..3d86d9d55 100644
--- a/src/celestia/gtk/dialog-goto.h
+++ b/src/celestia/gtk/dialog-goto.h
@@ -25,23 +25,23 @@ void dialogGotoObject(AppData* app);
 /* Local Data Structures */
 typedef struct _gotoObjectData gotoObjectData;
 struct _gotoObjectData {
-	AppData* app;
-	
-	GtkWidget* dialog;
-	GtkWidget* nameEntry;
-	GtkWidget* latEntry;
-	GtkWidget* longEntry;
-	GtkWidget* distEntry;
+    AppData* app;
 
-	int units;
+    GtkWidget* dialog;
+    GtkWidget* nameEntry;
+    GtkWidget* latEntry;
+    GtkWidget* longEntry;
+    GtkWidget* distEntry;
+
+    int units;
 };
 
 static const char * const unitLabels[] =
 {
-	"km",
-	"radii",
-	"au",
-	NULL
+    "km",
+    "radii",
+    "au",
+    NULL
 };
 
 #endif /* GTK_DIALOG_GOTO_H */
diff --git a/src/celestia/gtk/dialog-options.cpp b/src/celestia/gtk/dialog-options.cpp
index 370a1e180..e2b0f8777 100644
--- a/src/celestia/gtk/dialog-options.cpp
+++ b/src/celestia/gtk/dialog-options.cpp
@@ -37,185 +37,185 @@ static const float MaxDistanceLimit = 1.0e6f;
 /* ENTRY: Options -> View Options... */
 void dialogViewOptions(AppData* app)
 {
-	/* This dialog is hidden and shown because it is likely to be used a lot
-	 * and the actions->widgets operations are fairly intensive. */
-	if (app->optionDialog != NULL)
-	{
-		gtk_window_present(GTK_WINDOW(app->optionDialog));
-		return;
-	}
-	
-	app->optionDialog = gtk_dialog_new_with_buttons("View Options",
-	                                                GTK_WINDOW(app->mainWindow),
-	                                                GTK_DIALOG_DESTROY_WITH_PARENT,
-	                                                GTK_STOCK_OK,
-	                                                GTK_RESPONSE_OK,
-	                                                NULL);
-	
-	/* Create the main layout boxes */
-	GtkWidget* hbox = gtk_hbox_new(FALSE, CELSPACING);
-	GtkWidget* midBox = gtk_vbox_new(FALSE, CELSPACING);
-	GtkWidget* miscBox = gtk_vbox_new(FALSE, CELSPACING);
+    /* This dialog is hidden and shown because it is likely to be used a lot
+     * and the actions->widgets operations are fairly intensive. */
+    if (app->optionDialog != NULL)
+    {
+        gtk_window_present(GTK_WINDOW(app->optionDialog));
+        return;
+    }
 
-	/* Create all of the frames */
-	GtkWidget* showFrame = gtk_frame_new("Show");
-	GtkWidget* orbitFrame = gtk_frame_new("Orbits");
-	GtkWidget* labelFrame = gtk_frame_new("Label");
-	GtkWidget* limitFrame = gtk_frame_new("Filter Stars");
-	GtkWidget* textureFrame = gtk_frame_new("Texture Detail");
-	GtkWidget* infoFrame = gtk_frame_new("Info Text");
-	GtkWidget* ambientFrame = gtk_frame_new("Ambient Light");
+    app->optionDialog = gtk_dialog_new_with_buttons("View Options",
+                                                    GTK_WINDOW(app->mainWindow),
+                                                    GTK_DIALOG_DESTROY_WITH_PARENT,
+                                                    GTK_STOCK_OK,
+                                                    GTK_RESPONSE_OK,
+                                                    NULL);
 
-	/* Create the boxes that go in the frames */
-	GtkWidget* showBox = gtk_vbox_new(FALSE, 0);
-	GtkWidget* labelBox = gtk_vbox_new(FALSE, 0);
-	GtkWidget* orbitBox = gtk_vbox_new(FALSE, 0);
-	GtkWidget* limitBox = gtk_vbox_new(FALSE, 0);
-	GtkWidget* textureBox = gtk_vbox_new(FALSE, 0);
-	GtkWidget* infoBox = gtk_vbox_new(FALSE, 0);
-	GtkWidget* ambientBox = gtk_vbox_new(FALSE, 0);
-    
-	/* Set border padding on the boxes */
-	gtk_container_border_width(GTK_CONTAINER(showBox), CELSPACING);
-	gtk_container_border_width(GTK_CONTAINER(labelBox), CELSPACING);
-	gtk_container_border_width(GTK_CONTAINER(orbitBox), CELSPACING);
-	gtk_container_border_width(GTK_CONTAINER(limitBox), CELSPACING);
-	gtk_container_border_width(GTK_CONTAINER(textureBox), CELSPACING);
-	gtk_container_border_width(GTK_CONTAINER(ambientBox), CELSPACING);
-	gtk_container_border_width(GTK_CONTAINER(infoBox), CELSPACING);
-	
-	/* Set border padding on the frames */
-	gtk_container_border_width(GTK_CONTAINER(showFrame), 0);
-	gtk_container_border_width(GTK_CONTAINER(labelFrame), 0);
-	gtk_container_border_width(GTK_CONTAINER(orbitFrame), 0);
-	gtk_container_border_width(GTK_CONTAINER(limitFrame), 0);
-	gtk_container_border_width(GTK_CONTAINER(textureFrame), 0);
-	gtk_container_border_width(GTK_CONTAINER(ambientFrame), 0);
-	gtk_container_border_width(GTK_CONTAINER(infoFrame), 0);
-	
-	/* Place the boxes in the frames */
-	gtk_container_add(GTK_CONTAINER(showFrame), GTK_WIDGET(showBox));
-	gtk_container_add(GTK_CONTAINER(labelFrame), GTK_WIDGET(labelBox));
-	gtk_container_add(GTK_CONTAINER(orbitFrame), GTK_WIDGET(orbitBox));
-	gtk_container_add(GTK_CONTAINER(limitFrame),GTK_WIDGET(limitBox));
-	gtk_container_add(GTK_CONTAINER(textureFrame),GTK_WIDGET(textureBox));
-	gtk_container_add(GTK_CONTAINER(ambientFrame),GTK_WIDGET(ambientBox));
-	gtk_container_add(GTK_CONTAINER(infoFrame),GTK_WIDGET(infoBox));
+    /* Create the main layout boxes */
+    GtkWidget* hbox = gtk_hbox_new(FALSE, CELSPACING);
+    GtkWidget* midBox = gtk_vbox_new(FALSE, CELSPACING);
+    GtkWidget* miscBox = gtk_vbox_new(FALSE, CELSPACING);
 
-	/* Pack the frames into the top-level boxes and into the window */
-	gtk_box_pack_start(GTK_BOX(hbox), showFrame, TRUE, TRUE, 0);
-	gtk_box_pack_start(GTK_BOX(midBox), labelFrame, TRUE, TRUE, 0);
-	gtk_box_pack_start(GTK_BOX(midBox), limitFrame, TRUE, TRUE, 0);
-	gtk_box_pack_start(GTK_BOX(midBox), textureFrame, TRUE, TRUE, 0);
-	gtk_box_pack_start(GTK_BOX(miscBox), orbitFrame, TRUE, TRUE, 0);
-	gtk_box_pack_start(GTK_BOX(miscBox), ambientFrame, TRUE, TRUE, 0);
-	gtk_box_pack_start(GTK_BOX(miscBox), infoFrame, TRUE, TRUE, 0);
-	gtk_box_pack_start(GTK_BOX(hbox), midBox, TRUE, TRUE, 0);
-	gtk_box_pack_start(GTK_BOX(hbox), miscBox, TRUE, TRUE, 0);
-	gtk_box_pack_start(GTK_BOX(GTK_DIALOG (app->optionDialog)->vbox), hbox, TRUE,
-	                   TRUE, 0);
+    /* Create all of the frames */
+    GtkWidget* showFrame = gtk_frame_new("Show");
+    GtkWidget* orbitFrame = gtk_frame_new("Orbits");
+    GtkWidget* labelFrame = gtk_frame_new("Label");
+    GtkWidget* limitFrame = gtk_frame_new("Filter Stars");
+    GtkWidget* textureFrame = gtk_frame_new("Texture Detail");
+    GtkWidget* infoFrame = gtk_frame_new("Info Text");
+    GtkWidget* ambientFrame = gtk_frame_new("Ambient Light");
 
-	gtk_container_set_border_width(GTK_CONTAINER(hbox), CELSPACING);
+    /* Create the boxes that go in the frames */
+    GtkWidget* showBox = gtk_vbox_new(FALSE, 0);
+    GtkWidget* labelBox = gtk_vbox_new(FALSE, 0);
+    GtkWidget* orbitBox = gtk_vbox_new(FALSE, 0);
+    GtkWidget* limitBox = gtk_vbox_new(FALSE, 0);
+    GtkWidget* textureBox = gtk_vbox_new(FALSE, 0);
+    GtkWidget* infoBox = gtk_vbox_new(FALSE, 0);
+    GtkWidget* ambientBox = gtk_vbox_new(FALSE, 0);
 
-	float logDistanceLimit = log(app->renderer->getDistanceLimit()) / log((float)MaxDistanceLimit);
-	GtkAdjustment *adj = (GtkAdjustment *)
-	                        gtk_adjustment_new((gfloat)(logDistanceLimit * DistanceSliderRange),
-	                        0.0, DistanceSliderRange, 1.0, 2.0, 0.0);
+    /* Set border padding on the boxes */
+    gtk_container_border_width(GTK_CONTAINER(showBox), CELSPACING);
+    gtk_container_border_width(GTK_CONTAINER(labelBox), CELSPACING);
+    gtk_container_border_width(GTK_CONTAINER(orbitBox), CELSPACING);
+    gtk_container_border_width(GTK_CONTAINER(limitBox), CELSPACING);
+    gtk_container_border_width(GTK_CONTAINER(textureBox), CELSPACING);
+    gtk_container_border_width(GTK_CONTAINER(ambientBox), CELSPACING);
+    gtk_container_border_width(GTK_CONTAINER(infoBox), CELSPACING);
 
-	/* Distance limit slider */
-	GtkWidget* magLabel = gtk_label_new(NULL);
-	GtkWidget* slider = gtk_hscale_new(adj);
-	g_object_set_data(G_OBJECT(slider), "valueLabel", magLabel);
-	gtk_scale_set_draw_value(GTK_SCALE(slider), 0);
-	gtk_box_pack_start(GTK_BOX(limitBox), slider, TRUE, TRUE, 0);
-	gtk_box_pack_start(GTK_BOX(limitBox), magLabel, TRUE, TRUE, 0);
-	g_signal_connect(GTK_OBJECT(slider), "value-changed", G_CALLBACK(changeDistanceLimit), app);
-	changeDistanceLimit(GTK_RANGE(GTK_HSCALE(slider)), app);
+    /* Set border padding on the frames */
+    gtk_container_border_width(GTK_CONTAINER(showFrame), 0);
+    gtk_container_border_width(GTK_CONTAINER(labelFrame), 0);
+    gtk_container_border_width(GTK_CONTAINER(orbitFrame), 0);
+    gtk_container_border_width(GTK_CONTAINER(limitFrame), 0);
+    gtk_container_border_width(GTK_CONTAINER(textureFrame), 0);
+    gtk_container_border_width(GTK_CONTAINER(ambientFrame), 0);
+    gtk_container_border_width(GTK_CONTAINER(infoFrame), 0);
 
-	/* Texture resolution slider */
-	GtkWidget* textureSlider = gtk_hscale_new_with_range(0, 2, 1);
-	gtk_scale_set_value_pos(GTK_SCALE(textureSlider), GTK_POS_BOTTOM);
-	gtk_range_set_increments(GTK_RANGE(textureSlider), 1, 1);
-	gtk_range_set_value(GTK_RANGE(textureSlider), app->renderer->getResolution());
-	gtk_range_set_update_policy(GTK_RANGE(textureSlider), GTK_UPDATE_DISCONTINUOUS);
-	gtk_box_pack_start(GTK_BOX(textureBox), textureSlider, TRUE, TRUE, 0);
-	g_signal_connect(GTK_OBJECT(textureSlider), "value-changed", G_CALLBACK(changeTextureResolution), app);
-	g_signal_connect(GTK_OBJECT(textureSlider), "format-value", G_CALLBACK(formatTextureSlider), NULL);
+    /* Place the boxes in the frames */
+    gtk_container_add(GTK_CONTAINER(showFrame), GTK_WIDGET(showBox));
+    gtk_container_add(GTK_CONTAINER(labelFrame), GTK_WIDGET(labelBox));
+    gtk_container_add(GTK_CONTAINER(orbitFrame), GTK_WIDGET(orbitBox));
+    gtk_container_add(GTK_CONTAINER(limitFrame),GTK_WIDGET(limitBox));
+    gtk_container_add(GTK_CONTAINER(textureFrame),GTK_WIDGET(textureBox));
+    gtk_container_add(GTK_CONTAINER(ambientFrame),GTK_WIDGET(ambientBox));
+    gtk_container_add(GTK_CONTAINER(infoFrame),GTK_WIDGET(infoBox));
 
-	checkButtonsFromAG(actionsRenderFlags, G_N_ELEMENTS(actionsRenderFlags), app->agRender, showBox);
-	checkButtonsFromAG(actionsOrbitFlags, G_N_ELEMENTS(actionsOrbitFlags), app->agOrbit, orbitBox);
-	checkButtonsFromAG(actionsLabelFlags, G_N_ELEMENTS(actionsLabelFlags), app->agLabel, labelBox);
-	toggleButtonsFromAG(actionsVerbosity, G_N_ELEMENTS(actionsVerbosity), app->agVerbosity, infoBox);
-	toggleButtonsFromAG(actionsAmbientLight, G_N_ELEMENTS(actionsAmbientLight), app->agAmbient, ambientBox);
+    /* Pack the frames into the top-level boxes and into the window */
+    gtk_box_pack_start(GTK_BOX(hbox), showFrame, TRUE, TRUE, 0);
+    gtk_box_pack_start(GTK_BOX(midBox), labelFrame, TRUE, TRUE, 0);
+    gtk_box_pack_start(GTK_BOX(midBox), limitFrame, TRUE, TRUE, 0);
+    gtk_box_pack_start(GTK_BOX(midBox), textureFrame, TRUE, TRUE, 0);
+    gtk_box_pack_start(GTK_BOX(miscBox), orbitFrame, TRUE, TRUE, 0);
+    gtk_box_pack_start(GTK_BOX(miscBox), ambientFrame, TRUE, TRUE, 0);
+    gtk_box_pack_start(GTK_BOX(miscBox), infoFrame, TRUE, TRUE, 0);
+    gtk_box_pack_start(GTK_BOX(hbox), midBox, TRUE, TRUE, 0);
+    gtk_box_pack_start(GTK_BOX(hbox), miscBox, TRUE, TRUE, 0);
+    gtk_box_pack_start(GTK_BOX(GTK_DIALOG (app->optionDialog)->vbox), hbox, TRUE,
+                       TRUE, 0);
 
-	g_signal_connect(app->optionDialog, "response",
-	                 G_CALLBACK(gtk_widget_hide), GTK_WIDGET(app->optionDialog));
+    gtk_container_set_border_width(GTK_CONTAINER(hbox), CELSPACING);
 
-	gtk_widget_show_all(hbox);
+    float logDistanceLimit = log(app->renderer->getDistanceLimit()) / log((float)MaxDistanceLimit);
+    GtkAdjustment *adj = (GtkAdjustment *)
+                            gtk_adjustment_new((gfloat)(logDistanceLimit * DistanceSliderRange),
+                            0.0, DistanceSliderRange, 1.0, 2.0, 0.0);
 
-	gtk_dialog_set_default_response(GTK_DIALOG(app->optionDialog), GTK_RESPONSE_OK);
-	gtk_window_present(GTK_WINDOW(app->optionDialog));
+    /* Distance limit slider */
+    GtkWidget* magLabel = gtk_label_new(NULL);
+    GtkWidget* slider = gtk_hscale_new(adj);
+    g_object_set_data(G_OBJECT(slider), "valueLabel", magLabel);
+    gtk_scale_set_draw_value(GTK_SCALE(slider), 0);
+    gtk_box_pack_start(GTK_BOX(limitBox), slider, TRUE, TRUE, 0);
+    gtk_box_pack_start(GTK_BOX(limitBox), magLabel, TRUE, TRUE, 0);
+    g_signal_connect(GTK_OBJECT(slider), "value-changed", G_CALLBACK(changeDistanceLimit), app);
+    changeDistanceLimit(GTK_RANGE(GTK_HSCALE(slider)), app);
+
+    /* Texture resolution slider */
+    GtkWidget* textureSlider = gtk_hscale_new_with_range(0, 2, 1);
+    gtk_scale_set_value_pos(GTK_SCALE(textureSlider), GTK_POS_BOTTOM);
+    gtk_range_set_increments(GTK_RANGE(textureSlider), 1, 1);
+    gtk_range_set_value(GTK_RANGE(textureSlider), app->renderer->getResolution());
+    gtk_range_set_update_policy(GTK_RANGE(textureSlider), GTK_UPDATE_DISCONTINUOUS);
+    gtk_box_pack_start(GTK_BOX(textureBox), textureSlider, TRUE, TRUE, 0);
+    g_signal_connect(GTK_OBJECT(textureSlider), "value-changed", G_CALLBACK(changeTextureResolution), app);
+    g_signal_connect(GTK_OBJECT(textureSlider), "format-value", G_CALLBACK(formatTextureSlider), NULL);
+
+    checkButtonsFromAG(actionsRenderFlags, G_N_ELEMENTS(actionsRenderFlags), app->agRender, showBox);
+    checkButtonsFromAG(actionsOrbitFlags, G_N_ELEMENTS(actionsOrbitFlags), app->agOrbit, orbitBox);
+    checkButtonsFromAG(actionsLabelFlags, G_N_ELEMENTS(actionsLabelFlags), app->agLabel, labelBox);
+    toggleButtonsFromAG(actionsVerbosity, G_N_ELEMENTS(actionsVerbosity), app->agVerbosity, infoBox);
+    toggleButtonsFromAG(actionsAmbientLight, G_N_ELEMENTS(actionsAmbientLight), app->agAmbient, ambientBox);
+
+    g_signal_connect(app->optionDialog, "response",
+                     G_CALLBACK(gtk_widget_hide), GTK_WIDGET(app->optionDialog));
+
+    gtk_widget_show_all(hbox);
+
+    gtk_dialog_set_default_response(GTK_DIALOG(app->optionDialog), GTK_RESPONSE_OK);
+    gtk_window_present(GTK_WINDOW(app->optionDialog));
 }
 
 
 /* CALLBACK: React to changes in the star distance limit slider */
 static gint changeDistanceLimit(GtkRange *slider, AppData* app)
 {
-	GtkLabel* magLabel = (GtkLabel*)g_object_get_data(G_OBJECT(slider), "valueLabel");
-	float limit = makeDistanceLimit(gtk_range_get_value(slider));
-	app->renderer->setDistanceLimit(limit);
+    GtkLabel* magLabel = (GtkLabel*)g_object_get_data(G_OBJECT(slider), "valueLabel");
+    float limit = makeDistanceLimit(gtk_range_get_value(slider));
+    app->renderer->setDistanceLimit(limit);
 
-	char labeltext[16] = "100000 ly";
-	sprintf(labeltext, "%ld ly", (long)(limit + 0.5));
-	gtk_label_set_text(GTK_LABEL(magLabel), labeltext);
+    char labeltext[16] = "100000 ly";
+    sprintf(labeltext, "%ld ly", (long)(limit + 0.5));
+    gtk_label_set_text(GTK_LABEL(magLabel), labeltext);
 
-	#ifdef GNOME
-	/* Distance limit changes do not trigger an event like the other
-	 * render settings. Save setting here. */
-	gconf_client_set_int(app->client, "/apps/celestia/distanceLimit", (int)(limit + 0.5), NULL);
-	#endif /* GNOME */
+    #ifdef GNOME
+    /* Distance limit changes do not trigger an event like the other
+     * render settings. Save setting here. */
+    gconf_client_set_int(app->client, "/apps/celestia/distanceLimit", (int)(limit + 0.5), NULL);
+    #endif /* GNOME */
 
-	return TRUE;
+    return TRUE;
 }
 
 
 /* CALLBACK: React to changes in the texture resolution slider */
 static gint changeTextureResolution(GtkRange *slider, AppData* app)
 {
-	app->renderer->setResolution((int)gtk_range_get_value(slider));
+    app->renderer->setResolution((int)gtk_range_get_value(slider));
 
-	/* Seeing as this is not a GtkAction, kick off the update function */
-	resyncTextureResolutionActions(app);
+    /* Seeing as this is not a GtkAction, kick off the update function */
+    resyncTextureResolutionActions(app);
 
-	return TRUE;
+    return TRUE;
 }
 
 
 /* CALLBACK: Format the label under the texture detail slider */
 static gchar* formatTextureSlider(GtkRange*, gdouble value)
 {
-	switch ((int)value) {
-		case 0: return g_strdup("Low");
-		case 1: return g_strdup("Medium");
-		case 2: return g_strdup("High");
-		default: return g_strdup("Error");
-	}
+    switch ((int)value) {
+        case 0: return g_strdup("Low");
+        case 1: return g_strdup("Medium");
+        case 2: return g_strdup("High");
+        default: return g_strdup("Error");
+    }
 }
 
 
 /* HELPER: Creates check buttons from a GtkActionGroup */
 static void checkButtonsFromAG(const GtkToggleActionEntry actions[], int size, GtkActionGroup* ag, GtkWidget* box)
 {
-	for (int i = 0; i < size; i++) {
-		GtkAction* action = gtk_action_group_get_action(ag, actions[i].name);
-		
-		/* Mnemonic work-around for bug in GTK 2.6 > 2.6.2, where the label
-		 * is not set with action proxy. */
-		GtkWidget* w = gtk_check_button_new_with_mnemonic(actions[i].label);
+    for (int i = 0; i < size; i++) {
+        GtkAction* action = gtk_action_group_get_action(ag, actions[i].name);
 
-		gtk_action_connect_proxy(action, w);
-		gtk_box_pack_start(GTK_BOX(box), w, TRUE, TRUE, 0);
-	}
+        /* Mnemonic work-around for bug in GTK 2.6 > 2.6.2, where the label
+         * is not set with action proxy. */
+        GtkWidget* w = gtk_check_button_new_with_mnemonic(actions[i].label);
+
+        gtk_action_connect_proxy(action, w);
+        gtk_box_pack_start(GTK_BOX(box), w, TRUE, TRUE, 0);
+    }
 }
 
 
@@ -223,22 +223,22 @@ static void checkButtonsFromAG(const GtkToggleActionEntry actions[], int size, G
  *         Cannot be GtkRadioButtons because of GTK limitations/bugs. */
 static void toggleButtonsFromAG(const GtkRadioActionEntry actions[], int size, GtkActionGroup* ag, GtkWidget* box)
 {
-	for (int i = 0; i < size; i++) {
-		GtkAction* action = gtk_action_group_get_action(ag, actions[i].name);
+    for (int i = 0; i < size; i++) {
+        GtkAction* action = gtk_action_group_get_action(ag, actions[i].name);
 
-		/* Mnemonic work-around for bug in GTK 2.6 > 2.6.2, where the label
-		 * is not set with action proxy. */
-		GtkWidget* w = gtk_toggle_button_new_with_mnemonic(actions[i].label);
+        /* Mnemonic work-around for bug in GTK 2.6 > 2.6.2, where the label
+         * is not set with action proxy. */
+        GtkWidget* w = gtk_toggle_button_new_with_mnemonic(actions[i].label);
 
-		gtk_action_connect_proxy(action, w);
-		gtk_box_pack_start(GTK_BOX(box), w, TRUE, TRUE, 0);
-	}
+        gtk_action_connect_proxy(action, w);
+        gtk_box_pack_start(GTK_BOX(box), w, TRUE, TRUE, 0);
+    }
 }
 
 
 /* HELPER: gives a logarithmic value based on linear value */
 static float makeDistanceLimit(float value)
 {
-	float logDistanceLimit = value / DistanceSliderRange;
-	return (float) pow(MaxDistanceLimit, logDistanceLimit);
+    float logDistanceLimit = value / DistanceSliderRange;
+    return (float) pow(MaxDistanceLimit, logDistanceLimit);
 }
diff --git a/src/celestia/gtk/dialog-solar.cpp b/src/celestia/gtk/dialog-solar.cpp
index 2d40afd70..aeeed09c9 100644
--- a/src/celestia/gtk/dialog-solar.cpp
+++ b/src/celestia/gtk/dialog-solar.cpp
@@ -38,151 +38,151 @@ static void loadNearestStarSystem(AppData* data, GtkWidget* solarTree,
 /* ENTRY: Navigation -> Solar System Browser... */
 void dialogSolarBrowser(AppData* app)
 {
-	GtkWidget *solarTree = NULL;
-	GtkTreeStore *solarTreeStore = NULL;
-	
-	GtkWidget *browser = gtk_dialog_new_with_buttons("Solar System Browser",
-	                                                 GTK_WINDOW(app->mainWindow),
-	                                                 GTK_DIALOG_DESTROY_WITH_PARENT,
-	                                                 GTK_STOCK_CLOSE,
-	                                                 GTK_RESPONSE_CLOSE,
-	                                                 NULL);
-	app->simulation->setSelection(Selection((Star *) NULL));
- 
-	/* Solar System Browser */
-	GtkWidget *mainbox = gtk_vbox_new(FALSE, CELSPACING);
-	gtk_container_set_border_width(GTK_CONTAINER(mainbox), CELSPACING);
-	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(browser)->vbox), mainbox, TRUE, TRUE, 0);
-	
-	GtkWidget *scrolled_win = gtk_scrolled_window_new (NULL, NULL);
+    GtkWidget *solarTree = NULL;
+    GtkTreeStore *solarTreeStore = NULL;
 
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win),
-	                                GTK_POLICY_AUTOMATIC,
-	                                GTK_POLICY_ALWAYS);
-	gtk_box_pack_start(GTK_BOX(mainbox), scrolled_win, TRUE, TRUE, 0);
+    GtkWidget *browser = gtk_dialog_new_with_buttons("Solar System Browser",
+                                                     GTK_WINDOW(app->mainWindow),
+                                                     GTK_DIALOG_DESTROY_WITH_PARENT,
+                                                     GTK_STOCK_CLOSE,
+                                                     GTK_RESPONSE_CLOSE,
+                                                     NULL);
+    app->simulation->setSelection(Selection((Star *) NULL));
 
-	/* Set the tree store to have 2 visible cols, two hidden. The hidden ones
-	 * store pointer to the row's object and its Selection::Type. */
-	solarTreeStore = gtk_tree_store_new(4, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_INT);
-	solarTree = gtk_tree_view_new_with_model(GTK_TREE_MODEL(solarTreeStore));
+    /* Solar System Browser */
+    GtkWidget *mainbox = gtk_vbox_new(FALSE, CELSPACING);
+    gtk_container_set_border_width(GTK_CONTAINER(mainbox), CELSPACING);
+    gtk_box_pack_start(GTK_BOX(GTK_DIALOG(browser)->vbox), mainbox, TRUE, TRUE, 0);
 
-	gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(solarTree), TRUE);
-	gtk_container_add(GTK_CONTAINER(scrolled_win), solarTree);
+    GtkWidget *scrolled_win = gtk_scrolled_window_new (NULL, NULL);
 
-	GtkCellRenderer *renderer;
-	GtkTreeViewColumn *column;
+    gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win),
+                                    GTK_POLICY_AUTOMATIC,
+                                    GTK_POLICY_ALWAYS);
+    gtk_box_pack_start(GTK_BOX(mainbox), scrolled_win, TRUE, TRUE, 0);
 
-	for (int i = 0; i < 2; i++) {
-		renderer = gtk_cell_renderer_text_new();
-		column = gtk_tree_view_column_new_with_attributes (ssTitles[i], renderer, "text", i, NULL);
-		gtk_tree_view_append_column(GTK_TREE_VIEW(solarTree), column);
-		gtk_tree_view_column_set_min_width(column, 200);
-	}
-																							 
-	loadNearestStarSystem(app, solarTree, solarTreeStore);
+    /* Set the tree store to have 2 visible cols, two hidden. The hidden ones
+     * store pointer to the row's object and its Selection::Type. */
+    solarTreeStore = gtk_tree_store_new(4, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_INT);
+    solarTree = gtk_tree_view_new_with_model(GTK_TREE_MODEL(solarTreeStore));
 
-	GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(solarTree));
-	g_signal_connect(selection, "changed", G_CALLBACK(treeSolarSelect), app);
+    gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(solarTree), TRUE);
+    gtk_container_add(GTK_CONTAINER(scrolled_win), solarTree);
 
-	/* Common Buttons */
-	GtkWidget *hbox = gtk_hbox_new(TRUE, CELSPACING);
-	if (buttonMake(hbox, "Center", (GtkSignalFunc)actionCenterSelection, app))
-		return;
-	if (buttonMake(hbox, "Go To", (GtkSignalFunc)actionGotoSelection, app))
-		return;
-	gtk_box_pack_start(GTK_BOX(mainbox), hbox, FALSE, FALSE, 0);
-	
-	g_signal_connect(browser, "response", G_CALLBACK(gtk_widget_destroy), browser);
+    GtkCellRenderer *renderer;
+    GtkTreeViewColumn *column;
 
-	gtk_widget_set_usize(browser, 500, 400); /* Absolute Size, urghhh */
-	gtk_widget_show_all(browser);
+    for (int i = 0; i < 2; i++) {
+        renderer = gtk_cell_renderer_text_new();
+        column = gtk_tree_view_column_new_with_attributes (ssTitles[i], renderer, "text", i, NULL);
+        gtk_tree_view_append_column(GTK_TREE_VIEW(solarTree), column);
+        gtk_tree_view_column_set_min_width(column, 200);
+    }
+
+    loadNearestStarSystem(app, solarTree, solarTreeStore);
+
+    GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(solarTree));
+    g_signal_connect(selection, "changed", G_CALLBACK(treeSolarSelect), app);
+
+    /* Common Buttons */
+    GtkWidget *hbox = gtk_hbox_new(TRUE, CELSPACING);
+    if (buttonMake(hbox, "Center", (GtkSignalFunc)actionCenterSelection, app))
+        return;
+    if (buttonMake(hbox, "Go To", (GtkSignalFunc)actionGotoSelection, app))
+        return;
+    gtk_box_pack_start(GTK_BOX(mainbox), hbox, FALSE, FALSE, 0);
+
+    g_signal_connect(browser, "response", G_CALLBACK(gtk_widget_destroy), browser);
+
+    gtk_widget_set_usize(browser, 500, 400); /* Absolute Size, urghhh */
+    gtk_widget_show_all(browser);
 }
 
 
 /* CALLBACK: When Object is selected in Solar System Browser */
 static void treeSolarSelect(GtkTreeSelection* sel, AppData* app)
 {
-	gpointer item;
-	gint type;
-	
-	GValue value = { 0, {{0}} }; /* Initialize empty GValue */
-	GtkTreeIter iter;
-	GtkTreeModel* model;
-	
-	gtk_tree_selection_get_selected(sel, &model, &iter);
+    gpointer item;
+    gint type;
 
-	/* Retrieve the item (Body/Star) */
-	gtk_tree_model_get_value(model, &iter, 2, &value);
-	item = g_value_get_pointer(&value);
-	g_value_unset(&value);
-	
-	/* Retrieve if isStar */
-	gtk_tree_model_get_value(model, &iter, 3, &value);
-	type = g_value_get_int(&value);
-	g_value_unset(&value);
-	
-	if (type == Selection::Type_Star)
-		app->simulation->setSelection(Selection((Star *)item));
-	else if (type == Selection::Type_Body)
-		app->simulation->setSelection(Selection((Body *)item));
-	else
-		g_warning("Unexpected selection type selected.");
+    GValue value = { 0, {{0}} }; /* Initialize empty GValue */
+    GtkTreeIter iter;
+    GtkTreeModel* model;
+
+    gtk_tree_selection_get_selected(sel, &model, &iter);
+
+    /* Retrieve the item (Body/Star) */
+    gtk_tree_model_get_value(model, &iter, 2, &value);
+    item = g_value_get_pointer(&value);
+    g_value_unset(&value);
+
+    /* Retrieve if isStar */
+    gtk_tree_model_get_value(model, &iter, 3, &value);
+    type = g_value_get_int(&value);
+    g_value_unset(&value);
+
+    if (type == Selection::Type_Star)
+        app->simulation->setSelection(Selection((Star *)item));
+    else if (type == Selection::Type_Body)
+        app->simulation->setSelection(Selection((Body *)item));
+    else
+        g_warning("Unexpected selection type selected.");
 }
 
 
 /* HELPER: Recursively populate GtkTreeView with objects in PlanetarySystem */
 static void addPlanetarySystemToTree(const PlanetarySystem* sys, GtkTreeStore* solarTreeStore, GtkTreeIter* parent)
 {
-	const char *name;
-	const char *type;
-	
-	Body* world;
-	const PlanetarySystem* satellites;
-	GtkTreeIter child;
-	
-	for (int i = 0; i < sys->getSystemSize(); i++)
-	{
-		world = sys->getBody(i);
-		name = g_strdup(world->getName().c_str());
-		
-		switch(world->getClassification())
-		{
-			case Body::Planet:
-				type = "Planet";
-				break;
-			case Body::Moon:
-				type = "Moon";
-				break;
-			case Body::Asteroid:
-				type = "Asteroid";
-				break;
-			case Body::Comet:
-				type = "Comet";
-				break;
-			case Body::Spacecraft:
-				type = "Spacecraft";
-				break;
-			case Body::Unknown:
-			default:
-				type = "-";
-				break;
-		}
+    const char *name;
+    const char *type;
 
-		satellites = world->getSatellites();
+    Body* world;
+    const PlanetarySystem* satellites;
+    GtkTreeIter child;
 
-		/* Add child */
-		gtk_tree_store_append(solarTreeStore, &child, parent);
-		gtk_tree_store_set(solarTreeStore, &child,
-		                   0, name,
-		                   1, type,
-		                   2, (gpointer)world,
-		                   3, Selection::Type_Body, /* not Star */
-		                   -1);
+    for (int i = 0; i < sys->getSystemSize(); i++)
+    {
+        world = sys->getBody(i);
+        name = g_strdup(world->getName().c_str());
 
-		/* Recurse */
-		if (satellites != NULL)
-			addPlanetarySystemToTree(satellites, solarTreeStore, &child);
-	}
+        switch(world->getClassification())
+        {
+            case Body::Planet:
+                type = "Planet";
+                break;
+            case Body::Moon:
+                type = "Moon";
+                break;
+            case Body::Asteroid:
+                type = "Asteroid";
+                break;
+            case Body::Comet:
+                type = "Comet";
+                break;
+            case Body::Spacecraft:
+                type = "Spacecraft";
+                break;
+            case Body::Unknown:
+            default:
+                type = "-";
+                break;
+        }
+
+        satellites = world->getSatellites();
+
+        /* Add child */
+        gtk_tree_store_append(solarTreeStore, &child, parent);
+        gtk_tree_store_set(solarTreeStore, &child,
+                           0, name,
+                           1, type,
+                           2, (gpointer)world,
+                           3, Selection::Type_Body, /* not Star */
+                           -1);
+
+        /* Recurse */
+        if (satellites != NULL)
+            addPlanetarySystemToTree(satellites, solarTreeStore, &child);
+    }
 }
 
 
@@ -190,43 +190,43 @@ static void addPlanetarySystemToTree(const PlanetarySystem* sys, GtkTreeStore* s
  *         populate. */
 static void loadNearestStarSystem(AppData* app, GtkWidget* solarTree, GtkTreeStore* solarTreeStore)
 {
-	const char* name;
-	char type[30];
-	
-	const Star* nearestStar;
-	
-	const SolarSystem* solarSys = app->simulation->getNearestSolarSystem();
-	StarDatabase *stardb = app->simulation->getUniverse()->getStarCatalog();
-	g_assert(stardb);
+    const char* name;
+    char type[30];
 
-	GtkTreeIter top;
-	gtk_tree_store_clear(solarTreeStore);
-	gtk_tree_store_append(solarTreeStore, &top, NULL);
+    const Star* nearestStar;
 
-	if (solarSys != NULL)
-	{
-		nearestStar = solarSys->getStar();
+    const SolarSystem* solarSys = app->simulation->getNearestSolarSystem();
+    StarDatabase *stardb = app->simulation->getUniverse()->getStarCatalog();
+    g_assert(stardb);
 
-		name = g_strdup(stardb->getStarName(*nearestStar).c_str());
+    GtkTreeIter top;
+    gtk_tree_store_clear(solarTreeStore);
+    gtk_tree_store_append(solarTreeStore, &top, NULL);
 
-		sprintf(type, "%s Star", nearestStar->getSpectralType());
-	
-		/* Set up the top-level node. */
-		gtk_tree_store_set(solarTreeStore, &top,
-		                   0, name,
-		                   1, &type,
-		                   2, (gpointer)nearestStar,
-		                   3, Selection::Type_Star, /* Is Star */
-		                   -1);
+    if (solarSys != NULL)
+    {
+        nearestStar = solarSys->getStar();
 
-		const PlanetarySystem* planets = solarSys->getPlanets();
-		if (planets != NULL)
-			addPlanetarySystemToTree(planets, solarTreeStore, &top);
+        name = g_strdup(stardb->getStarName(*nearestStar).c_str());
 
-		/* Open up the top node */
-		GtkTreePath* path = gtk_tree_model_get_path(GTK_TREE_MODEL(solarTreeStore), &top);
-		gtk_tree_view_expand_row(GTK_TREE_VIEW(solarTree), path, FALSE);
-	}
-	else
-		gtk_tree_store_set(solarTreeStore, &top, 0, "No Planetary Bodies", -1);
+        sprintf(type, "%s Star", nearestStar->getSpectralType());
+
+        /* Set up the top-level node. */
+        gtk_tree_store_set(solarTreeStore, &top,
+                           0, name,
+                           1, &type,
+                           2, (gpointer)nearestStar,
+                           3, Selection::Type_Star, /* Is Star */
+                           -1);
+
+        const PlanetarySystem* planets = solarSys->getPlanets();
+        if (planets != NULL)
+            addPlanetarySystemToTree(planets, solarTreeStore, &top);
+
+        /* Open up the top node */
+        GtkTreePath* path = gtk_tree_model_get_path(GTK_TREE_MODEL(solarTreeStore), &top);
+        gtk_tree_view_expand_row(GTK_TREE_VIEW(solarTree), path, FALSE);
+    }
+    else
+        gtk_tree_store_set(solarTreeStore, &top, 0, "No Planetary Bodies", -1);
 }
diff --git a/src/celestia/gtk/dialog-star.cpp b/src/celestia/gtk/dialog-star.cpp
index dae1d358a..89572e91b 100644
--- a/src/celestia/gtk/dialog-star.cpp
+++ b/src/celestia/gtk/dialog-star.cpp
@@ -42,261 +42,261 @@ static void addStars(sbData* sb);
 /* ENTRY: Navigation -> Star Browser... */
 void dialogStarBrowser(AppData* app)
 {
-	sbData* sb = g_new0(sbData, 1);
-	sb->app = app;
-	sb->numListStars = 100;
-	
-	GtkWidget *browser = gtk_dialog_new_with_buttons("Star System Browser",
-	                                                 GTK_WINDOW(app->mainWindow),
-	                                                 GTK_DIALOG_DESTROY_WITH_PARENT,
-	                                                 GTK_STOCK_OK, GTK_RESPONSE_OK,
-	                                                 NULL);
-	app->simulation->setSelection(Selection((Star *) NULL));
- 
-	/* Star System Browser */
-	GtkWidget *mainbox = gtk_vbox_new(FALSE, CELSPACING);
-	gtk_container_set_border_width(GTK_CONTAINER(mainbox), CELSPACING);
-	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(browser)->vbox), mainbox, TRUE, TRUE, 0);
+    sbData* sb = g_new0(sbData, 1);
+    sb->app = app;
+    sb->numListStars = 100;
 
-	GtkWidget *scrolled_win = gtk_scrolled_window_new (NULL, NULL);
+    GtkWidget *browser = gtk_dialog_new_with_buttons("Star System Browser",
+                                                     GTK_WINDOW(app->mainWindow),
+                                                     GTK_DIALOG_DESTROY_WITH_PARENT,
+                                                     GTK_STOCK_OK, GTK_RESPONSE_OK,
+                                                     NULL);
+    app->simulation->setSelection(Selection((Star *) NULL));
 
-	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW (scrolled_win),
-	                               GTK_POLICY_AUTOMATIC,
-	                               GTK_POLICY_ALWAYS);
-	gtk_box_pack_start(GTK_BOX(mainbox), scrolled_win, TRUE, TRUE, 0);
+    /* Star System Browser */
+    GtkWidget *mainbox = gtk_vbox_new(FALSE, CELSPACING);
+    gtk_container_set_border_width(GTK_CONTAINER(mainbox), CELSPACING);
+    gtk_box_pack_start(GTK_BOX(GTK_DIALOG(browser)->vbox), mainbox, TRUE, TRUE, 0);
 
-	/* Create listbox list */
-	sb->starListStore = gtk_list_store_new(6,
-	                                       G_TYPE_STRING,
-	                                       G_TYPE_STRING,
-	                                       G_TYPE_STRING,
-	                                       G_TYPE_STRING,
-	                                       G_TYPE_STRING,
-	                                       G_TYPE_POINTER);
-	GtkWidget *starList = gtk_tree_view_new_with_model(GTK_TREE_MODEL(sb->starListStore));
+    GtkWidget *scrolled_win = gtk_scrolled_window_new (NULL, NULL);
 
-	gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(starList), TRUE);
-	gtk_container_add(GTK_CONTAINER(scrolled_win), starList);
+    gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW (scrolled_win),
+                                   GTK_POLICY_AUTOMATIC,
+                                   GTK_POLICY_ALWAYS);
+    gtk_box_pack_start(GTK_BOX(mainbox), scrolled_win, TRUE, TRUE, 0);
 
-	GtkCellRenderer *renderer;
-	GtkTreeViewColumn *column;
+    /* Create listbox list */
+    sb->starListStore = gtk_list_store_new(6,
+                                           G_TYPE_STRING,
+                                           G_TYPE_STRING,
+                                           G_TYPE_STRING,
+                                           G_TYPE_STRING,
+                                           G_TYPE_STRING,
+                                           G_TYPE_POINTER);
+    GtkWidget *starList = gtk_tree_view_new_with_model(GTK_TREE_MODEL(sb->starListStore));
 
-	/* Add the columns */
-	for (int i=0; i<5; i++) {
-		renderer = gtk_cell_renderer_text_new();
-		column = gtk_tree_view_column_new_with_attributes (sbTitles[i], renderer, "text", i, NULL);
-		if (i > 0 && i < 4) {
-			/* Right align */
-			gtk_tree_view_column_set_alignment(column, 1.0);
-			g_object_set(G_OBJECT(renderer), "xalign", 1.0, NULL);
-		}
-		gtk_tree_view_append_column(GTK_TREE_VIEW(starList), column);
-	}
+    gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(starList), TRUE);
+    gtk_container_add(GTK_CONTAINER(scrolled_win), starList);
 
-	/* Initialize the star browser */
-	sb->browser.setSimulation(sb->app->simulation);
+    GtkCellRenderer *renderer;
+    GtkTreeViewColumn *column;
 
-	/* Set up callback for when a star is selected */
-	GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(starList));
-	g_signal_connect(selection, "changed", G_CALLBACK(listStarSelect), app);
+    /* Add the columns */
+    for (int i=0; i<5; i++) {
+        renderer = gtk_cell_renderer_text_new();
+        column = gtk_tree_view_column_new_with_attributes (sbTitles[i], renderer, "text", i, NULL);
+        if (i > 0 && i < 4) {
+            /* Right align */
+            gtk_tree_view_column_set_alignment(column, 1.0);
+            g_object_set(G_OBJECT(renderer), "xalign", 1.0, NULL);
+        }
+        gtk_tree_view_append_column(GTK_TREE_VIEW(starList), column);
+    }
 
-	/* From now on, it's the bottom-of-the-window controls */
-	GtkWidget *frame = gtk_frame_new("Star Search Criteria");
-	gtk_box_pack_start(GTK_BOX(mainbox), frame, FALSE, FALSE, 0);
+    /* Initialize the star browser */
+    sb->browser.setSimulation(sb->app->simulation);
 
-	GtkWidget *hbox = gtk_hbox_new(FALSE, CELSPACING);
-	gtk_container_set_border_width(GTK_CONTAINER(hbox), CELSPACING);
-	gtk_container_add(GTK_CONTAINER(frame), hbox);
+    /* Set up callback for when a star is selected */
+    GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(starList));
+    g_signal_connect(selection, "changed", G_CALLBACK(listStarSelect), app);
 
-	/* List viewing preference settings */
-	GtkWidget *vbox = gtk_vbox_new(FALSE, 0);
-	GtkWidget *hbox2 = gtk_hbox_new(FALSE, CELSPACING);
-	GtkWidget *label = gtk_label_new("Maximum Stars Displayed in List");
-	gtk_box_pack_start(GTK_BOX(hbox2), label, TRUE, FALSE, 0);
-	sb->entry = gtk_entry_new_with_max_length(3);
-	gtk_entry_set_width_chars(GTK_ENTRY(sb->entry), 5);
-	gtk_box_pack_start(GTK_BOX(hbox2), sb->entry, TRUE, FALSE, 0);
-	gtk_box_pack_start(GTK_BOX(vbox), hbox2, TRUE, FALSE, 0);
-	sb->scale = gtk_hscale_new_with_range(MINLISTSTARS, MAXLISTSTARS, 1);
-	gtk_scale_set_draw_value(GTK_SCALE(sb->scale), FALSE);
-	gtk_range_set_update_policy(GTK_RANGE(sb->scale), GTK_UPDATE_DISCONTINUOUS);
-	g_signal_connect(sb->scale, "value-changed", G_CALLBACK(listStarSliderChange), sb);
-	g_signal_connect(sb->entry, "focus-out-event", G_CALLBACK(listStarEntryChange), sb);
-	gtk_box_pack_start(GTK_BOX(vbox), sb->scale, TRUE, FALSE, 0);
-	gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, FALSE, 0);
+    /* From now on, it's the bottom-of-the-window controls */
+    GtkWidget *frame = gtk_frame_new("Star Search Criteria");
+    gtk_box_pack_start(GTK_BOX(mainbox), frame, FALSE, FALSE, 0);
 
-	/* Set initial Star Value */
-	gtk_range_set_value(GTK_RANGE(sb->scale), sb->numListStars);
-	if (sb->numListStars == MINLISTSTARS)
-	{
-		/* Force update manually (scale won't trigger event) */
-		listStarEntryChange(GTK_ENTRY(sb->entry), NULL, sb);
-		refreshBrowser(NULL, sb);
-	}
+    GtkWidget *hbox = gtk_hbox_new(FALSE, CELSPACING);
+    gtk_container_set_border_width(GTK_CONTAINER(hbox), CELSPACING);
+    gtk_container_add(GTK_CONTAINER(frame), hbox);
 
-	/* Radio Buttons */
-	vbox = gtk_vbox_new(TRUE, 0);
-	makeRadioItems(sbRadioLabels, vbox, GTK_SIGNAL_FUNC(radioClicked), NULL, sb);
-	gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 0);
+    /* List viewing preference settings */
+    GtkWidget *vbox = gtk_vbox_new(FALSE, 0);
+    GtkWidget *hbox2 = gtk_hbox_new(FALSE, CELSPACING);
+    GtkWidget *label = gtk_label_new("Maximum Stars Displayed in List");
+    gtk_box_pack_start(GTK_BOX(hbox2), label, TRUE, FALSE, 0);
+    sb->entry = gtk_entry_new_with_max_length(3);
+    gtk_entry_set_width_chars(GTK_ENTRY(sb->entry), 5);
+    gtk_box_pack_start(GTK_BOX(hbox2), sb->entry, TRUE, FALSE, 0);
+    gtk_box_pack_start(GTK_BOX(vbox), hbox2, TRUE, FALSE, 0);
+    sb->scale = gtk_hscale_new_with_range(MINLISTSTARS, MAXLISTSTARS, 1);
+    gtk_scale_set_draw_value(GTK_SCALE(sb->scale), FALSE);
+    gtk_range_set_update_policy(GTK_RANGE(sb->scale), GTK_UPDATE_DISCONTINUOUS);
+    g_signal_connect(sb->scale, "value-changed", G_CALLBACK(listStarSliderChange), sb);
+    g_signal_connect(sb->entry, "focus-out-event", G_CALLBACK(listStarEntryChange), sb);
+    gtk_box_pack_start(GTK_BOX(vbox), sb->scale, TRUE, FALSE, 0);
+    gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, FALSE, 0);
 
-	/* Common Buttons */
-	hbox = gtk_hbox_new(TRUE, CELSPACING);
-	if (buttonMake(hbox, "Center", (GtkSignalFunc)actionCenterSelection, app))
-		return;
-	if (buttonMake(hbox, "Go To", (GtkSignalFunc)actionGotoSelection, app))
-		return;
-	if (buttonMake(hbox, "Refresh", (GtkSignalFunc)refreshBrowser, sb))
-		return;
-	gtk_box_pack_start(GTK_BOX(mainbox), hbox, FALSE, FALSE, 0);
+    /* Set initial Star Value */
+    gtk_range_set_value(GTK_RANGE(sb->scale), sb->numListStars);
+    if (sb->numListStars == MINLISTSTARS)
+    {
+        /* Force update manually (scale won't trigger event) */
+        listStarEntryChange(GTK_ENTRY(sb->entry), NULL, sb);
+        refreshBrowser(NULL, sb);
+    }
 
-	g_signal_connect(browser, "response", G_CALLBACK(starDestroy), browser);
-	
-	gtk_widget_set_usize(browser, 500, 400); /* Absolute Size, urghhh */
-	gtk_widget_show_all(browser);
+    /* Radio Buttons */
+    vbox = gtk_vbox_new(TRUE, 0);
+    makeRadioItems(sbRadioLabels, vbox, GTK_SIGNAL_FUNC(radioClicked), NULL, sb);
+    gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 0);
+
+    /* Common Buttons */
+    hbox = gtk_hbox_new(TRUE, CELSPACING);
+    if (buttonMake(hbox, "Center", (GtkSignalFunc)actionCenterSelection, app))
+        return;
+    if (buttonMake(hbox, "Go To", (GtkSignalFunc)actionGotoSelection, app))
+        return;
+    if (buttonMake(hbox, "Refresh", (GtkSignalFunc)refreshBrowser, sb))
+        return;
+    gtk_box_pack_start(GTK_BOX(mainbox), hbox, FALSE, FALSE, 0);
+
+    g_signal_connect(browser, "response", G_CALLBACK(starDestroy), browser);
+
+    gtk_widget_set_usize(browser, 500, 400); /* Absolute Size, urghhh */
+    gtk_widget_show_all(browser);
 }
 
 
 /* CALLBACK: When Star is selected in Star Browser */
 static void listStarSelect(GtkTreeSelection* sel, AppData* app)
 {
-	GValue value = { 0, {{0}} }; /* Initialize GValue to 0 */
-	GtkTreeIter iter;
-	GtkTreeModel* model;
+    GValue value = { 0, {{0}} }; /* Initialize GValue to 0 */
+    GtkTreeIter iter;
+    GtkTreeModel* model;
 
-	/* IF prevents selection while list is being updated */
-	if (!gtk_tree_selection_get_selected(sel, &model, &iter))
-		return;
+    /* IF prevents selection while list is being updated */
+    if (!gtk_tree_selection_get_selected(sel, &model, &iter))
+        return;
 
-	gtk_tree_model_get_value(model, &iter, 5, &value);
-	Star *selStar = (Star *)g_value_get_pointer(&value);
-	g_value_unset(&value);
+    gtk_tree_model_get_value(model, &iter, 5, &value);
+    Star *selStar = (Star *)g_value_get_pointer(&value);
+    g_value_unset(&value);
 
-	if (selStar)
-		app->simulation->setSelection(Selection(selStar));
+    if (selStar)
+        app->simulation->setSelection(Selection(selStar));
 }
 
 
 /* CALLBACK: Refresh button is pressed. */
 static void refreshBrowser(GtkWidget*, sbData* sb)
 {
-	addStars(sb);
+    addStars(sb);
 }
 
 
 /* CALLBACK: One of the RadioButtons is pressed */
 static void radioClicked(GtkButton* r, gpointer choice)
 {
-	sbData* sb = (sbData*)g_object_get_data(G_OBJECT(r), "data");
-	gint selection = GPOINTER_TO_INT(choice);
-	
-	sb->browser.setPredicate(selection);
-	refreshBrowser(NULL, sb);
+    sbData* sb = (sbData*)g_object_get_data(G_OBJECT(r), "data");
+    gint selection = GPOINTER_TO_INT(choice);
+
+    sb->browser.setPredicate(selection);
+    refreshBrowser(NULL, sb);
 }
 
 
 /* CALLBACK: Maximum stars EntryBox changed. */
 static void listStarEntryChange(GtkEntry *entry, GdkEventFocus *event, sbData* sb)
 {
-	/* If not called by the slider, but rather by user.
-	   Prevents infinite recursion. */
-	if (event != NULL)
-	{
-		sb->numListStars = atoi(gtk_entry_get_text(entry));
-		
-		/* Sanity Check */
-		if (sb->numListStars < MINLISTSTARS)
-		{
-			sb->numListStars = MINLISTSTARS;
-			/* Call self to set text (NULL event = no recursion) */
-			listStarEntryChange(entry, NULL, sb);
-		}
-		if (sb->numListStars > MAXLISTSTARS)
-		{
-			sb->numListStars = MAXLISTSTARS;
-			/* Call self to set text */
-			listStarEntryChange(entry, NULL, sb);
-		}
+    /* If not called by the slider, but rather by user.
+       Prevents infinite recursion. */
+    if (event != NULL)
+    {
+        sb->numListStars = atoi(gtk_entry_get_text(entry));
 
-		gtk_range_set_value(GTK_RANGE(sb->scale), (gdouble)sb->numListStars);
-	}
+        /* Sanity Check */
+        if (sb->numListStars < MINLISTSTARS)
+        {
+            sb->numListStars = MINLISTSTARS;
+            /* Call self to set text (NULL event = no recursion) */
+            listStarEntryChange(entry, NULL, sb);
+        }
+        if (sb->numListStars > MAXLISTSTARS)
+        {
+            sb->numListStars = MAXLISTSTARS;
+            /* Call self to set text */
+            listStarEntryChange(entry, NULL, sb);
+        }
 
-	/* Update value of this box */
-	char stars[4];
-	sprintf(stars, "%d", sb->numListStars);
-	gtk_entry_set_text(entry, stars);
+        gtk_range_set_value(GTK_RANGE(sb->scale), (gdouble)sb->numListStars);
+    }
+
+    /* Update value of this box */
+    char stars[4];
+    sprintf(stars, "%d", sb->numListStars);
+    gtk_entry_set_text(entry, stars);
 }
 
 
 /* CALLBACK: Maximum stars RangeSlider changed. */
 static void listStarSliderChange(GtkRange *range, sbData* sb)
 {
-	/* Update the value of the text entry box */
-	sb->numListStars = (int)gtk_range_get_value(GTK_RANGE(range));
-	listStarEntryChange(GTK_ENTRY(sb->entry), NULL, sb);
+    /* Update the value of the text entry box */
+    sb->numListStars = (int)gtk_range_get_value(GTK_RANGE(range));
+    listStarEntryChange(GTK_ENTRY(sb->entry), NULL, sb);
 
-	/* Refresh the browser listbox */
-	refreshBrowser(NULL, sb);
+    /* Refresh the browser listbox */
+    refreshBrowser(NULL, sb);
 }
 
 
 /* CALLBACK: Destroy Window */
 static void starDestroy(GtkWidget* w, gint, sbData*)
 {
-	gtk_widget_destroy(GTK_WIDGET(w));
+    gtk_widget_destroy(GTK_WIDGET(w));
 
-	/* Cannot do this, as the program crashes because of the StarBrowser:
-	 * g_free(sb); */
+    /* Cannot do this, as the program crashes because of the StarBrowser:
+     * g_free(sb); */
 }
 
 
 /* HELPER: Clear and Add stars to the starListStore */
 static void addStars(sbData* sb)
 {
-	const char *values[5];
-	GtkTreeIter iter;
-	
-	StarDatabase* stardb;
-	vector<const Star*> *stars;
-	unsigned int currentLength;
-	UniversalCoord ucPos;
-	
-	/* Load the catalogs and set data */
-	stardb = sb->app->simulation->getUniverse()->getStarCatalog();
-	sb->browser.refresh();
-	stars = sb->browser.listStars(sb->numListStars);
-	currentLength = (*stars).size();
-	sb->app->simulation->setSelection(Selection((Star *)(*stars)[0]));
-	ucPos = sb->app->simulation->getObserver().getPosition();
+    const char *values[5];
+    GtkTreeIter iter;
 
-	gtk_list_store_clear(sb->starListStore);
+    StarDatabase* stardb;
+    vector<const Star*> *stars;
+    unsigned int currentLength;
+    UniversalCoord ucPos;
 
-	for (unsigned int i = 0; i < currentLength; i++)
-	{
-		char buf[20];
-		const Star *star=(*stars)[i];
-		values[0] = g_strdup(ReplaceGreekLetterAbbr((stardb->getStarName(*star))).c_str());
+    /* Load the catalogs and set data */
+    stardb = sb->app->simulation->getUniverse()->getStarCatalog();
+    sb->browser.refresh();
+    stars = sb->browser.listStars(sb->numListStars);
+    currentLength = (*stars).size();
+    sb->app->simulation->setSelection(Selection((Star *)(*stars)[0]));
+    ucPos = sb->app->simulation->getObserver().getPosition();
 
-		/* Calculate distance to star */
-		float d = ucPos.offsetFromLy(star->getPosition()).norm();
+    gtk_list_store_clear(sb->starListStore);
 
-		sprintf(buf, " %.3f ", d);
-		values[1] = g_strdup(buf);
+    for (unsigned int i = 0; i < currentLength; i++)
+    {
+        char buf[20];
+        const Star *star=(*stars)[i];
+        values[0] = g_strdup(ReplaceGreekLetterAbbr((stardb->getStarName(*star))).c_str());
 
-		sprintf(buf, " %.2f ", astro::absToAppMag(star->getAbsoluteMagnitude(), d));
-		values[2] = g_strdup(buf);
+        /* Calculate distance to star */
+        float d = ucPos.offsetFromLy(star->getPosition()).norm();
 
-		sprintf(buf, " %.2f ", star->getAbsoluteMagnitude());
-		values[3] = g_strdup(buf);
+        sprintf(buf, " %.3f ", d);
+        values[1] = g_strdup(buf);
 
-		gtk_list_store_append(sb->starListStore, &iter);
-		gtk_list_store_set(sb->starListStore, &iter,
-		                   0, values[0],
-		                   1, values[1],
-		                   2, values[2],
-		                   3, values[3],
-		                   4, star->getSpectralType(),
-		                   5, (gpointer)star, -1);
-	}
+        sprintf(buf, " %.2f ", astro::absToAppMag(star->getAbsoluteMagnitude(), d));
+        values[2] = g_strdup(buf);
 
-	delete stars;
+        sprintf(buf, " %.2f ", star->getAbsoluteMagnitude());
+        values[3] = g_strdup(buf);
+
+        gtk_list_store_append(sb->starListStore, &iter);
+        gtk_list_store_set(sb->starListStore, &iter,
+                           0, values[0],
+                           1, values[1],
+                           2, values[2],
+                           3, values[3],
+                           4, star->getSpectralType(),
+                           5, (gpointer)star, -1);
+    }
+
+    delete stars;
 }
diff --git a/src/celestia/gtk/dialog-star.h b/src/celestia/gtk/dialog-star.h
index 17e8db935..2c4500e65 100644
--- a/src/celestia/gtk/dialog-star.h
+++ b/src/celestia/gtk/dialog-star.h
@@ -30,31 +30,31 @@ void dialogStarBrowser(AppData* app);
 /* Local Data Structures */
 typedef struct _sbData sbData;
 struct _sbData {
-	AppData* app;
-	
-	StarBrowser browser;
-	GtkListStore* starListStore;
-	int numListStars;
-	GtkWidget* entry;
-	GtkWidget* scale;
+    AppData* app;
+
+    StarBrowser browser;
+    GtkListStore* starListStore;
+    int numListStars;
+    GtkWidget* entry;
+    GtkWidget* scale;
 };
 
 static const char * const sbTitles[] =
 {
-	"Name",
-	"Distance(LY)",
-	"App. Mag",
-	"Abs. Mag",
-	"Type"
+    "Name",
+    "Distance(LY)",
+    "App. Mag",
+    "Abs. Mag",
+    "Type"
 };
 
 static const char * const sbRadioLabels[] =
 {
-	"Nearest",
-	"Brightest (App.)",
-	"Brightest (Abs.)",
-	"With Planets",
-	NULL
+    "Nearest",
+    "Brightest (App.)",
+    "Brightest (Abs.)",
+    "With Planets",
+    NULL
 };
 
 #endif /* GTK_DIALOG_STAR_H */
diff --git a/src/celestia/gtk/dialog-time.cpp b/src/celestia/gtk/dialog-time.cpp
index 552149b5c..406ec98c4 100644
--- a/src/celestia/gtk/dialog-time.cpp
+++ b/src/celestia/gtk/dialog-time.cpp
@@ -35,173 +35,173 @@ static void intSpin(GtkWidget *hbox, const char *str, int min, int max,
 /* ENTRY: Dialog initializer */
 void dialogSetTime(AppData* app)
 {
-	int timezone = 1;
-	
-	GtkWidget *stimedialog = gtk_dialog_new_with_buttons("Set Time",
-	                                                     GTK_WINDOW(app->mainWindow),
-	                                                     GTK_DIALOG_DESTROY_WITH_PARENT,
-	                                                     GTK_STOCK_OK,
-	                                                     GTK_RESPONSE_OK,
-	                                                     "Set Current Time",
-	                                                     GTK_RESPONSE_ACCEPT,
-	                                                     GTK_STOCK_CANCEL,
-	                                                     GTK_RESPONSE_CANCEL,
-	                                                     NULL);
+    int timezone = 1;
 
-	if (app->showLocalTime)
-		timezone = 2;
-	
-	GtkWidget *hbox = gtk_hbox_new(FALSE, 6);
-	GtkWidget *frame = gtk_frame_new("Time");
-	GtkWidget *align = gtk_alignment_new(0.5, 0.5, 0.0, 0.0);
+    GtkWidget *stimedialog = gtk_dialog_new_with_buttons("Set Time",
+                                                         GTK_WINDOW(app->mainWindow),
+                                                         GTK_DIALOG_DESTROY_WITH_PARENT,
+                                                         GTK_STOCK_OK,
+                                                         GTK_RESPONSE_OK,
+                                                         "Set Current Time",
+                                                         GTK_RESPONSE_ACCEPT,
+                                                         GTK_STOCK_CANCEL,
+                                                         GTK_RESPONSE_CANCEL,
+                                                         NULL);
 
-	astro::Date date(app->simulation->getTime() +
-	                 astro::secondsToJulianDate(app->core->getTimeZoneBias()));
+    if (app->showLocalTime)
+        timezone = 2;
 
-	gtk_widget_show(align);
-	gtk_widget_show(frame);
-	gtk_container_add(GTK_CONTAINER(align),GTK_WIDGET(hbox));
-	gtk_container_add(GTK_CONTAINER(frame),GTK_WIDGET(align));
-	gtk_container_set_border_width (GTK_CONTAINER (frame), 7);
-	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(stimedialog)->vbox), frame, FALSE, FALSE, 0);
-    
-	int seconds = (int)date.seconds;
-	intSpin(hbox, "Hour", 0, 23, &date.hour, ":");
-	intSpin(hbox, "Minute", 0, 59, &date.minute, ":");
-	intSpin(hbox, "Second", 0, 59, &seconds, "  ");
+    GtkWidget *hbox = gtk_hbox_new(FALSE, 6);
+    GtkWidget *frame = gtk_frame_new("Time");
+    GtkWidget *align = gtk_alignment_new(0.5, 0.5, 0.0, 0.0);
 
-	chooseOption(hbox,
-	             "Timezone",
-	             (char **)timeOptions,
-	             &timezone,
-	             GTK_SIGNAL_FUNC(zoneChosen));
-	
-	gtk_widget_show_all(hbox);
-	hbox = gtk_hbox_new(FALSE, 6);
-	frame = gtk_frame_new("Date");
-	align=gtk_alignment_new(0.5, 0.5, 0.0, 0.0);
-	gtk_container_set_border_width (GTK_CONTAINER (frame), 7);
+    astro::Date date(app->simulation->getTime() +
+                     astro::secondsToJulianDate(app->core->getTimeZoneBias()));
 
-	chooseOption(hbox,
-	             "Month",
-	             (char **)monthOptions,
-	             &date.month,
-	             GTK_SIGNAL_FUNC(monthChosen));
-	
-	/* (Hopefully, noone will need to go beyond these years :-) */
-	intSpin(hbox, "Day", 1, 31, &date.day, ",");
-	intSpin(hbox, "Year", -9999, 9999, &date.year, " ");
+    gtk_widget_show(align);
+    gtk_widget_show(frame);
+    gtk_container_add(GTK_CONTAINER(align),GTK_WIDGET(hbox));
+    gtk_container_add(GTK_CONTAINER(frame),GTK_WIDGET(align));
+    gtk_container_set_border_width (GTK_CONTAINER (frame), 7);
+    gtk_box_pack_start(GTK_BOX(GTK_DIALOG(stimedialog)->vbox), frame, FALSE, FALSE, 0);
 
-	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(stimedialog)->vbox), frame, FALSE, FALSE, 0);
-	gtk_container_add(GTK_CONTAINER(align),GTK_WIDGET(hbox));
-	gtk_container_add(GTK_CONTAINER(frame),GTK_WIDGET(align));
-	gtk_widget_show(align);
-	gtk_widget_show(frame);
-	gtk_widget_show_all(hbox);
+    int seconds = (int)date.seconds;
+    intSpin(hbox, "Hour", 0, 23, &date.hour, ":");
+    intSpin(hbox, "Minute", 0, 59, &date.minute, ":");
+    intSpin(hbox, "Second", 0, 59, &seconds, "  ");
 
-	gtk_dialog_set_default_response(GTK_DIALOG(stimedialog), GTK_RESPONSE_OK);
-	gint button = gtk_dialog_run(GTK_DIALOG(stimedialog));
+    chooseOption(hbox,
+                 "Timezone",
+                 (char **)timeOptions,
+                 &timezone,
+                 GTK_SIGNAL_FUNC(zoneChosen));
 
-	/* Set the selected seconds value back to the Date struct */
-	date.seconds = seconds;
+    gtk_widget_show_all(hbox);
+    hbox = gtk_hbox_new(FALSE, 6);
+    frame = gtk_frame_new("Date");
+    align=gtk_alignment_new(0.5, 0.5, 0.0, 0.0);
+    gtk_container_set_border_width (GTK_CONTAINER (frame), 7);
 
-	if (button == GTK_RESPONSE_ACCEPT)
-		/* Set current time and exit. */
-		app->simulation->setTime((double)time(NULL) / 86400.0 + (double)astro::Date(1970, 1, 1));
-	else if (button == GTK_RESPONSE_OK)
-		/* Set entered time and exit */
-		app->simulation->setTime((double)date - ((timezone == 1) ? 0 : astro::secondsToJulianDate(tzOffsetAtDate(date))));
+    chooseOption(hbox,
+                 "Month",
+                 (char **)monthOptions,
+                 &date.month,
+                 GTK_SIGNAL_FUNC(monthChosen));
 
-	gtk_widget_destroy(stimedialog);
+    /* (Hopefully, noone will need to go beyond these years :-) */
+    intSpin(hbox, "Day", 1, 31, &date.day, ",");
+    intSpin(hbox, "Year", -9999, 9999, &date.year, " ");
+
+    gtk_box_pack_start(GTK_BOX(GTK_DIALOG(stimedialog)->vbox), frame, FALSE, FALSE, 0);
+    gtk_container_add(GTK_CONTAINER(align),GTK_WIDGET(hbox));
+    gtk_container_add(GTK_CONTAINER(frame),GTK_WIDGET(align));
+    gtk_widget_show(align);
+    gtk_widget_show(frame);
+    gtk_widget_show_all(hbox);
+
+    gtk_dialog_set_default_response(GTK_DIALOG(stimedialog), GTK_RESPONSE_OK);
+    gint button = gtk_dialog_run(GTK_DIALOG(stimedialog));
+
+    /* Set the selected seconds value back to the Date struct */
+    date.seconds = seconds;
+
+    if (button == GTK_RESPONSE_ACCEPT)
+        /* Set current time and exit. */
+        app->simulation->setTime((double)time(NULL) / 86400.0 + (double)astro::Date(1970, 1, 1));
+    else if (button == GTK_RESPONSE_OK)
+        /* Set entered time and exit */
+        app->simulation->setTime((double)date - ((timezone == 1) ? 0 : astro::secondsToJulianDate(tzOffsetAtDate(date))));
+
+    gtk_widget_destroy(stimedialog);
 }
 
 
 /* CALLBACK: spinner value changed */
 static gboolean intAdjChanged(GtkAdjustment* adj, int *val)
 {
-	if (val)
-	{
-		*val = (int)adj->value;
-		return TRUE;
-	}
-	return FALSE;
+    if (val)
+    {
+        *val = (int)adj->value;
+        return TRUE;
+    }
+    return FALSE;
 }
 
 
 /* CALLBACK: time zone selected from drop-down */
 static gboolean zoneChosen(GtkComboBox *menu, gboolean* timezone)
 {
-	*timezone = gtk_combo_box_get_active(menu) + 1;
-	return TRUE;
+    *timezone = gtk_combo_box_get_active(menu) + 1;
+    return TRUE;
 }
 
 
 /* CALLBACK: month selected from drop-down */
 static gboolean monthChosen(GtkComboBox *menu, int* month)
 {
-	if (month)
-		*month = gtk_combo_box_get_active(menu) + 1;
-	return TRUE;
+    if (month)
+        *month = gtk_combo_box_get_active(menu) + 1;
+    return TRUE;
 }
 
 
 /* HELPER: creates one of the several drop-down boxes */
 static void chooseOption(GtkWidget *hbox, const char *str, char *choices[], int *val, GtkSignalFunc chosen)
 {
-	GtkWidget *vbox = gtk_vbox_new(FALSE, 0);
-	GtkWidget *label = gtk_label_new(str);
-	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-	GtkWidget* combo = gtk_combo_box_new_text();
-	
-	for(unsigned int i = 0; choices[i]; i++)
-	{
-		gtk_combo_box_append_text(GTK_COMBO_BOX(combo), choices[i]);
-	}
-	
-	gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 0);
-	gtk_box_pack_start (GTK_BOX (vbox), combo, FALSE, TRUE, 7);
-	gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 2);
-	
-	gtk_combo_box_set_active(GTK_COMBO_BOX(combo), (*val - 1));
+    GtkWidget *vbox = gtk_vbox_new(FALSE, 0);
+    GtkWidget *label = gtk_label_new(str);
+    gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+    GtkWidget* combo = gtk_combo_box_new_text();
 
-	g_signal_connect(GTK_OBJECT(combo), "changed", G_CALLBACK(chosen), (gpointer)val);
+    for(unsigned int i = 0; choices[i]; i++)
+    {
+        gtk_combo_box_append_text(GTK_COMBO_BOX(combo), choices[i]);
+    }
+
+    gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 0);
+    gtk_box_pack_start (GTK_BOX (vbox), combo, FALSE, TRUE, 7);
+    gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 2);
+
+    gtk_combo_box_set_active(GTK_COMBO_BOX(combo), (*val - 1));
+
+    g_signal_connect(GTK_OBJECT(combo), "changed", G_CALLBACK(chosen), (gpointer)val);
 }
 
 
 /* HELPER: creates spinner */
 static void intSpin(GtkWidget *hbox, const char *str, int min, int max, int *val, const char *sep)
 {
-	GtkWidget *vbox = gtk_vbox_new(FALSE, 0);
-	GtkWidget *label = gtk_label_new(str);
-	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-	GtkAdjustment *adj = (GtkAdjustment *) gtk_adjustment_new ((float)*val, (float) min, (float) max,
-	                                                           1.0, 5.0, 0.0);
-	GtkWidget *spinner = gtk_spin_button_new (adj, 1.0, 0);
-	gtk_spin_button_set_numeric(GTK_SPIN_BUTTON (spinner), TRUE);
-	gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spinner), TRUE);
-	gtk_spin_button_set_snap_to_ticks(GTK_SPIN_BUTTON (spinner),TRUE);
-	gtk_entry_set_max_length(GTK_ENTRY (spinner), ((max<99)?2:4) );
+    GtkWidget *vbox = gtk_vbox_new(FALSE, 0);
+    GtkWidget *label = gtk_label_new(str);
+    gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+    GtkAdjustment *adj = (GtkAdjustment *) gtk_adjustment_new ((float)*val, (float) min, (float) max,
+                                                               1.0, 5.0, 0.0);
+    GtkWidget *spinner = gtk_spin_button_new (adj, 1.0, 0);
+    gtk_spin_button_set_numeric(GTK_SPIN_BUTTON (spinner), TRUE);
+    gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spinner), TRUE);
+    gtk_spin_button_set_snap_to_ticks(GTK_SPIN_BUTTON (spinner),TRUE);
+    gtk_entry_set_max_length(GTK_ENTRY (spinner), ((max<99)?2:4) );
 
-	gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 0);
-	gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
-	
-	if ((sep) && (*sep))
-	{
-		gtk_widget_show (label);
-		GtkWidget *hbox2 = gtk_hbox_new(FALSE, 3);
-		label = gtk_label_new(sep);
-		gtk_misc_set_alignment (GTK_MISC (label), 0.5, 0.5);
-		gtk_box_pack_start (GTK_BOX (hbox2), spinner, FALSE, FALSE, 0);
-		gtk_box_pack_start (GTK_BOX (hbox2), label, FALSE, FALSE, 0);
-		gtk_box_pack_start (GTK_BOX (vbox), hbox2, TRUE, TRUE, 7);
-		gtk_widget_show (label);
-		gtk_widget_show (hbox2);
-	}
-	else
-	{
-		gtk_box_pack_start (GTK_BOX (vbox), spinner, TRUE, TRUE, 7);
-	}
+    gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 0);
+    gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
 
-	g_signal_connect(GTK_OBJECT(adj), "value-changed",
-	                 G_CALLBACK(intAdjChanged), val);
+    if ((sep) && (*sep))
+    {
+        gtk_widget_show (label);
+        GtkWidget *hbox2 = gtk_hbox_new(FALSE, 3);
+        label = gtk_label_new(sep);
+        gtk_misc_set_alignment (GTK_MISC (label), 0.5, 0.5);
+        gtk_box_pack_start (GTK_BOX (hbox2), spinner, FALSE, FALSE, 0);
+        gtk_box_pack_start (GTK_BOX (hbox2), label, FALSE, FALSE, 0);
+        gtk_box_pack_start (GTK_BOX (vbox), hbox2, TRUE, TRUE, 7);
+        gtk_widget_show (label);
+        gtk_widget_show (hbox2);
+    }
+    else
+    {
+        gtk_box_pack_start (GTK_BOX (vbox), spinner, TRUE, TRUE, 7);
+    }
+
+    g_signal_connect(GTK_OBJECT(adj), "value-changed",
+                     G_CALLBACK(intAdjChanged), val);
 }
diff --git a/src/celestia/gtk/dialog-tour.cpp b/src/celestia/gtk/dialog-tour.cpp
index 5e74b373d..44d803ae6 100644
--- a/src/celestia/gtk/dialog-tour.cpp
+++ b/src/celestia/gtk/dialog-tour.cpp
@@ -32,142 +32,142 @@ static void TourGuideDestroy(GtkWidget* w, gint, TourData* td);
 /* ENTRY: Navigation->Tour Guide... */
 void dialogTourGuide(AppData* app)
 {
-	TourData* td = g_new0(TourData, 1);
-	td->app = app;
+    TourData* td = g_new0(TourData, 1);
+    td->app = app;
 
-	GtkWidget* dialog = gtk_dialog_new_with_buttons("Tour Guide...",
-	                                                GTK_WINDOW(app->mainWindow),
-	                                                GTK_DIALOG_DESTROY_WITH_PARENT,
-	                                                GTK_STOCK_CLOSE,
-	                                                GTK_RESPONSE_CLOSE,
-	                                                NULL);
+    GtkWidget* dialog = gtk_dialog_new_with_buttons("Tour Guide...",
+                                                    GTK_WINDOW(app->mainWindow),
+                                                    GTK_DIALOG_DESTROY_WITH_PARENT,
+                                                    GTK_STOCK_CLOSE,
+                                                    GTK_RESPONSE_CLOSE,
+                                                    NULL);
 
-	GtkWidget* hbox = gtk_hbox_new(FALSE, CELSPACING); 
-	gtk_container_set_border_width(GTK_CONTAINER(hbox), CELSPACING);
+    GtkWidget* hbox = gtk_hbox_new(FALSE, CELSPACING);
+    gtk_container_set_border_width(GTK_CONTAINER(hbox), CELSPACING);
 
-	GtkWidget* label = gtk_label_new("Select your destination:");
-	gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
+    GtkWidget* label = gtk_label_new("Select your destination:");
+    gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
 
-	GtkWidget* menubox = gtk_option_menu_new();
-	gtk_box_pack_start(GTK_BOX(hbox), menubox, TRUE, TRUE, 0);
+    GtkWidget* menubox = gtk_option_menu_new();
+    gtk_box_pack_start(GTK_BOX(hbox), menubox, TRUE, TRUE, 0);
 
-	GtkWidget* gotoButton = gtk_button_new_with_label("Go To");
-	gtk_box_pack_start(GTK_BOX(hbox), gotoButton, TRUE, TRUE, 0);
+    GtkWidget* gotoButton = gtk_button_new_with_label("Go To");
+    gtk_box_pack_start(GTK_BOX(hbox), gotoButton, TRUE, TRUE, 0);
 
-	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox, FALSE, TRUE, 0);
+    gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox, FALSE, TRUE, 0);
 
-	gtk_widget_show(hbox);
+    gtk_widget_show(hbox);
 
-	td->descLabel = gtk_label_new("");
-	gtk_label_set_line_wrap(GTK_LABEL(td->descLabel), TRUE);
-	gtk_label_set_justify(GTK_LABEL(td->descLabel), GTK_JUSTIFY_FILL);
-	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), td->descLabel, TRUE, TRUE, 0);
+    td->descLabel = gtk_label_new("");
+    gtk_label_set_line_wrap(GTK_LABEL(td->descLabel), TRUE);
+    gtk_label_set_justify(GTK_LABEL(td->descLabel), GTK_JUSTIFY_FILL);
+    gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), td->descLabel, TRUE, TRUE, 0);
 
-	GtkWidget* menu = gtk_menu_new();
-	const DestinationList* destinations = app->core->getDestinations();
-	if (destinations != NULL)
-	{
-		for (DestinationList::const_iterator iter = destinations->begin();
-		     iter != destinations->end(); iter++)
-		{
-			Destination* dest = *iter;
-			if (dest != NULL)
-			{
-				GtkWidget* item = gtk_menu_item_new_with_label(dest->name.c_str());
-				gtk_menu_append(GTK_MENU(menu), item);
-				gtk_widget_show(item);
-			}
-		}
-	}
+    GtkWidget* menu = gtk_menu_new();
+    const DestinationList* destinations = app->core->getDestinations();
+    if (destinations != NULL)
+    {
+        for (DestinationList::const_iterator iter = destinations->begin();
+             iter != destinations->end(); iter++)
+        {
+            Destination* dest = *iter;
+            if (dest != NULL)
+            {
+                GtkWidget* item = gtk_menu_item_new_with_label(dest->name.c_str());
+                gtk_menu_append(GTK_MENU(menu), item);
+                gtk_widget_show(item);
+            }
+        }
+    }
 
-	g_signal_connect(GTK_OBJECT(menu),
-	                 "selection-done",
-	                 G_CALLBACK(TourGuideSelect),
-	                 td);
-	g_signal_connect(GTK_OBJECT(gotoButton),
-	                 "pressed",
-	                 G_CALLBACK(TourGuideGoto),
-	                 td);
-	g_signal_connect(dialog,
-	                 "response",
-	                 G_CALLBACK(TourGuideDestroy),
-	                 td);
+    g_signal_connect(GTK_OBJECT(menu),
+                     "selection-done",
+                     G_CALLBACK(TourGuideSelect),
+                     td);
+    g_signal_connect(GTK_OBJECT(gotoButton),
+                     "pressed",
+                     G_CALLBACK(TourGuideGoto),
+                     td);
+    g_signal_connect(dialog,
+                     "response",
+                     G_CALLBACK(TourGuideDestroy),
+                     td);
 
-	gtk_option_menu_set_menu(GTK_OPTION_MENU(menubox), menu);
+    gtk_option_menu_set_menu(GTK_OPTION_MENU(menubox), menu);
 
-	gtk_widget_set_usize(dialog, 440, 300);
+    gtk_widget_set_usize(dialog, 440, 300);
 
-	gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK);
-	gtk_widget_show_all(dialog);
+    gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK);
+    gtk_widget_show_all(dialog);
 }
 
 
 /* CALLBACK: tour list object selected */
 static gint TourGuideSelect(GtkWidget* w, TourData* td)
 {
-	GtkMenu* menu = GTK_MENU(w);
-	if (menu == NULL)
-		return FALSE;
+    GtkMenu* menu = GTK_MENU(w);
+    if (menu == NULL)
+        return FALSE;
 
-	GtkWidget* item = gtk_menu_get_active(GTK_MENU(menu));
-	if (item == NULL)
-		return FALSE;
+    GtkWidget* item = gtk_menu_get_active(GTK_MENU(menu));
+    if (item == NULL)
+        return FALSE;
 
-	GList* list = gtk_container_children(GTK_CONTAINER(menu));
-	int itemIndex = g_list_index(list, item);
+    GList* list = gtk_container_children(GTK_CONTAINER(menu));
+    int itemIndex = g_list_index(list, item);
 
-	const DestinationList* destinations = td->app->core->getDestinations();
-	if (destinations != NULL &&
-	    itemIndex >= 0 && itemIndex < (int) destinations->size())
-	{
-		td->selected = (*destinations)[itemIndex];
-	}
+    const DestinationList* destinations = td->app->core->getDestinations();
+    if (destinations != NULL &&
+        itemIndex >= 0 && itemIndex < (int) destinations->size())
+    {
+        td->selected = (*destinations)[itemIndex];
+    }
 
-	if (td->descLabel != NULL && td->selected != NULL)
-	{
-		gtk_label_set_text(GTK_LABEL(td->descLabel), td->selected->description.c_str());
-	}
+    if (td->descLabel != NULL && td->selected != NULL)
+    {
+        gtk_label_set_text(GTK_LABEL(td->descLabel), td->selected->description.c_str());
+    }
 
-	return TRUE;
+    return TRUE;
 }
 
 
 /* CALLBACK: Goto button clicked */
 static gint TourGuideGoto(GtkWidget*, TourData* td)
 {
-	Simulation* simulation = td->app->simulation;
-	
-	if (td->selected != NULL && simulation != NULL)
-	{
-		Selection sel = simulation->findObjectFromPath(td->selected->target);
-		if (!sel.empty())
-		{
-			simulation->follow();
-			simulation->setSelection(sel);
-			if (td->selected->distance <= 0)
-			{
-				/* Use the default distance */
-				simulation->gotoSelection(5.0,
-				                          Vector3f::UnitY(),
-				                          ObserverFrame::ObserverLocal);
-			}
-			else
-			{
-				simulation->gotoSelection(5.0,
-				                          td->selected->distance,
-				                          Vector3f::UnitY(),
-				                          ObserverFrame::ObserverLocal);
-			}
-		}
-	}
+    Simulation* simulation = td->app->simulation;
 
-	return TRUE;
+    if (td->selected != NULL && simulation != NULL)
+    {
+        Selection sel = simulation->findObjectFromPath(td->selected->target);
+        if (!sel.empty())
+        {
+            simulation->follow();
+            simulation->setSelection(sel);
+            if (td->selected->distance <= 0)
+            {
+                /* Use the default distance */
+                simulation->gotoSelection(5.0,
+                                          Vector3f::UnitY(),
+                                          ObserverFrame::ObserverLocal);
+            }
+            else
+            {
+                simulation->gotoSelection(5.0,
+                                          td->selected->distance,
+                                          Vector3f::UnitY(),
+                                          ObserverFrame::ObserverLocal);
+            }
+        }
+    }
+
+    return TRUE;
 }
 
 
 /* CALLBACK: Destroy Window */
 static void TourGuideDestroy(GtkWidget* w, gint, TourData* td)
 {
-	gtk_widget_destroy(GTK_WIDGET(w));
-	g_free(td);
+    gtk_widget_destroy(GTK_WIDGET(w));
+    g_free(td);
 }
diff --git a/src/celestia/gtk/dialog-tour.h b/src/celestia/gtk/dialog-tour.h
index e62e540ea..6ed3ff13e 100644
--- a/src/celestia/gtk/dialog-tour.h
+++ b/src/celestia/gtk/dialog-tour.h
@@ -25,10 +25,10 @@ void dialogTourGuide(AppData* app);
 /* Local Data Struct */
 typedef struct _TourData TourData;
 struct _TourData {
-	AppData* app;
-	
-	Destination* selected;
-	GtkWidget* descLabel;
+    AppData* app;
+
+    Destination* selected;
+    GtkWidget* descLabel;
 };
 
 #endif /* GTK_DIALOG_TOUR_H */
diff --git a/src/celestia/gtk/glwidget.cpp b/src/celestia/gtk/glwidget.cpp
index 32fe10911..2d0586ef9 100644
--- a/src/celestia/gtk/glwidget.cpp
+++ b/src/celestia/gtk/glwidget.cpp
@@ -40,25 +40,25 @@ static bool handleSpecialKey(int key, int state, bool down, AppData* app);
 /* ENTRY: Initialize/Bind all glArea Callbacks */
 void initGLCallbacks(AppData* app)
 {
-	g_signal_connect(GTK_OBJECT(app->glArea), "expose_event",
-	                 G_CALLBACK(glarea_expose), app);
-	g_signal_connect(GTK_OBJECT(app->glArea), "configure_event",
-	                 G_CALLBACK(glarea_configure), app);
-	g_signal_connect(GTK_OBJECT(app->glArea), "button_press_event",
-	                 G_CALLBACK(glarea_button_press), app);
-	g_signal_connect(GTK_OBJECT(app->glArea), "button_release_event",
-	                 G_CALLBACK(glarea_button_release), app);
-	g_signal_connect(GTK_OBJECT(app->glArea), "scroll_event",
-	                 G_CALLBACK(glarea_mouse_scroll), app);
-	g_signal_connect(GTK_OBJECT(app->glArea), "motion_notify_event",
-	                 G_CALLBACK(glarea_motion_notify), app);
-	g_signal_connect(GTK_OBJECT(app->glArea), "key_press_event",
-	                 G_CALLBACK(glarea_key_press), app);
-	g_signal_connect(GTK_OBJECT(app->glArea), "key_release_event",
-	                 G_CALLBACK(glarea_key_release), app);
-	
-	/* Main call to execute redraw during GTK main loop */
-	g_idle_add((GSourceFunc)glarea_idle, app);
+    g_signal_connect(GTK_OBJECT(app->glArea), "expose_event",
+                     G_CALLBACK(glarea_expose), app);
+    g_signal_connect(GTK_OBJECT(app->glArea), "configure_event",
+                     G_CALLBACK(glarea_configure), app);
+    g_signal_connect(GTK_OBJECT(app->glArea), "button_press_event",
+                     G_CALLBACK(glarea_button_press), app);
+    g_signal_connect(GTK_OBJECT(app->glArea), "button_release_event",
+                     G_CALLBACK(glarea_button_release), app);
+    g_signal_connect(GTK_OBJECT(app->glArea), "scroll_event",
+                     G_CALLBACK(glarea_mouse_scroll), app);
+    g_signal_connect(GTK_OBJECT(app->glArea), "motion_notify_event",
+                     G_CALLBACK(glarea_motion_notify), app);
+    g_signal_connect(GTK_OBJECT(app->glArea), "key_press_event",
+                     G_CALLBACK(glarea_key_press), app);
+    g_signal_connect(GTK_OBJECT(app->glArea), "key_release_event",
+                     G_CALLBACK(glarea_key_release), app);
+
+    /* Main call to execute redraw during GTK main loop */
+    g_idle_add((GSourceFunc)glarea_idle, app);
 
 }
 
@@ -66,175 +66,175 @@ void initGLCallbacks(AppData* app)
 /* CALLBACK: GL Function for main update (in GTK idle loop) */
 static gint glarea_idle(AppData* app)
 {
-	app->core->tick();
-	return glDrawFrame(app);
+    app->core->tick();
+    return glDrawFrame(app);
 }
 
 
 /* CALLBACK: GL Function for event "configure_event" */
 static gint glarea_configure(GtkWidget* widget, GdkEventConfigure*, AppData* app)
 {
-	GdkGLContext *glcontext = gtk_widget_get_gl_context (widget);
-	GdkGLDrawable *gldrawable = gtk_widget_get_gl_drawable (widget);
+    GdkGLContext *glcontext = gtk_widget_get_gl_context (widget);
+    GdkGLDrawable *gldrawable = gtk_widget_get_gl_drawable (widget);
 
-	if (!gdk_gl_drawable_gl_begin (gldrawable, glcontext))
-		return FALSE;
+    if (!gdk_gl_drawable_gl_begin (gldrawable, glcontext))
+        return FALSE;
 
-	app->core->resize(widget->allocation.width, widget->allocation.height);
+    app->core->resize(widget->allocation.width, widget->allocation.height);
 
-	/* GConf changes only saved upon exit, since caused a lot of CPU activity
-	 * while saving intermediate steps. */
+    /* GConf changes only saved upon exit, since caused a lot of CPU activity
+     * while saving intermediate steps. */
 
-	gdk_gl_drawable_gl_end (gldrawable);
-	return TRUE;
+    gdk_gl_drawable_gl_end (gldrawable);
+    return TRUE;
 }
 
 
 /* CALLBACK: GL Function for event "expose_event" */
 static gint glarea_expose(GtkWidget*, GdkEventExpose* event, AppData* app)
 {
-	/* Draw only the last expose */
-	if (event->count > 0)
-		return TRUE;
+    /* Draw only the last expose */
+    if (event->count > 0)
+        return TRUE;
 
-	/* Redraw -- draw checks are made in function */
-	return glDrawFrame(app);
+    /* Redraw -- draw checks are made in function */
+    return glDrawFrame(app);
 }
 
 
 /* CALLBACK: GL Function for event "motion_notify_event" */
 static gint glarea_motion_notify(GtkWidget*, GdkEventMotion* event, AppData* app)
 {
-	int x = (int) event->x;
-	int y = (int) event->y;
+    int x = (int) event->x;
+    int y = (int) event->y;
 
-	int buttons = 0;
-	if ((event->state & GDK_BUTTON1_MASK) != 0)
-		buttons |= CelestiaCore::LeftButton;
-	if ((event->state & GDK_BUTTON2_MASK) != 0)
-		buttons |= CelestiaCore::MiddleButton;
-	if ((event->state & GDK_BUTTON3_MASK) != 0)
-		buttons |= CelestiaCore::RightButton;
-	if ((event->state & GDK_SHIFT_MASK) != 0)
-		buttons |= CelestiaCore::ShiftKey;
-	if ((event->state & GDK_CONTROL_MASK) != 0)
-		buttons |= CelestiaCore::ControlKey;
+    int buttons = 0;
+    if ((event->state & GDK_BUTTON1_MASK) != 0)
+        buttons |= CelestiaCore::LeftButton;
+    if ((event->state & GDK_BUTTON2_MASK) != 0)
+        buttons |= CelestiaCore::MiddleButton;
+    if ((event->state & GDK_BUTTON3_MASK) != 0)
+        buttons |= CelestiaCore::RightButton;
+    if ((event->state & GDK_SHIFT_MASK) != 0)
+        buttons |= CelestiaCore::ShiftKey;
+    if ((event->state & GDK_CONTROL_MASK) != 0)
+        buttons |= CelestiaCore::ControlKey;
 
-	app->core->mouseMove(x - app->lastX, y - app->lastY, buttons);
+    app->core->mouseMove(x - app->lastX, y - app->lastY, buttons);
 
-	app->lastX = x;
-	app->lastY = y;
+    app->lastX = x;
+    app->lastY = y;
 
-	return TRUE;
+    return TRUE;
 }
 
 
 /* CALLBACK: GL Function for event "scroll_event" */
 static gint glarea_mouse_scroll(GtkWidget*, GdkEventScroll* event, AppData* app)
 {
-	if (event->direction == GDK_SCROLL_UP)
-		app->core->mouseWheel(-1.0f, 0);
-	else 
-		app->core->mouseWheel(1.0f, 0);
+    if (event->direction == GDK_SCROLL_UP)
+        app->core->mouseWheel(-1.0f, 0);
+    else
+        app->core->mouseWheel(1.0f, 0);
 
-	return TRUE;
+    return TRUE;
 }
 
 
 /* CALLBACK: GL Function for event "button_press_event" */
 static gint glarea_button_press(GtkWidget*, GdkEventButton* event, AppData* app)
 {
-	app->lastX = (int) event->x;
-	app->lastY = (int) event->y;
+    app->lastX = (int) event->x;
+    app->lastY = (int) event->y;
 
-	if (event->button == 1)
-		app->core->mouseButtonDown(event->x, event->y, CelestiaCore::LeftButton);
-	else if (event->button == 2)
-		app->core->mouseButtonDown(event->x, event->y, CelestiaCore::MiddleButton);
-	else if (event->button == 3)
-		app->core->mouseButtonDown(event->x, event->y, CelestiaCore::RightButton);
+    if (event->button == 1)
+        app->core->mouseButtonDown(event->x, event->y, CelestiaCore::LeftButton);
+    else if (event->button == 2)
+        app->core->mouseButtonDown(event->x, event->y, CelestiaCore::MiddleButton);
+    else if (event->button == 3)
+        app->core->mouseButtonDown(event->x, event->y, CelestiaCore::RightButton);
 
-	return TRUE;
+    return TRUE;
 }
 
 
 /* CALLBACK: GL Function for event "button_release_event" */
 static gint glarea_button_release(GtkWidget*, GdkEventButton* event, AppData* app)
 {
-	app->lastX = (int) event->x;
-	app->lastY = (int) event->y;
+    app->lastX = (int) event->x;
+    app->lastY = (int) event->y;
 
-	if (event->button == 1)
-		app->core->mouseButtonUp(event->x, event->y, CelestiaCore::LeftButton);
-	else if (event->button == 2)
-		app->core->mouseButtonUp(event->x, event->y, CelestiaCore::MiddleButton);
-	else if (event->button == 3)
-		app->core->mouseButtonUp(event->x, event->y, CelestiaCore::RightButton);
+    if (event->button == 1)
+        app->core->mouseButtonUp(event->x, event->y, CelestiaCore::LeftButton);
+    else if (event->button == 2)
+        app->core->mouseButtonUp(event->x, event->y, CelestiaCore::MiddleButton);
+    else if (event->button == 3)
+        app->core->mouseButtonUp(event->x, event->y, CelestiaCore::RightButton);
 
-	return TRUE;
+    return TRUE;
 }
 
 
 /* CALLBACK: GL Function for event "key_press_event" */
 static gint glarea_key_press(GtkWidget* widget, GdkEventKey* event, AppData* app)
 {
-	gtk_signal_emit_stop_by_name(GTK_OBJECT(widget),"key_press_event");
+    gtk_signal_emit_stop_by_name(GTK_OBJECT(widget),"key_press_event");
 
-	switch (event->keyval)
-	{
-		case GDK_Escape:
-			app->core->charEntered('\033');
-			break;
-		case GDK_BackSpace:
-			app->core->charEntered('\b');
-			break;
-		case GDK_Tab:
-			/* Tab has to be handled specially because keyDown and keyUp
-			 * do not trigger auto-completion. */
-			app->core->charEntered(event->keyval);
-			break;
-		case GDK_ISO_Left_Tab:
-			/* This is what Celestia calls BackTab */
-			app->core->charEntered(CelestiaCore::Key_BackTab);
-			break;
-		/* Temporary until galaxy brightness added as GtkAction */
-		case GDK_bracketleft:
-			app->core->charEntered('(');
-			break;
-		case GDK_bracketright:
-			app->core->charEntered(')');
-			break;
-		default:
-			if (!handleSpecialKey(event->keyval, event->state, true, app))
-			{
-				if ((event->string != NULL) && (*(event->string)))
-				{
-					/* See if our key accelerators will handle this event. */
-					if((!app->core->getTextEnterMode()) && gtk_accel_groups_activate (G_OBJECT (app->mainWindow), event->keyval, GDK_SHIFT_MASK))
-						return TRUE;
+    switch (event->keyval)
+    {
+        case GDK_Escape:
+            app->core->charEntered('\033');
+            break;
+        case GDK_BackSpace:
+            app->core->charEntered('\b');
+            break;
+        case GDK_Tab:
+            /* Tab has to be handled specially because keyDown and keyUp
+             * do not trigger auto-completion. */
+            app->core->charEntered(event->keyval);
+            break;
+        case GDK_ISO_Left_Tab:
+            /* This is what Celestia calls BackTab */
+            app->core->charEntered(CelestiaCore::Key_BackTab);
+            break;
+        /* Temporary until galaxy brightness added as GtkAction */
+        case GDK_bracketleft:
+            app->core->charEntered('(');
+            break;
+        case GDK_bracketright:
+            app->core->charEntered(')');
+            break;
+        default:
+            if (!handleSpecialKey(event->keyval, event->state, true, app))
+            {
+                if ((event->string != NULL) && (*(event->string)))
+                {
+                    /* See if our key accelerators will handle this event. */
+                    if((!app->core->getTextEnterMode()) && gtk_accel_groups_activate (G_OBJECT (app->mainWindow), event->keyval, GDK_SHIFT_MASK))
+                        return TRUE;
 
-					char* s = event->string;
+                    char* s = event->string;
 
-					while (*s != '\0')
-					{
-						char c = *s++;
-						app->core->charEntered(c);
-					}
-				}
-			}
-			if (event->state & GDK_MOD1_MASK)
-				return FALSE;
-	}
+                    while (*s != '\0')
+                    {
+                        char c = *s++;
+                        app->core->charEntered(c);
+                    }
+                }
+            }
+            if (event->state & GDK_MOD1_MASK)
+                return FALSE;
+    }
 
-	return TRUE;
+    return TRUE;
 }
 
 
 /* CALLBACK: GL Function for event "key_release_event" */
 static gint glarea_key_release(GtkWidget* widget, GdkEventKey* event, AppData* app)
 {
-	gtk_signal_emit_stop_by_name(GTK_OBJECT(widget),"key_release_event");
-	return handleSpecialKey(event->keyval, event->state, false, app);
+    gtk_signal_emit_stop_by_name(GTK_OBJECT(widget),"key_release_event");
+    return handleSpecialKey(event->keyval, event->state, false, app);
 }
 
 
@@ -242,20 +242,20 @@ static gint glarea_key_release(GtkWidget* widget, GdkEventKey* event, AppData* a
  *         If everything checks out, call appCore->draw() */
 static gint glDrawFrame(AppData* app)
 {
-	GdkGLContext *glcontext = gtk_widget_get_gl_context(app->glArea);
-	GdkGLDrawable *gldrawable = gtk_widget_get_gl_drawable(app->glArea);
+    GdkGLContext *glcontext = gtk_widget_get_gl_context(app->glArea);
+    GdkGLDrawable *gldrawable = gtk_widget_get_gl_drawable(app->glArea);
 
-	if (!gdk_gl_drawable_gl_begin(gldrawable, glcontext))
-		return FALSE;
+    if (!gdk_gl_drawable_gl_begin(gldrawable, glcontext))
+        return FALSE;
 
-	if (app->bReady)
-	{
-		app->core->draw();
-		gdk_gl_drawable_swap_buffers(GDK_GL_DRAWABLE(gldrawable));
-	}
+    if (app->bReady)
+    {
+        app->core->draw();
+        gdk_gl_drawable_swap_buffers(GDK_GL_DRAWABLE(gldrawable));
+    }
 
-	gdk_gl_drawable_gl_end(gldrawable);
-	return TRUE;
+    gdk_gl_drawable_gl_end(gldrawable);
+    return TRUE;
 }
 
 
@@ -263,120 +263,120 @@ static gint glDrawFrame(AppData* app)
  *         the menu system must be listed here. */
 static bool handleSpecialKey(int key, int state, bool down, AppData* app)
 {
-	int k = -1;
+    int k = -1;
 
-	switch (key)
-	{
-		case GDK_Up:
-			k = CelestiaCore::Key_Up;
-			break;
-		case GDK_Down:
-			k = CelestiaCore::Key_Down;
-			break;
-		case GDK_Left:
-			k = CelestiaCore::Key_Left;
-			break;
-		case GDK_Right:
-			k = CelestiaCore::Key_Right;
-			break;
-		case GDK_Home:
-			k = CelestiaCore::Key_Home;
-			break;
-		case GDK_End:
-			k = CelestiaCore::Key_End;
-			break;
-		case GDK_F1:
-			k = CelestiaCore::Key_F1;
-			break;
-		case GDK_F2:
-			k = CelestiaCore::Key_F2;
-			break;
-		case GDK_F3:
-			k = CelestiaCore::Key_F3;
-			break;
-		case GDK_F4:
-			k = CelestiaCore::Key_F4;
-			break;
-		case GDK_F5:
-			k = CelestiaCore::Key_F5;
-			break;
-		case GDK_F6:
-			k = CelestiaCore::Key_F6;
-			break;
-		case GDK_F7:
-			k = CelestiaCore::Key_F7;
-			break;
-		case GDK_F10:
-			if (down) actionCaptureImage(NULL, app);
-			break;
-		case GDK_F11:
-			k = CelestiaCore::Key_F11;
-			break;
-		case GDK_F12:
-			k = CelestiaCore::Key_F12;
-			break;
-		case GDK_KP_Insert:
-		case GDK_KP_0:
-			k = CelestiaCore::Key_NumPad0;
-			break;
-		case GDK_KP_End:
-		case GDK_KP_1:
-			k = CelestiaCore::Key_NumPad1;
-			break;
-		case  GDK_KP_Down:
-		case GDK_KP_2:
-			k = CelestiaCore::Key_NumPad2;
-			break;
-		case GDK_KP_Next:
-		case GDK_KP_3:
-			k = CelestiaCore::Key_NumPad3;
-			break;
-		case GDK_KP_Left:
-		case GDK_KP_4:
-			k = CelestiaCore::Key_NumPad4;
-			break;
-		case GDK_KP_Begin:
-		case GDK_KP_5:
-			k = CelestiaCore::Key_NumPad5;
-			break;
-		case GDK_KP_Right:
-		case GDK_KP_6:
-			k = CelestiaCore::Key_NumPad6;
-			break;
-		case GDK_KP_Home:
-		case GDK_KP_7:
-			k = CelestiaCore::Key_NumPad7;
-			break;
-		case GDK_KP_Up:
-		case GDK_KP_8:
-			k = CelestiaCore::Key_NumPad8;
-			break;
-		case GDK_KP_Prior:
-		case GDK_KP_9:
-			k = CelestiaCore::Key_NumPad9;
-			break;
-		case GDK_A:
-		case GDK_a:
-			k = 'A';
-			break;
-		case GDK_Z:
-		case GDK_z:
-			k = 'Z';
-			break;
-	}
+    switch (key)
+    {
+        case GDK_Up:
+            k = CelestiaCore::Key_Up;
+            break;
+        case GDK_Down:
+            k = CelestiaCore::Key_Down;
+            break;
+        case GDK_Left:
+            k = CelestiaCore::Key_Left;
+            break;
+        case GDK_Right:
+            k = CelestiaCore::Key_Right;
+            break;
+        case GDK_Home:
+            k = CelestiaCore::Key_Home;
+            break;
+        case GDK_End:
+            k = CelestiaCore::Key_End;
+            break;
+        case GDK_F1:
+            k = CelestiaCore::Key_F1;
+            break;
+        case GDK_F2:
+            k = CelestiaCore::Key_F2;
+            break;
+        case GDK_F3:
+            k = CelestiaCore::Key_F3;
+            break;
+        case GDK_F4:
+            k = CelestiaCore::Key_F4;
+            break;
+        case GDK_F5:
+            k = CelestiaCore::Key_F5;
+            break;
+        case GDK_F6:
+            k = CelestiaCore::Key_F6;
+            break;
+        case GDK_F7:
+            k = CelestiaCore::Key_F7;
+            break;
+        case GDK_F10:
+            if (down) actionCaptureImage(NULL, app);
+            break;
+        case GDK_F11:
+            k = CelestiaCore::Key_F11;
+            break;
+        case GDK_F12:
+            k = CelestiaCore::Key_F12;
+            break;
+        case GDK_KP_Insert:
+        case GDK_KP_0:
+            k = CelestiaCore::Key_NumPad0;
+            break;
+        case GDK_KP_End:
+        case GDK_KP_1:
+            k = CelestiaCore::Key_NumPad1;
+            break;
+        case  GDK_KP_Down:
+        case GDK_KP_2:
+            k = CelestiaCore::Key_NumPad2;
+            break;
+        case GDK_KP_Next:
+        case GDK_KP_3:
+            k = CelestiaCore::Key_NumPad3;
+            break;
+        case GDK_KP_Left:
+        case GDK_KP_4:
+            k = CelestiaCore::Key_NumPad4;
+            break;
+        case GDK_KP_Begin:
+        case GDK_KP_5:
+            k = CelestiaCore::Key_NumPad5;
+            break;
+        case GDK_KP_Right:
+        case GDK_KP_6:
+            k = CelestiaCore::Key_NumPad6;
+            break;
+        case GDK_KP_Home:
+        case GDK_KP_7:
+            k = CelestiaCore::Key_NumPad7;
+            break;
+        case GDK_KP_Up:
+        case GDK_KP_8:
+            k = CelestiaCore::Key_NumPad8;
+            break;
+        case GDK_KP_Prior:
+        case GDK_KP_9:
+            k = CelestiaCore::Key_NumPad9;
+            break;
+        case GDK_A:
+        case GDK_a:
+            k = 'A';
+            break;
+        case GDK_Z:
+        case GDK_z:
+            k = 'Z';
+            break;
+    }
 
-	if (k >= 0)
-	{
-		if (down)
-			app->core->keyDown(k, (state & GDK_SHIFT_MASK) 
-			                   ? CelestiaCore::ShiftKey 
-			                   : 0);
-		else
-			app->core->keyUp(k);
-		return (k < 'A' || k > 'Z');
-	}
-	else
-	{
-		return false;
-	}
+    if (k >= 0)
+    {
+        if (down)
+            app->core->keyDown(k, (state & GDK_SHIFT_MASK)
+                               ? CelestiaCore::ShiftKey
+                               : 0);
+        else
+            app->core->keyUp(k);
+        return (k < 'A' || k > 'Z');
+    }
+    else
+    {
+        return false;
+    }
 }
diff --git a/src/celestia/gtk/main.cpp b/src/celestia/gtk/main.cpp
index 6a09d600a..835d2cafa 100644
--- a/src/celestia/gtk/main.cpp
+++ b/src/celestia/gtk/main.cpp
@@ -83,61 +83,61 @@ static gboolean noSplash = FALSE;
 /* Command-Line Options specification */
 static GOptionEntry optionEntries[] =
 {
-	{ "conf", 'c', 0, G_OPTION_ARG_FILENAME, &configFile, "Alternate configuration file", "file" },
-	{ "dir", 'd', 0, G_OPTION_ARG_FILENAME, &installDir, "Alternate installation directory", "directory" },
-	{ "extrasdir", 'e', 0, G_OPTION_ARG_FILENAME_ARRAY, &extrasDir, "Additional \"extras\" directory", "directory" },
-	{ "fullscreen", 'f', 0, G_OPTION_ARG_NONE, &fullScreen, "Start full-screen", NULL },
-	{ "nosplash", 's', 0, G_OPTION_ARG_NONE, &noSplash, "Disable splash screen", NULL },
-	{ NULL, NULL, 0, G_OPTION_ARG_NONE, NULL, NULL, NULL }
+    { "conf", 'c', 0, G_OPTION_ARG_FILENAME, &configFile, "Alternate configuration file", "file" },
+    { "dir", 'd', 0, G_OPTION_ARG_FILENAME, &installDir, "Alternate installation directory", "directory" },
+    { "extrasdir", 'e', 0, G_OPTION_ARG_FILENAME_ARRAY, &extrasDir, "Additional \"extras\" directory", "directory" },
+    { "fullscreen", 'f', 0, G_OPTION_ARG_NONE, &fullScreen, "Start full-screen", NULL },
+    { "nosplash", 's', 0, G_OPTION_ARG_NONE, &noSplash, "Disable splash screen", NULL },
+    { NULL, NULL, 0, G_OPTION_ARG_NONE, NULL, NULL, NULL }
 };
 
 
 /* Initializes GtkActions and creates main menu */
 static void createMainMenu(GtkWidget* window, AppData* app)
 {
-	GtkUIManager *ui_manager;
-	GtkAccelGroup *accel_group;
-	GError *error;
-	
-	app->agMain = gtk_action_group_new ("MenuActions");
-	app->agRender = gtk_action_group_new("RenderActions");
-	app->agLabel = gtk_action_group_new("LabelActions");
-	app->agOrbit = gtk_action_group_new("OrbitActions");
-	app->agVerbosity = gtk_action_group_new("VerbosityActions");
-	app->agStarStyle = gtk_action_group_new("StarStyleActions");
-	app->agAmbient = gtk_action_group_new("AmbientActions");
-	
-	/* All actions have the AppData structure passed */
-	gtk_action_group_add_actions(app->agMain, actionsPlain, G_N_ELEMENTS(actionsPlain), app);
-	gtk_action_group_add_toggle_actions(app->agMain, actionsToggle, G_N_ELEMENTS(actionsToggle), app);
-	gtk_action_group_add_radio_actions(app->agVerbosity, actionsVerbosity, G_N_ELEMENTS(actionsVerbosity), 0, G_CALLBACK(actionVerbosity), app);
-	gtk_action_group_add_radio_actions(app->agStarStyle, actionsStarStyle, G_N_ELEMENTS(actionsStarStyle), 0, G_CALLBACK(actionStarStyle), app);
-	gtk_action_group_add_radio_actions(app->agAmbient, actionsAmbientLight, G_N_ELEMENTS(actionsAmbientLight), 0, G_CALLBACK(actionAmbientLight), app);
-	gtk_action_group_add_toggle_actions(app->agRender, actionsRenderFlags, G_N_ELEMENTS(actionsRenderFlags), app);
-	gtk_action_group_add_toggle_actions(app->agLabel, actionsLabelFlags, G_N_ELEMENTS(actionsLabelFlags), app);
-	gtk_action_group_add_toggle_actions(app->agOrbit, actionsOrbitFlags, G_N_ELEMENTS(actionsOrbitFlags), app);
+    GtkUIManager *ui_manager;
+    GtkAccelGroup *accel_group;
+    GError *error;
 
-	ui_manager = gtk_ui_manager_new();
-	gtk_ui_manager_insert_action_group(ui_manager, app->agMain, 0);
-	gtk_ui_manager_insert_action_group(ui_manager, app->agRender, 0);
-	gtk_ui_manager_insert_action_group(ui_manager, app->agLabel, 0);
-	gtk_ui_manager_insert_action_group(ui_manager, app->agOrbit, 0);
-	gtk_ui_manager_insert_action_group(ui_manager, app->agStarStyle, 0);
-	gtk_ui_manager_insert_action_group(ui_manager, app->agAmbient, 0);
-	gtk_ui_manager_insert_action_group(ui_manager, app->agVerbosity, 0);
+    app->agMain = gtk_action_group_new ("MenuActions");
+    app->agRender = gtk_action_group_new("RenderActions");
+    app->agLabel = gtk_action_group_new("LabelActions");
+    app->agOrbit = gtk_action_group_new("OrbitActions");
+    app->agVerbosity = gtk_action_group_new("VerbosityActions");
+    app->agStarStyle = gtk_action_group_new("StarStyleActions");
+    app->agAmbient = gtk_action_group_new("AmbientActions");
 
-	accel_group = gtk_ui_manager_get_accel_group(ui_manager);
-	gtk_window_add_accel_group(GTK_WINDOW (window), accel_group);
+    /* All actions have the AppData structure passed */
+    gtk_action_group_add_actions(app->agMain, actionsPlain, G_N_ELEMENTS(actionsPlain), app);
+    gtk_action_group_add_toggle_actions(app->agMain, actionsToggle, G_N_ELEMENTS(actionsToggle), app);
+    gtk_action_group_add_radio_actions(app->agVerbosity, actionsVerbosity, G_N_ELEMENTS(actionsVerbosity), 0, G_CALLBACK(actionVerbosity), app);
+    gtk_action_group_add_radio_actions(app->agStarStyle, actionsStarStyle, G_N_ELEMENTS(actionsStarStyle), 0, G_CALLBACK(actionStarStyle), app);
+    gtk_action_group_add_radio_actions(app->agAmbient, actionsAmbientLight, G_N_ELEMENTS(actionsAmbientLight), 0, G_CALLBACK(actionAmbientLight), app);
+    gtk_action_group_add_toggle_actions(app->agRender, actionsRenderFlags, G_N_ELEMENTS(actionsRenderFlags), app);
+    gtk_action_group_add_toggle_actions(app->agLabel, actionsLabelFlags, G_N_ELEMENTS(actionsLabelFlags), app);
+    gtk_action_group_add_toggle_actions(app->agOrbit, actionsOrbitFlags, G_N_ELEMENTS(actionsOrbitFlags), app);
 
-	error = NULL;
-	if (!gtk_ui_manager_add_ui_from_file(ui_manager, "celestiaui.xml", &error))
-	{
-		g_message("Building menus failed: %s", error->message);
-		g_error_free(error);
-		exit(EXIT_FAILURE);
-	}
+    ui_manager = gtk_ui_manager_new();
+    gtk_ui_manager_insert_action_group(ui_manager, app->agMain, 0);
+    gtk_ui_manager_insert_action_group(ui_manager, app->agRender, 0);
+    gtk_ui_manager_insert_action_group(ui_manager, app->agLabel, 0);
+    gtk_ui_manager_insert_action_group(ui_manager, app->agOrbit, 0);
+    gtk_ui_manager_insert_action_group(ui_manager, app->agStarStyle, 0);
+    gtk_ui_manager_insert_action_group(ui_manager, app->agAmbient, 0);
+    gtk_ui_manager_insert_action_group(ui_manager, app->agVerbosity, 0);
 
-	app->mainMenu = gtk_ui_manager_get_widget(ui_manager, "/MainMenu");
+    accel_group = gtk_ui_manager_get_accel_group(ui_manager);
+    gtk_window_add_accel_group(GTK_WINDOW (window), accel_group);
+
+    error = NULL;
+    if (!gtk_ui_manager_add_ui_from_file(ui_manager, "celestiaui.xml", &error))
+    {
+        g_message("Building menus failed: %s", error->message);
+        g_error_free(error);
+        exit(EXIT_FAILURE);
+    }
+
+    app->mainMenu = gtk_ui_manager_get_widget(ui_manager, "/MainMenu");
 }
 
 
@@ -146,11 +146,11 @@ static void createMainMenu(GtkWidget* window, AppData* app)
 
 class GtkWatcher : public CelestiaWatcher
 {
-	public:
-	    GtkWatcher(CelestiaCore*, AppData*);
-	    virtual void notifyChange(CelestiaCore*, int);
-	private:
-		AppData* app;
+    public:
+        GtkWatcher(CelestiaCore*, AppData*);
+        virtual void notifyChange(CelestiaCore*, int);
+    private:
+        AppData* app;
 };
 
 GtkWatcher::GtkWatcher(CelestiaCore* _appCore, AppData* _app) :
@@ -160,58 +160,58 @@ GtkWatcher::GtkWatcher(CelestiaCore* _appCore, AppData* _app) :
 
 void GtkWatcher::notifyChange(CelestiaCore*, int property)
 {
-	if (property & CelestiaCore::LabelFlagsChanged)
-		resyncLabelActions(app);
+    if (property & CelestiaCore::LabelFlagsChanged)
+        resyncLabelActions(app);
 
-	else if (property & CelestiaCore::RenderFlagsChanged)
-	{
-		resyncRenderActions(app);
-		resyncOrbitActions(app);
-		resyncStarStyleActions(app);
-		resyncTextureResolutionActions(app);
-	}
+    else if (property & CelestiaCore::RenderFlagsChanged)
+    {
+        resyncRenderActions(app);
+        resyncOrbitActions(app);
+        resyncStarStyleActions(app);
+        resyncTextureResolutionActions(app);
+    }
 
-	else if (property & CelestiaCore::VerbosityLevelChanged)
-		resyncVerbosityActions(app);
+    else if (property & CelestiaCore::VerbosityLevelChanged)
+        resyncVerbosityActions(app);
 
-	else if (property & CelestiaCore::TimeZoneChanged)
-		resyncTimeZoneAction(app);
+    else if (property & CelestiaCore::TimeZoneChanged)
+        resyncTimeZoneAction(app);
 
-	else if (property & CelestiaCore::AmbientLightChanged)
-		resyncAmbientActions(app);
+    else if (property & CelestiaCore::AmbientLightChanged)
+        resyncAmbientActions(app);
 
-	/*
-	else if (property & CelestiaCore::FaintestChanged) DEPRECATED?
-	else if (property & CelestiaCore::HistoryChanged)
-	*/
+    /*
+    else if (property & CelestiaCore::FaintestChanged) DEPRECATED?
+    else if (property & CelestiaCore::HistoryChanged)
+    */
 
-	else if (property == CelestiaCore::TextEnterModeChanged)
-	{
-		if (app->core->getTextEnterMode() != 0)
-		{
-			/* Grey-out the menu */
-			gtk_widget_set_sensitive(app->mainMenu, FALSE);
-			
-			/* Disable any actions that will interfere in typing and
-			   autocomplete */
-			gtk_action_group_set_sensitive(app->agMain, FALSE);
-			gtk_action_group_set_sensitive(app->agRender, FALSE);
-			gtk_action_group_set_sensitive(app->agLabel, FALSE);
-		}
-		else
-		{
-			/* Set the menu normal */
-			gtk_widget_set_sensitive(app->mainMenu, TRUE);
-			
-			/* Re-enable action groups */
-			gtk_action_group_set_sensitive(app->agMain, TRUE);
-			gtk_action_group_set_sensitive(app->agRender, TRUE);
-			gtk_action_group_set_sensitive(app->agLabel, TRUE);
-		}
-	}
-	
-	else if (property & CelestiaCore::GalaxyLightGainChanged)
-		resyncGalaxyGainActions(app);
+    else if (property == CelestiaCore::TextEnterModeChanged)
+    {
+        if (app->core->getTextEnterMode() != 0)
+        {
+            /* Grey-out the menu */
+            gtk_widget_set_sensitive(app->mainMenu, FALSE);
+
+            /* Disable any actions that will interfere in typing and
+               autocomplete */
+            gtk_action_group_set_sensitive(app->agMain, FALSE);
+            gtk_action_group_set_sensitive(app->agRender, FALSE);
+            gtk_action_group_set_sensitive(app->agLabel, FALSE);
+        }
+        else
+        {
+            /* Set the menu normal */
+            gtk_widget_set_sensitive(app->mainMenu, TRUE);
+
+            /* Re-enable action groups */
+            gtk_action_group_set_sensitive(app->agMain, TRUE);
+            gtk_action_group_set_sensitive(app->agRender, TRUE);
+            gtk_action_group_set_sensitive(app->agLabel, TRUE);
+        }
+    }
+
+    else if (property & CelestiaCore::GalaxyLightGainChanged)
+        resyncGalaxyGainActions(app);
 }
 
 /* END Watcher */
@@ -221,309 +221,309 @@ void GtkWatcher::notifyChange(CelestiaCore*, int property)
  *           that require the glArea to be set up. */
 static void initRealize(GtkWidget* widget, AppData* app)
 {
-	GLenum glewErr = glewInit();
-	   { 
-	     if (GLEW_OK != glewErr)
-		{
-		GtkWidget *message;
-			message = gtk_message_dialog_new(GTK_WINDOW(app->mainWindow),
-			GTK_DIALOG_DESTROY_WITH_PARENT,
-			GTK_MESSAGE_ERROR,
-			GTK_BUTTONS_CLOSE,
-			"Celestia was unable to initialize OpenGL extensions. Graphics quality will be reduced. Only Basic render path will be available.");
-		gtk_dialog_run(GTK_DIALOG(message));
-		gtk_widget_destroy(message);
-		}
-	}
+    GLenum glewErr = glewInit();
+       {
+         if (GLEW_OK != glewErr)
+        {
+        GtkWidget *message;
+            message = gtk_message_dialog_new(GTK_WINDOW(app->mainWindow),
+            GTK_DIALOG_DESTROY_WITH_PARENT,
+            GTK_MESSAGE_ERROR,
+            GTK_BUTTONS_CLOSE,
+            "Celestia was unable to initialize OpenGL extensions. Graphics quality will be reduced. Only Basic render path will be available.");
+        gtk_dialog_run(GTK_DIALOG(message));
+        gtk_widget_destroy(message);
+        }
+    }
 
-	if (!app->core->initRenderer())
-	{
-		cerr << "Failed to initialize renderer.\n";
-	}
+    if (!app->core->initRenderer())
+    {
+        cerr << "Failed to initialize renderer.\n";
+    }
 
-	/* Read/Apply Settings */
-	#ifdef GNOME
-	applySettingsGConfMain(app, app->client);
-	#else
-	applySettingsFileMain(app, app->settingsFile);
-	#endif /* GNOME */
-	
-	/* Synchronize all actions with core settings */
-	resyncLabelActions(app);
-	resyncRenderActions(app);
-	resyncOrbitActions(app);
-	resyncVerbosityActions(app);
-	resyncAmbientActions(app);
-	resyncStarStyleActions(app);
-	
-	/* If full-screen at startup, make it so. */
-	if (app->fullScreen)
-		gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(gtk_action_group_get_action(app->agMain, "FullScreen")), TRUE);
+    /* Read/Apply Settings */
+    #ifdef GNOME
+    applySettingsGConfMain(app, app->client);
+    #else
+    applySettingsFileMain(app, app->settingsFile);
+    #endif /* GNOME */
 
-	/* If framerate limiting is off, set it so. */
-	if (!app->renderer->getVideoSync())
-		gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(gtk_action_group_get_action(app->agMain, "VideoSync")), FALSE);
+    /* Synchronize all actions with core settings */
+    resyncLabelActions(app);
+    resyncRenderActions(app);
+    resyncOrbitActions(app);
+    resyncVerbosityActions(app);
+    resyncAmbientActions(app);
+    resyncStarStyleActions(app);
 
-	/* If URL at startup, make it so. */
-	if (app->startURL != NULL)
-		app->core->setStartURL(app->startURL);
-	
-	/* Set simulation time */
-	app->core->start((double)time(NULL) / 86400.0 + (double)astro::Date(1970, 1, 1));
-	updateTimeZone(app, app->showLocalTime);
-	
-	/* Setting time zone name not very useful, but makes space for "LT" status in
-	 * the top-right corner. Set to some default. */
-	app->core->setTimeZoneName("UTC");
+    /* If full-screen at startup, make it so. */
+    if (app->fullScreen)
+        gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(gtk_action_group_get_action(app->agMain, "FullScreen")), TRUE);
 
-	/* Set the cursor to a crosshair */
-	gdk_window_set_cursor(widget->window, gdk_cursor_new(GDK_CROSSHAIR));
+    /* If framerate limiting is off, set it so. */
+    if (!app->renderer->getVideoSync())
+        gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(gtk_action_group_get_action(app->agMain, "VideoSync")), FALSE);
+
+    /* If URL at startup, make it so. */
+    if (app->startURL != NULL)
+        app->core->setStartURL(app->startURL);
+
+    /* Set simulation time */
+    app->core->start((double)time(NULL) / 86400.0 + (double)astro::Date(1970, 1, 1));
+    updateTimeZone(app, app->showLocalTime);
+
+    /* Setting time zone name not very useful, but makes space for "LT" status in
+     * the top-right corner. Set to some default. */
+    app->core->setTimeZoneName("UTC");
+
+    /* Set the cursor to a crosshair */
+    gdk_window_set_cursor(widget->window, gdk_cursor_new(GDK_CROSSHAIR));
 }
 
 
 /* MAIN */
 int main(int argc, char* argv[])
 {
-	/* Initialize the structure that holds the application's vitals. */
-	AppData* app = g_new0(AppData, 1);
+    /* Initialize the structure that holds the application's vitals. */
+    AppData* app = g_new0(AppData, 1);
 
-	/* Not ready to render yet. */
-	app->bReady = FALSE;
+    /* Not ready to render yet. */
+    app->bReady = FALSE;
 
-	/* Initialize variables in the AppData structure. */
-	app->lastX = 0;
-	app->lastY = 0;
-	app->showLocalTime = FALSE;
-	app->fullScreen = FALSE;
-	app->startURL = NULL;
+    /* Initialize variables in the AppData structure. */
+    app->lastX = 0;
+    app->lastY = 0;
+    app->showLocalTime = FALSE;
+    app->fullScreen = FALSE;
+    app->startURL = NULL;
 
-	/* Watcher enables sending signals from inside of core */
-	GtkWatcher* gtkWatcher;
+    /* Watcher enables sending signals from inside of core */
+    GtkWatcher* gtkWatcher;
 
-	/* Command line option parsing */
-	GError *error = NULL;
-	GOptionContext* context = g_option_context_new("");
-	g_option_context_add_main_entries(context, optionEntries, NULL);
-	g_option_context_add_group(context, gtk_get_option_group(TRUE));
-	g_option_context_parse(context, &argc, &argv, &error);
+    /* Command line option parsing */
+    GError *error = NULL;
+    GOptionContext* context = g_option_context_new("");
+    g_option_context_add_main_entries(context, optionEntries, NULL);
+    g_option_context_add_group(context, gtk_get_option_group(TRUE));
+    g_option_context_parse(context, &argc, &argv, &error);
 
-	if (error != NULL)
-	{
-		g_print("Error in command line options. Use --help for full list.\n");
-		exit(1);
-	}
-	
-	/* At this point, the argument count should be 1 or 2, with the lastX
-	 * potentially being a cel:// URL. */
-	
-	/* If there's an argument left, assume it's a URL. This happens here
-	 * because it's after the saved prefs are applied. The appCore gets
-	 * initialized elsewhere. */
-	if (argc > 1)
-		app->startURL = argv[argc - 1];
-	
-	if (installDir == NULL)
-		installDir = (gchar*)CONFIG_DATA_DIR;
+    if (error != NULL)
+    {
+        g_print("Error in command line options. Use --help for full list.\n");
+        exit(1);
+    }
 
-	if (chdir(installDir) == -1)
-		cerr << "Cannot chdir to '" << installDir << "', probably due to improper installation.\n";
+    /* At this point, the argument count should be 1 or 2, with the lastX
+     * potentially being a cel:// URL. */
 
-	#ifdef GNOME
-	/* GNOME Initialization */
-	GnomeProgram *program;
-	program = gnome_program_init("Celestia", VERSION, LIBGNOMEUI_MODULE,
-	                             argc, argv, GNOME_PARAM_NONE);
-	#else
-	/* GTK-Only Initialization */
-	gtk_init(&argc, &argv);
-	#endif
+    /* If there's an argument left, assume it's a URL. This happens here
+     * because it's after the saved prefs are applied. The appCore gets
+     * initialized elsewhere. */
+    if (argc > 1)
+        app->startURL = argv[argc - 1];
 
-	/* Turn on the splash screen */
-	SplashData* ss = splashStart(app, !noSplash);
-	splashSetText(ss, "Initializing...");
+    if (installDir == NULL)
+        installDir = (gchar*)CONFIG_DATA_DIR;
 
-	SetDebugVerbosity(0);
+    if (chdir(installDir) == -1)
+        cerr << "Cannot chdir to '" << installDir << "', probably due to improper installation.\n";
 
-	/* Force number displays into C locale. */
-	setlocale(LC_NUMERIC, "C");
-	setlocale(LC_ALL, "");
+    #ifdef GNOME
+    /* GNOME Initialization */
+    GnomeProgram *program;
+    program = gnome_program_init("Celestia", VERSION, LIBGNOMEUI_MODULE,
+                                 argc, argv, GNOME_PARAM_NONE);
+    #else
+    /* GTK-Only Initialization */
+    gtk_init(&argc, &argv);
+    #endif
 
-	#ifndef WIN32
-	bindtextdomain(PACKAGE, LOCALEDIR);
-	bind_textdomain_codeset(PACKAGE, "UTF-8");
-	textdomain(PACKAGE);
-	#endif /* WIN32 */
+    /* Turn on the splash screen */
+    SplashData* ss = splashStart(app, !noSplash);
+    splashSetText(ss, "Initializing...");
 
-	app->core = new CelestiaCore();
-	if (app->core == NULL)
-	{
-		cerr << "Failed to initialize Celestia core.\n";
-		return 1;
-	}
+    SetDebugVerbosity(0);
 
-	app->renderer = app->core->getRenderer();
-	g_assert(app->renderer);
-	
-	/* Parse simulation arguments */
-	string cf;
-	if (configFile != NULL)
-		cf = string(configFile);
-	
-	string* altConfig = (configFile != NULL) ? &cf : NULL;
+    /* Force number displays into C locale. */
+    setlocale(LC_NUMERIC, "C");
+    setlocale(LC_ALL, "");
 
-	vector<string> configDirs;
-	if (extrasDir != NULL)
-	{
-		/* Add each extrasDir to the vector */
-		int i = 0;
-		while (extrasDir[i] != NULL)
-		{
-			configDirs.push_back(extrasDir[i]);
-			i++;
-		}
-	}
+    #ifndef WIN32
+    bindtextdomain(PACKAGE, LOCALEDIR);
+    bind_textdomain_codeset(PACKAGE, "UTF-8");
+    textdomain(PACKAGE);
+    #endif /* WIN32 */
 
-	/* Initialize the simulation */	
-	if (!app->core->initSimulation(altConfig, &configDirs, ss->notifier))
-		return 1;
-	
-	app->simulation = app->core->getSimulation();
-	g_assert(app->simulation);
-	
-	#ifdef GNOME
-	/* Create the main window (GNOME) */
-	app->mainWindow = gnome_app_new("Celestia", "Celestia");
-	#else
-	/* Create the main window (GTK) */
-	app->mainWindow = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-	gtk_window_set_title(GTK_WINDOW(app->mainWindow), "Celestia");
-	#endif /* GNOME */
+    app->core = new CelestiaCore();
+    if (app->core == NULL)
+    {
+        cerr << "Failed to initialize Celestia core.\n";
+        return 1;
+    }
 
-	/* Set pointer to AppData structure. This is for when a function is in a
-	 * *real* bind to get at this structure. */
-	g_object_set_data(G_OBJECT(app->mainWindow), "CelestiaData", app);
-	
-	GtkWidget* mainBox = GTK_WIDGET(gtk_vbox_new(FALSE, 0));
-	gtk_container_set_border_width(GTK_CONTAINER(mainBox), 0);
+    app->renderer = app->core->getRenderer();
+    g_assert(app->renderer);
 
-	g_signal_connect(GTK_OBJECT(app->mainWindow), "destroy",
-	                 G_CALLBACK(actionQuit), app);
+    /* Parse simulation arguments */
+    string cf;
+    if (configFile != NULL)
+        cf = string(configFile);
 
-	/* Initialize the OpenGL widget */
-	gtk_gl_init (&argc, &argv);
+    string* altConfig = (configFile != NULL) ? &cf : NULL;
 
-	/* Configure OpenGL. Try double-buffered visual. */
-	GdkGLConfig* glconfig = gdk_gl_config_new_by_mode(static_cast<GdkGLConfigMode>
-	                                                  (GDK_GL_MODE_RGB | GDK_GL_MODE_DEPTH | GDK_GL_MODE_DOUBLE));
+    vector<string> configDirs;
+    if (extrasDir != NULL)
+    {
+        /* Add each extrasDir to the vector */
+        int i = 0;
+        while (extrasDir[i] != NULL)
+        {
+            configDirs.push_back(extrasDir[i]);
+            i++;
+        }
+    }
 
-	if (glconfig == NULL)
-	{
-		g_print("*** Cannot find the double-buffered visual.\n");
-		g_print("*** Trying single-buffered visual.\n");
+    /* Initialize the simulation */
+    if (!app->core->initSimulation(altConfig, &configDirs, ss->notifier))
+        return 1;
 
-		/* Try single-buffered visual */
-		glconfig = gdk_gl_config_new_by_mode(static_cast<GdkGLConfigMode>
-		                                     (GDK_GL_MODE_RGB | GDK_GL_MODE_DEPTH));
-		if (glconfig == NULL)
-		{
-			g_print ("*** No appropriate OpenGL-capable visual found.\n");
-			exit(1);
-		}
-	}
+    app->simulation = app->core->getSimulation();
+    g_assert(app->simulation);
 
-	/* Initialize settings system */
-	#ifdef GNOME
-	initSettingsGConf(app);
-	#else
-	initSettingsFile(app);
-	#endif /* GNOME */
-	
-	/* Create area to be used for OpenGL display */
-	app->glArea = gtk_drawing_area_new();
-	
-	/* Set OpenGL-capability to the widget. */
-	gtk_widget_set_gl_capability(app->glArea,
-	                             glconfig,
-	                             NULL,
-	                             TRUE,
-	                             GDK_GL_RGBA_TYPE);
-	
-	gtk_widget_set_events(GTK_WIDGET(app->glArea),
-	                      GDK_EXPOSURE_MASK |
-	                      GDK_KEY_PRESS_MASK |
-	                      GDK_KEY_RELEASE_MASK |
-	                      GDK_BUTTON_PRESS_MASK |
-	                      GDK_BUTTON_RELEASE_MASK |
-	                      GDK_POINTER_MOTION_MASK);
+    #ifdef GNOME
+    /* Create the main window (GNOME) */
+    app->mainWindow = gnome_app_new("Celestia", "Celestia");
+    #else
+    /* Create the main window (GTK) */
+    app->mainWindow = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+    gtk_window_set_title(GTK_WINDOW(app->mainWindow), "Celestia");
+    #endif /* GNOME */
 
-	/* Load settings the can be applied before the simulation is initialized */
-	#ifdef GNOME
-	applySettingsGConfPre(app, app->client);
-	#else
-	applySettingsFilePre(app, app->settingsFile);
-	#endif /* GNOME */
+    /* Set pointer to AppData structure. This is for when a function is in a
+     * *real* bind to get at this structure. */
+    g_object_set_data(G_OBJECT(app->mainWindow), "CelestiaData", app);
 
-	/* Full-Screen option from the command line (overrides above). */
-	if (fullScreen)
-		app->fullScreen = TRUE;
+    GtkWidget* mainBox = GTK_WIDGET(gtk_vbox_new(FALSE, 0));
+    gtk_container_set_border_width(GTK_CONTAINER(mainBox), 0);
 
-	/* Initialize handlers to all events in the glArea */
-	initGLCallbacks(app);
+    g_signal_connect(GTK_OBJECT(app->mainWindow), "destroy",
+                     G_CALLBACK(actionQuit), app);
 
-	/* Handler than completes initialization when the glArea is realized */
-	g_signal_connect(GTK_OBJECT(app->glArea), "realize",
-	                 G_CALLBACK(initRealize), app);
+    /* Initialize the OpenGL widget */
+    gtk_gl_init (&argc, &argv);
 
-	/* Create the main menu bar */
-	createMainMenu(app->mainWindow, app);
-	
-	/* Initialize the context menu */
-	initContext(app);
+    /* Configure OpenGL. Try double-buffered visual. */
+    GdkGLConfig* glconfig = gdk_gl_config_new_by_mode(static_cast<GdkGLConfigMode>
+                                                      (GDK_GL_MODE_RGB | GDK_GL_MODE_DEPTH | GDK_GL_MODE_DOUBLE));
 
-	/* Set context menu callback for the core */
-	app->core->setContextMenuCallback(menuContext);
-	
-	#ifdef GNOME
-	/* Set window contents (GNOME) */
-	gnome_app_set_contents((GnomeApp *)app->mainWindow, GTK_WIDGET(mainBox));
-	#else
-	/* Set window contents (GTK) */
-	gtk_container_add(GTK_CONTAINER(app->mainWindow), GTK_WIDGET(mainBox));
-	#endif /* GNOME */
+    if (glconfig == NULL)
+    {
+        g_print("*** Cannot find the double-buffered visual.\n");
+        g_print("*** Trying single-buffered visual.\n");
 
-	gtk_box_pack_start(GTK_BOX(mainBox), app->mainMenu, FALSE, TRUE, 0);
-	gtk_box_pack_start(GTK_BOX(mainBox), app->glArea, TRUE, TRUE, 0);
+        /* Try single-buffered visual */
+        glconfig = gdk_gl_config_new_by_mode(static_cast<GdkGLConfigMode>
+                                             (GDK_GL_MODE_RGB | GDK_GL_MODE_DEPTH));
+        if (glconfig == NULL)
+        {
+            g_print ("*** No appropriate OpenGL-capable visual found.\n");
+            exit(1);
+        }
+    }
 
-	gtk_window_set_default_icon_from_file("celestia-logo.png", NULL);
+    /* Initialize settings system */
+    #ifdef GNOME
+    initSettingsGConf(app);
+    #else
+    initSettingsFile(app);
+    #endif /* GNOME */
 
-	/* Set focus to glArea widget */
-	GTK_WIDGET_SET_FLAGS(app->glArea, GTK_CAN_FOCUS);
-	gtk_widget_grab_focus(GTK_WIDGET(app->glArea));
+    /* Create area to be used for OpenGL display */
+    app->glArea = gtk_drawing_area_new();
 
-	/* Initialize the Watcher */
-	gtkWatcher = new GtkWatcher(app->core, app);
+    /* Set OpenGL-capability to the widget. */
+    gtk_widget_set_gl_capability(app->glArea,
+                                 glconfig,
+                                 NULL,
+                                 TRUE,
+                                 GDK_GL_RGBA_TYPE);
 
-	/* Unload the splash screen */
-	splashEnd(ss);
+    gtk_widget_set_events(GTK_WIDGET(app->glArea),
+                          GDK_EXPOSURE_MASK |
+                          GDK_KEY_PRESS_MASK |
+                          GDK_KEY_RELEASE_MASK |
+                          GDK_BUTTON_PRESS_MASK |
+                          GDK_BUTTON_RELEASE_MASK |
+                          GDK_POINTER_MOTION_MASK);
 
-	gtk_widget_show_all(app->mainWindow);
+    /* Load settings the can be applied before the simulation is initialized */
+    #ifdef GNOME
+    applySettingsGConfPre(app, app->client);
+    #else
+    applySettingsFilePre(app, app->settingsFile);
+    #endif /* GNOME */
 
-	/* HACK: Now that window is drawn, set minimum window size */
-	gtk_widget_set_size_request(app->glArea, 320, 240);
+    /* Full-Screen option from the command line (overrides above). */
+    if (fullScreen)
+        app->fullScreen = TRUE;
 
-	#ifdef GNOME
-	initSettingsGConfNotifiers(app);
-	#endif /* GNOME */
-	
-	/* Set the ready flag */
-	app->bReady = TRUE;
-	
-	/* Call Main GTK Loop */
-	gtk_main();
-    
-	g_free(app);
+    /* Initialize handlers to all events in the glArea */
+    initGLCallbacks(app);
 
-	return 0;
+    /* Handler than completes initialization when the glArea is realized */
+    g_signal_connect(GTK_OBJECT(app->glArea), "realize",
+                     G_CALLBACK(initRealize), app);
+
+    /* Create the main menu bar */
+    createMainMenu(app->mainWindow, app);
+
+    /* Initialize the context menu */
+    initContext(app);
+
+    /* Set context menu callback for the core */
+    app->core->setContextMenuCallback(menuContext);
+
+    #ifdef GNOME
+    /* Set window contents (GNOME) */
+    gnome_app_set_contents((GnomeApp *)app->mainWindow, GTK_WIDGET(mainBox));
+    #else
+    /* Set window contents (GTK) */
+    gtk_container_add(GTK_CONTAINER(app->mainWindow), GTK_WIDGET(mainBox));
+    #endif /* GNOME */
+
+    gtk_box_pack_start(GTK_BOX(mainBox), app->mainMenu, FALSE, TRUE, 0);
+    gtk_box_pack_start(GTK_BOX(mainBox), app->glArea, TRUE, TRUE, 0);
+
+    gtk_window_set_default_icon_from_file("celestia-logo.png", NULL);
+
+    /* Set focus to glArea widget */
+    GTK_WIDGET_SET_FLAGS(app->glArea, GTK_CAN_FOCUS);
+    gtk_widget_grab_focus(GTK_WIDGET(app->glArea));
+
+    /* Initialize the Watcher */
+    gtkWatcher = new GtkWatcher(app->core, app);
+
+    /* Unload the splash screen */
+    splashEnd(ss);
+
+    gtk_widget_show_all(app->mainWindow);
+
+    /* HACK: Now that window is drawn, set minimum window size */
+    gtk_widget_set_size_request(app->glArea, 320, 240);
+
+    #ifdef GNOME
+    initSettingsGConfNotifiers(app);
+    #endif /* GNOME */
+
+    /* Set the ready flag */
+    app->bReady = TRUE;
+
+    /* Call Main GTK Loop */
+    gtk_main();
+
+    g_free(app);
+
+    return 0;
 }
 
 
@@ -533,6 +533,6 @@ int APIENTRY WinMain(HINSTANCE hInstance,
                      LPSTR lpCmdLine,
                      int nCmdShow)
 {
-	return main(__argc, __argv);
+    return main(__argc, __argv);
 }
 #endif /* WIN32 */
diff --git a/src/celestia/gtk/menu-context.cpp b/src/celestia/gtk/menu-context.cpp
index c8ca96a5e..923e49295 100644
--- a/src/celestia/gtk/menu-context.cpp
+++ b/src/celestia/gtk/menu-context.cpp
@@ -43,7 +43,7 @@ static AppData* app;
 /* Initializer. Sets the appData, since there is no way to pass it. */
 void initContext(AppData* a)
 {
-	app = a;
+    app = a;
 }
 
 
@@ -51,93 +51,93 @@ void initContext(AppData* a)
  *        Normally, float x and y, but unused, so removed. */
 void menuContext(float, float, Selection sel)
 {
-	GtkWidget* popup = gtk_menu_new();
-	string name;
+    GtkWidget* popup = gtk_menu_new();
+    string name;
 
-	switch (sel.getType())
-	{
-		case Selection::Type_Body:
-		{
-			name = sel.body()->getName();
-			AppendMenu(popup, NULL, name.c_str(), gtk_action_group_get_action(app->agMain, "CenterSelection"));
-			AppendMenu(popup, NULL, NULL, 0);
-			AppendMenu(popup, NULL, "_Goto", gtk_action_group_get_action(app->agMain, "GotoSelection"));
-			AppendMenu(popup, NULL, "_Follow", gtk_action_group_get_action(app->agMain, "FollowSelection"));
-			AppendMenu(popup, NULL, "S_ync Orbit", gtk_action_group_get_action(app->agMain, "SyncSelection"));
-			/* Add info eventually:
-			 * AppendMenu(popup, NULL, "_Info", 0); */
+    switch (sel.getType())
+    {
+        case Selection::Type_Body:
+        {
+            name = sel.body()->getName();
+            AppendMenu(popup, NULL, name.c_str(), gtk_action_group_get_action(app->agMain, "CenterSelection"));
+            AppendMenu(popup, NULL, NULL, 0);
+            AppendMenu(popup, NULL, "_Goto", gtk_action_group_get_action(app->agMain, "GotoSelection"));
+            AppendMenu(popup, NULL, "_Follow", gtk_action_group_get_action(app->agMain, "FollowSelection"));
+            AppendMenu(popup, NULL, "S_ync Orbit", gtk_action_group_get_action(app->agMain, "SyncSelection"));
+            /* Add info eventually:
+             * AppendMenu(popup, NULL, "_Info", 0); */
 
-			const PlanetarySystem* satellites = sel.body()->getSatellites();
-			if (satellites != NULL && satellites->getSystemSize() != 0)
-			{
-				GtkMenu* satMenu = CreatePlanetarySystemMenu(name, satellites);
-				gtk_menu_item_set_submenu(AppendMenu(popup, NULL, "_Satellites", 0), GTK_WIDGET(satMenu));
-			}
+            const PlanetarySystem* satellites = sel.body()->getSatellites();
+            if (satellites != NULL && satellites->getSystemSize() != 0)
+            {
+                GtkMenu* satMenu = CreatePlanetarySystemMenu(name, satellites);
+                gtk_menu_item_set_submenu(AppendMenu(popup, NULL, "_Satellites", 0), GTK_WIDGET(satMenu));
+            }
 
-			vector<string>* altSurfaces = sel.body()->getAlternateSurfaceNames();
-			if (altSurfaces != NULL)
-			{
-				if (altSurfaces->size() > 0)
-				{
-					GtkMenu* surfMenu = CreateAlternateSurfaceMenu(*altSurfaces);
-					gtk_menu_item_set_submenu(AppendMenu(popup, NULL, "_Alternate Surfaces", 0), GTK_WIDGET(surfMenu));
-					delete altSurfaces;
-				}
-			}
-		}
-		break;
+            vector<string>* altSurfaces = sel.body()->getAlternateSurfaceNames();
+            if (altSurfaces != NULL)
+            {
+                if (altSurfaces->size() > 0)
+                {
+                    GtkMenu* surfMenu = CreateAlternateSurfaceMenu(*altSurfaces);
+                    gtk_menu_item_set_submenu(AppendMenu(popup, NULL, "_Alternate Surfaces", 0), GTK_WIDGET(surfMenu));
+                    delete altSurfaces;
+                }
+            }
+        }
+        break;
 
-		case Selection::Type_Star:
-		{
-			Simulation* sim = app->simulation;
-			name = ReplaceGreekLetterAbbr(sim->getUniverse()->getStarCatalog()->getStarName(*(sel.star())));
-			AppendMenu(popup, NULL, name.c_str(), gtk_action_group_get_action(app->agMain, "CenterSelection"));
-			AppendMenu(popup, NULL, NULL, 0);
-			AppendMenu(popup, NULL, "_Goto", gtk_action_group_get_action(app->agMain, "GotoSelection"));
-			/* Add info eventually:
-			 * AppendMenu(popup, NULL, "_Info", 0); */
+        case Selection::Type_Star:
+        {
+            Simulation* sim = app->simulation;
+            name = ReplaceGreekLetterAbbr(sim->getUniverse()->getStarCatalog()->getStarName(*(sel.star())));
+            AppendMenu(popup, NULL, name.c_str(), gtk_action_group_get_action(app->agMain, "CenterSelection"));
+            AppendMenu(popup, NULL, NULL, 0);
+            AppendMenu(popup, NULL, "_Goto", gtk_action_group_get_action(app->agMain, "GotoSelection"));
+            /* Add info eventually:
+             * AppendMenu(popup, NULL, "_Info", 0); */
 
-			SolarSystemCatalog* solarSystemCatalog = sim->getUniverse()->getSolarSystemCatalog();
-			SolarSystemCatalog::iterator iter = solarSystemCatalog->find(sel.star()->getCatalogNumber());
-			if (iter != solarSystemCatalog->end())
-			{
-				SolarSystem* solarSys = iter->second;
-				GtkMenu* planetsMenu = CreatePlanetarySystemMenu(name, solarSys->getPlanets());
-				if (name == "Sol")
-					gtk_menu_item_set_submenu(AppendMenu(popup, NULL, "Orbiting Bodies", 0), GTK_WIDGET(planetsMenu));
-				else
-					gtk_menu_item_set_submenu(AppendMenu(popup, NULL, "Planets", 0), GTK_WIDGET(planetsMenu));
-			}
-		}
-		break;
+            SolarSystemCatalog* solarSystemCatalog = sim->getUniverse()->getSolarSystemCatalog();
+            SolarSystemCatalog::iterator iter = solarSystemCatalog->find(sel.star()->getCatalogNumber());
+            if (iter != solarSystemCatalog->end())
+            {
+                SolarSystem* solarSys = iter->second;
+                GtkMenu* planetsMenu = CreatePlanetarySystemMenu(name, solarSys->getPlanets());
+                if (name == "Sol")
+                    gtk_menu_item_set_submenu(AppendMenu(popup, NULL, "Orbiting Bodies", 0), GTK_WIDGET(planetsMenu));
+                else
+                    gtk_menu_item_set_submenu(AppendMenu(popup, NULL, "Planets", 0), GTK_WIDGET(planetsMenu));
+            }
+        }
+        break;
 
-		case Selection::Type_DeepSky:
-		{
-			AppendMenu(popup, NULL, app->simulation->getUniverse()->getDSOCatalog()->getDSOName(sel.deepsky()).c_str(), gtk_action_group_get_action(app->agMain, "CenterSelection"));
-			AppendMenu(popup, NULL, NULL, 0);
-			AppendMenu(popup, NULL, "_Goto", gtk_action_group_get_action(app->agMain, "GotoSelection"));
-			AppendMenu(popup, NULL, "_Follow", gtk_action_group_get_action(app->agMain, "FollowSelection"));
-			/* Add info eventually:
-			 * AppendMenu(popup, NULL, "_Info", 0); */
-		}
-		break;
+        case Selection::Type_DeepSky:
+        {
+            AppendMenu(popup, NULL, app->simulation->getUniverse()->getDSOCatalog()->getDSOName(sel.deepsky()).c_str(), gtk_action_group_get_action(app->agMain, "CenterSelection"));
+            AppendMenu(popup, NULL, NULL, 0);
+            AppendMenu(popup, NULL, "_Goto", gtk_action_group_get_action(app->agMain, "GotoSelection"));
+            AppendMenu(popup, NULL, "_Follow", gtk_action_group_get_action(app->agMain, "FollowSelection"));
+            /* Add info eventually:
+             * AppendMenu(popup, NULL, "_Info", 0); */
+        }
+        break;
 
-		case Selection::Type_Location:
-			break;
+        case Selection::Type_Location:
+            break;
 
-		default:
-			break;
-	}
+        default:
+            break;
+    }
 
-	if (app->simulation->getUniverse()->isMarked(sel, 1))
-		AppendMenu(popup, menuUnMark, "_Unmark", 0);
-	else
-		AppendMenu(popup, menuMark, "_Mark", 0);
+    if (app->simulation->getUniverse()->isMarked(sel, 1))
+        AppendMenu(popup, menuUnMark, "_Unmark", 0);
+    else
+        AppendMenu(popup, menuMark, "_Mark", 0);
 
-	app->simulation->setSelection(sel);
+    app->simulation->setSelection(sel);
 
-	gtk_widget_show_all(popup);	
-	gtk_menu_popup(GTK_MENU(popup), NULL, NULL, NULL, NULL, 0, gtk_get_current_event_time());
+    gtk_widget_show_all(popup);
+    gtk_menu_popup(GTK_MENU(popup), NULL, NULL, NULL, NULL, 0, gtk_get_current_event_time());
 }
 
 
@@ -145,117 +145,117 @@ void menuContext(float, float, Selection sel)
  *           some point */
 static void wrapAction(GtkAction* action)
 {
-	gtk_action_activate(action);
+    gtk_action_activate(action);
 }
 
 
 /* CALLBACK: Mark the selected object. Might some day be a GtkAction. */
 static void menuMark()
 {
-	Simulation* sim = app->simulation;
-	if (sim->getUniverse() != NULL)
-	{
-		MarkerRepresentation markerRep(MarkerRepresentation::Diamond, 10.0f, Color(0.0f, 1.0f, 0.0f, 0.9f));
-		sim->getUniverse()->markObject(sim->getSelection(), markerRep, 1);
-	}
+    Simulation* sim = app->simulation;
+    if (sim->getUniverse() != NULL)
+    {
+        MarkerRepresentation markerRep(MarkerRepresentation::Diamond, 10.0f, Color(0.0f, 1.0f, 0.0f, 0.9f));
+        sim->getUniverse()->markObject(sim->getSelection(), markerRep, 1);
+    }
 }
 
 
 /* CALLBACK: Unmark the selected object. Might some day be a GtkAction. */
 static void menuUnMark()
 {
-	Simulation* sim = app->simulation;
-	if (sim->getUniverse() != NULL)
-		sim->getUniverse()->unmarkObject(sim->getSelection(), 1);
+    Simulation* sim = app->simulation;
+    if (sim->getUniverse() != NULL)
+        sim->getUniverse()->unmarkObject(sim->getSelection(), 1);
 }
 
 
 /* CALLBACK: Handle a planetary selection from the context menu. */
 static void handleContextPlanet(gpointer data)
 {
-	int value = GPOINTER_TO_INT(data);
-	
-	/* Handle the satellite/child object submenu */
-	Selection sel = app->simulation->getSelection();
-	switch (sel.getType())
-	{
-		case Selection::Type_Star:
-			app->simulation->selectPlanet(value);
-			break;
+    int value = GPOINTER_TO_INT(data);
 
-		case Selection::Type_Body:
-			{
-				PlanetarySystem* satellites = (PlanetarySystem*) sel.body()->getSatellites();
-				app->simulation->setSelection(Selection(satellites->getBody(value)));
-				break;
-			}
+    /* Handle the satellite/child object submenu */
+    Selection sel = app->simulation->getSelection();
+    switch (sel.getType())
+    {
+        case Selection::Type_Star:
+            app->simulation->selectPlanet(value);
+            break;
 
-		case Selection::Type_DeepSky:
-			/* Current deep sky object/galaxy implementation does
-			 * not have children to select. */
-			break;
+        case Selection::Type_Body:
+            {
+                PlanetarySystem* satellites = (PlanetarySystem*) sel.body()->getSatellites();
+                app->simulation->setSelection(Selection(satellites->getBody(value)));
+                break;
+            }
 
-		case Selection::Type_Location:
-			break;
+        case Selection::Type_DeepSky:
+            /* Current deep sky object/galaxy implementation does
+             * not have children to select. */
+            break;
 
-		default:
-			break;
-	}
+        case Selection::Type_Location:
+            break;
+
+        default:
+            break;
+    }
 }
 
 
 /* CALLBACK: Handle an alternate surface from the context menu. */
 static void handleContextSurface(gpointer data)
 {
-	int value = GPOINTER_TO_INT(data);
-	
-	/* Handle the alternate surface submenu */
-	Selection sel = app->simulation->getSelection();
-	if (sel.body() != NULL)
-	{
-		guint index = value - 1;
-		vector<string>* surfNames = sel.body()->getAlternateSurfaceNames();
-		if (surfNames != NULL)
-		{
-			string surfName;
-			if (index < surfNames->size())
-				surfName = surfNames->at(index);
-			app->simulation->getActiveObserver()->setDisplayedSurface(surfName);
-			delete surfNames;
-		}
-	}
+    int value = GPOINTER_TO_INT(data);
+
+    /* Handle the alternate surface submenu */
+    Selection sel = app->simulation->getSelection();
+    if (sel.body() != NULL)
+    {
+        guint index = value - 1;
+        vector<string>* surfNames = sel.body()->getAlternateSurfaceNames();
+        if (surfNames != NULL)
+        {
+            string surfName;
+            if (index < surfNames->size())
+                surfName = surfNames->at(index);
+            app->simulation->getActiveObserver()->setDisplayedSurface(surfName);
+            delete surfNames;
+        }
+    }
 }
 
 
 /* HELPER: Append a menu item and return pointer. Used for context menu. */
 static GtkMenuItem* AppendMenu(GtkWidget* parent, GtkSignalFunc callback, const gchar* name, gpointer extra)
 {
-	GtkWidget* menuitem;
-	gpointer data;
+    GtkWidget* menuitem;
+    gpointer data;
 
-	/* Check for separator */
-	if (name == NULL)
-		menuitem = gtk_separator_menu_item_new();
-	else
-		menuitem = gtk_menu_item_new_with_mnemonic(name);
+    /* Check for separator */
+    if (name == NULL)
+        menuitem = gtk_separator_menu_item_new();
+    else
+        menuitem = gtk_menu_item_new_with_mnemonic(name);
 
-	/* If no callback was provided, pass GtkAction, else convert to pointer */
-	if (callback == NULL && extra != 0)
-	{
-		callback = G_CALLBACK(wrapAction);
-		data = extra;
-	}
-	else
-		data = GINT_TO_POINTER(extra);
-	
-	/* Add handler */
-	if (callback != NULL)
-		g_signal_connect_swapped (G_OBJECT(menuitem), "activate",
-		                          G_CALLBACK(callback),
-		                          data);
+    /* If no callback was provided, pass GtkAction, else convert to pointer */
+    if (callback == NULL && extra != 0)
+    {
+        callback = G_CALLBACK(wrapAction);
+        data = extra;
+    }
+    else
+        data = GINT_TO_POINTER(extra);
 
-	gtk_menu_shell_append(GTK_MENU_SHELL(parent), menuitem);
-	return GTK_MENU_ITEM(menuitem);
+    /* Add handler */
+    if (callback != NULL)
+        g_signal_connect_swapped (G_OBJECT(menuitem), "activate",
+                                  G_CALLBACK(callback),
+                                  data);
+
+    gtk_menu_shell_append(GTK_MENU_SHELL(parent), menuitem);
+    return GTK_MENU_ITEM(menuitem);
 }
 
 
@@ -267,151 +267,151 @@ struct IntStrPairComparePredicate
 {
     IntStrPairComparePredicate() : dummy(0) {}
 
-	bool operator()(const IntStrPair pair1, const IntStrPair pair2) const
-	{
-		return (pair1.second.compare(pair2.second) < 0);
-	}
+    bool operator()(const IntStrPair pair1, const IntStrPair pair2) const
+    {
+        return (pair1.second.compare(pair2.second) < 0);
+    }
 
-	int dummy;
+    int dummy;
 };
 
 /* HELPER: Create planetary submenu for context menu, return menu pointer. */
 static GtkMenu* CreatePlanetarySystemMenu(string parentName, const PlanetarySystem* psys)
 {
-	/*
-	 * Modified from winmain.cpp
-	 *
-	 * Use some vectors to categorize and sort the bodies within this
-	 * PlanetarySystem. In order to generate sorted menus, we must carry the
-	 * name and menu index as a single unit in the sort. One obvious way is to
-	 * create a vector<pair<int,string>> and then use a comparison predicate
-	 * to sort the vector based on the string in each pair.
-	 */
+    /*
+     * Modified from winmain.cpp
+     *
+     * Use some vectors to categorize and sort the bodies within this
+     * PlanetarySystem. In order to generate sorted menus, we must carry the
+     * name and menu index as a single unit in the sort. One obvious way is to
+     * create a vector<pair<int,string>> and then use a comparison predicate
+     * to sort the vector based on the string in each pair.
+     */
 
-	/* Declare vector<pair<int,string>> objects for each classification of body */
-	vector<IntStrPair> asteroids;
-	vector<IntStrPair> comets;
-	vector<IntStrPair> invisibles;
-	vector<IntStrPair> moons;
-	vector<IntStrPair> planets;
-	vector<IntStrPair> spacecraft;
+    /* Declare vector<pair<int,string>> objects for each classification of body */
+    vector<IntStrPair> asteroids;
+    vector<IntStrPair> comets;
+    vector<IntStrPair> invisibles;
+    vector<IntStrPair> moons;
+    vector<IntStrPair> planets;
+    vector<IntStrPair> spacecraft;
 
-	/* We will use these objects to iterate over all the above vectors */
-	vector<IntStrPairVec> objects;
-	vector<string> menuNames;
+    /* We will use these objects to iterate over all the above vectors */
+    vector<IntStrPairVec> objects;
+    vector<string> menuNames;
 
-	/* Place each body in the correct vector based on classification */
-	GtkWidget* menu = gtk_menu_new();
-	for (int i = 0; i < psys->getSystemSize(); i++)
-	{
-		Body* body = psys->getBody(i);
-		switch(body->getClassification())
-		{
-			case Body::Asteroid:
-				asteroids.push_back(make_pair(i, body->getName()));
-				break;
-			case Body::Comet:
-				comets.push_back(make_pair(i, body->getName()));
-				break;
-			case Body::Invisible:
-				invisibles.push_back(make_pair(i, body->getName()));
-				break;
-			case Body::Moon:
-				moons.push_back(make_pair(i, body->getName()));
-				break;
-			case Body::Planet:
-				planets.push_back(make_pair(i, body->getName()));
-				break;
-			case Body::Spacecraft:
-				spacecraft.push_back(make_pair(i, body->getName()));
-				break;
-		}
-	}
+    /* Place each body in the correct vector based on classification */
+    GtkWidget* menu = gtk_menu_new();
+    for (int i = 0; i < psys->getSystemSize(); i++)
+    {
+        Body* body = psys->getBody(i);
+        switch(body->getClassification())
+        {
+            case Body::Asteroid:
+                asteroids.push_back(make_pair(i, body->getName()));
+                break;
+            case Body::Comet:
+                comets.push_back(make_pair(i, body->getName()));
+                break;
+            case Body::Invisible:
+                invisibles.push_back(make_pair(i, body->getName()));
+                break;
+            case Body::Moon:
+                moons.push_back(make_pair(i, body->getName()));
+                break;
+            case Body::Planet:
+                planets.push_back(make_pair(i, body->getName()));
+                break;
+            case Body::Spacecraft:
+                spacecraft.push_back(make_pair(i, body->getName()));
+                break;
+        }
+    }
 
-	/* Add each vector of PlanetarySystem bodies to a vector to iterate over */
-	objects.push_back(asteroids);
-	menuNames.push_back("Asteroids");
-	objects.push_back(comets);
-	menuNames.push_back("Comets");
-	objects.push_back(invisibles);
-	menuNames.push_back("Invisibles");
-	objects.push_back(moons);
-	menuNames.push_back("Moons");
-	objects.push_back(planets);
-	menuNames.push_back("Planets");
-	objects.push_back(spacecraft);
-	menuNames.push_back("Spacecraft");
+    /* Add each vector of PlanetarySystem bodies to a vector to iterate over */
+    objects.push_back(asteroids);
+    menuNames.push_back("Asteroids");
+    objects.push_back(comets);
+    menuNames.push_back("Comets");
+    objects.push_back(invisibles);
+    menuNames.push_back("Invisibles");
+    objects.push_back(moons);
+    menuNames.push_back("Moons");
+    objects.push_back(planets);
+    menuNames.push_back("Planets");
+    objects.push_back(spacecraft);
+    menuNames.push_back("Spacecraft");
 
-	/* Now sort each vector and generate submenus */
-	IntStrPairComparePredicate pred;
-	vector<IntStrPairVec>::iterator obj;
-	vector<IntStrPair>::iterator it;
-	vector<string>::iterator menuName;
-	GtkWidget* subMenu;
-	int numSubMenus;
+    /* Now sort each vector and generate submenus */
+    IntStrPairComparePredicate pred;
+    vector<IntStrPairVec>::iterator obj;
+    vector<IntStrPair>::iterator it;
+    vector<string>::iterator menuName;
+    GtkWidget* subMenu;
+    int numSubMenus;
 
-	/* Count how many submenus we need to create */
-	numSubMenus = 0;
-	for (obj=objects.begin(); obj != objects.end(); obj++)
-	{
-		if (obj->size() > 0)
-			numSubMenus++;
-	}
+    /* Count how many submenus we need to create */
+    numSubMenus = 0;
+    for (obj=objects.begin(); obj != objects.end(); obj++)
+    {
+        if (obj->size() > 0)
+            numSubMenus++;
+    }
 
-	menuName = menuNames.begin();
-	for (obj=objects.begin(); obj != objects.end(); obj++)
-	{
-		/* Only generate a submenu if the vector is not empty */
-		if (obj->size() > 0)
-		{
-			/* Don't create a submenu for a single item */
-			if (obj->size() == 1)
-			{
-				it=obj->begin();
-				AppendMenu(menu, GTK_SIGNAL_FUNC(handleContextPlanet), it->second.c_str(), GINT_TO_POINTER(it->first));
-			}
-			else
-			{
-				/* Skip sorting if we are dealing with the planets in our own
-				 * Solar System. */
-				if (parentName != "Sol" || *menuName != "Planets")
-					sort(obj->begin(), obj->end(), pred);
+    menuName = menuNames.begin();
+    for (obj=objects.begin(); obj != objects.end(); obj++)
+    {
+        /* Only generate a submenu if the vector is not empty */
+        if (obj->size() > 0)
+        {
+            /* Don't create a submenu for a single item */
+            if (obj->size() == 1)
+            {
+                it=obj->begin();
+                AppendMenu(menu, GTK_SIGNAL_FUNC(handleContextPlanet), it->second.c_str(), GINT_TO_POINTER(it->first));
+            }
+            else
+            {
+                /* Skip sorting if we are dealing with the planets in our own
+                 * Solar System. */
+                if (parentName != "Sol" || *menuName != "Planets")
+                    sort(obj->begin(), obj->end(), pred);
 
-				if (numSubMenus > 1)
-				{
-					/* Add items to submenu */
-					subMenu = gtk_menu_new();
+                if (numSubMenus > 1)
+                {
+                    /* Add items to submenu */
+                    subMenu = gtk_menu_new();
 
-					for(it=obj->begin(); it != obj->end(); it++)
-						AppendMenu(subMenu, GTK_SIGNAL_FUNC(handleContextPlanet), it->second.c_str(), GINT_TO_POINTER(it->first));
+                    for(it=obj->begin(); it != obj->end(); it++)
+                        AppendMenu(subMenu, GTK_SIGNAL_FUNC(handleContextPlanet), it->second.c_str(), GINT_TO_POINTER(it->first));
 
-					gtk_menu_item_set_submenu(AppendMenu(menu, NULL, menuName->c_str(), 0), GTK_WIDGET(subMenu));
-				}
-				else
-				{
-					/* Just add items to the popup */
-					for(it=obj->begin(); it != obj->end(); it++)
-						AppendMenu(menu, GTK_SIGNAL_FUNC(handleContextPlanet), it->second.c_str(), GINT_TO_POINTER(it->first));
-				}
-			}
-		}
-		menuName++;
-	}
+                    gtk_menu_item_set_submenu(AppendMenu(menu, NULL, menuName->c_str(), 0), GTK_WIDGET(subMenu));
+                }
+                else
+                {
+                    /* Just add items to the popup */
+                    for(it=obj->begin(); it != obj->end(); it++)
+                        AppendMenu(menu, GTK_SIGNAL_FUNC(handleContextPlanet), it->second.c_str(), GINT_TO_POINTER(it->first));
+                }
+            }
+        }
+        menuName++;
+    }
 
-	return GTK_MENU(menu);
+    return GTK_MENU(menu);
 }
 
 
 /* HELPER: Create surface submenu for context menu, return menu pointer. */
 static GtkMenu* CreateAlternateSurfaceMenu(const vector<string>& surfaces)
 {
-	GtkWidget* menu = gtk_menu_new();
+    GtkWidget* menu = gtk_menu_new();
 
-	AppendMenu(menu, GTK_SIGNAL_FUNC(handleContextSurface), "Normal", 0);
-	for (guint i = 0; i < surfaces.size(); i++)
-	{
-		AppendMenu(menu, GTK_SIGNAL_FUNC(handleContextSurface), surfaces[i].c_str(), GINT_TO_POINTER(i+1));
-	}
+    AppendMenu(menu, GTK_SIGNAL_FUNC(handleContextSurface), "Normal", 0);
+    for (guint i = 0; i < surfaces.size(); i++)
+    {
+        AppendMenu(menu, GTK_SIGNAL_FUNC(handleContextSurface), surfaces[i].c_str(), GINT_TO_POINTER(i+1));
+    }
 
-	return GTK_MENU(menu);
+    return GTK_MENU(menu);
 }
diff --git a/src/celestia/gtk/settings-file.cpp b/src/celestia/gtk/settings-file.cpp
index 5ba52bf48..1d4437f60 100644
--- a/src/celestia/gtk/settings-file.cpp
+++ b/src/celestia/gtk/settings-file.cpp
@@ -27,294 +27,294 @@ static void getFlag(GKeyFile* file, int *flags, int setting, const gchar* sectio
 /* ENTRY: Initializes and reads into memory the preferences */
 void initSettingsFile(AppData* app)
 {
-	GError *error = NULL;
-	app->settingsFile = g_key_file_new();
-	
-	char* fn = g_build_filename(g_get_home_dir(), CELESTIARC, NULL);
-	
-	g_key_file_load_from_file(app->settingsFile, fn, G_KEY_FILE_NONE, &error);
+    GError *error = NULL;
+    app->settingsFile = g_key_file_new();
 
-	/* Should check G_KEY_FILE_ERROR_NOT_FOUND, but bug in glib returns wrong
-	 * error code. */
-	if (error != NULL && g_file_test(fn, G_FILE_TEST_EXISTS))
-	{
-		g_print("Error reading '%s': %s.\n", fn, error->message);
-		exit(1);
-	}
-	
-	g_free(fn);
+    char* fn = g_build_filename(g_get_home_dir(), CELESTIARC, NULL);
+
+    g_key_file_load_from_file(app->settingsFile, fn, G_KEY_FILE_NONE, &error);
+
+    /* Should check G_KEY_FILE_ERROR_NOT_FOUND, but bug in glib returns wrong
+     * error code. */
+    if (error != NULL && g_file_test(fn, G_FILE_TEST_EXISTS))
+    {
+        g_print("Error reading '%s': %s.\n", fn, error->message);
+        exit(1);
+    }
+
+    g_free(fn);
 }
 
 
 /* ENTRY: Applies preferences needed before initializing the core */
 void applySettingsFilePre(AppData* app, GKeyFile* file)
 {
-	int sizeX, sizeY, positionX, positionY;
-	GError* e;
+    int sizeX, sizeY, positionX, positionY;
+    GError* e;
 
-	/* Numbers require special treatment because if they are not found they
-	 * are not set to NULL like strings. So, if that is the case, we set them
-	 * to values that will cause setSane*() to set defaults. */
-	e= NULL;
-	sizeX = g_key_file_get_integer(file, "Window", "width", &e);
-	if (e != NULL) sizeX = -1;
+    /* Numbers require special treatment because if they are not found they
+     * are not set to NULL like strings. So, if that is the case, we set them
+     * to values that will cause setSane*() to set defaults. */
+    e= NULL;
+    sizeX = g_key_file_get_integer(file, "Window", "width", &e);
+    if (e != NULL) sizeX = -1;
 
-	e= NULL;
-	sizeY = g_key_file_get_integer(file, "Window", "height", &e);
-	if (e != NULL) sizeY = -1;
+    e= NULL;
+    sizeY = g_key_file_get_integer(file, "Window", "height", &e);
+    if (e != NULL) sizeY = -1;
 
-	e= NULL;
-	positionX = g_key_file_get_integer(file, "Window", "x", &e);
-	if (e != NULL) positionX = -1;
+    e= NULL;
+    positionX = g_key_file_get_integer(file, "Window", "x", &e);
+    if (e != NULL) positionX = -1;
 
-	e= NULL;
-	positionY = g_key_file_get_integer(file, "Window", "y", &e);
-	if (e != NULL) positionY = -1;
+    e= NULL;
+    positionY = g_key_file_get_integer(file, "Window", "y", &e);
+    if (e != NULL) positionY = -1;
 
-	/* These next two cannot be checked for sanity, default set here */
-	e= NULL;
-	app->fullScreen = g_key_file_get_boolean(file, "Window", "fullScreen", &e);
-	if (e != NULL) app->fullScreen = FALSE;
-	
-	/* Nothing is set here. The prefs structure is used to set things at the
-	 * corrent times. */
-	setSaneWinSize(app, sizeX, sizeY);
-	setSaneWinPosition(app, positionX, positionY);
+    /* These next two cannot be checked for sanity, default set here */
+    e= NULL;
+    app->fullScreen = g_key_file_get_boolean(file, "Window", "fullScreen", &e);
+    if (e != NULL) app->fullScreen = FALSE;
+
+    /* Nothing is set here. The prefs structure is used to set things at the
+     * corrent times. */
+    setSaneWinSize(app, sizeX, sizeY);
+    setSaneWinPosition(app, positionX, positionY);
 }
 
 
 /* ENTRY: Applies preferences after the core is initialized */
 void applySettingsFileMain(AppData* app, GKeyFile* file)
 {
-	GError* e;
-	float ambientLight, visualMagnitude, galaxyLightGain;
-	int errors, verbosity, starStyle, textureResolution, distanceLimit, rf, om, lm;
-		
-	/* See comment in applySettingsFilePrefs() */
-	e = NULL;
-	ambientLight = (float)g_key_file_get_integer(file, "Main", "ambientLight", &e) / 1000.0;
-	if (e != NULL) ambientLight = -1.0;
-	
-	e = NULL;
-	visualMagnitude = (float)g_key_file_get_integer(file, "Main", "visualMagnitude", &e) / 1000.0;
-	if (e != NULL) visualMagnitude = -1.0;
+    GError* e;
+    float ambientLight, visualMagnitude, galaxyLightGain;
+    int errors, verbosity, starStyle, textureResolution, distanceLimit, rf, om, lm;
 
-	e = NULL;
-	galaxyLightGain = (float)g_key_file_get_integer(file, "Main", "galaxyLightGain", &e) / 1000.0;
-	if (e != NULL) galaxyLightGain = -1.0;
+    /* See comment in applySettingsFilePrefs() */
+    e = NULL;
+    ambientLight = (float)g_key_file_get_integer(file, "Main", "ambientLight", &e) / 1000.0;
+    if (e != NULL) ambientLight = -1.0;
 
-	e = NULL;
-	distanceLimit = g_key_file_get_integer(file, "Main", "distanceLimit", &e);
-	if (e != NULL) distanceLimit = -1;
-		
-	e = NULL;
-	verbosity = g_key_file_get_integer(file, "Main", "verbosity", &e);
-	if (e != NULL) verbosity = -1;
-	
-	e = NULL;
-	starStyle = g_key_file_get_integer(file, "Main", "starStyle", &e);
-	if (e != NULL) starStyle = -1;
-		
-	e = NULL;
-	textureResolution = g_key_file_get_integer(file, "Main", "textureResolution", &e);
-	if (e != NULL) textureResolution = -1;
-		
-	e = NULL;
-	app->showLocalTime = g_key_file_get_boolean(file, "Main", "localTime", &e);
-	if (e != NULL) app->showLocalTime = FALSE;
+    e = NULL;
+    visualMagnitude = (float)g_key_file_get_integer(file, "Main", "visualMagnitude", &e) / 1000.0;
+    if (e != NULL) visualMagnitude = -1.0;
 
-	e = NULL;
-	app->renderer->setVideoSync(g_key_file_get_integer(file, "Main", "starStyle", &e));
-	if (e != NULL) app->renderer->setVideoSync(TRUE);
-	
-	/* All settings that need sanity checks get them */
-	setSaneAmbientLight(app, ambientLight);
-	setSaneVisualMagnitude(app, visualMagnitude);
-	setSaneGalaxyLightGain(galaxyLightGain);
-	setSaneDistanceLimit(app, distanceLimit);
-	setSaneVerbosity(app, verbosity);
-	setSaneStarStyle(app, (Renderer::StarStyle)starStyle);
-	setSaneTextureResolution(app, textureResolution);
-	setSaneAltSurface(app, g_key_file_get_string(file, "Main", "altSurfaceName", NULL));
-	
-	/* Render Flags */
-	errors = 0;
-	rf = Renderer::ShowNothing;
-	getFlag(file, &rf, Renderer::ShowStars, "RenderFlags", "stars", &errors);
-	getFlag(file, &rf, Renderer::ShowPlanets, "RenderFlags", "planets", &errors);
-	getFlag(file, &rf, Renderer::ShowGalaxies, "RenderFlags", "galaxies", &errors);
-	getFlag(file, &rf, Renderer::ShowDiagrams, "RenderFlags", "diagrams", &errors);
-	getFlag(file, &rf, Renderer::ShowCloudMaps, "RenderFlags", "cloudMaps", &errors);
-	getFlag(file, &rf, Renderer::ShowOrbits, "RenderFlags", "orbits", &errors);
-	getFlag(file, &rf, Renderer::ShowCelestialSphere, "RenderFlags", "celestialSphere", &errors);
-	getFlag(file, &rf, Renderer::ShowNightMaps, "RenderFlags", "nightMaps", &errors);
-	getFlag(file, &rf, Renderer::ShowAtmospheres, "RenderFlags", "atmospheres", &errors);
-	getFlag(file, &rf, Renderer::ShowSmoothLines, "RenderFlags", "smoothLines", &errors);
-	getFlag(file, &rf, Renderer::ShowEclipseShadows, "RenderFlags", "eclipseShadows", &errors);
-	getFlag(file, &rf, Renderer::ShowRingShadows, "RenderFlags", "ringShadows", &errors);
-	getFlag(file, &rf, Renderer::ShowBoundaries, "RenderFlags", "boundaries", &errors);
-	getFlag(file, &rf, Renderer::ShowAutoMag, "RenderFlags", "autoMag", &errors);
-	getFlag(file, &rf, Renderer::ShowCometTails, "RenderFlags", "cometTails", &errors);
-	getFlag(file, &rf, Renderer::ShowMarkers, "RenderFlags", "markers", &errors);
-	getFlag(file, &rf, Renderer::ShowPartialTrajectories, "RenderFlags", "partialTrajectories", &errors);
-	getFlag(file, &rf, Renderer::ShowNebulae, "RenderFlags", "nebulae", &errors);
-	getFlag(file, &rf, Renderer::ShowOpenClusters, "RenderFlags", "openClusters", &errors);
-	getFlag(file, &rf, Renderer::ShowGlobulars, "RenderFlags", "globulars", &errors);
-	getFlag(file, &rf, Renderer::ShowGalacticGrid, "RenderFlags", "gridGalactic", &errors);
-	getFlag(file, &rf, Renderer::ShowEclipticGrid, "RenderFlags", "gridEcliptic", &errors);
-	getFlag(file, &rf, Renderer::ShowHorizonGrid, "RenderFlags", "gridHorizontal", &errors);
-	
-	/* If any flag is missing, use defaults for all. */
-	if (errors > 0)
-		setDefaultRenderFlags(app);
-	else
-		app->renderer->setRenderFlags(rf);
-	
-	/* Orbit Mask */
-	errors = 0;
-	om = 0;
-	getFlag(file, &om, Body::Planet, "OrbitMask", "planet", &errors);
-	getFlag(file, &om, Body::Moon, "OrbitMask", "moon", &errors);
-	getFlag(file, &om, Body::Asteroid, "OrbitMask", "asteroid", &errors);
-	getFlag(file, &om, Body::Comet, "OrbitMask", "comet", &errors);
-	getFlag(file, &om, Body::Spacecraft, "OrbitMask", "spacecraft", &errors);
-	getFlag(file, &om, Body::Invisible, "OrbitMask", "invisible", &errors);
-	getFlag(file, &om, Body::Unknown, "OrbitMask", "unknown", &errors);
-	
-	/* If any orbit is missing, use core defaults for all (do nothing). */
-	if (errors == 0)
-		app->renderer->setOrbitMask(om);
+    e = NULL;
+    galaxyLightGain = (float)g_key_file_get_integer(file, "Main", "galaxyLightGain", &e) / 1000.0;
+    if (e != NULL) galaxyLightGain = -1.0;
 
-	/* Label Mode */
-	errors = 0;
-	lm = Renderer::NoLabels;
-	
-	getFlag(file, &lm, Renderer::StarLabels, "LabelMode", "star", &errors);
-	getFlag(file, &lm, Renderer::PlanetLabels, "LabelMode", "planet", &errors);
-	getFlag(file, &lm, Renderer::MoonLabels, "LabelMode", "moon", &errors);
-	getFlag(file, &lm, Renderer::ConstellationLabels, "LabelMode", "constellation", &errors);
-	getFlag(file, &lm, Renderer::GalaxyLabels, "LabelMode", "galaxy", &errors);
-	getFlag(file, &lm, Renderer::AsteroidLabels, "LabelMode", "asteroid", &errors);
-	getFlag(file, &lm, Renderer::SpacecraftLabels, "LabelMode", "spacecraft", &errors);
-	getFlag(file, &lm, Renderer::LocationLabels, "LabelMode", "location", &errors);
-	getFlag(file, &lm, Renderer::CometLabels, "LabelMode", "comet", &errors);
-	getFlag(file, &lm, Renderer::NebulaLabels, "LabelMode", "nebula", &errors);
-	getFlag(file, &lm, Renderer::OpenClusterLabels, "LabelMode", "opencluster", &errors);
-	getFlag(file, &lm, Renderer::I18nConstellationLabels, "LabelMode", "i18n", &errors);
-	getFlag(file, &lm, Renderer::GlobularLabels, "LabelMode", "globular", &errors);
-	
-	/* If any label is missing, use core defaults for all (do nothing). */
-	if (errors == 0)
-		app->renderer->setLabelMode(lm);
+    e = NULL;
+    distanceLimit = g_key_file_get_integer(file, "Main", "distanceLimit", &e);
+    if (e != NULL) distanceLimit = -1;
+
+    e = NULL;
+    verbosity = g_key_file_get_integer(file, "Main", "verbosity", &e);
+    if (e != NULL) verbosity = -1;
+
+    e = NULL;
+    starStyle = g_key_file_get_integer(file, "Main", "starStyle", &e);
+    if (e != NULL) starStyle = -1;
+
+    e = NULL;
+    textureResolution = g_key_file_get_integer(file, "Main", "textureResolution", &e);
+    if (e != NULL) textureResolution = -1;
+
+    e = NULL;
+    app->showLocalTime = g_key_file_get_boolean(file, "Main", "localTime", &e);
+    if (e != NULL) app->showLocalTime = FALSE;
+
+    e = NULL;
+    app->renderer->setVideoSync(g_key_file_get_integer(file, "Main", "starStyle", &e));
+    if (e != NULL) app->renderer->setVideoSync(TRUE);
+
+    /* All settings that need sanity checks get them */
+    setSaneAmbientLight(app, ambientLight);
+    setSaneVisualMagnitude(app, visualMagnitude);
+    setSaneGalaxyLightGain(galaxyLightGain);
+    setSaneDistanceLimit(app, distanceLimit);
+    setSaneVerbosity(app, verbosity);
+    setSaneStarStyle(app, (Renderer::StarStyle)starStyle);
+    setSaneTextureResolution(app, textureResolution);
+    setSaneAltSurface(app, g_key_file_get_string(file, "Main", "altSurfaceName", NULL));
+
+    /* Render Flags */
+    errors = 0;
+    rf = Renderer::ShowNothing;
+    getFlag(file, &rf, Renderer::ShowStars, "RenderFlags", "stars", &errors);
+    getFlag(file, &rf, Renderer::ShowPlanets, "RenderFlags", "planets", &errors);
+    getFlag(file, &rf, Renderer::ShowGalaxies, "RenderFlags", "galaxies", &errors);
+    getFlag(file, &rf, Renderer::ShowDiagrams, "RenderFlags", "diagrams", &errors);
+    getFlag(file, &rf, Renderer::ShowCloudMaps, "RenderFlags", "cloudMaps", &errors);
+    getFlag(file, &rf, Renderer::ShowOrbits, "RenderFlags", "orbits", &errors);
+    getFlag(file, &rf, Renderer::ShowCelestialSphere, "RenderFlags", "celestialSphere", &errors);
+    getFlag(file, &rf, Renderer::ShowNightMaps, "RenderFlags", "nightMaps", &errors);
+    getFlag(file, &rf, Renderer::ShowAtmospheres, "RenderFlags", "atmospheres", &errors);
+    getFlag(file, &rf, Renderer::ShowSmoothLines, "RenderFlags", "smoothLines", &errors);
+    getFlag(file, &rf, Renderer::ShowEclipseShadows, "RenderFlags", "eclipseShadows", &errors);
+    getFlag(file, &rf, Renderer::ShowRingShadows, "RenderFlags", "ringShadows", &errors);
+    getFlag(file, &rf, Renderer::ShowBoundaries, "RenderFlags", "boundaries", &errors);
+    getFlag(file, &rf, Renderer::ShowAutoMag, "RenderFlags", "autoMag", &errors);
+    getFlag(file, &rf, Renderer::ShowCometTails, "RenderFlags", "cometTails", &errors);
+    getFlag(file, &rf, Renderer::ShowMarkers, "RenderFlags", "markers", &errors);
+    getFlag(file, &rf, Renderer::ShowPartialTrajectories, "RenderFlags", "partialTrajectories", &errors);
+    getFlag(file, &rf, Renderer::ShowNebulae, "RenderFlags", "nebulae", &errors);
+    getFlag(file, &rf, Renderer::ShowOpenClusters, "RenderFlags", "openClusters", &errors);
+    getFlag(file, &rf, Renderer::ShowGlobulars, "RenderFlags", "globulars", &errors);
+    getFlag(file, &rf, Renderer::ShowGalacticGrid, "RenderFlags", "gridGalactic", &errors);
+    getFlag(file, &rf, Renderer::ShowEclipticGrid, "RenderFlags", "gridEcliptic", &errors);
+    getFlag(file, &rf, Renderer::ShowHorizonGrid, "RenderFlags", "gridHorizontal", &errors);
+
+    /* If any flag is missing, use defaults for all. */
+    if (errors > 0)
+        setDefaultRenderFlags(app);
+    else
+        app->renderer->setRenderFlags(rf);
+
+    /* Orbit Mask */
+    errors = 0;
+    om = 0;
+    getFlag(file, &om, Body::Planet, "OrbitMask", "planet", &errors);
+    getFlag(file, &om, Body::Moon, "OrbitMask", "moon", &errors);
+    getFlag(file, &om, Body::Asteroid, "OrbitMask", "asteroid", &errors);
+    getFlag(file, &om, Body::Comet, "OrbitMask", "comet", &errors);
+    getFlag(file, &om, Body::Spacecraft, "OrbitMask", "spacecraft", &errors);
+    getFlag(file, &om, Body::Invisible, "OrbitMask", "invisible", &errors);
+    getFlag(file, &om, Body::Unknown, "OrbitMask", "unknown", &errors);
+
+    /* If any orbit is missing, use core defaults for all (do nothing). */
+    if (errors == 0)
+        app->renderer->setOrbitMask(om);
+
+    /* Label Mode */
+    errors = 0;
+    lm = Renderer::NoLabels;
+
+    getFlag(file, &lm, Renderer::StarLabels, "LabelMode", "star", &errors);
+    getFlag(file, &lm, Renderer::PlanetLabels, "LabelMode", "planet", &errors);
+    getFlag(file, &lm, Renderer::MoonLabels, "LabelMode", "moon", &errors);
+    getFlag(file, &lm, Renderer::ConstellationLabels, "LabelMode", "constellation", &errors);
+    getFlag(file, &lm, Renderer::GalaxyLabels, "LabelMode", "galaxy", &errors);
+    getFlag(file, &lm, Renderer::AsteroidLabels, "LabelMode", "asteroid", &errors);
+    getFlag(file, &lm, Renderer::SpacecraftLabels, "LabelMode", "spacecraft", &errors);
+    getFlag(file, &lm, Renderer::LocationLabels, "LabelMode", "location", &errors);
+    getFlag(file, &lm, Renderer::CometLabels, "LabelMode", "comet", &errors);
+    getFlag(file, &lm, Renderer::NebulaLabels, "LabelMode", "nebula", &errors);
+    getFlag(file, &lm, Renderer::OpenClusterLabels, "LabelMode", "opencluster", &errors);
+    getFlag(file, &lm, Renderer::I18nConstellationLabels, "LabelMode", "i18n", &errors);
+    getFlag(file, &lm, Renderer::GlobularLabels, "LabelMode", "globular", &errors);
+
+    /* If any label is missing, use core defaults for all (do nothing). */
+    if (errors == 0)
+        app->renderer->setLabelMode(lm);
 }
 
 
 /* ENTRY: Saves settings to file */
 void saveSettingsFile(AppData* app)
 {
-	int rf, om, lm;
-	GKeyFile* file = app->settingsFile;
-	char* fn = g_build_filename(g_get_home_dir(), CELESTIARC, NULL);
-	FILE* outfile;
-	
-	g_key_file_set_integer(file, "Main", "ambientLight", (int)(1000 * app->renderer->getAmbientLightLevel()));
-	g_key_file_set_comment(file, "Main", "ambientLight", "ambientLight = (int)(1000 * AmbientLightLevel)", NULL);
-	g_key_file_set_integer(file, "Main", "visualMagnitude", (int)(1000 * app->simulation->getFaintestVisible()));
-	g_key_file_set_comment(file, "Main", "visualMagnitude", "visualMagnitude = (int)(1000 * FaintestVisible)", NULL);
-	g_key_file_set_integer(file, "Main", "galaxyLightGain", (int)(1000 * Galaxy::getLightGain()));
-	g_key_file_set_comment(file, "Main", "galaxyLightGain", "galaxyLightGain = (int)(1000 * GalaxyLightGain)", NULL);
-	g_key_file_set_integer(file, "Main", "distanceLimit", (int)app->renderer->getDistanceLimit());
-	g_key_file_set_comment(file, "Main", "distanceLimit", "Rendering limit in light-years", NULL);
-	g_key_file_set_boolean(file, "Main", "localTime", app->showLocalTime);
-	g_key_file_set_comment(file, "Main", "localTime", "Display time in terms of local time zone", NULL);
-	g_key_file_set_integer(file, "Main", "verbosity", app->core->getHudDetail());
-	g_key_file_set_comment(file, "Main", "verbosity", "Level of Detail in the heads-up-display. 0=None, 1=Terse, 2=Verbose", NULL);
-	g_key_file_set_integer(file, "Main", "starStyle", app->renderer->getStarStyle());
-	g_key_file_set_comment(file, "Main", "starStyle", "Style of star rendering. 0=Fuzzy Points, 1=Points, 2=Scaled Discs", NULL);
-	g_key_file_set_integer(file, "Main", "textureResolution", app->renderer->getResolution());
-	g_key_file_set_comment(file, "Main", "textureResolution", "Resolution of textures. 0=Low, 1=Medium, 2=High", NULL);
-	g_key_file_set_string(file, "Main", "altSurfaceName", app->simulation->getActiveObserver()->getDisplayedSurface().c_str());
-	g_key_file_set_boolean(file, "Main", "videoSync", app->renderer->getVideoSync());
-	g_key_file_set_comment(file, "Main", "videoSync", "Sync Framerate to Video Refresh", NULL);
-	
-	g_key_file_set_integer(file, "Window", "width", getWinWidth(app));
-	g_key_file_set_integer(file, "Window", "height", getWinHeight(app));
-	g_key_file_set_integer(file, "Window", "x", getWinX(app));
-	g_key_file_set_integer(file, "Window", "y", getWinY(app));
-	g_key_file_set_boolean(file, "Window", "fullScreen", app->fullScreen);
-	
-	rf = app->renderer->getRenderFlags();
-	g_key_file_set_boolean(file, "RenderFlags", "stars", rf & Renderer::ShowStars);
-	g_key_file_set_boolean(file, "RenderFlags", "planets", rf & Renderer::ShowPlanets);
-	g_key_file_set_boolean(file, "RenderFlags", "galaxies", rf & Renderer::ShowGalaxies);
-	g_key_file_set_boolean(file, "RenderFlags", "diagrams", rf & Renderer::ShowDiagrams);
-	g_key_file_set_boolean(file, "RenderFlags", "cloudMaps", rf & Renderer::ShowCloudMaps);
-	g_key_file_set_boolean(file, "RenderFlags", "orbits", rf & Renderer::ShowOrbits);
-	g_key_file_set_boolean(file, "RenderFlags", "celestialSphere", rf & Renderer::ShowCelestialSphere);
-	g_key_file_set_boolean(file, "RenderFlags", "nightMaps", rf & Renderer::ShowNightMaps);
-	g_key_file_set_boolean(file, "RenderFlags", "atmospheres", rf & Renderer::ShowAtmospheres);
-	g_key_file_set_boolean(file, "RenderFlags", "smoothLines", rf & Renderer::ShowSmoothLines);
-	g_key_file_set_boolean(file, "RenderFlags", "eclipseShadows", rf & Renderer::ShowEclipseShadows);
-	g_key_file_set_boolean(file, "RenderFlags", "ringShadows", rf & Renderer::ShowRingShadows);
-	g_key_file_set_boolean(file, "RenderFlags", "boundaries", rf & Renderer::ShowBoundaries);
-	g_key_file_set_boolean(file, "RenderFlags", "autoMag", rf & Renderer::ShowAutoMag);
-	g_key_file_set_boolean(file, "RenderFlags", "cometTails", rf & Renderer::ShowCometTails);
-	g_key_file_set_boolean(file, "RenderFlags", "markers", rf & Renderer::ShowMarkers);
-	g_key_file_set_boolean(file, "RenderFlags", "partialTrajectories", rf & Renderer::ShowPartialTrajectories);
-	g_key_file_set_boolean(file, "RenderFlags", "nebulae", rf & Renderer::ShowNebulae);
-	g_key_file_set_boolean(file, "RenderFlags", "openClusters", rf & Renderer::ShowOpenClusters);
-	g_key_file_set_boolean(file, "RenderFlags", "globulars", rf & Renderer::ShowGlobulars);
-	g_key_file_set_boolean(file, "RenderFlags", "gridGalactic", rf & Renderer::ShowGalacticGrid);
-	g_key_file_set_boolean(file, "RenderFlags", "gridEcliptic", rf & Renderer::ShowEclipticGrid);
-	g_key_file_set_boolean(file, "RenderFlags", "gridHorizontal", rf & Renderer::ShowHorizonGrid);
-	
-	om = app->renderer->getOrbitMask();
-	g_key_file_set_boolean(file, "OrbitMask", "planet", om & Body::Planet);
-	g_key_file_set_boolean(file, "OrbitMask", "moon", om & Body::Moon);
-	g_key_file_set_boolean(file, "OrbitMask", "asteroid", om & Body::Asteroid);
-	g_key_file_set_boolean(file, "OrbitMask", "comet", om & Body::Comet);
-	g_key_file_set_boolean(file, "OrbitMask", "spacecraft", om & Body::Spacecraft);
-	g_key_file_set_boolean(file, "OrbitMask", "invisible", om & Body::Invisible);
-	g_key_file_set_boolean(file, "OrbitMask", "unknown", om & Body::Unknown);
-	
-	lm = app->renderer->getLabelMode();
-	g_key_file_set_boolean(file, "LabelMode", "star", lm & Renderer::StarLabels);
-	g_key_file_set_boolean(file, "LabelMode", "planet", lm & Renderer::PlanetLabels);
-	g_key_file_set_boolean(file, "LabelMode", "moon", lm & Renderer::MoonLabels);
-	g_key_file_set_boolean(file, "LabelMode", "constellation", lm & Renderer::ConstellationLabels);
-	g_key_file_set_boolean(file, "LabelMode", "galaxy", lm & Renderer::GalaxyLabels);
-	g_key_file_set_boolean(file, "LabelMode", "asteroid", lm & Renderer::AsteroidLabels);
-	g_key_file_set_boolean(file, "LabelMode", "spacecraft", lm & Renderer::SpacecraftLabels);
-	g_key_file_set_boolean(file, "LabelMode", "location", lm & Renderer::LocationLabels);
-	g_key_file_set_boolean(file, "LabelMode", "comet", lm & Renderer::CometLabels);
-	g_key_file_set_boolean(file, "LabelMode", "nebula", lm & Renderer::NebulaLabels);
-	g_key_file_set_boolean(file, "LabelMode", "opencluster", lm & Renderer::OpenClusterLabels);
-	g_key_file_set_boolean(file, "LabelMode", "i18n", lm & Renderer::I18nConstellationLabels);
-	g_key_file_set_boolean(file, "LabelMode", "globular", lm & Renderer::GlobularLabels);
-	
-	g_key_file_set_comment(file, "RenderFlags", NULL, "All Render Flag values must be true or false", NULL);
-	g_key_file_set_comment(file, "OrbitMask", NULL, "All Orbit Mask values must be true or false", NULL);
-	g_key_file_set_comment(file, "LabelMode", NULL, "All Label Mode values must be true or false", NULL);
-	
-	/* Write the settings to a file */
-	outfile = fopen(fn, "w");
-	
-	if (outfile == NULL)
-		g_print("Error writing '%s'.\n", fn);
-	
-	fputs(g_key_file_to_data(file, NULL, NULL), outfile);
-	
-	g_free(fn);
+    int rf, om, lm;
+    GKeyFile* file = app->settingsFile;
+    char* fn = g_build_filename(g_get_home_dir(), CELESTIARC, NULL);
+    FILE* outfile;
+
+    g_key_file_set_integer(file, "Main", "ambientLight", (int)(1000 * app->renderer->getAmbientLightLevel()));
+    g_key_file_set_comment(file, "Main", "ambientLight", "ambientLight = (int)(1000 * AmbientLightLevel)", NULL);
+    g_key_file_set_integer(file, "Main", "visualMagnitude", (int)(1000 * app->simulation->getFaintestVisible()));
+    g_key_file_set_comment(file, "Main", "visualMagnitude", "visualMagnitude = (int)(1000 * FaintestVisible)", NULL);
+    g_key_file_set_integer(file, "Main", "galaxyLightGain", (int)(1000 * Galaxy::getLightGain()));
+    g_key_file_set_comment(file, "Main", "galaxyLightGain", "galaxyLightGain = (int)(1000 * GalaxyLightGain)", NULL);
+    g_key_file_set_integer(file, "Main", "distanceLimit", (int)app->renderer->getDistanceLimit());
+    g_key_file_set_comment(file, "Main", "distanceLimit", "Rendering limit in light-years", NULL);
+    g_key_file_set_boolean(file, "Main", "localTime", app->showLocalTime);
+    g_key_file_set_comment(file, "Main", "localTime", "Display time in terms of local time zone", NULL);
+    g_key_file_set_integer(file, "Main", "verbosity", app->core->getHudDetail());
+    g_key_file_set_comment(file, "Main", "verbosity", "Level of Detail in the heads-up-display. 0=None, 1=Terse, 2=Verbose", NULL);
+    g_key_file_set_integer(file, "Main", "starStyle", app->renderer->getStarStyle());
+    g_key_file_set_comment(file, "Main", "starStyle", "Style of star rendering. 0=Fuzzy Points, 1=Points, 2=Scaled Discs", NULL);
+    g_key_file_set_integer(file, "Main", "textureResolution", app->renderer->getResolution());
+    g_key_file_set_comment(file, "Main", "textureResolution", "Resolution of textures. 0=Low, 1=Medium, 2=High", NULL);
+    g_key_file_set_string(file, "Main", "altSurfaceName", app->simulation->getActiveObserver()->getDisplayedSurface().c_str());
+    g_key_file_set_boolean(file, "Main", "videoSync", app->renderer->getVideoSync());
+    g_key_file_set_comment(file, "Main", "videoSync", "Sync Framerate to Video Refresh", NULL);
+
+    g_key_file_set_integer(file, "Window", "width", getWinWidth(app));
+    g_key_file_set_integer(file, "Window", "height", getWinHeight(app));
+    g_key_file_set_integer(file, "Window", "x", getWinX(app));
+    g_key_file_set_integer(file, "Window", "y", getWinY(app));
+    g_key_file_set_boolean(file, "Window", "fullScreen", app->fullScreen);
+
+    rf = app->renderer->getRenderFlags();
+    g_key_file_set_boolean(file, "RenderFlags", "stars", rf & Renderer::ShowStars);
+    g_key_file_set_boolean(file, "RenderFlags", "planets", rf & Renderer::ShowPlanets);
+    g_key_file_set_boolean(file, "RenderFlags", "galaxies", rf & Renderer::ShowGalaxies);
+    g_key_file_set_boolean(file, "RenderFlags", "diagrams", rf & Renderer::ShowDiagrams);
+    g_key_file_set_boolean(file, "RenderFlags", "cloudMaps", rf & Renderer::ShowCloudMaps);
+    g_key_file_set_boolean(file, "RenderFlags", "orbits", rf & Renderer::ShowOrbits);
+    g_key_file_set_boolean(file, "RenderFlags", "celestialSphere", rf & Renderer::ShowCelestialSphere);
+    g_key_file_set_boolean(file, "RenderFlags", "nightMaps", rf & Renderer::ShowNightMaps);
+    g_key_file_set_boolean(file, "RenderFlags", "atmospheres", rf & Renderer::ShowAtmospheres);
+    g_key_file_set_boolean(file, "RenderFlags", "smoothLines", rf & Renderer::ShowSmoothLines);
+    g_key_file_set_boolean(file, "RenderFlags", "eclipseShadows", rf & Renderer::ShowEclipseShadows);
+    g_key_file_set_boolean(file, "RenderFlags", "ringShadows", rf & Renderer::ShowRingShadows);
+    g_key_file_set_boolean(file, "RenderFlags", "boundaries", rf & Renderer::ShowBoundaries);
+    g_key_file_set_boolean(file, "RenderFlags", "autoMag", rf & Renderer::ShowAutoMag);
+    g_key_file_set_boolean(file, "RenderFlags", "cometTails", rf & Renderer::ShowCometTails);
+    g_key_file_set_boolean(file, "RenderFlags", "markers", rf & Renderer::ShowMarkers);
+    g_key_file_set_boolean(file, "RenderFlags", "partialTrajectories", rf & Renderer::ShowPartialTrajectories);
+    g_key_file_set_boolean(file, "RenderFlags", "nebulae", rf & Renderer::ShowNebulae);
+    g_key_file_set_boolean(file, "RenderFlags", "openClusters", rf & Renderer::ShowOpenClusters);
+    g_key_file_set_boolean(file, "RenderFlags", "globulars", rf & Renderer::ShowGlobulars);
+    g_key_file_set_boolean(file, "RenderFlags", "gridGalactic", rf & Renderer::ShowGalacticGrid);
+    g_key_file_set_boolean(file, "RenderFlags", "gridEcliptic", rf & Renderer::ShowEclipticGrid);
+    g_key_file_set_boolean(file, "RenderFlags", "gridHorizontal", rf & Renderer::ShowHorizonGrid);
+
+    om = app->renderer->getOrbitMask();
+    g_key_file_set_boolean(file, "OrbitMask", "planet", om & Body::Planet);
+    g_key_file_set_boolean(file, "OrbitMask", "moon", om & Body::Moon);
+    g_key_file_set_boolean(file, "OrbitMask", "asteroid", om & Body::Asteroid);
+    g_key_file_set_boolean(file, "OrbitMask", "comet", om & Body::Comet);
+    g_key_file_set_boolean(file, "OrbitMask", "spacecraft", om & Body::Spacecraft);
+    g_key_file_set_boolean(file, "OrbitMask", "invisible", om & Body::Invisible);
+    g_key_file_set_boolean(file, "OrbitMask", "unknown", om & Body::Unknown);
+
+    lm = app->renderer->getLabelMode();
+    g_key_file_set_boolean(file, "LabelMode", "star", lm & Renderer::StarLabels);
+    g_key_file_set_boolean(file, "LabelMode", "planet", lm & Renderer::PlanetLabels);
+    g_key_file_set_boolean(file, "LabelMode", "moon", lm & Renderer::MoonLabels);
+    g_key_file_set_boolean(file, "LabelMode", "constellation", lm & Renderer::ConstellationLabels);
+    g_key_file_set_boolean(file, "LabelMode", "galaxy", lm & Renderer::GalaxyLabels);
+    g_key_file_set_boolean(file, "LabelMode", "asteroid", lm & Renderer::AsteroidLabels);
+    g_key_file_set_boolean(file, "LabelMode", "spacecraft", lm & Renderer::SpacecraftLabels);
+    g_key_file_set_boolean(file, "LabelMode", "location", lm & Renderer::LocationLabels);
+    g_key_file_set_boolean(file, "LabelMode", "comet", lm & Renderer::CometLabels);
+    g_key_file_set_boolean(file, "LabelMode", "nebula", lm & Renderer::NebulaLabels);
+    g_key_file_set_boolean(file, "LabelMode", "opencluster", lm & Renderer::OpenClusterLabels);
+    g_key_file_set_boolean(file, "LabelMode", "i18n", lm & Renderer::I18nConstellationLabels);
+    g_key_file_set_boolean(file, "LabelMode", "globular", lm & Renderer::GlobularLabels);
+
+    g_key_file_set_comment(file, "RenderFlags", NULL, "All Render Flag values must be true or false", NULL);
+    g_key_file_set_comment(file, "OrbitMask", NULL, "All Orbit Mask values must be true or false", NULL);
+    g_key_file_set_comment(file, "LabelMode", NULL, "All Label Mode values must be true or false", NULL);
+
+    /* Write the settings to a file */
+    outfile = fopen(fn, "w");
+
+    if (outfile == NULL)
+        g_print("Error writing '%s'.\n", fn);
+
+    fputs(g_key_file_to_data(file, NULL, NULL), outfile);
+
+    g_free(fn);
 }
 
 
 /* HELPER: gets an or-group flag and handles error checking */
 static void getFlag(GKeyFile* file, int *flags, int setting, const gchar* section, const gchar* key, int* errors)
 {
-	GError* e = NULL;
-	
-	*flags |= setting * g_key_file_get_boolean(file, section, key, &e);
-	
-	if (e != NULL)
-		*errors += 1;
+    GError* e = NULL;
+
+    *flags |= setting * g_key_file_get_boolean(file, section, key, &e);
+
+    if (e != NULL)
+        *errors += 1;
 }
diff --git a/src/celestia/gtk/settings-gconf.cpp b/src/celestia/gtk/settings-gconf.cpp
index c70c4cae4..39b43e574 100644
--- a/src/celestia/gtk/settings-gconf.cpp
+++ b/src/celestia/gtk/settings-gconf.cpp
@@ -51,477 +51,477 @@ static void gcSetFlag(int type, const char* name, gboolean value, GConfClient* c
 /* ENTRY: Initializes the GConf connection */
 void initSettingsGConf(AppData* app)
 {
-	app->client = gconf_client_get_default();
-	gconf_client_add_dir(app->client, "/apps/celestia", GCONF_CLIENT_PRELOAD_RECURSIVE, NULL);
+    app->client = gconf_client_get_default();
+    gconf_client_add_dir(app->client, "/apps/celestia", GCONF_CLIENT_PRELOAD_RECURSIVE, NULL);
 }
 
 
 /* ENTRY: Connects GConf keys to their callbacks */
 void initSettingsGConfNotifiers(AppData* app)
 {
-	/* Add preference client notifiers. */
-	gconf_client_notify_add (app->client, "/apps/celestia/labels", (GConfClientNotifyFunc)confLabels, app, NULL, NULL);
-	gconf_client_notify_add (app->client, "/apps/celestia/render", (GConfClientNotifyFunc)confRender, app, NULL, NULL);
-	gconf_client_notify_add (app->client, "/apps/celestia/orbits", (GConfClientNotifyFunc)confOrbits, app, NULL, NULL);
-	gconf_client_notify_add (app->client, "/apps/celestia/winWidth", (GConfClientNotifyFunc)confWinWidth, app, NULL, NULL);
-	gconf_client_notify_add (app->client, "/apps/celestia/winHeight", (GConfClientNotifyFunc)confWinHeight, app, NULL, NULL);
-	gconf_client_notify_add (app->client, "/apps/celestia/winX", (GConfClientNotifyFunc)confWinX, app, NULL, NULL);
-	gconf_client_notify_add (app->client, "/apps/celestia/winY", (GConfClientNotifyFunc)confWinY, app, NULL, NULL);
-	gconf_client_notify_add (app->client, "/apps/celestia/ambientLight", (GConfClientNotifyFunc)confAmbientLight, app, NULL, NULL);
-	gconf_client_notify_add (app->client, "/apps/celestia/visualMagnitude", (GConfClientNotifyFunc)confVisualMagnitude, app, NULL, NULL);
-	gconf_client_notify_add (app->client, "/apps/celestia/galaxyLightGain", (GConfClientNotifyFunc)confGalaxyLightGain, app, NULL, NULL);
-	gconf_client_notify_add (app->client, "/apps/celestia/distanceLimit", (GConfClientNotifyFunc)confDistanceLimit, app, NULL, NULL);
-	gconf_client_notify_add (app->client, "/apps/celestia/showLocalTime", (GConfClientNotifyFunc)confShowLocalTime, app, NULL, NULL);
-	gconf_client_notify_add (app->client, "/apps/celestia/verbosity", (GConfClientNotifyFunc)confVerbosity, app, NULL, NULL);
-	gconf_client_notify_add (app->client, "/apps/celestia/fullScreen", (GConfClientNotifyFunc)confFullScreen, app, NULL, NULL);
-	gconf_client_notify_add (app->client, "/apps/celestia/starStyle", (GConfClientNotifyFunc)confStarStyle, app, NULL, NULL);
-	gconf_client_notify_add (app->client, "/apps/celestia/textureResolution", (GConfClientNotifyFunc)confTextureResolution, app, NULL, NULL);
-	gconf_client_notify_add (app->client, "/apps/celestia/altSurfaceName", (GConfClientNotifyFunc)confAltSurfaceName, app, NULL, NULL);
-	gconf_client_notify_add (app->client, "/apps/celestia/videoSync", (GConfClientNotifyFunc)confVideoSync, app, NULL, NULL);
+    /* Add preference client notifiers. */
+    gconf_client_notify_add (app->client, "/apps/celestia/labels", (GConfClientNotifyFunc)confLabels, app, NULL, NULL);
+    gconf_client_notify_add (app->client, "/apps/celestia/render", (GConfClientNotifyFunc)confRender, app, NULL, NULL);
+    gconf_client_notify_add (app->client, "/apps/celestia/orbits", (GConfClientNotifyFunc)confOrbits, app, NULL, NULL);
+    gconf_client_notify_add (app->client, "/apps/celestia/winWidth", (GConfClientNotifyFunc)confWinWidth, app, NULL, NULL);
+    gconf_client_notify_add (app->client, "/apps/celestia/winHeight", (GConfClientNotifyFunc)confWinHeight, app, NULL, NULL);
+    gconf_client_notify_add (app->client, "/apps/celestia/winX", (GConfClientNotifyFunc)confWinX, app, NULL, NULL);
+    gconf_client_notify_add (app->client, "/apps/celestia/winY", (GConfClientNotifyFunc)confWinY, app, NULL, NULL);
+    gconf_client_notify_add (app->client, "/apps/celestia/ambientLight", (GConfClientNotifyFunc)confAmbientLight, app, NULL, NULL);
+    gconf_client_notify_add (app->client, "/apps/celestia/visualMagnitude", (GConfClientNotifyFunc)confVisualMagnitude, app, NULL, NULL);
+    gconf_client_notify_add (app->client, "/apps/celestia/galaxyLightGain", (GConfClientNotifyFunc)confGalaxyLightGain, app, NULL, NULL);
+    gconf_client_notify_add (app->client, "/apps/celestia/distanceLimit", (GConfClientNotifyFunc)confDistanceLimit, app, NULL, NULL);
+    gconf_client_notify_add (app->client, "/apps/celestia/showLocalTime", (GConfClientNotifyFunc)confShowLocalTime, app, NULL, NULL);
+    gconf_client_notify_add (app->client, "/apps/celestia/verbosity", (GConfClientNotifyFunc)confVerbosity, app, NULL, NULL);
+    gconf_client_notify_add (app->client, "/apps/celestia/fullScreen", (GConfClientNotifyFunc)confFullScreen, app, NULL, NULL);
+    gconf_client_notify_add (app->client, "/apps/celestia/starStyle", (GConfClientNotifyFunc)confStarStyle, app, NULL, NULL);
+    gconf_client_notify_add (app->client, "/apps/celestia/textureResolution", (GConfClientNotifyFunc)confTextureResolution, app, NULL, NULL);
+    gconf_client_notify_add (app->client, "/apps/celestia/altSurfaceName", (GConfClientNotifyFunc)confAltSurfaceName, app, NULL, NULL);
+    gconf_client_notify_add (app->client, "/apps/celestia/videoSync", (GConfClientNotifyFunc)confVideoSync, app, NULL, NULL);
 }
 
 
 /* ENTRY: Reads preferences required before initializing simulation */
 void applySettingsGConfPre(AppData* app, GConfClient* client)
 {
-	int sizeX, sizeY, positionX, positionY;
-	
-	/* Error checking occurs as values are used */
-	sizeX = gconf_client_get_int(client, "/apps/celestia/winWidth", NULL);
-	sizeY = gconf_client_get_int(client, "/apps/celestia/winHeight", NULL);
-	positionX = gconf_client_get_int(client, "/apps/celestia/winX", NULL);
-	positionY = gconf_client_get_int(client, "/apps/celestia/winY", NULL);
-	app->fullScreen = gconf_client_get_bool(client, "/apps/celestia/fullScreen", NULL);
-	
-	setSaneWinSize(app, sizeX, sizeY);
-	setSaneWinPosition(app, positionX, positionY);
+    int sizeX, sizeY, positionX, positionY;
+
+    /* Error checking occurs as values are used */
+    sizeX = gconf_client_get_int(client, "/apps/celestia/winWidth", NULL);
+    sizeY = gconf_client_get_int(client, "/apps/celestia/winHeight", NULL);
+    positionX = gconf_client_get_int(client, "/apps/celestia/winX", NULL);
+    positionY = gconf_client_get_int(client, "/apps/celestia/winY", NULL);
+    app->fullScreen = gconf_client_get_bool(client, "/apps/celestia/fullScreen", NULL);
+
+    setSaneWinSize(app, sizeX, sizeY);
+    setSaneWinPosition(app, positionX, positionY);
 }
 
 
 /* ENTRY: Reads and applies basic preferences */
 void applySettingsGConfMain(AppData* app, GConfClient* client)
 {
-	int rf, om, lm;
-	
-	/* All settings that need sanity checks get them */
-	setSaneAmbientLight(app, gconf_client_get_float(client, "/apps/celestia/ambientLight", NULL));
-	setSaneVisualMagnitude(app, gconf_client_get_float(client, "/apps/celestia/visualMagnitude", NULL));
-	setSaneGalaxyLightGain(gconf_client_get_float(client, "/apps/celestia/galaxyLightGain", NULL));
-	setSaneDistanceLimit(app, gconf_client_get_int(client, "/apps/celestia/distanceLimit", NULL));
-	setSaneVerbosity(app, gconf_client_get_int(client, "/apps/celestia/verbosity", NULL));
-	setSaneStarStyle(app, (Renderer::StarStyle)gconf_client_get_int(client, "/apps/celestia/starStyle", NULL));
-	setSaneTextureResolution(app, gconf_client_get_int(client, "/apps/celestia/textureResolution", NULL));
-	setSaneAltSurface(app, gconf_client_get_string(client, "/apps/celestia/altSurfaceName", NULL));
-	
-	app->showLocalTime = gconf_client_get_bool(client, "/apps/celestia/showLocalTime", NULL);
+    int rf, om, lm;
 
-	app->renderer->setVideoSync(gconf_client_get_bool(client, "/apps/celestia/videoSync", NULL));
-	
-	/* Render Flags */
-	rf = readGConfRender(app->client);
-	app->renderer->setRenderFlags(rf);
+    /* All settings that need sanity checks get them */
+    setSaneAmbientLight(app, gconf_client_get_float(client, "/apps/celestia/ambientLight", NULL));
+    setSaneVisualMagnitude(app, gconf_client_get_float(client, "/apps/celestia/visualMagnitude", NULL));
+    setSaneGalaxyLightGain(gconf_client_get_float(client, "/apps/celestia/galaxyLightGain", NULL));
+    setSaneDistanceLimit(app, gconf_client_get_int(client, "/apps/celestia/distanceLimit", NULL));
+    setSaneVerbosity(app, gconf_client_get_int(client, "/apps/celestia/verbosity", NULL));
+    setSaneStarStyle(app, (Renderer::StarStyle)gconf_client_get_int(client, "/apps/celestia/starStyle", NULL));
+    setSaneTextureResolution(app, gconf_client_get_int(client, "/apps/celestia/textureResolution", NULL));
+    setSaneAltSurface(app, gconf_client_get_string(client, "/apps/celestia/altSurfaceName", NULL));
 
-	/* Orbit Mode */
-	om = readGConfOrbits(app->client);
-	app->renderer->setOrbitMask(om);
-	
-	/* Label Mode */
-	lm = readGConfLabels(app->client);
-	app->renderer->setLabelMode(lm);
+    app->showLocalTime = gconf_client_get_bool(client, "/apps/celestia/showLocalTime", NULL);
+
+    app->renderer->setVideoSync(gconf_client_get_bool(client, "/apps/celestia/videoSync", NULL));
+
+    /* Render Flags */
+    rf = readGConfRender(app->client);
+    app->renderer->setRenderFlags(rf);
+
+    /* Orbit Mode */
+    om = readGConfOrbits(app->client);
+    app->renderer->setOrbitMask(om);
+
+    /* Label Mode */
+    lm = readGConfLabels(app->client);
+    app->renderer->setLabelMode(lm);
 }
 
 
 /* ENTRY: Saves the final settings that are not updated on-the-fly */
 void saveSettingsGConf(AppData* app)
 {
-	/* Save window position */
-	gconf_client_set_int(app->client, "/apps/celestia/winX", getWinX(app), NULL);
-	gconf_client_set_int(app->client, "/apps/celestia/winY", getWinY(app), NULL);
-	
-	/* Save window size */
-	gconf_client_set_int(app->client, "/apps/celestia/winWidth", getWinWidth(app), NULL);
-	gconf_client_set_int(app->client, "/apps/celestia/winHeight", getWinHeight(app), NULL);
+    /* Save window position */
+    gconf_client_set_int(app->client, "/apps/celestia/winX", getWinX(app), NULL);
+    gconf_client_set_int(app->client, "/apps/celestia/winY", getWinY(app), NULL);
 
-	/* These do not produce notification when changed */
-	gconf_client_set_int(app->client, "/apps/celestia/textureResolution", app->renderer->getResolution(), NULL);
-	gconf_client_set_int(app->client, "/apps/celestia/distanceLimit", (int)app->renderer->getDistanceLimit(), NULL);
-	
-	g_object_unref (G_OBJECT (app->client));
+    /* Save window size */
+    gconf_client_set_int(app->client, "/apps/celestia/winWidth", getWinWidth(app), NULL);
+    gconf_client_set_int(app->client, "/apps/celestia/winHeight", getWinHeight(app), NULL);
+
+    /* These do not produce notification when changed */
+    gconf_client_set_int(app->client, "/apps/celestia/textureResolution", app->renderer->getResolution(), NULL);
+    gconf_client_set_int(app->client, "/apps/celestia/distanceLimit", (int)app->renderer->getDistanceLimit(), NULL);
+
+    g_object_unref (G_OBJECT (app->client));
 }
 
 
 /* UTILITY: Converts a binary render flag to individual keys */
 void gcSetRenderFlag(int flag, gboolean state, GConfClient* client)
 {
-	switch (flag)
-	{
-		case Renderer::ShowStars: gcSetFlag(Render, "stars", state, client); break;
-		case Renderer::ShowPlanets: gcSetFlag(Render, "planets", state, client); break;
-		case Renderer::ShowGalaxies: gcSetFlag(Render, "galaxies", state, client); break;
-		case Renderer::ShowDiagrams: gcSetFlag(Render, "diagrams", state, client); break;
-		case Renderer::ShowCloudMaps: gcSetFlag(Render, "cloudMaps", state, client); break;
-		case Renderer::ShowOrbits: gcSetFlag(Render, "orbits", state, client); break;
-		case Renderer::ShowCelestialSphere: gcSetFlag(Render, "celestialSphere", state, client); break;
-		case Renderer::ShowNightMaps: gcSetFlag(Render, "nightMaps", state, client); break;
-		case Renderer::ShowAtmospheres: gcSetFlag(Render, "atmospheres", state, client); break;
-		case Renderer::ShowSmoothLines: gcSetFlag(Render, "smoothLines", state, client); break;
-		case Renderer::ShowEclipseShadows: gcSetFlag(Render, "eclipseShadows", state, client); break;
-		case Renderer::ShowRingShadows: gcSetFlag(Render, "ringShadows", state, client); break;
-		case Renderer::ShowBoundaries: gcSetFlag(Render, "boundaries", state, client); break;
-		case Renderer::ShowAutoMag: gcSetFlag(Render, "autoMag", state, client); break;
-		case Renderer::ShowCometTails: gcSetFlag(Render, "cometTails", state, client); break;
-		case Renderer::ShowMarkers: gcSetFlag(Render, "markers", state, client); break;
-		case Renderer::ShowPartialTrajectories: gcSetFlag(Render, "partialTrajectories", state, client); break;
-		case Renderer::ShowNebulae: gcSetFlag(Render, "nebulae", state, client); break;
-		case Renderer::ShowOpenClusters: gcSetFlag(Render, "openClusters", state, client); break;
-		case Renderer::ShowGlobulars: gcSetFlag(Render, "globulars", state, client); break;
-		case Renderer::ShowGalacticGrid: gcSetFlag(Render, "gridGalactic", state, client); break;
-		case Renderer::ShowEclipticGrid: gcSetFlag(Render, "gridEcliptic", state, client); break;
-		case Renderer::ShowHorizonGrid: gcSetFlag(Render, "gridHorizontal", state, client); break;
-	}
+    switch (flag)
+    {
+        case Renderer::ShowStars: gcSetFlag(Render, "stars", state, client); break;
+        case Renderer::ShowPlanets: gcSetFlag(Render, "planets", state, client); break;
+        case Renderer::ShowGalaxies: gcSetFlag(Render, "galaxies", state, client); break;
+        case Renderer::ShowDiagrams: gcSetFlag(Render, "diagrams", state, client); break;
+        case Renderer::ShowCloudMaps: gcSetFlag(Render, "cloudMaps", state, client); break;
+        case Renderer::ShowOrbits: gcSetFlag(Render, "orbits", state, client); break;
+        case Renderer::ShowCelestialSphere: gcSetFlag(Render, "celestialSphere", state, client); break;
+        case Renderer::ShowNightMaps: gcSetFlag(Render, "nightMaps", state, client); break;
+        case Renderer::ShowAtmospheres: gcSetFlag(Render, "atmospheres", state, client); break;
+        case Renderer::ShowSmoothLines: gcSetFlag(Render, "smoothLines", state, client); break;
+        case Renderer::ShowEclipseShadows: gcSetFlag(Render, "eclipseShadows", state, client); break;
+        case Renderer::ShowRingShadows: gcSetFlag(Render, "ringShadows", state, client); break;
+        case Renderer::ShowBoundaries: gcSetFlag(Render, "boundaries", state, client); break;
+        case Renderer::ShowAutoMag: gcSetFlag(Render, "autoMag", state, client); break;
+        case Renderer::ShowCometTails: gcSetFlag(Render, "cometTails", state, client); break;
+        case Renderer::ShowMarkers: gcSetFlag(Render, "markers", state, client); break;
+        case Renderer::ShowPartialTrajectories: gcSetFlag(Render, "partialTrajectories", state, client); break;
+        case Renderer::ShowNebulae: gcSetFlag(Render, "nebulae", state, client); break;
+        case Renderer::ShowOpenClusters: gcSetFlag(Render, "openClusters", state, client); break;
+        case Renderer::ShowGlobulars: gcSetFlag(Render, "globulars", state, client); break;
+        case Renderer::ShowGalacticGrid: gcSetFlag(Render, "gridGalactic", state, client); break;
+        case Renderer::ShowEclipticGrid: gcSetFlag(Render, "gridEcliptic", state, client); break;
+        case Renderer::ShowHorizonGrid: gcSetFlag(Render, "gridHorizontal", state, client); break;
+    }
 }
 
 
 /* UTILITY: Converts a binary orbit mask to individual keys */
 void gcSetOrbitMask(int flag, gboolean state, GConfClient* client)
 {
-	switch (flag)
-	{
-		case Body::Planet: gcSetFlag(Orbit, "planet", state, client); break;
-		case Body::Moon: gcSetFlag(Orbit, "moon", state, client); break;
-		case Body::Asteroid: gcSetFlag(Orbit, "asteroid", state, client); break;
-		case Body::Spacecraft: gcSetFlag(Orbit, "spacecraft", state, client); break;
-		case Body::Comet: gcSetFlag(Orbit, "comet", state, client); break;
-		case Body::Invisible: gcSetFlag(Orbit, "invisible", state, client); break;
-		case Body::Unknown: gcSetFlag(Orbit, "unknown", state, client); break;
-	}
+    switch (flag)
+    {
+        case Body::Planet: gcSetFlag(Orbit, "planet", state, client); break;
+        case Body::Moon: gcSetFlag(Orbit, "moon", state, client); break;
+        case Body::Asteroid: gcSetFlag(Orbit, "asteroid", state, client); break;
+        case Body::Spacecraft: gcSetFlag(Orbit, "spacecraft", state, client); break;
+        case Body::Comet: gcSetFlag(Orbit, "comet", state, client); break;
+        case Body::Invisible: gcSetFlag(Orbit, "invisible", state, client); break;
+        case Body::Unknown: gcSetFlag(Orbit, "unknown", state, client); break;
+    }
 }
 
 
 /* UTILITY: Converts a binary label mode to individual keys */
 void gcSetLabelMode(int flag, gboolean state, GConfClient* client)
 {
-	switch (flag)
-	{
-		case Renderer::StarLabels: gcSetFlag(Label, "star", state, client); break;
-		case Renderer::PlanetLabels: gcSetFlag(Label, "planet", state, client); break;
-		case Renderer::MoonLabels: gcSetFlag(Label, "moon", state, client); break;
-		case Renderer::ConstellationLabels: gcSetFlag(Label, "constellation", state, client); break;
-		case Renderer::GalaxyLabels: gcSetFlag(Label, "galaxy", state, client); break;
-		case Renderer::AsteroidLabels: gcSetFlag(Label, "asteroid", state, client); break;
-		case Renderer::SpacecraftLabels: gcSetFlag(Label, "spacecraft", state, client); break;
-		case Renderer::LocationLabels: gcSetFlag(Label, "location", state, client); break;
-		case Renderer::CometLabels: gcSetFlag(Label, "comet", state, client); break;
-		case Renderer::NebulaLabels: gcSetFlag(Label, "nebula", state, client); break;
-		case Renderer::OpenClusterLabels: gcSetFlag(Label, "openCluster", state, client); break;
-		case Renderer::I18nConstellationLabels: gcSetFlag(Label, "i18n", state, client); break;
-		case Renderer::GlobularLabels: gcSetFlag(Label, "globular", state, client); break;
-	}
+    switch (flag)
+    {
+        case Renderer::StarLabels: gcSetFlag(Label, "star", state, client); break;
+        case Renderer::PlanetLabels: gcSetFlag(Label, "planet", state, client); break;
+        case Renderer::MoonLabels: gcSetFlag(Label, "moon", state, client); break;
+        case Renderer::ConstellationLabels: gcSetFlag(Label, "constellation", state, client); break;
+        case Renderer::GalaxyLabels: gcSetFlag(Label, "galaxy", state, client); break;
+        case Renderer::AsteroidLabels: gcSetFlag(Label, "asteroid", state, client); break;
+        case Renderer::SpacecraftLabels: gcSetFlag(Label, "spacecraft", state, client); break;
+        case Renderer::LocationLabels: gcSetFlag(Label, "location", state, client); break;
+        case Renderer::CometLabels: gcSetFlag(Label, "comet", state, client); break;
+        case Renderer::NebulaLabels: gcSetFlag(Label, "nebula", state, client); break;
+        case Renderer::OpenClusterLabels: gcSetFlag(Label, "openCluster", state, client); break;
+        case Renderer::I18nConstellationLabels: gcSetFlag(Label, "i18n", state, client); break;
+        case Renderer::GlobularLabels: gcSetFlag(Label, "globular", state, client); break;
+    }
 }
 
 
 /* GCONF CALLBACK: Reloads labels upon change */
 static void confLabels(GConfClient*, guint, GConfEntry*, AppData* app)
 {
-	int oldLabels = app->renderer->getLabelMode();
-	
-	/* Reload all the labels */
-	int newLabels = readGConfLabels(app->client);
+    int oldLabels = app->renderer->getLabelMode();
 
-	/* Set label flags */
-	if (newLabels != oldLabels)
-		app->renderer->setLabelMode(newLabels);
+    /* Reload all the labels */
+    int newLabels = readGConfLabels(app->client);
+
+    /* Set label flags */
+    if (newLabels != oldLabels)
+        app->renderer->setLabelMode(newLabels);
 }
 
 
 /* GCONF CALLBACK: Reloads render flags upon change */
 static void confRender(GConfClient*, guint, GConfEntry*, AppData* app)
 {
-	int oldRender = app->renderer->getRenderFlags();
-	
-	/* Reload all the render flags */
-	int newRender = readGConfRender(app->client);
+    int oldRender = app->renderer->getRenderFlags();
 
-	/* Set render flags */
-	if (newRender != oldRender)
-		app->renderer->setRenderFlags(newRender);
+    /* Reload all the render flags */
+    int newRender = readGConfRender(app->client);
+
+    /* Set render flags */
+    if (newRender != oldRender)
+        app->renderer->setRenderFlags(newRender);
 }
 
 
 /* GCONF CALLBACK: Reloads orbits upon change */
 static void confOrbits(GConfClient*, guint, GConfEntry*, AppData* app)
 {
-	int oldOrbit = app->renderer->getOrbitMask();
-	
-	/* Reload all the orbits */
-	int newOrbit = readGConfOrbits(app->client);
+    int oldOrbit = app->renderer->getOrbitMask();
 
-	/* Set orbit flags */
-	if (newOrbit != oldOrbit)
-		app->renderer->setOrbitMask(newOrbit);
+    /* Reload all the orbits */
+    int newOrbit = readGConfOrbits(app->client);
+
+    /* Set orbit flags */
+    if (newOrbit != oldOrbit)
+        app->renderer->setOrbitMask(newOrbit);
 }
 
 
 /* GCONF CALLBACK: Sets window width upon change */
 static void confWinWidth(GConfClient*, guint, GConfEntry* e, AppData* app)
 {
-	int w = gconf_value_get_int(e->value);
+    int w = gconf_value_get_int(e->value);
 
-	if (w != getWinWidth(app))
-		setSaneWinSize(app, w, getWinHeight(app));
+    if (w != getWinWidth(app))
+        setSaneWinSize(app, w, getWinHeight(app));
 }
 
 
 /* GCONF CALLBACK: Sets window height upon change */
 static void confWinHeight(GConfClient*, guint, GConfEntry* e, AppData* app)
 {
-	int h = gconf_value_get_int(e->value);
+    int h = gconf_value_get_int(e->value);
 
-	if (h != getWinHeight(app))
-		setSaneWinSize(app, getWinWidth(app), h);
+    if (h != getWinHeight(app))
+        setSaneWinSize(app, getWinWidth(app), h);
 }
 
 
 /* GCONF CALLBACK: Sets window X position upon change */
 static void confWinX(GConfClient*, guint, GConfEntry* e, AppData* app)
 {
-	int x = gconf_value_get_int(e->value);
+    int x = gconf_value_get_int(e->value);
 
-	if (x != getWinX(app))
-		setSaneWinPosition(app, x, getWinY(app));
+    if (x != getWinX(app))
+        setSaneWinPosition(app, x, getWinY(app));
 }
 
 
 /* GCONF CALLBACK: Sets window Y position upon change */
 static void confWinY(GConfClient*, guint, GConfEntry* e, AppData* app)
 {
-	int y = gconf_value_get_int(e->value);
+    int y = gconf_value_get_int(e->value);
 
-	if (y != getWinY(app))
-		setSaneWinPosition(app, getWinX(app), y);
+    if (y != getWinY(app))
+        setSaneWinPosition(app, getWinX(app), y);
 }
 
 
 /* GCONF CALLBACK: Reloads ambient light setting upon change */
 static void confAmbientLight(GConfClient*, guint, GConfEntry* e, AppData* app)
 {
-	float value = gconf_value_get_float(e->value);
-	
-	/* Comparing floats is tricky. Three decimal places is "close enough." */
-	if (abs(value - app->renderer->getAmbientLightLevel()) < 0.001)
-		return;
-	
-	setSaneAmbientLight(app, value);
+    float value = gconf_value_get_float(e->value);
+
+    /* Comparing floats is tricky. Three decimal places is "close enough." */
+    if (abs(value - app->renderer->getAmbientLightLevel()) < 0.001)
+        return;
+
+    setSaneAmbientLight(app, value);
 }
 
 
 /* GCONF CALLBACK: Reloads visual magnitude setting upon change */
 static void confVisualMagnitude(GConfClient*, guint, GConfEntry* e, AppData* app)
 {
-	float value = gconf_value_get_float(e->value);
-	
-	if (abs(value - app->simulation->getFaintestVisible()) < 0.001)
-		return;
-	
-	setSaneVisualMagnitude(app, value);
+    float value = gconf_value_get_float(e->value);
+
+    if (abs(value - app->simulation->getFaintestVisible()) < 0.001)
+        return;
+
+    setSaneVisualMagnitude(app, value);
 }
 
 
 /* GCONF CALLBACK: Reloads galaxy light gain setting upon change */
 static void confGalaxyLightGain(GConfClient*, guint, GConfEntry* e, AppData*)
 {
-	float value = gconf_value_get_float(e->value);
-	
-	if (abs(value - Galaxy::getLightGain()) < 0.001)
-		return;
-	
-	setSaneGalaxyLightGain(value);
+    float value = gconf_value_get_float(e->value);
+
+    if (abs(value - Galaxy::getLightGain()) < 0.001)
+        return;
+
+    setSaneGalaxyLightGain(value);
 }
 
 
 /* GCONF CALLBACK: Sets texture resolution when changed */
 static void confDistanceLimit(GConfClient*, guint, GConfEntry* e, AppData* app)
 {
-	int value = gconf_value_get_int(e->value);
-	
-	if (value == app->renderer->getDistanceLimit())
-		return;
-	
-	setSaneDistanceLimit(app, value);
+    int value = gconf_value_get_int(e->value);
+
+    if (value == app->renderer->getDistanceLimit())
+        return;
+
+    setSaneDistanceLimit(app, value);
 }
 
 
 /* GCONF CALLBACK: Sets "show local time" setting upon change */
 static void confShowLocalTime(GConfClient*, guint, GConfEntry* e, AppData* app)
 {
-	gboolean value = gconf_value_get_bool(e->value);
-	
-	if (value == app->showLocalTime)
-		return;
+    gboolean value = gconf_value_get_bool(e->value);
 
-	app->showLocalTime = value;
-	updateTimeZone(app, app->showLocalTime);
+    if (value == app->showLocalTime)
+        return;
+
+    app->showLocalTime = value;
+    updateTimeZone(app, app->showLocalTime);
 }
 
 
 /* GCONF CALLBACK: Sets HUD detail when changed */
 static void confVerbosity(GConfClient*, guint, GConfEntry* e, AppData* app)
 {
-	int value = gconf_value_get_int(e->value);
-	
-	if (value == app->core->getHudDetail())
-		return;
-	
-	setSaneVerbosity(app, value);
+    int value = gconf_value_get_int(e->value);
+
+    if (value == app->core->getHudDetail())
+        return;
+
+    setSaneVerbosity(app, value);
 }
 
 
 /* GCONF CALLBACK: Sets window to fullscreen when change occurs */
 static void confFullScreen(GConfClient*, guint, GConfEntry* e, AppData* app)
 {
-	gboolean value = gconf_value_get_bool(e->value);
-	
-	/* There is no way to determine if the window is actually full screen */
-	if (value == app->fullScreen)
-		return;
-	
-	/* The Action handler for full-screen toggles for us, so we set it opposite
-	 * of what is wanted, and... */
-	app->fullScreen = !value;
-	
-	/* ... tickle it. */
-	gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(gtk_action_group_get_action(app->agMain, "FullScreen")), value);
+    gboolean value = gconf_value_get_bool(e->value);
+
+    /* There is no way to determine if the window is actually full screen */
+    if (value == app->fullScreen)
+        return;
+
+    /* The Action handler for full-screen toggles for us, so we set it opposite
+     * of what is wanted, and... */
+    app->fullScreen = !value;
+
+    /* ... tickle it. */
+    gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(gtk_action_group_get_action(app->agMain, "FullScreen")), value);
 }
 
 
 /* GCONF CALLBACK: Sets star style when changed */
 static void confStarStyle(GConfClient*, guint, GConfEntry* e, AppData* app)
 {
-	int value = gconf_value_get_int(e->value);
-	
-	if (value == app->renderer->getStarStyle())
-		return;
-	
-	setSaneStarStyle(app, (Renderer::StarStyle)value);
+    int value = gconf_value_get_int(e->value);
+
+    if (value == app->renderer->getStarStyle())
+        return;
+
+    setSaneStarStyle(app, (Renderer::StarStyle)value);
 }
 
 
 /* GCONF CALLBACK: Sets texture resolution when changed */
 static void confTextureResolution(GConfClient*, guint, GConfEntry* e, AppData* app)
 {
-	int value = gconf_value_get_int(e->value);
-	
-	if (value == (int)app->renderer->getResolution())
-		return;
-	
-	setSaneTextureResolution(app, value);
+    int value = gconf_value_get_int(e->value);
+
+    if (value == (int)app->renderer->getResolution())
+        return;
+
+    setSaneTextureResolution(app, value);
 }
 
 
 /* GCONF CALLBACK: Sets alternate surface texture when changed */
 static void confAltSurfaceName(GConfClient*, guint, GConfEntry* e, AppData* app)
 {
-	const char* value = gconf_value_get_string(e->value);
-	
-	if (string(value) == app->simulation->getActiveObserver()->getDisplayedSurface())
-		return;
-	
-	setSaneAltSurface(app, (char*)value);
+    const char* value = gconf_value_get_string(e->value);
+
+    if (string(value) == app->simulation->getActiveObserver()->getDisplayedSurface())
+        return;
+
+    setSaneAltSurface(app, (char*)value);
 }
 
 
 /* GCONF CALLBACK: Sets video framerate sync when changed */
 static void confVideoSync(GConfClient*, guint, GConfEntry* e, AppData* app)
 {
-	gboolean value = gconf_value_get_bool(e->value);
-	
-	if (value == app->renderer->getVideoSync())
-		return;
-	
-	app->renderer->setVideoSync(value);
+    gboolean value = gconf_value_get_bool(e->value);
+
+    if (value == app->renderer->getVideoSync())
+        return;
+
+    app->renderer->setVideoSync(value);
 }
 
 
 /* HELPER: Reads in GConf->Render preferences and returns as int mask */
 static int readGConfRender(GConfClient* client)
 {
-	int rf = Renderer::ShowNothing;
-	rf |= Renderer::ShowStars * gconf_client_get_bool(client, "/apps/celestia/render/stars",  NULL);
-	rf |= Renderer::ShowPlanets * gconf_client_get_bool(client, "/apps/celestia/render/planets",  NULL);
-	rf |= Renderer::ShowGalaxies * gconf_client_get_bool(client, "/apps/celestia/render/galaxies",  NULL);
-	rf |= Renderer::ShowDiagrams * gconf_client_get_bool(client, "/apps/celestia/render/diagrams",  NULL);
-	rf |= Renderer::ShowCloudMaps * gconf_client_get_bool(client, "/apps/celestia/render/cloudMaps",  NULL);
-	rf |= Renderer::ShowOrbits * gconf_client_get_bool(client, "/apps/celestia/render/orbits",  NULL);
-	rf |= Renderer::ShowCelestialSphere * gconf_client_get_bool(client, "/apps/celestia/render/celestialSphere",  NULL);
-	rf |= Renderer::ShowNightMaps * gconf_client_get_bool(client, "/apps/celestia/render/nightMaps",  NULL);
-	rf |= Renderer::ShowAtmospheres * gconf_client_get_bool(client, "/apps/celestia/render/atmospheres",  NULL);
-	rf |= Renderer::ShowSmoothLines * gconf_client_get_bool(client, "/apps/celestia/render/smoothLines",  NULL);
-	rf |= Renderer::ShowEclipseShadows * gconf_client_get_bool(client, "/apps/celestia/render/eclipseShadows",  NULL);
-	rf |= Renderer::ShowRingShadows * gconf_client_get_bool(client, "/apps/celestia/render/ringShadows",  NULL);
-	rf |= Renderer::ShowBoundaries * gconf_client_get_bool(client, "/apps/celestia/render/boundaries",  NULL);
-	rf |= Renderer::ShowAutoMag * gconf_client_get_bool(client, "/apps/celestia/render/autoMag",  NULL);
-	rf |= Renderer::ShowCometTails * gconf_client_get_bool(client, "/apps/celestia/render/cometTails",  NULL);
-	rf |= Renderer::ShowMarkers * gconf_client_get_bool(client, "/apps/celestia/render/markers",  NULL);
-	rf |= Renderer::ShowPartialTrajectories * gconf_client_get_bool(client, "/apps/celestia/render/partialTrajectories",  NULL);
-	rf |= Renderer::ShowNebulae * gconf_client_get_bool(client, "/apps/celestia/render/nebulae",  NULL);
-	rf |= Renderer::ShowOpenClusters * gconf_client_get_bool(client, "/apps/celestia/render/openClusters",  NULL);
-	rf |= Renderer::ShowGlobulars * gconf_client_get_bool(client, "/apps/celestia/render/globulars",  NULL);
-	rf |= Renderer::ShowGalacticGrid * gconf_client_get_bool(client, "/apps/celestia/render/gridGalactic",  NULL);
-	rf |= Renderer::ShowEclipticGrid * gconf_client_get_bool(client, "/apps/celestia/render/gridEcliptic",  NULL);
-	rf |= Renderer::ShowHorizonGrid * gconf_client_get_bool(client, "/apps/celestia/render/gridHorizontal",  NULL);
-	
-	return rf;
+    int rf = Renderer::ShowNothing;
+    rf |= Renderer::ShowStars * gconf_client_get_bool(client, "/apps/celestia/render/stars",  NULL);
+    rf |= Renderer::ShowPlanets * gconf_client_get_bool(client, "/apps/celestia/render/planets",  NULL);
+    rf |= Renderer::ShowGalaxies * gconf_client_get_bool(client, "/apps/celestia/render/galaxies",  NULL);
+    rf |= Renderer::ShowDiagrams * gconf_client_get_bool(client, "/apps/celestia/render/diagrams",  NULL);
+    rf |= Renderer::ShowCloudMaps * gconf_client_get_bool(client, "/apps/celestia/render/cloudMaps",  NULL);
+    rf |= Renderer::ShowOrbits * gconf_client_get_bool(client, "/apps/celestia/render/orbits",  NULL);
+    rf |= Renderer::ShowCelestialSphere * gconf_client_get_bool(client, "/apps/celestia/render/celestialSphere",  NULL);
+    rf |= Renderer::ShowNightMaps * gconf_client_get_bool(client, "/apps/celestia/render/nightMaps",  NULL);
+    rf |= Renderer::ShowAtmospheres * gconf_client_get_bool(client, "/apps/celestia/render/atmospheres",  NULL);
+    rf |= Renderer::ShowSmoothLines * gconf_client_get_bool(client, "/apps/celestia/render/smoothLines",  NULL);
+    rf |= Renderer::ShowEclipseShadows * gconf_client_get_bool(client, "/apps/celestia/render/eclipseShadows",  NULL);
+    rf |= Renderer::ShowRingShadows * gconf_client_get_bool(client, "/apps/celestia/render/ringShadows",  NULL);
+    rf |= Renderer::ShowBoundaries * gconf_client_get_bool(client, "/apps/celestia/render/boundaries",  NULL);
+    rf |= Renderer::ShowAutoMag * gconf_client_get_bool(client, "/apps/celestia/render/autoMag",  NULL);
+    rf |= Renderer::ShowCometTails * gconf_client_get_bool(client, "/apps/celestia/render/cometTails",  NULL);
+    rf |= Renderer::ShowMarkers * gconf_client_get_bool(client, "/apps/celestia/render/markers",  NULL);
+    rf |= Renderer::ShowPartialTrajectories * gconf_client_get_bool(client, "/apps/celestia/render/partialTrajectories",  NULL);
+    rf |= Renderer::ShowNebulae * gconf_client_get_bool(client, "/apps/celestia/render/nebulae",  NULL);
+    rf |= Renderer::ShowOpenClusters * gconf_client_get_bool(client, "/apps/celestia/render/openClusters",  NULL);
+    rf |= Renderer::ShowGlobulars * gconf_client_get_bool(client, "/apps/celestia/render/globulars",  NULL);
+    rf |= Renderer::ShowGalacticGrid * gconf_client_get_bool(client, "/apps/celestia/render/gridGalactic",  NULL);
+    rf |= Renderer::ShowEclipticGrid * gconf_client_get_bool(client, "/apps/celestia/render/gridEcliptic",  NULL);
+    rf |= Renderer::ShowHorizonGrid * gconf_client_get_bool(client, "/apps/celestia/render/gridHorizontal",  NULL);
+
+    return rf;
 }
 
 
 /* HELPER: Reads in GConf->Orbits preferences and returns as int mask */
 static int readGConfOrbits(GConfClient* client)
 {
-	int om = 0;
-	om |= Body::Planet * gconf_client_get_bool(client, "/apps/celestia/orbits/planet",  NULL);
-	om |= Body::Moon * gconf_client_get_bool(client, "/apps/celestia/orbits/moon",  NULL);
-	om |= Body::Asteroid * gconf_client_get_bool(client, "/apps/celestia/orbits/asteroid",  NULL);
-	om |= Body::Comet * gconf_client_get_bool(client, "/apps/celestia/orbits/comet",  NULL);
-	om |= Body::Spacecraft * gconf_client_get_bool(client, "/apps/celestia/orbits/spacecraft",  NULL);
-	om |= Body::Invisible * gconf_client_get_bool(client, "/apps/celestia/orbits/invisible",  NULL);
-	om |= Body::Unknown * gconf_client_get_bool(client, "/apps/celestia/orbits/unknown",  NULL);
-	
-	return om;
+    int om = 0;
+    om |= Body::Planet * gconf_client_get_bool(client, "/apps/celestia/orbits/planet",  NULL);
+    om |= Body::Moon * gconf_client_get_bool(client, "/apps/celestia/orbits/moon",  NULL);
+    om |= Body::Asteroid * gconf_client_get_bool(client, "/apps/celestia/orbits/asteroid",  NULL);
+    om |= Body::Comet * gconf_client_get_bool(client, "/apps/celestia/orbits/comet",  NULL);
+    om |= Body::Spacecraft * gconf_client_get_bool(client, "/apps/celestia/orbits/spacecraft",  NULL);
+    om |= Body::Invisible * gconf_client_get_bool(client, "/apps/celestia/orbits/invisible",  NULL);
+    om |= Body::Unknown * gconf_client_get_bool(client, "/apps/celestia/orbits/unknown",  NULL);
+
+    return om;
 }
 
 
 /* HELPER: Reads in GConf->Labels preferences and returns as int mask */
 static int readGConfLabels(GConfClient* client)
 {
-	int lm = Renderer::NoLabels;
-	lm |= Renderer::StarLabels  * gconf_client_get_bool(client, "/apps/celestia/labels/star", NULL);
-	lm |= Renderer::PlanetLabels  * gconf_client_get_bool(client, "/apps/celestia/labels/planet", NULL);
-	lm |= Renderer::MoonLabels  * gconf_client_get_bool(client, "/apps/celestia/labels/moon", NULL);
-	lm |= Renderer::ConstellationLabels  * gconf_client_get_bool(client, "/apps/celestia/labels/constellation", NULL);
-	lm |= Renderer::GalaxyLabels  * gconf_client_get_bool(client, "/apps/celestia/labels/galaxy", NULL);
-	lm |= Renderer::AsteroidLabels  * gconf_client_get_bool(client, "/apps/celestia/labels/asteroid", NULL);
-	lm |= Renderer::SpacecraftLabels  * gconf_client_get_bool(client, "/apps/celestia/labels/spacecraft", NULL);
-	lm |= Renderer::LocationLabels  * gconf_client_get_bool(client, "/apps/celestia/labels/location", NULL);
-	lm |= Renderer::CometLabels  * gconf_client_get_bool(client, "/apps/celestia/labels/comet", NULL);
-	lm |= Renderer::NebulaLabels  * gconf_client_get_bool(client, "/apps/celestia/labels/nebula", NULL);
-	lm |= Renderer::OpenClusterLabels  * gconf_client_get_bool(client, "/apps/celestia/labels/openCluster", NULL);
-	lm |= Renderer::I18nConstellationLabels  * gconf_client_get_bool(client, "/apps/celestia/labels/i18n", NULL);
-	lm |= Renderer::GlobularLabels  * gconf_client_get_bool(client, "/apps/celestia/labels/globular", NULL);
-	
-	return lm;
+    int lm = Renderer::NoLabels;
+    lm |= Renderer::StarLabels  * gconf_client_get_bool(client, "/apps/celestia/labels/star", NULL);
+    lm |= Renderer::PlanetLabels  * gconf_client_get_bool(client, "/apps/celestia/labels/planet", NULL);
+    lm |= Renderer::MoonLabels  * gconf_client_get_bool(client, "/apps/celestia/labels/moon", NULL);
+    lm |= Renderer::ConstellationLabels  * gconf_client_get_bool(client, "/apps/celestia/labels/constellation", NULL);
+    lm |= Renderer::GalaxyLabels  * gconf_client_get_bool(client, "/apps/celestia/labels/galaxy", NULL);
+    lm |= Renderer::AsteroidLabels  * gconf_client_get_bool(client, "/apps/celestia/labels/asteroid", NULL);
+    lm |= Renderer::SpacecraftLabels  * gconf_client_get_bool(client, "/apps/celestia/labels/spacecraft", NULL);
+    lm |= Renderer::LocationLabels  * gconf_client_get_bool(client, "/apps/celestia/labels/location", NULL);
+    lm |= Renderer::CometLabels  * gconf_client_get_bool(client, "/apps/celestia/labels/comet", NULL);
+    lm |= Renderer::NebulaLabels  * gconf_client_get_bool(client, "/apps/celestia/labels/nebula", NULL);
+    lm |= Renderer::OpenClusterLabels  * gconf_client_get_bool(client, "/apps/celestia/labels/openCluster", NULL);
+    lm |= Renderer::I18nConstellationLabels  * gconf_client_get_bool(client, "/apps/celestia/labels/i18n", NULL);
+    lm |= Renderer::GlobularLabels  * gconf_client_get_bool(client, "/apps/celestia/labels/globular", NULL);
+
+    return lm;
 }
 
 
 /* HELPER: Sets one of the flags according to provided type, key, and value */
 static void gcSetFlag(int type, const char* name, gboolean value, GConfClient* client)
 {
-	gchar key[60];
-	switch (type)
-	{
-		case Render: sprintf(key, "%s%s", "/apps/celestia/render/", name); break;
-		case Orbit: sprintf(key, "%s%s", "/apps/celestia/orbits/", name); break;
-		case Label: sprintf(key, "%s%s", "/apps/celestia/labels/", name); break;
-	}
-	
-	gconf_client_set_bool(client, key, value, NULL);
+    gchar key[60];
+    switch (type)
+    {
+        case Render: sprintf(key, "%s%s", "/apps/celestia/render/", name); break;
+        case Orbit: sprintf(key, "%s%s", "/apps/celestia/orbits/", name); break;
+        case Label: sprintf(key, "%s%s", "/apps/celestia/labels/", name); break;
+    }
+
+    gconf_client_set_bool(client, key, value, NULL);
 }
diff --git a/src/celestia/gtk/settings-gconf.h b/src/celestia/gtk/settings-gconf.h
index 9dd1f817e..e6961d0aa 100644
--- a/src/celestia/gtk/settings-gconf.h
+++ b/src/celestia/gtk/settings-gconf.h
@@ -36,9 +36,9 @@ void gcSetLabelMode(int flag, gboolean state, GConfClient* client);
 
 
 enum {
-	Render = 0,
-	Orbit = 1,
-	Label = 2,
+    Render = 0,
+    Orbit = 1,
+    Label = 2,
 };
 
 #endif /* GTK_SETTINGS_GCONF_H */
diff --git a/src/celestia/gtk/splash.cpp b/src/celestia/gtk/splash.cpp
index ab9ec9a56..9e6b98f19 100644
--- a/src/celestia/gtk/splash.cpp
+++ b/src/celestia/gtk/splash.cpp
@@ -30,11 +30,11 @@ static gboolean splashExpose(GtkWidget* win, GdkEventExpose *event, SplashData*
 
 /* OBJECT: Overrides ProgressNotifier to receive feedback from core */
 GtkSplashProgressNotifier::GtkSplashProgressNotifier(SplashData* _splash) :
-	splash(_splash) {};
+    splash(_splash) {};
 
 void GtkSplashProgressNotifier::update(const string& filename)
 {
-	splashSetText(splash, filename.c_str());
+    splashSetText(splash, filename.c_str());
 }
 
 GtkSplashProgressNotifier::~GtkSplashProgressNotifier() {};
@@ -43,145 +43,145 @@ GtkSplashProgressNotifier::~GtkSplashProgressNotifier() {};
 /* ENTRY: Creates a new SplashData struct, starts the splash screen */
 SplashData* splashStart(AppData* app, gboolean showSplash)
 {
-	SplashData* ss = g_new0(SplashData, 1);
+    SplashData* ss = g_new0(SplashData, 1);
 
-	ss->app = app;
-	ss->notifier = new GtkSplashProgressNotifier(ss);
-	ss->hasARGB = FALSE;
-	ss->redraw = TRUE;
+    ss->app = app;
+    ss->notifier = new GtkSplashProgressNotifier(ss);
+    ss->hasARGB = FALSE;
+    ss->redraw = TRUE;
 
-	/* Continue the "wait" cursor until the splash is done */
-	gtk_window_set_auto_startup_notification(FALSE);
-	
-	/* Don't do anything else if the splash is not to be shown */
-	if (showSplash == FALSE) return ss;
+    /* Continue the "wait" cursor until the splash is done */
+    gtk_window_set_auto_startup_notification(FALSE);
 
-	ss->splash = gtk_window_new(GTK_WINDOW_POPUP);
-	gtk_window_set_position(GTK_WINDOW(ss->splash), GTK_WIN_POS_CENTER);
-	gtk_widget_set_app_paintable(ss->splash, TRUE);
+    /* Don't do anything else if the splash is not to be shown */
+    if (showSplash == FALSE) return ss;
 
-	#ifdef CAIRO
-	/* Colormap Magic */
-	GdkScreen* screen = gtk_widget_get_screen(ss->splash);
-	GdkColormap* colormap = gdk_screen_get_rgba_colormap(screen);
-	if (colormap != NULL)
-	{
-		gtk_widget_set_colormap(ss->splash, colormap);
-		ss->hasARGB = TRUE;
-	}
-	#endif
+    ss->splash = gtk_window_new(GTK_WINDOW_POPUP);
+    gtk_window_set_position(GTK_WINDOW(ss->splash), GTK_WIN_POS_CENTER);
+    gtk_widget_set_app_paintable(ss->splash, TRUE);
 
-	GtkWidget* gf = gtk_fixed_new();
-	gtk_container_add(GTK_CONTAINER(ss->splash), gf);
+    #ifdef CAIRO
+    /* Colormap Magic */
+    GdkScreen* screen = gtk_widget_get_screen(ss->splash);
+    GdkColormap* colormap = gdk_screen_get_rgba_colormap(screen);
+    if (colormap != NULL)
+    {
+        gtk_widget_set_colormap(ss->splash, colormap);
+        ss->hasARGB = TRUE;
+    }
+    #endif
 
-	GtkWidget* i = gtk_image_new_from_file("splash/splash.png");
-	gtk_fixed_put(GTK_FIXED(gf), i, 0, 0);
+    GtkWidget* gf = gtk_fixed_new();
+    gtk_container_add(GTK_CONTAINER(ss->splash), gf);
 
-	/* The information label is right-aligned and biased to the lower-right
-	 * of the window. It's designed to be the full width and height of the
-	 * opaque parts of the splash. */
-	ss->label = gtk_label_new(NULL);
-	gtk_misc_set_alignment(GTK_MISC(ss->label), 1, 1);
-	gtk_label_set_justify(GTK_LABEL(ss->label), GTK_JUSTIFY_RIGHT);
-	gtk_widget_modify_fg(ss->label, GTK_STATE_NORMAL, &ss->label->style->white);
+    GtkWidget* i = gtk_image_new_from_file("splash/splash.png");
+    gtk_fixed_put(GTK_FIXED(gf), i, 0, 0);
 
-	gtk_widget_show_all(ss->splash);
+    /* The information label is right-aligned and biased to the lower-right
+     * of the window. It's designed to be the full width and height of the
+     * opaque parts of the splash. */
+    ss->label = gtk_label_new(NULL);
+    gtk_misc_set_alignment(GTK_MISC(ss->label), 1, 1);
+    gtk_label_set_justify(GTK_LABEL(ss->label), GTK_JUSTIFY_RIGHT);
+    gtk_widget_modify_fg(ss->label, GTK_STATE_NORMAL, &ss->label->style->white);
 
-	/* Size allocations available after showing splash. */
-	gtk_widget_set_size_request(ss->label, i->allocation.width - 80,
-	                                       i->allocation.height / 2);
-	gtk_fixed_put(GTK_FIXED(gf), ss->label, 40, i->allocation.height / 2 - 40);
-	gtk_widget_show(ss->label);
+    gtk_widget_show_all(ss->splash);
 
-	g_signal_connect (ss->splash, "expose_event",
-			  G_CALLBACK (splashExpose),
-  			  ss);
-	
-	while (gtk_events_pending()) gtk_main_iteration();
+    /* Size allocations available after showing splash. */
+    gtk_widget_set_size_request(ss->label, i->allocation.width - 80,
+                                           i->allocation.height / 2);
+    gtk_fixed_put(GTK_FIXED(gf), ss->label, 40, i->allocation.height / 2 - 40);
+    gtk_widget_show(ss->label);
 
-	return ss;
+    g_signal_connect (ss->splash, "expose_event",
+              G_CALLBACK (splashExpose),
+                ss);
+
+    while (gtk_events_pending()) gtk_main_iteration();
+
+    return ss;
 }
 
 
 /* ENTRY: destroys the splash screen */
 void splashEnd(SplashData* ss)
 {
-	if (ss->splash)
-		gtk_widget_destroy(ss->splash);
+    if (ss->splash)
+        gtk_widget_destroy(ss->splash);
 
-	/* Return the cursor from wait to normal */
-	gdk_notify_startup_complete();
+    /* Return the cursor from wait to normal */
+    gdk_notify_startup_complete();
 
-	delete ss->notifier;
-	g_free(ss);
+    delete ss->notifier;
+    g_free(ss);
 }
 
 
 /* ENTRY: Sets the text to be shown in the splash */
 void splashSetText(SplashData* ss, const char* text)
 {
-	char message[255];
+    char message[255];
 
-	if (!ss->splash)
-		return;
+    if (!ss->splash)
+        return;
 
-	sprintf(message, "Version " VERSION "\n%s", text);
+    sprintf(message, "Version " VERSION "\n%s", text);
 
-	gtk_label_set_text(GTK_LABEL(ss->label), message);
+    gtk_label_set_text(GTK_LABEL(ss->label), message);
 
-	/* Update the GTK event queue */
-	while (gtk_events_pending()) gtk_main_iteration();
+    /* Update the GTK event queue */
+    while (gtk_events_pending()) gtk_main_iteration();
 }
 
 
 /* CALLBACK: Called when the splash screen is exposed */
 static gboolean splashExpose(GtkWidget* win, GdkEventExpose *event, SplashData* ss)
 {
-	/* All of this code is only needed at the very first drawing. This
-	 * operation is quite expensive. */
-	if (ss->redraw != TRUE) return FALSE;
+    /* All of this code is only needed at the very first drawing. This
+     * operation is quite expensive. */
+    if (ss->redraw != TRUE) return FALSE;
 
-	if (ss->hasARGB)
-	{
-		#ifdef CAIRO
-		/* Use cairo for true transparent windows */
-		cairo_t *cr = gdk_cairo_create(win->window);	
-	
-		cairo_rectangle(cr, event->area.x,
-				    event->area.y,
-				    event->area.width,
-				    event->area.height);
-	        cairo_clip(cr);
-	
-		/* Draw a fully transparent rectangle the size of the window */
-		cairo_set_source_rgba(cr, 1.0, 1.0, 1.0, 0.0);
-	
-		cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
-		cairo_paint(cr);
-	
-		cairo_destroy(cr);
-		#endif /* CAIRO */
-	}
-	else
-	{
-		/* Fall back to compositing a screenshot of whatever is below the
-		 * area we are drawing in. */
-		GdkPixbuf* bg;
-		int x, y, w, h;
+    if (ss->hasARGB)
+    {
+        #ifdef CAIRO
+        /* Use cairo for true transparent windows */
+        cairo_t *cr = gdk_cairo_create(win->window);
 
-		gdk_window_get_root_origin(win->window, &x, &y);
-		gdk_drawable_get_size(win->window, &w, &h);
+        cairo_rectangle(cr, event->area.x,
+                    event->area.y,
+                    event->area.width,
+                    event->area.height);
+            cairo_clip(cr);
 
-		bg = gdk_pixbuf_get_from_drawable(NULL,
-		                                  gtk_widget_get_root_window(win),
-		                                  NULL, x, y, 0, 0, w, h);
-		gdk_draw_pixbuf(win->window, NULL, bg, 0, 0, 0, 0, w, h,
-		                GDK_RGB_DITHER_NONE, 0, 0);
-		gdk_pixbuf_unref(bg);
-	}
-	
-	/* Never redraw again */
-	ss->redraw = FALSE;
+        /* Draw a fully transparent rectangle the size of the window */
+        cairo_set_source_rgba(cr, 1.0, 1.0, 1.0, 0.0);
 
-	return FALSE;
+        cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
+        cairo_paint(cr);
+
+        cairo_destroy(cr);
+        #endif /* CAIRO */
+    }
+    else
+    {
+        /* Fall back to compositing a screenshot of whatever is below the
+         * area we are drawing in. */
+        GdkPixbuf* bg;
+        int x, y, w, h;
+
+        gdk_window_get_root_origin(win->window, &x, &y);
+        gdk_drawable_get_size(win->window, &w, &h);
+
+        bg = gdk_pixbuf_get_from_drawable(NULL,
+                                          gtk_widget_get_root_window(win),
+                                          NULL, x, y, 0, 0, w, h);
+        gdk_draw_pixbuf(win->window, NULL, bg, 0, 0, 0, 0, w, h,
+                        GDK_RGB_DITHER_NONE, 0, 0);
+        gdk_pixbuf_unref(bg);
+    }
+
+    /* Never redraw again */
+    ss->redraw = FALSE;
+
+    return FALSE;
 }
diff --git a/src/celestia/gtk/splash.h b/src/celestia/gtk/splash.h
index de3da8ffd..ded0860b8 100644
--- a/src/celestia/gtk/splash.h
+++ b/src/celestia/gtk/splash.h
@@ -22,27 +22,27 @@ typedef struct _SplashData SplashData;
  * from the core. */
 class GtkSplashProgressNotifier : public ProgressNotifier
 {
-	public:
-		GtkSplashProgressNotifier(SplashData* _splash);
-		virtual ~GtkSplashProgressNotifier();
+    public:
+        GtkSplashProgressNotifier(SplashData* _splash);
+        virtual ~GtkSplashProgressNotifier();
 
-		virtual void update(const string& filename);
+        virtual void update(const string& filename);
 
-	private:
-		SplashData* splash;
+    private:
+        SplashData* splash;
 };
 
 /* Struct holds all information relevant to the splash screen. */
 struct _SplashData {
-	AppData* app;
-	
-	GtkWidget* splash;
-	GtkWidget* label;
+    AppData* app;
 
-	GtkSplashProgressNotifier* notifier;
+    GtkWidget* splash;
+    GtkWidget* label;
 
-	gboolean hasARGB;
-	gboolean redraw;
+    GtkSplashProgressNotifier* notifier;
+
+    gboolean hasARGB;
+    gboolean redraw;
 };
 
 
diff --git a/src/celestia/gtk/ui.h b/src/celestia/gtk/ui.h
index 7d4b7eb38..e34d41d6e 100644
--- a/src/celestia/gtk/ui.h
+++ b/src/celestia/gtk/ui.h
@@ -22,167 +22,167 @@
 
 /* Regular Actions */
 static const GtkActionEntry actionsPlain[] = {
-	{ "FileMenu", NULL, "_File", NULL, NULL, NULL },
-	{ "CopyURL", GTK_STOCK_COPY, "Copy _URL", NULL, NULL, G_CALLBACK(actionCopyURL) },
-	{ "OpenURL", NULL, "Open UR_L", NULL, NULL, G_CALLBACK(actionOpenURL) },
-	{ "OpenScript", GTK_STOCK_OPEN, "_Open Script...", NULL, NULL, G_CALLBACK(actionOpenScript) },
-	{ "CaptureImage", GTK_STOCK_SAVE_AS, "_Capture Image...", NULL, NULL, G_CALLBACK(actionCaptureImage) },
-	{ "CaptureMovie", GTK_STOCK_SAVE_AS, "Capture _Movie...", NULL, NULL, G_CALLBACK(actionCaptureMovie) },
-	{ "Quit", GTK_STOCK_QUIT, "_Quit", "<control>Q", NULL, G_CALLBACK(actionQuit) },
-	
-	{ "NavigationMenu", NULL, "_Navigation", NULL, NULL, NULL },
-	{ "SelectSol", GTK_STOCK_HOME, "Select _Sol", "H", NULL, G_CALLBACK(actionSelectSol) },
-	{ "TourGuide", NULL, "Tour G_uide...", NULL, NULL, G_CALLBACK(actionTourGuide) },
-	{ "SearchObject", GTK_STOCK_FIND, "Search for _Object...", NULL, NULL, G_CALLBACK(actionSearchObject) },
-	{ "GotoObject", NULL, "Go to Object...", NULL, NULL, G_CALLBACK(actionGotoObject) },
-	{ "CenterSelection", NULL, "_Center Selection", "c", NULL, G_CALLBACK(actionCenterSelection) },
-	{ "GotoSelection", GTK_STOCK_JUMP_TO, "_Go to Selection", "G", NULL, G_CALLBACK(actionGotoSelection) },
-	{ "FollowSelection", NULL, "_Follow Selection", "F", NULL, G_CALLBACK(actionFollowSelection) },
-	{ "SyncSelection", NULL, "S_ync Orbit Selection", "Y", NULL, G_CALLBACK(actionSyncSelection) },
-	{ "TrackSelection", NULL, "_Track Selection", "T", NULL, G_CALLBACK(actionTrackSelection) },
-	{ "SystemBrowser", NULL, "Solar System _Browser...", NULL, NULL, G_CALLBACK(actionSystemBrowser) },
-	{ "StarBrowser", NULL, "Star B_rowser...", NULL, NULL, G_CALLBACK(actionStarBrowser) },
-	{ "EclipseFinder", NULL, "_Eclipse Finder...", NULL, NULL, G_CALLBACK(actionEclipseFinder) },
-	
-	{ "TimeMenu", NULL, "_Time", NULL, NULL, NULL },
-	{ "TimeFaster", NULL, "10x _Faster", "L", NULL, G_CALLBACK(actionTimeFaster) },
-	{ "TimeSlower", NULL, "10x _Slower", "K", NULL, G_CALLBACK(actionTimeSlower) },
-	{ "TimeFreeze", NULL, "Free_ze", "space", NULL, G_CALLBACK(actionTimeFreeze) },
-	{ "TimeReal", NULL, "_Real Time", "backslash", NULL, G_CALLBACK(actionTimeReal) },
-	{ "TimeReverse", NULL, "Re_verse Time", "J", NULL, G_CALLBACK(actionTimeReverse) },
-	{ "TimeSet", NULL, "Set _Time...", NULL, NULL, G_CALLBACK(actionTimeSet) },
-	/* "Show Local Time" in toggle actions */
-	
-	{ "OptionsMenu", NULL, "_Options", NULL, NULL, NULL },
-	{ "ViewOptions", GTK_STOCK_PREFERENCES, "View _Options...", NULL, NULL, G_CALLBACK(actionViewOptions) },
-	{ "ShowObjectsMenu", NULL, "Show Objects", NULL, NULL, NULL },
-	{ "ShowGridsMenu", NULL, "Show Grids", NULL, NULL, NULL },
-	{ "ShowLabelsMenu", NULL, "Show Labels", NULL, NULL, NULL },
-	{ "ShowOrbitsMenu", NULL, "Show Orbits", NULL, NULL, NULL },
-	{ "InfoTextMenu", NULL, "Info Text", NULL, NULL, NULL },
-		/* "Info Text" in radio actions */
-	{ "StarStyleMenu", NULL, "Star St_yle", NULL, NULL, NULL },
-		/* "Star Style" in radio actions */
-	{ "AmbientLightMenu", NULL, "_Ambient Light", NULL, NULL, NULL },
-		/* "Ambient Light" in radio actions */
-	{ "StarsMore", NULL, "_More Stars Visible", "bracketright", NULL, G_CALLBACK(actionStarsMore) },
-	{ "StarsFewer", NULL, "_Fewer Stars Visible", "bracketleft", NULL, G_CALLBACK(actionStarsFewer) },
-	/* "VideoSync" in toggle actions */
-	
-	{ "WindowMenu", NULL, "_Window", NULL, NULL, NULL },
-	{ "ViewerSize", GTK_STOCK_ZOOM_FIT, "Set Window Size...", NULL, NULL, G_CALLBACK(actionViewerSize) },
-	/* "Full Screen" in toggle actions */
-	{ "MultiSplitH", NULL, "Split _Horizontally", "<control>R", NULL, G_CALLBACK(actionMultiSplitH) },
-	{ "MultiSplitV", NULL, "Split _Vertically", "<control>U", NULL, G_CALLBACK(actionMultiSplitV) },
-	{ "MultiCycle", NULL, "Cycle View", "Tab", NULL, G_CALLBACK(actionMultiCycle) },
-	{ "MultiDelete", NULL, "_Delete Active View", "Delete", NULL, G_CALLBACK(actionMultiDelete) },
-	{ "MultiSingle", NULL, "_Single View", "<control>D", NULL, G_CALLBACK(actionMultiSingle) },
-	/* "Show Frames" in toggle actions */
-	/* "Synchronize Time" in toggle actions */
-	
-	{ "HelpMenu", NULL, "_Help", NULL, NULL, NULL },
-	{ "RunDemo", GTK_STOCK_EXECUTE, "Run _Demo", "D", NULL, G_CALLBACK(actionRunDemo) },
-	{ "HelpControls", GTK_STOCK_HELP, "_Controls", NULL, NULL, G_CALLBACK(actionHelpControls) },
-	#if GTK_CHECK_VERSION(2, 7, 0)
-	{ "HelpOpenGL", GTK_STOCK_INFO, "OpenGL _Info", NULL, NULL, G_CALLBACK(actionHelpOpenGL) },
-	#else
-	{ "HelpOpenGL", NULL, "OpenGL _Info", NULL, NULL, G_CALLBACK(actionHelpOpenGL) },
-	#endif
-	{ "HelpAbout", GTK_STOCK_ABOUT, "_About", NULL, NULL, G_CALLBACK(actionHelpAbout) },
+    { "FileMenu", NULL, "_File", NULL, NULL, NULL },
+    { "CopyURL", GTK_STOCK_COPY, "Copy _URL", NULL, NULL, G_CALLBACK(actionCopyURL) },
+    { "OpenURL", NULL, "Open UR_L", NULL, NULL, G_CALLBACK(actionOpenURL) },
+    { "OpenScript", GTK_STOCK_OPEN, "_Open Script...", NULL, NULL, G_CALLBACK(actionOpenScript) },
+    { "CaptureImage", GTK_STOCK_SAVE_AS, "_Capture Image...", NULL, NULL, G_CALLBACK(actionCaptureImage) },
+    { "CaptureMovie", GTK_STOCK_SAVE_AS, "Capture _Movie...", NULL, NULL, G_CALLBACK(actionCaptureMovie) },
+    { "Quit", GTK_STOCK_QUIT, "_Quit", "<control>Q", NULL, G_CALLBACK(actionQuit) },
+
+    { "NavigationMenu", NULL, "_Navigation", NULL, NULL, NULL },
+    { "SelectSol", GTK_STOCK_HOME, "Select _Sol", "H", NULL, G_CALLBACK(actionSelectSol) },
+    { "TourGuide", NULL, "Tour G_uide...", NULL, NULL, G_CALLBACK(actionTourGuide) },
+    { "SearchObject", GTK_STOCK_FIND, "Search for _Object...", NULL, NULL, G_CALLBACK(actionSearchObject) },
+    { "GotoObject", NULL, "Go to Object...", NULL, NULL, G_CALLBACK(actionGotoObject) },
+    { "CenterSelection", NULL, "_Center Selection", "c", NULL, G_CALLBACK(actionCenterSelection) },
+    { "GotoSelection", GTK_STOCK_JUMP_TO, "_Go to Selection", "G", NULL, G_CALLBACK(actionGotoSelection) },
+    { "FollowSelection", NULL, "_Follow Selection", "F", NULL, G_CALLBACK(actionFollowSelection) },
+    { "SyncSelection", NULL, "S_ync Orbit Selection", "Y", NULL, G_CALLBACK(actionSyncSelection) },
+    { "TrackSelection", NULL, "_Track Selection", "T", NULL, G_CALLBACK(actionTrackSelection) },
+    { "SystemBrowser", NULL, "Solar System _Browser...", NULL, NULL, G_CALLBACK(actionSystemBrowser) },
+    { "StarBrowser", NULL, "Star B_rowser...", NULL, NULL, G_CALLBACK(actionStarBrowser) },
+    { "EclipseFinder", NULL, "_Eclipse Finder...", NULL, NULL, G_CALLBACK(actionEclipseFinder) },
+
+    { "TimeMenu", NULL, "_Time", NULL, NULL, NULL },
+    { "TimeFaster", NULL, "10x _Faster", "L", NULL, G_CALLBACK(actionTimeFaster) },
+    { "TimeSlower", NULL, "10x _Slower", "K", NULL, G_CALLBACK(actionTimeSlower) },
+    { "TimeFreeze", NULL, "Free_ze", "space", NULL, G_CALLBACK(actionTimeFreeze) },
+    { "TimeReal", NULL, "_Real Time", "backslash", NULL, G_CALLBACK(actionTimeReal) },
+    { "TimeReverse", NULL, "Re_verse Time", "J", NULL, G_CALLBACK(actionTimeReverse) },
+    { "TimeSet", NULL, "Set _Time...", NULL, NULL, G_CALLBACK(actionTimeSet) },
+    /* "Show Local Time" in toggle actions */
+
+    { "OptionsMenu", NULL, "_Options", NULL, NULL, NULL },
+    { "ViewOptions", GTK_STOCK_PREFERENCES, "View _Options...", NULL, NULL, G_CALLBACK(actionViewOptions) },
+    { "ShowObjectsMenu", NULL, "Show Objects", NULL, NULL, NULL },
+    { "ShowGridsMenu", NULL, "Show Grids", NULL, NULL, NULL },
+    { "ShowLabelsMenu", NULL, "Show Labels", NULL, NULL, NULL },
+    { "ShowOrbitsMenu", NULL, "Show Orbits", NULL, NULL, NULL },
+    { "InfoTextMenu", NULL, "Info Text", NULL, NULL, NULL },
+        /* "Info Text" in radio actions */
+    { "StarStyleMenu", NULL, "Star St_yle", NULL, NULL, NULL },
+        /* "Star Style" in radio actions */
+    { "AmbientLightMenu", NULL, "_Ambient Light", NULL, NULL, NULL },
+        /* "Ambient Light" in radio actions */
+    { "StarsMore", NULL, "_More Stars Visible", "bracketright", NULL, G_CALLBACK(actionStarsMore) },
+    { "StarsFewer", NULL, "_Fewer Stars Visible", "bracketleft", NULL, G_CALLBACK(actionStarsFewer) },
+    /* "VideoSync" in toggle actions */
+
+    { "WindowMenu", NULL, "_Window", NULL, NULL, NULL },
+    { "ViewerSize", GTK_STOCK_ZOOM_FIT, "Set Window Size...", NULL, NULL, G_CALLBACK(actionViewerSize) },
+    /* "Full Screen" in toggle actions */
+    { "MultiSplitH", NULL, "Split _Horizontally", "<control>R", NULL, G_CALLBACK(actionMultiSplitH) },
+    { "MultiSplitV", NULL, "Split _Vertically", "<control>U", NULL, G_CALLBACK(actionMultiSplitV) },
+    { "MultiCycle", NULL, "Cycle View", "Tab", NULL, G_CALLBACK(actionMultiCycle) },
+    { "MultiDelete", NULL, "_Delete Active View", "Delete", NULL, G_CALLBACK(actionMultiDelete) },
+    { "MultiSingle", NULL, "_Single View", "<control>D", NULL, G_CALLBACK(actionMultiSingle) },
+    /* "Show Frames" in toggle actions */
+    /* "Synchronize Time" in toggle actions */
+
+    { "HelpMenu", NULL, "_Help", NULL, NULL, NULL },
+    { "RunDemo", GTK_STOCK_EXECUTE, "Run _Demo", "D", NULL, G_CALLBACK(actionRunDemo) },
+    { "HelpControls", GTK_STOCK_HELP, "_Controls", NULL, NULL, G_CALLBACK(actionHelpControls) },
+    #if GTK_CHECK_VERSION(2, 7, 0)
+    { "HelpOpenGL", GTK_STOCK_INFO, "OpenGL _Info", NULL, NULL, G_CALLBACK(actionHelpOpenGL) },
+    #else
+    { "HelpOpenGL", NULL, "OpenGL _Info", NULL, NULL, G_CALLBACK(actionHelpOpenGL) },
+    #endif
+    { "HelpAbout", GTK_STOCK_ABOUT, "_About", NULL, NULL, G_CALLBACK(actionHelpAbout) },
 };
 
 
 /* Regular Checkbox Actions */
 static const GtkToggleActionEntry actionsToggle[] = {
-	{ "TimeLocal", NULL, "Show _Local Time", NULL, NULL, G_CALLBACK(actionTimeLocal), FALSE },
-	#if GTK_CHECK_VERSION(2, 7, 0)
-	{ "FullScreen", GTK_STOCK_FULLSCREEN, "_Full Screen", "<alt>Return",  NULL, G_CALLBACK(actionFullScreen), FALSE },
-	#else
-	{ "FullScreen", NULL, "_Full Screen", "<alt>Return",  NULL, G_CALLBACK(actionFullScreen), FALSE },
-	#endif /* GTK_CHECK_VERSION */
-	{ "MenuBarVisible", NULL, "_Menu Bar", "<control>M", NULL, G_CALLBACK(actionMenuBarVisible), TRUE },
-	{ "MultiShowFrames", NULL, "Show _Frames", NULL, NULL, G_CALLBACK(actionMultiShowFrames), FALSE },
-	{ "MultiShowActive", NULL, "Active Frame Highlighted", NULL, NULL, G_CALLBACK(actionMultiShowActive), FALSE },
-	{ "MultiSyncTime", NULL, "Synchronize _Time", NULL, NULL, G_CALLBACK(actionMultiSyncTime), FALSE },
-	{ "VideoSync", NULL, "_Limit Frame Rate", NULL, NULL, G_CALLBACK(actionVideoSync), TRUE },
+    { "TimeLocal", NULL, "Show _Local Time", NULL, NULL, G_CALLBACK(actionTimeLocal), FALSE },
+    #if GTK_CHECK_VERSION(2, 7, 0)
+    { "FullScreen", GTK_STOCK_FULLSCREEN, "_Full Screen", "<alt>Return",  NULL, G_CALLBACK(actionFullScreen), FALSE },
+    #else
+    { "FullScreen", NULL, "_Full Screen", "<alt>Return",  NULL, G_CALLBACK(actionFullScreen), FALSE },
+    #endif /* GTK_CHECK_VERSION */
+    { "MenuBarVisible", NULL, "_Menu Bar", "<control>M", NULL, G_CALLBACK(actionMenuBarVisible), TRUE },
+    { "MultiShowFrames", NULL, "Show _Frames", NULL, NULL, G_CALLBACK(actionMultiShowFrames), FALSE },
+    { "MultiShowActive", NULL, "Active Frame Highlighted", NULL, NULL, G_CALLBACK(actionMultiShowActive), FALSE },
+    { "MultiSyncTime", NULL, "Synchronize _Time", NULL, NULL, G_CALLBACK(actionMultiSyncTime), FALSE },
+    { "VideoSync", NULL, "_Limit Frame Rate", NULL, NULL, G_CALLBACK(actionVideoSync), TRUE },
 };
 
 
 /* Regular Radio Button Actions */
 static const GtkRadioActionEntry actionsVerbosity[] = {
-	{ "HudNone", NULL, "_None", NULL, NULL, 0 },
-	{ "HudTerse", NULL, "_Terse", NULL, NULL, 1},
-	{ "HudVerbose", NULL, "_Verbose", NULL, NULL, 2},
+    { "HudNone", NULL, "_None", NULL, NULL, 0 },
+    { "HudTerse", NULL, "_Terse", NULL, NULL, 1},
+    { "HudVerbose", NULL, "_Verbose", NULL, NULL, 2},
 };
 
 static const GtkRadioActionEntry actionsStarStyle[] = {
-	{ "StarsFuzzy", NULL, "_Fuzzy Points", NULL, NULL, Renderer::FuzzyPointStars },
-	{ "StarsPoints", NULL, "_Points", NULL, NULL, Renderer::PointStars },
-	{ "StarsDiscs", NULL, "Scaled _Discs", NULL, NULL, Renderer::ScaledDiscStars },
+    { "StarsFuzzy", NULL, "_Fuzzy Points", NULL, NULL, Renderer::FuzzyPointStars },
+    { "StarsPoints", NULL, "_Points", NULL, NULL, Renderer::PointStars },
+    { "StarsDiscs", NULL, "Scaled _Discs", NULL, NULL, Renderer::ScaledDiscStars },
 };
 
 static const GtkRadioActionEntry actionsAmbientLight[] = {
-	{ "AmbientNone", NULL, "_None", NULL, NULL, 0 },
-	{ "AmbientLow", NULL, "_Low", NULL, NULL, 1 },
-	{ "AmbientMedium", NULL, "_Medium", NULL, NULL, 2},
+    { "AmbientNone", NULL, "_None", NULL, NULL, 0 },
+    { "AmbientLow", NULL, "_Low", NULL, NULL, 1 },
+    { "AmbientMedium", NULL, "_Medium", NULL, NULL, 2},
 };
 
 
 /* Render-Flag Actions */
 static const GtkToggleActionEntry actionsRenderFlags[] = {
-	{ "RenderAA", NULL, "Antialiasing", "<control>X", NULL, G_CALLBACK(actionRenderAA), FALSE },
-	{ "RenderAtmospheres", NULL, "Atmospheres", "<control>A", NULL, G_CALLBACK(actionRenderAtmospheres), FALSE },
-	{ "RenderAutoMagnitude", NULL, "Auto Magnitude", "<control>Y", NULL, G_CALLBACK(actionRenderAutoMagnitude), FALSE },
-	{ "RenderClouds", NULL, "Clouds", "I", NULL, G_CALLBACK(actionRenderClouds), FALSE },
-	{ "RenderCometTails", NULL, "Comet Tails", "<control>T", NULL, G_CALLBACK(actionRenderCometTails), FALSE },
-	{ "RenderConstellationBoundaries", NULL, "Constellation Boundaries", NULL, NULL, G_CALLBACK(actionRenderConstellationBoundaries), FALSE },
-	{ "RenderConstellations", NULL, "Constellations", "slash", NULL, G_CALLBACK(actionRenderConstellations), FALSE },
-	{ "RenderEclipseShadows", NULL, "Eclipse Shadows", "<control>E", NULL, G_CALLBACK(actionRenderEclipseShadows), FALSE },
-	{ "RenderGalaxies", NULL, "Galaxies", "U", NULL, G_CALLBACK(actionRenderGalaxies), FALSE },
-	{ "RenderGlobulars", NULL, "Globulars", "<shift>U", NULL, G_CALLBACK(actionRenderGlobulars), FALSE },
-	{ "RenderCelestialGrid", NULL, "Grid: Celestial", "semicolon", NULL, G_CALLBACK(actionRenderCelestialGrid), FALSE },
-	{ "RenderEclipticGrid", NULL, "Grid: Ecliptic", NULL, NULL, G_CALLBACK(actionRenderEclipticGrid), FALSE },
-	{ "RenderGalacticGrid", NULL, "Grid: Galactic", NULL, NULL, G_CALLBACK(actionRenderGalacticGrid), FALSE },
-	{ "RenderHorizontalGrid", NULL, "Grid: Horizontal", NULL, NULL, G_CALLBACK(actionRenderHorizontalGrid), FALSE },
-	{ "RenderMarkers", NULL, "Markers", "<control>M", NULL, G_CALLBACK(actionRenderMarkers), FALSE },
-	{ "RenderNebulae", NULL, "Nebulae", "asciicircum", NULL, G_CALLBACK(actionRenderNebulae), FALSE },
-	{ "RenderNightLights", NULL, "Night Side Lights", "<control>L", NULL, G_CALLBACK(actionRenderNightLights), FALSE },
-	{ "RenderOpenClusters", NULL, "Open Clusters", NULL, NULL, G_CALLBACK(actionRenderOpenClusters), FALSE },
-	{ "RenderOrbits", NULL, "Orbits", "O", NULL, G_CALLBACK(actionRenderOrbits), FALSE },
-	{ "RenderPlanets", NULL, "Planets", NULL, NULL, G_CALLBACK(actionRenderPlanets), FALSE },
-	{ "RenderRingShadows", NULL, "Ring Shadows", NULL, NULL, G_CALLBACK(actionRenderRingShadows), FALSE },
-	{ "RenderStars", NULL, "Stars", NULL, NULL, G_CALLBACK(actionRenderStars), FALSE },
+    { "RenderAA", NULL, "Antialiasing", "<control>X", NULL, G_CALLBACK(actionRenderAA), FALSE },
+    { "RenderAtmospheres", NULL, "Atmospheres", "<control>A", NULL, G_CALLBACK(actionRenderAtmospheres), FALSE },
+    { "RenderAutoMagnitude", NULL, "Auto Magnitude", "<control>Y", NULL, G_CALLBACK(actionRenderAutoMagnitude), FALSE },
+    { "RenderClouds", NULL, "Clouds", "I", NULL, G_CALLBACK(actionRenderClouds), FALSE },
+    { "RenderCometTails", NULL, "Comet Tails", "<control>T", NULL, G_CALLBACK(actionRenderCometTails), FALSE },
+    { "RenderConstellationBoundaries", NULL, "Constellation Boundaries", NULL, NULL, G_CALLBACK(actionRenderConstellationBoundaries), FALSE },
+    { "RenderConstellations", NULL, "Constellations", "slash", NULL, G_CALLBACK(actionRenderConstellations), FALSE },
+    { "RenderEclipseShadows", NULL, "Eclipse Shadows", "<control>E", NULL, G_CALLBACK(actionRenderEclipseShadows), FALSE },
+    { "RenderGalaxies", NULL, "Galaxies", "U", NULL, G_CALLBACK(actionRenderGalaxies), FALSE },
+    { "RenderGlobulars", NULL, "Globulars", "<shift>U", NULL, G_CALLBACK(actionRenderGlobulars), FALSE },
+    { "RenderCelestialGrid", NULL, "Grid: Celestial", "semicolon", NULL, G_CALLBACK(actionRenderCelestialGrid), FALSE },
+    { "RenderEclipticGrid", NULL, "Grid: Ecliptic", NULL, NULL, G_CALLBACK(actionRenderEclipticGrid), FALSE },
+    { "RenderGalacticGrid", NULL, "Grid: Galactic", NULL, NULL, G_CALLBACK(actionRenderGalacticGrid), FALSE },
+    { "RenderHorizontalGrid", NULL, "Grid: Horizontal", NULL, NULL, G_CALLBACK(actionRenderHorizontalGrid), FALSE },
+    { "RenderMarkers", NULL, "Markers", "<control>M", NULL, G_CALLBACK(actionRenderMarkers), FALSE },
+    { "RenderNebulae", NULL, "Nebulae", "asciicircum", NULL, G_CALLBACK(actionRenderNebulae), FALSE },
+    { "RenderNightLights", NULL, "Night Side Lights", "<control>L", NULL, G_CALLBACK(actionRenderNightLights), FALSE },
+    { "RenderOpenClusters", NULL, "Open Clusters", NULL, NULL, G_CALLBACK(actionRenderOpenClusters), FALSE },
+    { "RenderOrbits", NULL, "Orbits", "O", NULL, G_CALLBACK(actionRenderOrbits), FALSE },
+    { "RenderPlanets", NULL, "Planets", NULL, NULL, G_CALLBACK(actionRenderPlanets), FALSE },
+    { "RenderRingShadows", NULL, "Ring Shadows", NULL, NULL, G_CALLBACK(actionRenderRingShadows), FALSE },
+    { "RenderStars", NULL, "Stars", NULL, NULL, G_CALLBACK(actionRenderStars), FALSE },
 };
 
 
 /* Orbit-Flag Actions */
 static const GtkToggleActionEntry actionsOrbitFlags[] = {
-	{ "OrbitAsteroids", NULL, "Asteroids", NULL, NULL, G_CALLBACK(actionOrbitAsteroids), FALSE },
-	{ "OrbitComets", NULL, "Comets", NULL, NULL, G_CALLBACK(actionOrbitComets), FALSE },
-	{ "OrbitMoons", NULL, "Moons", NULL, NULL, G_CALLBACK(actionOrbitMoons), FALSE },
-	{ "OrbitPlanets", NULL, "Planets", NULL, NULL, G_CALLBACK(actionOrbitPlanets), FALSE },
-	{ "OrbitSpacecraft", NULL, "Spacecraft", NULL, NULL, G_CALLBACK(actionOrbitSpacecraft), FALSE },
+    { "OrbitAsteroids", NULL, "Asteroids", NULL, NULL, G_CALLBACK(actionOrbitAsteroids), FALSE },
+    { "OrbitComets", NULL, "Comets", NULL, NULL, G_CALLBACK(actionOrbitComets), FALSE },
+    { "OrbitMoons", NULL, "Moons", NULL, NULL, G_CALLBACK(actionOrbitMoons), FALSE },
+    { "OrbitPlanets", NULL, "Planets", NULL, NULL, G_CALLBACK(actionOrbitPlanets), FALSE },
+    { "OrbitSpacecraft", NULL, "Spacecraft", NULL, NULL, G_CALLBACK(actionOrbitSpacecraft), FALSE },
 };
 
 /* Label-Flag Actions */
 static const GtkToggleActionEntry actionsLabelFlags[] = {
-	{ "LabelAsteroids", NULL, "Asteroids", "W", NULL, G_CALLBACK(actionLabelAsteroids), FALSE },
-	{ "LabelComets", NULL, "Comets", "<shift>W", NULL, G_CALLBACK(actionLabelComets), FALSE },
-	{ "LabelConstellations", NULL, "Constellations", "equal", NULL, G_CALLBACK(actionLabelConstellations), FALSE },
-	{ "LabelGalaxies", NULL, "Galaxies", "E", NULL, G_CALLBACK(actionLabelGalaxies), FALSE },
-	{ "LabelGlobulars", NULL, "Globulars", "<shift>E", NULL, G_CALLBACK(actionLabelGlobulars), FALSE },
-	{ "LabelLocations", NULL, "Locations", NULL, NULL, G_CALLBACK(actionLabelLocations), FALSE },
-	{ "LabelMoons", NULL, "Moons", "M", NULL, G_CALLBACK(actionLabelMoons), FALSE },
-	{ "LabelNebulae", NULL, "Nebulae", NULL, NULL, G_CALLBACK(actionLabelNebulae), FALSE },
-	{ "LabelOpenClusters", NULL, "Open Clusters", NULL, NULL, G_CALLBACK(actionLabelOpenClusters), FALSE },
-	{ "LabelPlanets", NULL, "Planets", "P", NULL, G_CALLBACK(actionLabelPlanets), FALSE },
-	{ "LabelSpacecraft", NULL, "Spacecraft", "N", NULL, G_CALLBACK(actionLabelSpacecraft), FALSE },
-	{ "LabelStars", NULL, "Stars", "B", NULL, G_CALLBACK(actionLabelStars), FALSE },
-	
-	/*
-	Does not appear to do anything yet:
-	{ "LabelsLatin", NULL, "Labels in Latin", NULL, NULL, NULL, FALSE },
-	*/
+    { "LabelAsteroids", NULL, "Asteroids", "W", NULL, G_CALLBACK(actionLabelAsteroids), FALSE },
+    { "LabelComets", NULL, "Comets", "<shift>W", NULL, G_CALLBACK(actionLabelComets), FALSE },
+    { "LabelConstellations", NULL, "Constellations", "equal", NULL, G_CALLBACK(actionLabelConstellations), FALSE },
+    { "LabelGalaxies", NULL, "Galaxies", "E", NULL, G_CALLBACK(actionLabelGalaxies), FALSE },
+    { "LabelGlobulars", NULL, "Globulars", "<shift>E", NULL, G_CALLBACK(actionLabelGlobulars), FALSE },
+    { "LabelLocations", NULL, "Locations", NULL, NULL, G_CALLBACK(actionLabelLocations), FALSE },
+    { "LabelMoons", NULL, "Moons", "M", NULL, G_CALLBACK(actionLabelMoons), FALSE },
+    { "LabelNebulae", NULL, "Nebulae", NULL, NULL, G_CALLBACK(actionLabelNebulae), FALSE },
+    { "LabelOpenClusters", NULL, "Open Clusters", NULL, NULL, G_CALLBACK(actionLabelOpenClusters), FALSE },
+    { "LabelPlanets", NULL, "Planets", "P", NULL, G_CALLBACK(actionLabelPlanets), FALSE },
+    { "LabelSpacecraft", NULL, "Spacecraft", "N", NULL, G_CALLBACK(actionLabelSpacecraft), FALSE },
+    { "LabelStars", NULL, "Stars", "B", NULL, G_CALLBACK(actionLabelStars), FALSE },
+
+    /*
+    Does not appear to do anything yet:
+    { "LabelsLatin", NULL, "Labels in Latin", NULL, NULL, NULL, FALSE },
+    */
 };
 
 #endif /* GTK_UI_H */
diff --git a/src/celestia/imagecapture.cpp b/src/celestia/imagecapture.cpp
index ac22eba0a..4d729c161 100644
--- a/src/celestia/imagecapture.cpp
+++ b/src/celestia/imagecapture.cpp
@@ -1,5 +1,5 @@
 // imagecapture.cpp
-// 
+//
 // Copyright (C) 2001, Chris Laurel <claurel@shatters.net>
 //
 // This program is free software; you can redistribute it and/or
@@ -116,7 +116,7 @@ void PNGWriteData(png_structp png_ptr, png_bytep data, png_size_t length)
     fwrite((void*) data, 1, length, fp);
 }
 
-                           
+
 bool CaptureGLBufferToPNG(const string& filename,
                            int x, int y,
                            int width, int height)
diff --git a/src/celestia/imagecapture.h b/src/celestia/imagecapture.h
index fc90ac46b..edc96f2c3 100644
--- a/src/celestia/imagecapture.h
+++ b/src/celestia/imagecapture.h
@@ -1,5 +1,5 @@
 // imagecapture.h
-// 
+//
 // Copyright (C) 2001, Chris Laurel <claurel@shatters.net>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/celestia/kde/celestialbrowser.cpp b/src/celestia/kde/celestialbrowser.cpp
index 58853553a..876625bcc 100644
--- a/src/celestia/kde/celestialbrowser.cpp
+++ b/src/celestia/kde/celestialbrowser.cpp
@@ -126,7 +126,7 @@ void CelestialBrowser::slotRefresh()
 
         if (starClass == "Bary") continue;
 
-	float dist = ucPos.offsetFromLy(star->getPosition()).norm();
+        float dist = ucPos.offsetFromLy(star->getPosition()).norm();
         CelListViewItem *starItem = new CelListViewItem(listStars, stardb->getStarName(*star), dist, _("ly"),
                 astro::absToAppMag(star->getAbsoluteMagnitude(), dist),
                 star->getAbsoluteMagnitude(), starClass);
@@ -143,28 +143,28 @@ void CelestialBrowser::slotRefresh()
     delete(stars);
 }
 
-void CelestialBrowser::addPlanetarySystem(CelListViewItem* parentItem, const PlanetarySystem* system, const Eigen::Vector3d* parentBodyPos) 
+void CelestialBrowser::addPlanetarySystem(CelListViewItem* parentItem, const PlanetarySystem* system, const Eigen::Vector3d* parentBodyPos)
 {
     if (parentItem == NULL || system == NULL) return;
-    for ( int i = 0; i < system->getSystemSize(); i++ ) 
+    for ( int i = 0; i < system->getSystemSize(); i++ )
     {
         const Body* body = system->getBody(i);
         if (body->getClassification() & (Body::Barycenter | Body::Invisible)) continue;
         Vector3d bodyPos = (body->getAstrocentricPosition(appSim->getTime()));
         CelListViewItem* item = NULL;
-        if (parentBodyPos == NULL) 
+        if (parentBodyPos == NULL)
         {
             double bodyDist = bodyPos.norm();
             item = new CelListViewItem(parentItem, body->getName(true),
                                        bodyDist / KM_PER_AU, _("au"),
                                        0, 0, getClassification(body->getClassification()));
-        } 
-        else 
+        }
+        else
         {
             Vector3d bodyVec(parentBodyPos->x() - bodyPos.x(), parentBodyPos->y() - bodyPos.y(), parentBodyPos->z() - bodyPos.z());
             double bodyDist = bodyVec.norm();
             item = new CelListViewItem(parentItem, body->getName(true),
-                                       bodyDist, "km", 
+                                       bodyDist, "km",
                                        0, 0, getClassification(body->getClassification()));
         }
         addPlanetarySystem(item, body->getSatellites(), &bodyPos);
diff --git a/src/celestia/kde/celestialbrowser.h b/src/celestia/kde/celestialbrowser.h
index ce1be5a9e..c2125193d 100644
--- a/src/celestia/kde/celestialbrowser.h
+++ b/src/celestia/kde/celestialbrowser.h
@@ -28,7 +28,7 @@ public slots:
     void slotWithPlanets(bool);
     void slotRefresh();
     void slotRightClickOnStar(QListViewItem*, const QPoint&,int );
-    
+
 private:
     KdeApp *parent;
     CelestiaCore *appCore;
@@ -36,7 +36,7 @@ private:
     StarBrowser sbrowser;
     Selection browserSel;
     void addPlanetarySystem(CelListViewItem* parentItem, const PlanetarySystem* system, const Eigen::Vector3d* parentBodyPos = NULL);
-    
+
     QString getClassification(int c) const;
 
 };
diff --git a/src/celestia/kde/cellistviewitem.h b/src/celestia/kde/cellistviewitem.h
index c477ee438..6a1da79fe 100644
--- a/src/celestia/kde/cellistviewitem.h
+++ b/src/celestia/kde/cellistviewitem.h
@@ -3,21 +3,21 @@
 
 class CelListViewItem : public QListViewItem
 {
-   
+
 public:
     CelListViewItem( QListView * parent, std::string name, double dist, const char* dist_unit, double app_mag, double abs_mag, QString type);
     CelListViewItem( QListViewItem * parent, std::string name, double dist, const char* dist_unit, double app_mag, double abs_mag, QString type);
-    ~CelListViewItem();   
-        
+    ~CelListViewItem();
+
     std::string getName() const { return name; }
 
     double getDist() const { return dist; }
     double getAppMag() const { return app_mag; }
     double getAbsMag() const { return abs_mag; }
-    
+
 public slots:
     int compare ( QListViewItem * i, int col, bool ascending ) const;
-    
+
 private:
     std::string name;
     double dist;
diff --git a/src/celestia/kde/celsplashscreen.cpp b/src/celestia/kde/celsplashscreen.cpp
index eb2d33ef0..89625303c 100644
--- a/src/celestia/kde/celsplashscreen.cpp
+++ b/src/celestia/kde/celsplashscreen.cpp
@@ -24,7 +24,7 @@
 #include <X11/Xlib.h>
 
 CelSplashScreen::CelSplashScreen(const QString& filename, QWidget* _parent):
-    QWidget(0, 0, WStyle_Customize | WX11BypassWM), 
+    QWidget(0, 0, WStyle_Customize | WX11BypassWM),
     parent(_parent)
 {
     setPixmap(filename);
@@ -63,8 +63,8 @@ void CelSplashScreen::update(const string& _message) {
 void CelSplashScreen::finish( QWidget *mainWin )
 {
     if ( mainWin ) {
-	extern void qt_wait_for_window_manager( QWidget *mainWin );
-	qt_wait_for_window_manager( mainWin );
+    extern void qt_wait_for_window_manager( QWidget *mainWin );
+    qt_wait_for_window_manager( mainWin );
     }
     close();
 }
@@ -118,7 +118,7 @@ void CelSplashScreen::setPixmap( const QString &filename )
     } else {
         pixmap = _pixmap;
     }
-    
+
     QPainter painter( &pixmap, this );
     version.draw(&painter);
     for(std::vector<TextItem>::const_iterator i = extraText.begin(); i != extraText.end();  ++i)
diff --git a/src/celestia/kde/eclipsefinderdlg.cpp b/src/celestia/kde/eclipsefinderdlg.cpp
index 59b2bdf08..3945c1b15 100644
--- a/src/celestia/kde/eclipsefinderdlg.cpp
+++ b/src/celestia/kde/eclipsefinderdlg.cpp
@@ -16,26 +16,26 @@
 
 using namespace Eigen;
 
-/* 
- *  Constructs a EclipseFinder which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f' 
+/*
+ *  Constructs a EclipseFinder which is a child of 'parent', with the
+ *  name 'name' and widget flags set to 'f'
  */
 EclipseFinderDlg::EclipseFinderDlg( QWidget* parent, CelestiaCore *appCore)
     : EclipseFinderDlgBase( parent, i18n("Eclipse Finder") ),appCore(appCore)
-{  
+{
     astro::Date date(appCore->getSimulation()->getTime());
     fromYSpin->setValue(date.year-1);
     fromMSpin->setValue(date.month);
-    fromDSpin->setValue(date.day);    
+    fromDSpin->setValue(date.day);
     toYSpin->setValue(date.year+1);
     toMSpin->setValue(date.month);
-    toDSpin->setValue(date.day);    
-    
+    toDSpin->setValue(date.day);
+
 
     statusBar()->hide();
 }
 
-/*  
+/*
  *  Destroys the object and frees any allocated resources
  */
 EclipseFinderDlg::~EclipseFinderDlg()
@@ -49,61 +49,61 @@ EclipseFinderDlg::~EclipseFinderDlg()
 void EclipseFinderDlg::search()
 {
     std::string onBody = "";
-       
+
     switch(comboBody->currentItem()) {
         case 0:
             onBody = "Earth";
-            break;    
+            break;
         case 1:
             onBody = "Jupiter";
-            break;    
+            break;
         case 2:
             onBody = "Saturn";
-            break;    
+            break;
         case 3:
             onBody = "Uranus";
-            break;    
+            break;
         case 4:
             onBody = "Neptune";
-            break;    
+            break;
         case 5:
             onBody = "Pluto";
-            break;    
+            break;
     }
-    EclipseFinder ef(appCore, 
-                     onBody, 
-                     (radioSolar->isChecked()?Eclipse::Solar:Eclipse::Moon), 
-                     (double)(astro::Date(fromYSpin->value(), 
-                                          fromMSpin->value(), 
+    EclipseFinder ef(appCore,
+                     onBody,
+                     (radioSolar->isChecked()?Eclipse::Solar:Eclipse::Moon),
+                     (double)(astro::Date(fromYSpin->value(),
+                                          fromMSpin->value(),
                                           fromDSpin->value())),
                      (double)(astro::Date(toYSpin->value(),
                                           toMSpin->value(),
-                                          toDSpin->value())) + 1 
+                                          toDSpin->value())) + 1
                      );
 
     std::vector<Eclipse> eclipses = ef.getEclipses();
-    
+
     listEclipses->clear();
     for (std::vector<Eclipse>::iterator i = eclipses.begin();
          i != eclipses.end();
          i++) {
-         
+
          if ((*i).planete == "None") {
-	         new QListViewItem(listEclipses, 
-	             QString((*i).planete.c_str()));
+             new QListViewItem(listEclipses,
+                 QString((*i).planete.c_str()));
                  continue;
          }
-         
+
          char d[12], strStart[10], strEnd[10];
          astro::Date start((*i).startTime);
          astro::Date end((*i).endTime);
-         
+
          sprintf(d, "%d-%02d-%02d", (*i).date->year, (*i).date->month, (*i).date->day);
          sprintf(strStart, "%02d:%02d:%02d", start.hour, start.minute, (int)start.seconds);
          sprintf(strEnd, "%02d:%02d:%02d", end.hour, end.minute, (int)end.seconds);
-         
-         new QListViewItem(listEclipses, 
-             QString::fromUtf8(_((*i).planete.c_str())), 
+
+         new QListViewItem(listEclipses,
+             QString::fromUtf8(_((*i).planete.c_str())),
              QString::fromUtf8(_((*i).sattelite.c_str())),
              d,
              strStart,
@@ -114,21 +114,21 @@ void EclipseFinderDlg::search()
 
 void EclipseFinderDlg::gotoEclipse(QListViewItem* item, const QPoint& p, int col) {
     if (item->text(0) == "None") return;
-    
+
     KPopupMenu menu(this);
-    
+
     menu.insertTitle(item->text(col == 1));
     menu.insertItem(i18n("&Goto"), 1);
 
     int id=menu.exec(p);
-    
+
     if (id == 1) {
         Selection target = appCore->getSimulation()->findObjectFromPath(std::string(item->text(col == 1).utf8()), true);
-	Selection ref = target.body()->getSystem()->getStar();
-	appCore->getSimulation()->setFrame(ObserverFrame::PhaseLock, target, ref);
-	QString date = item->text(2);
+        Selection ref = target.body()->getSystem()->getStar();
+        appCore->getSimulation()->setFrame(ObserverFrame::PhaseLock, target, ref);
+        QString date = item->text(2);
         int yearEnd = date.find('-', 1);
-        astro::Date d(date.left(yearEnd).toInt(), 
+        astro::Date d(date.left(yearEnd).toInt(),
                       date.mid(yearEnd + 1, 2).toInt(),
                       date.mid(yearEnd + 4, 2).toInt());
         d.hour = item->text(3).left(2).toInt();
@@ -137,13 +137,8 @@ void EclipseFinderDlg::gotoEclipse(QListViewItem* item, const QPoint& p, int col
         appCore->getSimulation()->setTime((double)d);
         appCore->getSimulation()->update(0.0);
 
-	double distance = target.radius() * 4.0;
+        double distance = target.radius() * 4.0;
         appCore->getSimulation()->gotoLocation(UniversalCoord::Zero().offsetKm(Vector3d::UnitX() * distance),
-                                  (YRotation(-PI / 2) * XRotation(-PI / 2)), 2.5);
+                                              (YRotation(-PI / 2) * XRotation(-PI / 2)), 2.5);
     }
 }
-
-
-
-
-
diff --git a/src/celestia/kde/kcelbookmarkmanager.cpp b/src/celestia/kde/kcelbookmarkmanager.cpp
index 522144731..f752373f5 100644
--- a/src/celestia/kde/kcelbookmarkmanager.cpp
+++ b/src/celestia/kde/kcelbookmarkmanager.cpp
@@ -25,12 +25,12 @@ KBookmarkManager* KCelBookmarkManager::self() {
     {
         QString bookmarksFile = locateLocal("data", QString::fromLatin1("celestia/bookmarks.xml"));
         QFile local(bookmarksFile);
-        if (!local.exists()) { 
+        if (!local.exists()) {
             QString bookmarksFileDefault = locate("data", QString::fromLatin1("celestia/bookmarks.xml"));
             copy(bookmarksFileDefault, bookmarksFile);
             QString faviconsDefault = locate("data", QString::fromLatin1("celestia/favicons/"));
             QDir faviconsDir(faviconsDefault, "*.png");
-            QStringList iconsList = faviconsDir.entryList();                                                            
+            QStringList iconsList = faviconsDir.entryList();
             QString faviconsDest = locateLocal("cache", "favicons/");
             for ( QStringList::Iterator i = iconsList.begin(); i != iconsList.end(); ++i ) {
                 copy(faviconsDefault + *i, faviconsDest + *i);
diff --git a/src/celestia/kde/kdeapp.cpp b/src/celestia/kde/kdeapp.cpp
index 9b9695cf7..995c169c9 100644
--- a/src/celestia/kde/kdeapp.cpp
+++ b/src/celestia/kde/kdeapp.cpp
@@ -156,7 +156,7 @@ KdeApp::KdeApp(std::string config, std::string dir, std::vector<std::string> ext
     if ( (dir.length() > 1 ? chdir(dir.c_str()):chdir(CONFIG_DATA_DIR)) == -1)
     {
         ::std::cout << "Cannot chdir to '" << CONFIG_DATA_DIR << "', probably due to improper installation" << ::std::endl;
-	exit(1);
+        exit(1);
     }
     glWidget = new KdeGlWidget( this, "kdeglwidget", appCore);
     string* altConfig = config.length() > 0 ? &config : NULL;
@@ -208,7 +208,7 @@ glWidget->makeCurrent();
 
 
 GLenum glewErr = glewInit();
-   { 
+   {
      if (GLEW_OK != glewErr)
 
     {
@@ -542,20 +542,20 @@ void KdeApp::initActions()
     if (KGlobal::config()->hasKey("TimeZoneBias"))
         isLocal = (KGlobal::config()->readNumEntry("TimeZoneBias") != 0);
 
-    if (KGlobal::config()->hasKey("StarStyle")) 
+    if (KGlobal::config()->hasKey("StarStyle"))
     {
         int starStyle = KGlobal::config()->readNumEntry("StarStyle");
         if (starStyle >= 0 && starStyle < Renderer::StarStyleCount)
             appCore->getRenderer()->setStarStyle((Renderer::StarStyle)starStyle);
     }
 
-    if (KGlobal::config()->hasKey("TextureResolution")) 
+    if (KGlobal::config()->hasKey("TextureResolution"))
     {
         int textureResolution = KGlobal::config()->readNumEntry("TextureResolution");
         appCore->getRenderer()->setResolution(textureResolution);
     }
 
-    if (KGlobal::config()->hasKey("DateFormat")) 
+    if (KGlobal::config()->hasKey("DateFormat"))
     {
         astro::Date::Format dateFormat = (astro::Date::Format) KGlobal::config()->readNumEntry("DateFormat");
         appCore->setDateFormat(dateFormat);
@@ -1389,13 +1389,13 @@ void KdeApp::slotDisplayLocalTime() {
 }
 
 void KdeApp::slotWireframeMode() {
-	static bool mode = false;
-	mode = !mode;
-	renderer->setRenderMode(mode ? GL_LINE : GL_FILL);
+    static bool mode = false;
+    mode = !mode;
+    renderer->setRenderMode(mode ? GL_LINE : GL_FILL);
 }
 
 void KdeApp::slotCenterCO() {
-	appCore->charEntered('C');
+    appCore->charEntered('C');
 }
 
 void KdeApp::slotSetRenderPathBasic() {
@@ -1510,7 +1510,7 @@ void KdeApp::slotGoTo() {
     bool ok;
     QString _url = KInputDialog::getText(i18n("Go to URL"), i18n("Enter URL"), "", &ok, this);
     if (ok) {
-        KURL url(_url);        
+        KURL url(_url);
         appCore->addToHistory();
         appCore->goToUrl(url.url().latin1());
     }
diff --git a/src/celestia/kde/kdeapp.h b/src/celestia/kde/kdeapp.h
index 4d90912c1..80da8715d 100644
--- a/src/celestia/kde/kdeapp.h
+++ b/src/celestia/kde/kdeapp.h
@@ -199,7 +199,7 @@ public slots:
 
     void slotCelestialBrowser();
     void slotEclipseFinder();
-    
+
     void slotDisplayLocalTime();
     void slotWireframeMode();
     void slotGrabImage();
@@ -267,7 +267,7 @@ private slots:
     void slotOk();
     void slotApply();
     void slotCancel();
-    
+
 private:
     CelestiaCore* appCore;
     QLineEdit *altEdit, *longEdit, *latEdit, *objEdit;
diff --git a/src/celestia/kde/kdeglwidget.h b/src/celestia/kde/kdeglwidget.h
index aab222141..431ba0785 100644
--- a/src/celestia/kde/kdeglwidget.h
+++ b/src/celestia/kde/kdeglwidget.h
@@ -43,7 +43,7 @@ public:
 
     void setCursorShape(CelestiaCore::CursorShape);
     CelestiaCore::CursorShape getCursorShape() const;
-    
+
 protected:
 
     void initializeGL();
diff --git a/src/celestia/kde/kdemain.cpp b/src/celestia/kde/kdemain.cpp
index edcbc22c9..40dee816d 100644
--- a/src/celestia/kde/kdemain.cpp
+++ b/src/celestia/kde/kdemain.cpp
@@ -27,7 +27,7 @@ static const char *description =
 
 
 static KCmdLineOptions options[] =
-{ 
+{
   { "conf <file>", I18N_NOOP("Use alternate configuration file"), 0 },
   { "dir <directory>", I18N_NOOP("Use alternate installation directory"), 0 },
   { "extrasdir <directory>", I18N_NOOP("Use as additional \"extras\" directory"), 0 },
@@ -39,7 +39,7 @@ static KCmdLineOptions options[] =
 };
 
 int main(int argc, char *argv[])
-{    
+{
     KAboutData aboutData( "celestia", I18N_NOOP("Celestia"),
       VERSION, description, KAboutData::License_GPL,
       "(c) 2002, Chris Laurel", 0, "http://www.shatters.net/celestia/", "chris@teyssier.org");
@@ -67,7 +67,7 @@ int main(int argc, char *argv[])
     aboutData.addCredit("Diego Rodriguez", "Acrobat conversion of User's Guide");
     aboutData.addCredit("Don Goyette", "CEL Scripting Guide");
     aboutData.addCredit("Harald Schmidt", "Celx/Lua Scripting Guide");
-    
+
     aboutData.setTranslator(I18N_NOOP("_: NAME OF TRANSLATORS\\nYour names") ,I18N_NOOP("_: EMAIL OF TRANSLATORS\\nYour emails"));
 
     KCmdLineArgs::init( argc, argv, &aboutData );
diff --git a/src/celestia/kde/kdepreferencesdialog.h b/src/celestia/kde/kdepreferencesdialog.h
index 05f4f49fc..fc798bc9b 100644
--- a/src/celestia/kde/kdepreferencesdialog.h
+++ b/src/celestia/kde/kdepreferencesdialog.h
@@ -33,7 +33,7 @@ class KdePreferencesDialog : public KDialogBase {
 Q_OBJECT
 
 public:
-    KdePreferencesDialog( QWidget* parent, CelestiaCore* core );   
+    KdePreferencesDialog( QWidget* parent, CelestiaCore* core );
     ~KdePreferencesDialog();
 
 public slots:
@@ -55,7 +55,7 @@ public slots:
 protected:
     CelestiaCore* appCore;
     KdeApp* parent;
-    
+
     KKeyChooser* keyChooser;
 
     int savedRendererFlags;
@@ -88,10 +88,10 @@ protected:
     QComboBox *renderPathCombo;
     QLabel* renderPathLabel;
     QLabel* ambientLabel, *faintestLabel, *minFeatureSizeLabel;
-    
+
     void setTime(double d);
     double getTime() const;
 
     void setRenderPathLabel();
-};        
+};
 
diff --git a/src/celestia/kde/kdeuniquecelestia.cpp b/src/celestia/kde/kdeuniquecelestia.cpp
index 6322a4308..31d9b14e1 100644
--- a/src/celestia/kde/kdeuniquecelestia.cpp
+++ b/src/celestia/kde/kdeuniquecelestia.cpp
@@ -50,7 +50,7 @@ KdeUniqueCelestia::KdeUniqueCelestia() {
         QFileInfo d(args->getOption("dir"));
         if (d.exists() && d.isDir() && d.isReadable() && d.isExecutable())
             dir = std::string(d.absFilePath().utf8());
-        else 
+        else
             std::cerr << i18n("Directory %1 does not exist, using default %2")
                     .arg(args->getOption("dir"))
                     .arg(CONFIG_DATA_DIR)  << std::endl;
@@ -60,9 +60,9 @@ KdeUniqueCelestia::KdeUniqueCelestia() {
         QCStringList dirs = args->getOptionList("extrasdir");
         for (QCStringList::Iterator i = dirs.begin(); i != dirs.end(); ++i) {
             QFileInfo d(*i);
-            if (d.exists() && d.isDir() && d.isReadable() && d.isExecutable()) 
+            if (d.exists() && d.isDir() && d.isReadable() && d.isExecutable())
                 validDirs.push_back(std::string(d.absFilePath().utf8()));
-            else 
+            else
                 std::cerr << i18n("Extras directory %1 does not exist").arg(*i) << std::endl;
         }
     }
@@ -77,7 +77,7 @@ KdeUniqueCelestia::KdeUniqueCelestia() {
 
     setMainWidget(app);
     app->show();
-    
+
 }
 
 int KdeUniqueCelestia::newInstance() {
diff --git a/src/celestia/kde/selectionpopup.cpp b/src/celestia/kde/selectionpopup.cpp
index 6a1ae1a16..61c1b857d 100644
--- a/src/celestia/kde/selectionpopup.cpp
+++ b/src/celestia/kde/selectionpopup.cpp
@@ -225,29 +225,29 @@ void SelectionPopup::process(int id)
         }
         return;
     }
-    if (actionId >=25 && actionId < 31 && sel.body() != NULL) 
+    if (actionId >=25 && actionId < 31 && sel.body() != NULL)
     {
 
         switch(actionId)
         {
         case 25:
-		appCore->toggleReferenceMark("body axes");
+        appCore->toggleReferenceMark("body axes");
             break;
         case 26:
-		appCore->toggleReferenceMark("frame axes");
+        appCore->toggleReferenceMark("frame axes");
             break;
         case 27:
-		appCore->toggleReferenceMark("sun direction");
+        appCore->toggleReferenceMark("sun direction");
             break;
         case 28:
-		appCore->toggleReferenceMark("velocity vector");
+        appCore->toggleReferenceMark("velocity vector");
             break;
-	case 29:
-		appCore->toggleReferenceMark("planetographic grid");
-	    break;
-	case 30:
-		appCore->toggleReferenceMark("terminator");
-	    break;
+    case 29:
+        appCore->toggleReferenceMark("planetographic grid");
+        break;
+    case 30:
+        appCore->toggleReferenceMark("terminator");
+        break;
         }
 
     }
diff --git a/src/celestia/kde/videocapturedlg.h b/src/celestia/kde/videocapturedlg.h
index 822003f96..30a368260 100644
--- a/src/celestia/kde/videocapturedlg.h
+++ b/src/celestia/kde/videocapturedlg.h
@@ -17,7 +17,7 @@ public:
     VideoCaptureDlg(QWidget *parent, const QString & dir);
     virtual ~VideoCaptureDlg();
     QString getDir() const;
-    
+
 
 public slots:
     void newAspectRatioSlot(int aspectIdx);
diff --git a/src/celestia/oggtheoracapture.cpp b/src/celestia/oggtheoracapture.cpp
index f485378b2..7bc14035a 100644
--- a/src/celestia/oggtheoracapture.cpp
+++ b/src/celestia/oggtheoracapture.cpp
@@ -1,6 +1,6 @@
 /*
  *  Copyright (C) 2006, William K Volkman <wkvsf@users.sourceforge.net>
- * 
+ *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public License
  *  as published by the Free Software Foundation; either version 2
@@ -12,7 +12,7 @@
  * Ecb = 0.564(B - Ey) = -0.169R-0.331G+0.500B
  *
  * the defined range for Y is [16,235] (220 steps) and the valid ranges
- * for Cr and Cb are [16,239] (235 steps) 
+ * for Cr and Cb are [16,239] (235 steps)
  *
  * http://www.neuro.sfc.keio.ac.jp/~aly/polygon/info/color-space-faq.html
  *  RGB -> YUV                    | YUV -> RGB
@@ -127,7 +127,7 @@ void OggTheoraCapture::setAspectRatio(int aspect_numerator, int aspect_denominat
     if (a > 1) {
         video_an = aspect_numerator / a;
         video_ad = aspect_denominator / a;
-    } 
+    }
     else
     {
         video_an = aspect_numerator;
@@ -144,7 +144,7 @@ void OggTheoraCapture::setQuality(float quality)
         video_q = (int)ceil(quality * 6.3);
     else
         video_q = (int)ceil(quality);
-    
+
 }
 bool OggTheoraCapture::start(const std::string& filename,
                  int w, int h,
@@ -161,9 +161,9 @@ bool OggTheoraCapture::start(const std::string& filename,
     }
     /* Set up Ogg output stream */
 #ifdef _WIN32
-	std::srand(std::time(NULL));
+    std::srand(std::time(NULL));
 #else
-	std::srand(time(NULL));
+    std::srand(time(NULL));
 #endif
 
     ogg_stream_init(&to,std::rand());
@@ -380,7 +380,7 @@ bool OggTheoraCapture::captureFrame()
         unsigned char * uout = yuv.u;
         unsigned char * vin0 = yuv.v;
         unsigned char * vin1 = yuv.v + video_x;
-        unsigned char * vout = yuv.v; 
+        unsigned char * vout = yuv.v;
         for (int y = 0; y < video_y; y += 2)
         {
             for (int x = 0; x < video_x; x += 2)
diff --git a/src/celestia/qt/qtappwin.cpp b/src/celestia/qt/qtappwin.cpp
index 942f19179..5b44dd343 100644
--- a/src/celestia/qt/qtappwin.cpp
+++ b/src/celestia/qt/qtappwin.cpp
@@ -134,7 +134,7 @@ public:
 
 private:
     QWidget* parent;
-};    
+};
 
 
 CelestiaAppWindow::CelestiaAppWindow( QWidget* parent ) :
@@ -169,19 +169,19 @@ CelestiaAppWindow::~CelestiaAppWindow()
 void CelestiaAppWindow::init(const QString& qConfigFileName,
                              const QStringList& qExtrasDirectories)
 {
-	QString celestia_data_dir = QString::fromLocal8Bit(::getenv("CELESTIA_DATA_DIR"));
-	
-	if (celestia_data_dir.isEmpty()) {
-		QString celestia_data_dir = CONFIG_DATA_DIR;
-		QDir::setCurrent(celestia_data_dir);
-	} else if (QDir(celestia_data_dir).isReadable()) {
-		QDir::setCurrent(celestia_data_dir);
-	} else {
-		QMessageBox::critical(0, "Celestia",
-			_("Celestia is unable to run because the data directroy was not "
-			  "found, probably due to improper installation."));
-			exit(1);
-	}
+    QString celestia_data_dir = QString::fromLocal8Bit(::getenv("CELESTIA_DATA_DIR"));
+
+    if (celestia_data_dir.isEmpty()) {
+        QString celestia_data_dir = CONFIG_DATA_DIR;
+        QDir::setCurrent(celestia_data_dir);
+    } else if (QDir(celestia_data_dir).isReadable()) {
+        QDir::setCurrent(celestia_data_dir);
+    } else {
+        QMessageBox::critical(0, "Celestia",
+            _("Celestia is unable to run because the data directroy was not "
+              "found, probably due to improper installation."));
+            exit(1);
+    }
 
     // Get the config file name
     string configFileName;
@@ -229,27 +229,27 @@ void CelestiaAppWindow::init(const QString& qConfigFileName,
     initAppDataDirectory();
 
     m_appCore = new CelestiaCore();
-    
+
     AppProgressNotifier* progress = new AppProgressNotifier(this);
     alerter = new AppAlerter(this);
     m_appCore->setAlerter(alerter);
 
-	setWindowIcon(QIcon(":/icons/celestia.png"));
+    setWindowIcon(QIcon(":/icons/celestia.png"));
 
     m_appCore->initSimulation(&configFileName,
                             &extrasDirectories,
                             progress);
     delete progress;
 
-	// Enable antialiasing if requested in the config file.
-	// TODO: Make this settable via the GUI
-	QGLFormat glformat = QGLFormat::defaultFormat();
-	if (m_appCore->getConfig()->aaSamples > 1)
-	{
-		glformat.setSampleBuffers(true);
-		glformat.setSamples(m_appCore->getConfig()->aaSamples);
-		QGLFormat::setDefaultFormat(glformat);
-	}
+    // Enable antialiasing if requested in the config file.
+    // TODO: Make this settable via the GUI
+    QGLFormat glformat = QGLFormat::defaultFormat();
+    if (m_appCore->getConfig()->aaSamples > 1)
+    {
+        glformat.setSampleBuffers(true);
+        glformat.setSamples(m_appCore->getConfig()->aaSamples);
+        QGLFormat::setDefaultFormat(glformat);
+    }
 
     glWidget = new CelestiaGlWidget(NULL, "Celestia", m_appCore);
     glWidget->makeCurrent();
@@ -364,15 +364,15 @@ void CelestiaAppWindow::init(const QString& qConfigFileName,
     populateBookmarkMenu();
     connect(m_bookmarkManager, SIGNAL(bookmarkTriggered(const QString&)),
             this, SLOT(slotBookmarkTriggered(const QString&)));
-    
+
     m_bookmarkToolBar = new BookmarkToolBar(m_bookmarkManager, this);
-    m_bookmarkToolBar->setObjectName("bookmark-toolbar");    
+    m_bookmarkToolBar->setObjectName("bookmark-toolbar");
     m_bookmarkToolBar->rebuild();
     addToolBar(Qt::TopToolBarArea, m_bookmarkToolBar);
 
     // Read saved window preferences
     readSettings();
-    
+
     // Build the view menu
     // Add dockable panels and toolbars to the view menu
     viewMenu->addAction(timeToolBar->toggleViewAction());
@@ -383,18 +383,18 @@ void CelestiaAppWindow::init(const QString& qConfigFileName,
     viewMenu->addAction(infoPanel->toggleViewAction());
     viewMenu->addAction(eventFinder->toggleViewAction());
     viewMenu->addSeparator();
-    
+
     QAction* fullScreenAction = new QAction(_("Full screen"), this);
     fullScreenAction->setCheckable(true);
     fullScreenAction->setShortcut(QString(_("Shift+F11")));
 
     // Set the full screen check state only after reading settings
     fullScreenAction->setChecked(isFullScreen());
-    
+
     connect(fullScreenAction, SIGNAL(triggered()), this, SLOT(slotToggleFullScreen()));
     viewMenu->addAction(fullScreenAction);
-    
-    
+
+
     // We use a timer with a null timeout value
     // to add m_appCore->tick to Qt's event loop
     QTimer *t = new QTimer(dynamic_cast<QObject *>(this));
@@ -469,14 +469,14 @@ void CelestiaAppWindow::initAppDataDirectory()
 void CelestiaAppWindow::readSettings()
 {
     QDesktopWidget desktop;
-    
+
     QSettings settings;
 
     settings.beginGroup("MainWindow");
-    
+
     QSize windowSize = settings.value("Size", DEFAULT_MAIN_WINDOW_SIZE).toSize();
     QPoint windowPosition = settings.value("Pos", DEFAULT_MAIN_WINDOW_POSITION).toPoint();
-    
+
     // Make sure that the saved size fits on screen; it's possible for the previous saved
     // position to be off-screen if the monitor settings have changed.
     bool onScreen = false;
@@ -486,20 +486,20 @@ void CelestiaAppWindow::readSettings()
         if (screenGeometry.contains(windowPosition))
             onScreen = true;
     }
-    
+
     if (!onScreen)
     {
         windowPosition = DEFAULT_MAIN_WINDOW_POSITION;
         windowSize = DEFAULT_MAIN_WINDOW_SIZE;
     }
-    
+
     resize(windowSize);
     move(windowPosition);
     if (settings.contains("State"))
         restoreState(settings.value("State").toByteArray(), CELESTIA_MAIN_WINDOW_VERSION);
     if (settings.value("Fullscreen", false).toBool())
         showFullScreen();
-    
+
     settings.endGroup();
 
     // Render settings read in qtglwidget
@@ -706,12 +706,12 @@ void CelestiaAppWindow::slotCaptureVideo()
 
         QComboBox* resolutionCombo = new QComboBox(&videoInfoDialog);
         layout->addWidget(new QLabel(_("Resolution:"), &videoInfoDialog), 0, 0);
-        layout->addWidget(resolutionCombo, 0, 1);        
+        layout->addWidget(resolutionCombo, 0, 1);
         for (unsigned int i = 0; i < sizeof(videoSizes) / sizeof(videoSizes[0]); i++)
         {
             resolutionCombo->addItem(QString("%1 x %2").arg(videoSizes[i][0]).arg(videoSizes[i][1]), QSize(videoSizes[i][0], videoSizes[i][1]));
         }
-        
+
         QComboBox* frameRateCombo = new QComboBox(&videoInfoDialog);
         layout->addWidget(new QLabel(_("Frame rate:"), &videoInfoDialog), 1, 0);
         layout->addWidget(frameRateCombo, 1, 1);
@@ -768,7 +768,7 @@ void CelestiaAppWindow::slotCopyURL()
 {
     CelestiaState appState;
     appState.captureState(m_appCore);
-    
+
     Url url(appState, 3);
     QApplication::clipboard()->setText(url.getAsString().c_str());
     m_appCore->flash(QString(_("Copied URL")).toUtf8().data());
@@ -796,7 +796,7 @@ void CelestiaAppWindow::handleCelUrl(const QUrl& url)
         m_appCore->goToUrl(urlText.toUtf8().data());
     }
 }
- 
+
 
 void CelestiaAppWindow::selectSun()
 {
@@ -968,13 +968,13 @@ void CelestiaAppWindow::slotAddBookmark()
     {
         defaultTitle = sel.location()->getName().c_str();
     }
-    
+
     if (defaultTitle.isEmpty())
         defaultTitle = _("New bookmark");
 
     CelestiaState appState;
     appState.captureState(m_appCore);
-    
+
     // Capture the current frame buffer to use as a bookmark icon.
     QImage grabbedImage = glWidget->grabFrameBuffer();
     int width = grabbedImage.width();
@@ -1015,7 +1015,7 @@ void CelestiaAppWindow::slotManual()
 {
     QString MANUAL_FILE = "CelestiaGuide.html";
     QDesktopServices::openUrl(QUrl(QUrl::fromLocalFile(QDir::toNativeSeparators(QApplication::applicationDirPath()) + QDir::toNativeSeparators(QDir::separator()) + "help" + QDir::toNativeSeparators(QDir::separator()) + MANUAL_FILE)));
-//	QMessageBox::information(
+//    QMessageBox::information(
 //         QApplication::activeWindow(),
 //         QApplication::applicationName(),
 //         QDir::toNativeSeparators(QApplication::applicationDirPath()) + QDir::toNativeSeparators(QDir::separator()) + "help" + QDir::toNativeSeparators(QDir::separator()) + MANUAL_FILE
@@ -1041,7 +1041,7 @@ void CelestiaAppWindow::slotShowAbout()
     "https://github.com/CelestiaProject/Celestia</a><br>"
     "</html>");
 
-	QMessageBox::about(this, "Celestia", _(aboutText));
+    QMessageBox::about(this, "Celestia", _(aboutText));
 }
 
 
@@ -1100,7 +1100,7 @@ void CelestiaAppWindow::slotShowGLInfo()
     }
 
     QDialog glInfo(this);
-    
+
     QVBoxLayout* layout = new QVBoxLayout(&glInfo);
     QTextEdit* textEdit = new QTextEdit(infoText, &glInfo);
     layout->addWidget(textEdit);
@@ -1178,7 +1178,7 @@ void CelestiaAppWindow::createMenus()
     connect(quitAct, SIGNAL(triggered()), this, SLOT(close()));
     fileMenu->addAction(quitAct);
 
-    
+
 
     /****** Navigation menu ******/
     navMenu = menuBar()->addMenu(_("&Navigation"));
@@ -1348,7 +1348,6 @@ void CelestiaAppWindow::createMenus()
 #else
     m_appCore->setTimeZoneBias(-timezone + 3600 * daylight);
 #endif
-    m_appCore->setTimeZoneName(tzname[daylight?0:1]);
 
     // If LocalTime is set to false, set the time zone bias to zero.
     if (settings.contains("LocalTime"))
@@ -1363,18 +1362,18 @@ void CelestiaAppWindow::createMenus()
         m_appCore->setTimeZoneName(settings.value("TimeZoneName").toString().toUtf8().data());
     }
 
-	/****** Help Menu ******/
+    /****** Help Menu ******/
     helpMenu = menuBar()->addMenu(_("&Help"));
 
-	QAction* helpManualAct = new QAction(QIcon(":/icons/book.png"), _("Manual Celestia"), this);
+    QAction* helpManualAct = new QAction(QIcon(":/icons/book.png"), _("Manual Celestia"), this);
     connect(helpManualAct, SIGNAL(triggered()), this, SLOT(slotManual()));
     helpMenu->addAction(helpManualAct);
     helpMenu->addSeparator();
-	
+
     QAction* glInfoAct = new QAction(QIcon(":/icons/report_GL.png"), _("OpenGL Info"), this);
     connect(glInfoAct, SIGNAL(triggered()), this, SLOT(slotShowGLInfo()));
     helpMenu->addAction(glInfoAct);
-	
+
     QAction* aboutAct = new QAction(QIcon(":/icons/about.png"), _("About Celestia"), this);
     connect(aboutAct, SIGNAL(triggered()), this, SLOT(slotShowAbout()));
     helpMenu->addAction(aboutAct);
@@ -1390,15 +1389,15 @@ void CelestiaAppWindow::createMenus()
 void CelestiaAppWindow::populateBookmarkMenu()
 {
     bookmarkMenu->clear();
-    
+
     QAction* addBookmarkAction = new QAction(QIcon(":/icons/bookmark-add.png"), _("Add Bookmark..."), bookmarkMenu);
     bookmarkMenu->addAction(addBookmarkAction);
     connect(addBookmarkAction, SIGNAL(triggered()), this, SLOT(slotAddBookmark()));
-    
+
     QAction* organizeBookmarksAction = new QAction(QIcon(":/icons/application-bookmark.png"), _("Organize Bookmarks..."), bookmarkMenu);
     bookmarkMenu->addAction(organizeBookmarksAction);
     connect(organizeBookmarksAction, SIGNAL(triggered()), this, SLOT(slotOrganizeBookmarks()));
-   
+
     bookmarkMenu->addSeparator();
 
     m_bookmarkManager->populateBookmarkMenu(bookmarkMenu);
@@ -1435,7 +1434,7 @@ QMenu* CelestiaAppWindow::buildScriptsMenu()
         return NULL;
 
     QMenu* menu = new QMenu(_("Scripts"));
-    
+
     for (vector<ScriptMenuItem>::const_iterator iter = scripts->begin();
          iter != scripts->end(); iter++)
     {
diff --git a/src/celestia/qt/qtappwin.h b/src/celestia/qt/qtappwin.h
index 94e967ad3..8d25794e4 100644
--- a/src/celestia/qt/qtappwin.h
+++ b/src/celestia/qt/qtappwin.h
@@ -55,7 +55,7 @@ class CelestiaAppWindow : public QMainWindow
  public slots:
     void celestia_tick();
     void slotShowSelectionContextMenu(const QPoint& pos, Selection& sel);
-	void slotManual();
+    void slotManual();
 
  private slots:
     void slotGrabImage();
@@ -72,7 +72,7 @@ class CelestiaAppWindow : public QMainWindow
 
     void slotSplitViewVertically();
     void slotSplitViewHorizontally();
-    void slotCycleView();	
+    void slotCycleView();
     void slotSingleView();
     void slotDeleteView();
     void slotToggleFramesVisible();
@@ -88,15 +88,15 @@ class CelestiaAppWindow : public QMainWindow
 
     void slotToggleFullScreen();
 
-	void slotShowAbout();
+    void slotShowAbout();
     void slotShowGLInfo();
-    
+
     void slotAddBookmark();
     void slotOrganizeBookmarks();
     void slotBookmarkTriggered(const QString& url);
 
     void handleCelUrl(const QUrl& url);
-    
+
  signals:
     void progressUpdate(const QString& s, int align, const QColor& c);
 
@@ -116,7 +116,7 @@ class CelestiaAppWindow : public QMainWindow
     CelestialBrowser* celestialBrowser;
 
     CelestiaCore* m_appCore;
-    
+
     CelestiaActions* actions;
 
     QMenu* fileMenu;
@@ -125,17 +125,17 @@ class CelestiaAppWindow : public QMainWindow
     QMenu* displayMenu;
     QMenu* bookmarkMenu;
     QMenu* viewMenu;
-	QMenu* helpMenu;
+    QMenu* helpMenu;
 
     InfoPanel* infoPanel;
     EventFinder* eventFinder;
 
     CelestiaCore::Alerter* alerter;
-    
+
     PreferencesDialog* m_preferencesDialog;
     BookmarkManager* m_bookmarkManager;
     BookmarkToolBar* m_bookmarkToolBar;
-        
+
     QString m_dataDirPath;
 };
 
diff --git a/src/celestia/qt/qtbookmark.cpp b/src/celestia/qt/qtbookmark.cpp
index ca9613785..aaa3456d0 100644
--- a/src/celestia/qt/qtbookmark.cpp
+++ b/src/celestia/qt/qtbookmark.cpp
@@ -38,7 +38,7 @@ BookmarkItem::type() const
 }
 
 
-BookmarkItem* 
+BookmarkItem*
 BookmarkItem::parent() const
 {
     return m_parent;
@@ -60,7 +60,7 @@ BookmarkItem::title() const
 }
 
 
-void 
+void
 BookmarkItem::setTitle(const QString& title)
 {
     m_title = title;
@@ -95,7 +95,7 @@ BookmarkItem::description() const
 }
 
 
-void 
+void
 BookmarkItem::setDescription(const QString& description)
 {
     m_description = description;
@@ -237,7 +237,7 @@ BookmarkTreeModel::~BookmarkTreeModel()
 {
     delete m_root;
 }
-    
+
 
 const BookmarkItem*
 BookmarkTreeModel::getItem(const QModelIndex& index) const
@@ -246,7 +246,7 @@ BookmarkTreeModel::getItem(const QModelIndex& index) const
 }
 
 
-BookmarkItem* 
+BookmarkItem*
 BookmarkTreeModel::getItem(const QModelIndex& index)
 {
     return static_cast<BookmarkItem*>(index.internalPointer());
@@ -263,16 +263,16 @@ BookmarkTreeModel::itemIndex(BookmarkItem* item)
 }
 
 
-QModelIndex 
+QModelIndex
 BookmarkTreeModel::index(int row, int column, const QModelIndex& parent) const
 {
     const BookmarkItem* parentFolder = NULL;
-    
+
     if (!parent.isValid())
         parentFolder = m_root;
     else
         parentFolder = getItem(parent);
-    
+
     Q_ASSERT(parentFolder->type() == BookmarkItem::Folder);
     Q_ASSERT(row < (int) parentFolder->childCount());
 
@@ -285,7 +285,7 @@ BookmarkTreeModel::parent(const QModelIndex& index) const
 {
     if (!index.isValid())
         return QModelIndex();
-    
+
     const BookmarkItem* item = getItem(index);
     BookmarkItem* parentFolder = item->parent();
     if (parentFolder == m_root)
@@ -295,7 +295,7 @@ BookmarkTreeModel::parent(const QModelIndex& index) const
 }
 
 
-int 
+int
 BookmarkTreeModel::rowCount(const QModelIndex& parent) const
 {
     if (parent.column() > 0)
@@ -318,12 +318,12 @@ BookmarkTreeModel::columnCount(const QModelIndex& parent) const
 }
 
 
-QVariant 
+QVariant
 BookmarkTreeModel::data(const QModelIndex& index, int role) const
 {
     if (!index.isValid())
         return QVariant();
-    
+
     const BookmarkItem* item = getItem(index);
 
     switch (role)
@@ -445,7 +445,7 @@ BookmarkTreeModel::supportedDropActions() const
 }
 
 
-bool 
+bool
 BookmarkTreeModel::dropMimeData(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent)
 {
     if (action == Qt::IgnoreAction)
@@ -466,7 +466,7 @@ BookmarkTreeModel::dropMimeData(const QMimeData* data, Qt::DropAction action, in
     if (stream.readRawData(reinterpret_cast<char*>(&item), sizeof(item)) != sizeof(item))
         return false;
 
-    BookmarkItem* parentFolder = NULL;       
+    BookmarkItem* parentFolder = NULL;
     if (!parent.isValid())
         parentFolder = m_root;
     else
@@ -497,7 +497,7 @@ BookmarkTreeModel::dropMimeData(const QMimeData* data, Qt::DropAction action, in
 bool
 BookmarkTreeModel::removeRows(int row, int count, const QModelIndex& parent)
 {
-    BookmarkItem* parentFolder = NULL;       
+    BookmarkItem* parentFolder = NULL;
     if (!parent.isValid())
         parentFolder = m_root;
     else
@@ -590,7 +590,7 @@ BookmarkManager::initializeBookmarks()
 {
     m_root = new BookmarkItem(BookmarkItem::Folder, NULL);
     m_root->setTitle("root");
-    
+
     BookmarkItem* menuBookmarks = new BookmarkItem(BookmarkItem::Folder, m_root);
     menuBookmarks->setTitle(_("Bookmarks Menu"));
     menuBookmarks->setDescription(_("Add bookmarks to this folder to see them in the bookmarks menu."));
@@ -636,7 +636,7 @@ BookmarkManager::populateBookmarkMenu(QMenu* menu)
     // the main menu.
     BookmarkItem* bookmarksMenuFolder = m_root->child(0);
     Q_ASSERT(bookmarksMenuFolder != NULL);
-    
+
     if (bookmarksMenuFolder != NULL)
         appendBookmarkMenuItems(menu, bookmarksMenuFolder);
 }
@@ -681,7 +681,7 @@ BookmarkManager::appendBookmarkMenuItems(QMenu* menu, const BookmarkItem* item)
             menu->addSeparator();
             break;
         }
-    }   
+    }
 }
 
 
@@ -731,7 +731,7 @@ BookmarkToolBar::BookmarkToolBar(BookmarkManager* manager, QWidget* parent) :
     setObjectName("bookmark-toolbar");
     setFloatable(true);
     setMovable(true);
-    setToolButtonStyle(Qt::ToolButtonTextBesideIcon);        
+    setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
 }
 
 
@@ -739,7 +739,7 @@ void
 BookmarkToolBar::rebuild()
 {
     clear();
-    
+
     // Toolbar bookmarks
     BookmarkItem* rootItem = m_manager->toolBarRootItem();
     if (rootItem != NULL)
@@ -759,7 +759,7 @@ BookmarkToolBar::rebuild()
                         addAction(menuAction);
                     }
                     break;
-                    
+
                 case BookmarkItem::Bookmark:
                     {
                         QAction* action = new QAction(child->title(), this);
@@ -771,12 +771,12 @@ BookmarkToolBar::rebuild()
                         addAction(action);
                     }
                     break;
-                    
+
                 case BookmarkItem::Separator:
                     addSeparator();
                     break;
             }
-        }   
+        }
     }
 }
 
@@ -797,7 +797,7 @@ public:
         BookmarkItem::Type type = static_cast<BookmarkItem::Type>(sourceModel()->data(index, BookmarkTreeModel::TypeRole).toInt());
         return type == BookmarkItem::Folder;
     }
-    
+
     int columnCount(const QModelIndex& parent) const
     {
         return qMin(QSortFilterProxyModel::columnCount(parent), 1);
@@ -823,7 +823,7 @@ AddBookmarkDialog::AddBookmarkDialog(BookmarkManager* manager,
 
     // User is only allowed to create a new bookmark in a folder
     // Filter out non-folders in the "create in" combo box
-    QTreeView* view = new QTreeView(this); 
+    QTreeView* view = new QTreeView(this);
     m_filterModel = new OnlyFoldersProxyModel(this);
     m_filterModel->setSourceModel(model);
 
@@ -836,10 +836,10 @@ AddBookmarkDialog::AddBookmarkDialog(BookmarkManager* manager,
     createInCombo->setModel(m_filterModel);
     view->show();
     createInCombo->setView(view);
-    
+
     timeSourceCombo->addItem(_("Current simulation time"),       (int) Url::UseUrlTime);
     timeSourceCombo->addItem(_("Simulation time at activation"), (int) Url::UseSimulationTime);
-    timeSourceCombo->addItem(_("System time at activation"),     (int) Url::UseSystemTime);    
+    timeSourceCombo->addItem(_("System time at activation"),     (int) Url::UseSystemTime);
     timeSourceCombo->setCurrentIndex(m_lastTimeSourceIndex);
 
     // Initialize to first index
@@ -858,14 +858,14 @@ AddBookmarkDialog::accept()
     {
         // Preserve the last used time source index
         m_lastTimeSourceIndex = timeSourceCombo->currentIndex();
-        
+
         QVariant itemData = timeSourceCombo->itemData(timeSourceCombo->currentIndex());
         Url::TimeSource timeSource = (Url::TimeSource) itemData.toInt();
         Q_ASSERT(timeSource >= 0 && timeSource < Url::TimeSourceCount);
-        
+
         // Get the URL string
         Url url(m_appState, Url::CurrentVersion, timeSource);
-        
+
         BookmarkItem* folder = m_manager->model()->getItem(index);
         BookmarkItem* newItem = new BookmarkItem(BookmarkItem::Bookmark, folder);
         newItem->setTitle(bookmarkNameEdit->text());
@@ -890,7 +890,7 @@ NewBookmarkFolderDialog::NewBookmarkFolderDialog(BookmarkManager* manager) :
 
     // User is only allowed to create a new bookmark in a folder
     // Filter out non-folders in the "create in" combo box
-    QTreeView* view = new QTreeView(this); 
+    QTreeView* view = new QTreeView(this);
     m_filterModel = new OnlyFoldersProxyModel(this);
     m_filterModel->setSourceModel(model);
 
@@ -936,12 +936,12 @@ OrganizeBookmarksDialog::OrganizeBookmarksDialog(BookmarkManager* manager) :
 
     treeView->setSelectionMode(QAbstractItemView::SingleSelection);
     treeView->setUniformRowHeights(true);
-    
+
     treeView->setDragEnabled(true);
     treeView->setAcceptDrops(true);
     treeView->setDragDropMode(QAbstractItemView::InternalMove);
     treeView->setDropIndicatorShown(true);
-    
+
     treeView->header()->show();
     treeView->setModel(manager->model());
     treeView->resizeColumnToContents(0);
@@ -966,7 +966,7 @@ void
 OrganizeBookmarksDialog::on_newFolderButton_clicked()
 {
     QModelIndex index = treeView->currentIndex();
-    
+
     if (index.isValid())
     {
         BookmarkItem* item = m_manager->model()->getItem(index);
@@ -1008,7 +1008,7 @@ void
 OrganizeBookmarksDialog::on_newSeparatorButton_clicked()
 {
     QModelIndex index = treeView->currentIndex();
-    
+
     if (index.isValid())
     {
         BookmarkItem* item = m_manager->model()->getItem(index);
diff --git a/src/celestia/qt/qtbookmark.h b/src/celestia/qt/qtbookmark.h
index 060974f3d..71a1f90db 100644
--- a/src/celestia/qt/qtbookmark.h
+++ b/src/celestia/qt/qtbookmark.h
@@ -64,7 +64,7 @@ public:
 
     bool isRoot() const;
     int position() const;
-    int childPosition(const BookmarkItem* child) const; 
+    int childPosition(const BookmarkItem* child) const;
 
     BookmarkItem* clone(BookmarkItem* withParent = NULL) const;
 
@@ -88,7 +88,7 @@ private:
 class BookmarkTreeModel : public QAbstractItemModel
 {
 public:
-    BookmarkTreeModel();  
+    BookmarkTreeModel();
     ~BookmarkTreeModel();
 
     enum {
@@ -98,10 +98,10 @@ public:
 
     QModelIndex index(int row, int /* column */, const QModelIndex& parent) const;
     QModelIndex parent(const QModelIndex& index) const;
-    
+
     int rowCount(const QModelIndex& parent = QModelIndex()) const;
     int columnCount(const QModelIndex& /* parent */) const;
-    QVariant data(const QModelIndex& index, int role) const;   
+    QVariant data(const QModelIndex& index, int role) const;
     QVariant headerData(int /* section */, Qt::Orientation /* orientation */, int /* role */) const   ;
     Qt::ItemFlags flags(const QModelIndex& index) const;
 
@@ -144,7 +144,7 @@ public:
     void appendBookmarkMenuItems(QMenu* menu, const BookmarkItem* item);
 
     BookmarkTreeModel* model() const;
-    
+
     BookmarkItem* menuRootItem() const;
     BookmarkItem* toolBarRootItem() const;
 
@@ -163,12 +163,12 @@ private:
 class BookmarkToolBar : public QToolBar
 {
     Q_OBJECT
-    
+
 public:
     BookmarkToolBar(BookmarkManager *manager, QWidget* parent);
-    
+
     void rebuild();
-    
+
 private:
     BookmarkManager* m_manager;
 };
@@ -192,7 +192,7 @@ private:
     QSortFilterProxyModel* m_filterModel;
     const CelestiaState& m_appState;
     QImage m_iconImage;
-    
+
     static int m_lastTimeSourceIndex;
 };
 
diff --git a/src/celestia/qt/qtcelestiaactions.cpp b/src/celestia/qt/qtcelestiaactions.cpp
index f5095b6f9..e5df435cc 100644
--- a/src/celestia/qt/qtcelestiaactions.cpp
+++ b/src/celestia/qt/qtcelestiaactions.cpp
@@ -128,7 +128,7 @@ CelestiaActions::CelestiaActions(QObject* parent,
     asteroidOrbitsAction   = createCheckableAction(_("Asteroids"), orbitsMenu, Body::Asteroid);
     cometOrbitsAction      = createCheckableAction(_("Comets"), orbitsMenu, Body::Comet);
     spacecraftOrbitsAction = createCheckableAction(_("Spacecraft"), orbitsMenu, Body::Spacecraft);
-    
+
     connect(starOrbitsAction, SIGNAL(triggered()), this, SLOT(slotToggleOrbit()));
     connect(planetOrbitsAction, SIGNAL(triggered()), this, SLOT(slotToggleOrbit()));
     connect(dwarfPlanetOrbitsAction, SIGNAL(triggered()), this, SLOT(slotToggleOrbit()));
@@ -242,7 +242,7 @@ CelestiaActions::CelestiaActions(QObject* parent,
     lightTimeDelayAction->setCheckable(true);
     lightTimeDelayAction->setToolTip("Subtract one-way light travel time to selected object");
     connect(lightTimeDelayAction, SIGNAL(triggered()), this, SLOT(slotSetLightTimeDelay()));
-    
+
     syncWithRenderer(appCore->getRenderer());
     syncWithAppCore();
     appCore->getRenderer()->addWatcher(this);
@@ -272,7 +272,7 @@ void CelestiaActions::syncWithRenderer(const Renderer* renderer)
     constellationsAction->setChecked(renderFlags & Renderer::ShowDiagrams);
     boundariesAction->setChecked(renderFlags & Renderer::ShowBoundaries);
     orbitsAction->setChecked(renderFlags & Renderer::ShowOrbits);
-    
+
     labelGalaxiesAction->setChecked(labelMode & Renderer::GalaxyLabels);
     labelGlobularsAction->setChecked(labelMode & Renderer::GlobularLabels);
     labelOpenClustersAction->setChecked(labelMode & Renderer::OpenClusterLabels);
diff --git a/src/celestia/qt/qtcelestiaactions.h b/src/celestia/qt/qtcelestiaactions.h
index 787374546..e4c62fc5f 100644
--- a/src/celestia/qt/qtcelestiaactions.h
+++ b/src/celestia/qt/qtcelestiaactions.h
@@ -45,7 +45,7 @@ Q_OBJECT
     void syncWithAppCore();
     QAction* createCheckableAction(const QString& text, QMenu* menu, int data);
     QAction* createCheckableAction(const QString& text, int data);
-    
+
  public:
     QAction* equatorialGridAction;
     QAction* galacticGridAction;
@@ -62,7 +62,7 @@ Q_OBJECT
     QAction* globularsAction;
     QAction* openClustersAction;
     QAction* nebulaeAction;
-    
+
     QAction* labelGalaxiesAction;
     QAction* labelGlobularsAction;
     QAction* labelOpenClustersAction;
diff --git a/src/celestia/qt/qtcelestialbrowser.cpp b/src/celestia/qt/qtcelestialbrowser.cpp
index 1ea022601..163701f42 100644
--- a/src/celestia/qt/qtcelestialbrowser.cpp
+++ b/src/celestia/qt/qtcelestialbrowser.cpp
@@ -67,7 +67,7 @@ public:
     StarPredicate(Criterion _criterion, const UniversalCoord& _observerPos);
 
     bool operator()(const Star* star0, const Star* star1) const;
-    
+
 private:
     Criterion criterion;
     Vector3f pos;
@@ -386,7 +386,7 @@ void StarTableModel::populate(const UniversalCoord& _observerPos,
                               unsigned int nStars)
 {
     const StarDatabase& stardb = *universe->getStarCatalog();
-    
+
     observerPos = _observerPos;
     now = _now;
 
@@ -523,7 +523,7 @@ CelestialBrowser::CelestialBrowser(CelestiaCore* _appCore, QWidget* parent) :
     // Additional filtering controls
     QGroupBox* filterGroup = new QGroupBox(_("Filter"));
     QGridLayout* filterGroupLayout = new QGridLayout();
-    
+
     withPlanetsFilterBox = new QCheckBox(_("With Planets"));
     connect(withPlanetsFilterBox, SIGNAL(clicked()), this, SLOT(slotRefreshTable()));
     filterGroupLayout->addWidget(withPlanetsFilterBox, 0, 0);
@@ -597,7 +597,7 @@ CelestialBrowser::CelestialBrowser(CelestiaCore* _appCore, QWidget* parent) :
     colorSwatch = new ColorSwatchWidget(QColor("cyan"));
     colorSwatch->setToolTip(_("Click to select marker color"));
     markGroupLayout->addWidget(colorSwatch, 1, 2);
-    
+
     labelMarkerBox = new QCheckBox(_("Label"));
     markGroupLayout->addWidget(labelMarkerBox, 1, 3);
 
@@ -696,7 +696,7 @@ void CelestialBrowser::slotMarkSelected()
     Color color((float) markerColor.redF(),
                 (float) markerColor.greenF(),
                 (float) markerColor.blueF());
-    
+
     Universe* universe = appCore->getSimulation()->getUniverse();
     string label;
 
diff --git a/src/celestia/qt/qtdeepskybrowser.cpp b/src/celestia/qt/qtdeepskybrowser.cpp
index ad0918ab2..b69a8ed39 100644
--- a/src/celestia/qt/qtdeepskybrowser.cpp
+++ b/src/celestia/qt/qtdeepskybrowser.cpp
@@ -64,7 +64,7 @@ public:
     DSOPredicate(Criterion _criterion, const Vector3d& _observerPos);
 
     bool operator()(const DeepSkyObject* dso0, const DeepSkyObject* dso1) const;
-    
+
 private:
     Criterion criterion;
     Vector3d pos;
@@ -311,11 +311,11 @@ void DSOTableModel::populate(const UniversalCoord& _observerPos,
                              unsigned int nDSOs)
 {
     const DSODatabase& dsodb = *universe->getDSOCatalog();
-    
+
     observerPos = _observerPos.offsetFromKm(UniversalCoord::Zero()) * astro::kilometersToLightYears(1.0);
-    
+
     typedef multiset<DeepSkyObject*, DSOPredicate> DSOSet;
-    
+
     DSOPredicate pred(criterion, observerPos);
 
     // Apply the filter
@@ -451,7 +451,7 @@ DeepSkyBrowser::DeepSkyBrowser(CelestiaCore* _appCore, QWidget* parent) :
     // Additional filtering controls
     QGroupBox* filterGroup = new QGroupBox(_("Filter"));
     QHBoxLayout* filterGroupLayout = new QHBoxLayout();
-    
+
     filterGroupLayout->addWidget(new QLabel(_("Type")));
     objectTypeFilterBox = new QLineEdit();
     connect(objectTypeFilterBox, SIGNAL(editingFinished()), this, SLOT(slotRefreshTable()));
@@ -600,7 +600,7 @@ void DeepSkyBrowser::slotMarkSelected()
     Color color((float) markerColor.redF(),
                 (float) markerColor.greenF(),
                 (float) markerColor.blueF());
-    
+
     Universe* universe = appCore->getSimulation()->getUniverse();
     string label;
 
@@ -620,7 +620,7 @@ void DeepSkyBrowser::slotMarkSelected()
                         label = ReplaceGreekLetterAbbr(label);
                     }
 
-                    universe->markObject(Selection(dso), 
+                    universe->markObject(Selection(dso),
                                          MarkerRepresentation(markerSymbol, size, color, label),
                                          1);
                 }
diff --git a/src/celestia/qt/qteventfinder.cpp b/src/celestia/qt/qteventfinder.cpp
index 6bbb5d462..9015d1310 100644
--- a/src/celestia/qt/qteventfinder.cpp
+++ b/src/celestia/qt/qteventfinder.cpp
@@ -80,7 +80,7 @@ class QtEclipseFinder
     double findEclipseStart(const Body& recever, const Body& occulter, double now, double startStep, double minStep) const;
     double findEclipseEnd(const Body& recever, const Body& occulter, double now, double startStep, double minStep) const;
 
- private:                    
+ private:
     Body* body;
     EclipseFinderWatcher* watcher;
 };
@@ -104,10 +104,10 @@ static double QDateToTDB(const QDate& date)
 static QDateTime TDBToQDate(double tdb)
 {
     astro::Date date = astro::TDBtoUTC(tdb);
-    
+
     int sec = (int) date.seconds;
     int msec = (int) ((date.seconds - sec) * 1000);
-    
+
     return QDateTime(QDate(date.year, date.month, date.day),
                      QTime(date.hour, date.minute, sec, msec));
 }
@@ -217,12 +217,12 @@ double QtEclipseFinder::findEclipseEnd(const Body& receiver, const Body& occulte
     // of startStep.
     while (testEclipse(receiver, occulter, now + startStep))
         now += startStep;
-    
+
     double step = startStep / 2;
     double t = now + step;
     bool eclipsed = true;
 
-    
+
     // Perform a binary search to find the end of the eclipse
     while (step > minStep)
     {
@@ -251,7 +251,7 @@ void QtEclipseFinder::findEclipses(double startDate,
                                    vector<EclipseRecord>& eclipses)
 {
     PlanetarySystem* satellites = body->getSatellites();
- 
+
     // See if there's anything that could test
     if (satellites == NULL)
         return;
@@ -442,7 +442,7 @@ QVariant EventTableModel::data(const QModelIndex& index, int role) const
             {
                 int minutes = (int) ((eclipse.endTime - eclipse.startTime) * 24 * 60);
                 return QString("%1:%2").arg(minutes / 60).arg(minutes % 60, 2, 10, QLatin1Char('0'));
-                
+
             }
         default:
             return QVariant();
@@ -579,7 +579,7 @@ EventFinder::EventFinder(CelestiaCore* _appCore,
     // Search the search range box
     QGroupBox* searchRangeBox = new QGroupBox(_("Search range"));
     QVBoxLayout* searchRangeLayout = new QVBoxLayout();
-    
+
     startDateEdit = new QDateEdit(searchRangeBox);
     endDateEdit = new QDateEdit(searchRangeBox);
     startDateEdit->setDisplayFormat("dd MMM yyyy");
@@ -588,7 +588,7 @@ EventFinder::EventFinder(CelestiaCore* _appCore,
     searchRangeLayout->addWidget(endDateEdit);
 
     searchRangeBox->setLayout(searchRangeLayout);
-    
+
     // subgroup for layout
     QWidget* subgroup = new QWidget(this);
     QHBoxLayout* subLayout = new QHBoxLayout();
@@ -623,7 +623,7 @@ EventFinder::EventFinder(CelestiaCore* _appCore,
 
     model = new EventTableModel();
     eventTable->setModel(model);
-    
+
     this->setWidget(finderWidget);
 }
 
@@ -689,7 +689,7 @@ void EventFinder::slotFindEclipses()
 
     QtEclipseFinder finder(obj.body(), this);
     searchTimer.start();
-    
+
     double startTimeTDB = QDateToTDB(startDate);
     double endTimeTDB = QDateToTDB(endDate);
 
@@ -700,7 +700,7 @@ void EventFinder::slotFindEclipses()
     progress = new QProgressDialog(_("Finding eclipses..."), "Abort", (int) startTimeTDB, (int) endTimeTDB, this);
     progress->setWindowModality(Qt::WindowModal);
     progress->show();
-    
+
 
     vector<EclipseRecord> eclipses;
     finder.findEclipses(startTimeTDB, endTimeTDB,
@@ -708,7 +708,7 @@ void EventFinder::slotFindEclipses()
                         eclipses);
     delete progress;
     progress = NULL;
-    
+
     model->setEclipses(eclipses);
 
     eventTable->resizeColumnToContents(EventTableModel::OcculterColumn);
diff --git a/src/celestia/qt/qteventfinder.h b/src/celestia/qt/qteventfinder.h
index a1c203f23..4eb90d7e0 100644
--- a/src/celestia/qt/qteventfinder.h
+++ b/src/celestia/qt/qteventfinder.h
@@ -30,7 +30,7 @@ class EclipseFinderWatcher
 {
 public:
     virtual ~EclipseFinderWatcher() {};
-    
+
     enum Status
     {
         ContinueOperation = 0,
@@ -50,16 +50,16 @@ Q_OBJECT
     ~EventFinder();
 
     EclipseFinderWatcher::Status eclipseFinderProgressUpdate(double t);
-    
+
  public slots:
     void slotFindEclipses();
-	void slotContextMenu(const QPoint&);
+    void slotContextMenu(const QPoint&);
 
-	void slotSetEclipseTime();
-	void slotViewNearEclipsed();
-	void slotViewEclipsedSurface();
-	void slotViewOccluderSurface();
-	void slotViewBehindOccluder();
+    void slotSetEclipseTime();
+    void slotViewNearEclipsed();
+    void slotViewEclipsedSurface();
+    void slotViewOccluderSurface();
+    void slotViewBehindOccluder();
 
  private:
     CelestiaCore* appCore;
@@ -75,15 +75,15 @@ Q_OBJECT
 
     EventTableModel* model;
     QTreeView* eventTable;
-	QMenu* contextMenu;
+    QMenu* contextMenu;
 
     QProgressDialog* progress;
     double searchSpan;
     double lastProgressUpdate;
 
-	QTime searchTimer;
+    QTime searchTimer;
 
-	const EclipseRecord* activeEclipse;
+    const EclipseRecord* activeEclipse;
 };
 
 #endif // _QTEVENTFINDER_H_
diff --git a/src/celestia/qt/qtglwidget.cpp b/src/celestia/qt/qtglwidget.cpp
index 5ce38e949..7aafd6a50 100644
--- a/src/celestia/qt/qtglwidget.cpp
+++ b/src/celestia/qt/qtglwidget.cpp
@@ -49,22 +49,22 @@ using namespace Qt;
 
 
 const int DEFAULT_RENDER_FLAGS =
-		  Renderer::ShowStars              |
-		  Renderer::ShowPlanets            |
-		  Renderer::ShowGalaxies           |
-		  Renderer::ShowGlobulars          |
-		  Renderer::ShowCloudMaps          |
-		  Renderer::ShowAtmospheres        |
-		  Renderer::ShowEclipseShadows     |
-		  Renderer::ShowRingShadows        |
-		  Renderer::ShowCometTails         |
-		  Renderer::ShowNebulae            |
-		  Renderer::ShowOpenClusters       |
-		  Renderer::ShowAutoMag            |
-		  Renderer::ShowNightMaps          |
-		  Renderer::ShowCloudShadows       |
-		  Renderer::ShowTintedIllumination |
-		  Renderer::ShowSmoothLines;
+          Renderer::ShowStars              |
+          Renderer::ShowPlanets            |
+          Renderer::ShowGalaxies           |
+          Renderer::ShowGlobulars          |
+          Renderer::ShowCloudMaps          |
+          Renderer::ShowAtmospheres        |
+          Renderer::ShowEclipseShadows     |
+          Renderer::ShowRingShadows        |
+          Renderer::ShowCometTails         |
+          Renderer::ShowNebulae            |
+          Renderer::ShowOpenClusters       |
+          Renderer::ShowAutoMag            |
+          Renderer::ShowNightMaps          |
+          Renderer::ShowCloudShadows       |
+          Renderer::ShowTintedIllumination |
+          Renderer::ShowSmoothLines;
 
 const int DEFAULT_ORBIT_MASK = Body::Planet | Body::Moon | Body::Stellar;
 
@@ -166,9 +166,9 @@ void CelestiaGlWidget::initializeGL()
     appRenderer->setResolution(settings.value("TextureResolution", DEFAULT_TEXTURE_RESOLUTION).toUInt());
 
     if (settings.value("StarsColor", DEFAULT_STARS_COLOR).toInt() == 0)
-    appRenderer->setStarColorTable(GetStarColorTable(ColorTable_Enhanced));
+        appRenderer->setStarColorTable(GetStarColorTable(ColorTable_Enhanced));
     else
-    appRenderer->setStarColorTable(GetStarColorTable(ColorTable_Blackbody_D65));
+        appRenderer->setStarColorTable(GetStarColorTable(ColorTable_Blackbody_D65));
 
     appCore->getSimulation()->setFaintestVisible((float) settings.value("Preferences/VisualMagnitude", DEFAULT_VISUAL_MAGNITUDE).toDouble());
 
@@ -212,7 +212,7 @@ void CelestiaGlWidget::mouseMoveEvent(QMouseEvent* m)
         buttons |= CelestiaCore::ShiftKey;
     if (m->modifiers() & ControlModifier)
         buttons |= CelestiaCore::ControlKey;
-    
+
 #ifdef TARGET_OS_MAC
     // On the Mac, right dragging is be simulated with Option+left drag.
     // We may want to enable this on other platforms, though it's mostly only helpful
@@ -287,7 +287,6 @@ void CelestiaGlWidget::mousePressEvent( QMouseEvent* m )
         appCore->mouseButtonDown(m->x(), m->y(), CelestiaCore::MiddleButton);
     else if (m->button() == RightButton)
         appCore->mouseButtonDown(m->x(), m->y(), CelestiaCore::RightButton);
-
 }
 
 
@@ -396,7 +395,7 @@ bool CelestiaGlWidget::handleSpecialKey(QKeyEvent* e, bool down)
 /*    case Key_F10:
         if (e->modifiers()& ShiftModifier)
             k = CelestiaCore::Key_F10;
-        break;*/     
+        break;*/
     case Key_0:
         if (e->modifiers() & Qt::KeypadModifier)
             k = CelestiaCore::Key_NumPad0;
diff --git a/src/celestia/qt/qtglwidget.h b/src/celestia/qt/qtglwidget.h
index 74319213d..0543aeb95 100644
--- a/src/celestia/qt/qtglwidget.h
+++ b/src/celestia/qt/qtglwidget.h
@@ -38,7 +38,7 @@ public:
 
     void setCursorShape(CelestiaCore::CursorShape);
     CelestiaCore::CursorShape getCursorShape() const;
-    
+
 protected:
     void initializeGL();
     void paintGL();
diff --git a/src/celestia/qt/qtinfopanel.cpp b/src/celestia/qt/qtinfopanel.cpp
index 7c7497962..b1b249074 100644
--- a/src/celestia/qt/qtinfopanel.cpp
+++ b/src/celestia/qt/qtinfopanel.cpp
@@ -260,7 +260,7 @@ void InfoPanel::buildStarPage(const Star* star, const Universe* universe, double
 {
     string name = ReplaceGreekLetterAbbr(universe->getStarCatalog()->getStarName(*star, true));
     stream << "<h1>" << QString::fromUtf8(name.c_str()) << "</h1><br>\n";
-    
+
     // Compute the star's position relative to the Solar System Barycenter. Note that
     // this will ignore the effect of parallax in the star's position.
     // TODO: Use either the observer's position or the Earth's position as the
@@ -289,7 +289,7 @@ void InfoPanel::buildDSOPage(const DeepSkyObject* dso,
 {
     string name = universe->getDSOCatalog()->getDSOName(dso, true);
     stream << "<h1>" << QString::fromUtf8(name.c_str()) << "</h1><br>\n";
-    
+
     Vector3d eqPos = astro::eclipticToEquatorial(celToJ2000Ecliptic(dso->getPosition()));
     Vector3d sph = rectToSpherical(eqPos);
 
@@ -306,7 +306,7 @@ void InfoPanel::buildDSOPage(const DeepSkyObject* dso,
 
     Vector3d galPos = astro::equatorialToGalactic(eqPos);
     sph = rectToSpherical(galPos);
-    
+
     astro::decimalToDegMinSec(radToDeg(sph.x()), degrees, minutes, seconds);
     stream << "L: " << degrees << QString::fromUtf8(UTF8_DEGREE_SIGN) << " " <<
         abs(minutes) << "' " << abs(seconds) << "\"<br>\n";
diff --git a/src/celestia/qt/qtmain.cpp b/src/celestia/qt/qtmain.cpp
index f8dc50807..bf941adab 100644
--- a/src/celestia/qt/qtmain.cpp
+++ b/src/celestia/qt/qtmain.cpp
@@ -24,7 +24,7 @@
 #include <QBitmap>
 #include <vector>
 #include "qtappwin.h"
-#include <qtextcodec.h> 
+#include <qtextcodec.h>
 
 using namespace std;
 
@@ -55,14 +55,14 @@ void loadModules(QSplashScreen* psplash)
             ++i;
         }
         psplash->showMessage(_("Loading data files: ") + QString::number(i) + "%" + "\n\n",
-								Qt::AlignHCenter | Qt::AlignBottom,
-								Qt::white);
+                             Qt::AlignHCenter | Qt::AlignBottom,
+                             Qt::white);
     }
 }
 /////////////////////////////////////////
 
 int main(int argc, char *argv[])
-{  
+{
     QApplication app(argc, argv);
 
     Q_INIT_RESOURCE(icons);
@@ -81,12 +81,12 @@ int main(int argc, char *argv[])
     splash.show(); // Enable command
 
     // Gettext integration
-    setlocale(LC_ALL, ""); 
-    setlocale(LC_NUMERIC, "C"); 
+    setlocale(LC_ALL, "");
+    setlocale(LC_NUMERIC, "C");
     bindtextdomain("celestia","locale");
-    bind_textdomain_codeset("celestia", "UTF-8"); 
+    bind_textdomain_codeset("celestia", "UTF-8");
     bindtextdomain("celestia_constellations","locale");
-    bind_textdomain_codeset("celestia_constellations", "UTF-8"); 
+    bind_textdomain_codeset("celestia_constellations", "UTF-8");
     textdomain("celestia");
 
     // By default, QString converts the const char * data into Unicode Latin-1 characters.
@@ -96,18 +96,18 @@ int main(int argc, char *argv[])
 
     CelestiaAppWindow window;
 
-	loadModules(&splash);
-	
+    loadModules(&splash);
+
     // Connect the splash screen to the main window so that it
     // can receive progress notifications as Celestia files required
     // for startup are loaded.
-	// Disable command
+    // Disable command
     //QObject::connect(&window, SIGNAL(progressUpdate(const QString&, int, const QColor&)),
     //                 &splash, SLOT(showMessage(const QString&, int, const QColor&)));
 
     window.init(configFileName, extrasDirectories);
     window.show();
-	
+
     splash.finish(&window);
 
     // Set the main window to be the cel url handler
diff --git a/src/celestia/qt/qtpreferencesdialog.h b/src/celestia/qt/qtpreferencesdialog.h
index fa3ecb6aa..7beb59fbe 100644
--- a/src/celestia/qt/qtpreferencesdialog.h
+++ b/src/celestia/qt/qtpreferencesdialog.h
@@ -115,5 +115,5 @@ private slots:
 protected:
     CelestiaCore* appCore;
     Ui_preferencesDialog ui;
-};        
+};
 
diff --git a/src/celestia/qt/qtselectionpopup.cpp b/src/celestia/qt/qtselectionpopup.cpp
index 4b3960ee5..a74bbb193 100644
--- a/src/celestia/qt/qtselectionpopup.cpp
+++ b/src/celestia/qt/qtselectionpopup.cpp
@@ -64,7 +64,7 @@ SelectionPopup::SelectionPopup(const Selection& sel,
         double startTime = 0.0;
         double endTime = 0.0;
         sel.body()->getLifespan(startTime, endTime);
-        
+
         if (startTime > -1.0e9 || endTime < 1.0e9)
         {
             addSeparator();
@@ -95,7 +95,7 @@ SelectionPopup::SelectionPopup(const Selection& sel,
     {
         std::string name = ReplaceGreekLetterAbbr(sim->getUniverse()->getStarCatalog()->getStarName(*sel.star(), true));
         addAction(boldTextItem(QString::fromUtf8(name.c_str())));
-        
+
         // Add some text items giving additional information about
         // the star.
         double distance = astro::kilometersToLightYears(v.norm());
@@ -159,14 +159,14 @@ SelectionPopup::SelectionPopup(const Selection& sel,
     connect(infoAction, SIGNAL(triggered()), this, SLOT(slotInfo()));
     addAction(infoAction);
 
-	if (sel.body() != NULL)
-	{
-		QAction* setVisibilityAction = new QAction(_("Visible"), this);
-		setVisibilityAction->setCheckable(true);
-		setVisibilityAction->setChecked(sel.body()->isVisible());
-		connect(setVisibilityAction, SIGNAL(toggled(bool)), this, SLOT(slotToggleVisibility(bool)));
-		addAction(setVisibilityAction);
-	}
+    if (sel.body() != NULL)
+    {
+        QAction* setVisibilityAction = new QAction(_("Visible"), this);
+        setVisibilityAction->setCheckable(true);
+        setVisibilityAction->setChecked(sel.body()->isVisible());
+        connect(setVisibilityAction, SIGNAL(toggled(bool)), this, SLOT(slotToggleVisibility(bool)));
+        addAction(setVisibilityAction);
+    }
 
     // Marker submenu
     QMenu* markMenu = createMarkMenu();
@@ -246,7 +246,7 @@ QMenu* SelectionPopup::createMarkMenu()
         gettext_noop("Circle"),
         gettext_noop("Disk"),
     };
-        
+
     QMenu* markMenu = new QMenu(_("&Mark"));
     for (int i = 0; i < (int) (sizeof(MARKER_NAMES) / sizeof(MARKER_NAMES[0])); i++)
     {
@@ -349,10 +349,10 @@ QMenu* SelectionPopup::createAlternateSurfacesMenu()
                 surfacesMenu->addAction(act);
                 connect(act, SIGNAL(triggered()), this, SLOT(slotSelectAlternateSurface()));
             }
-            
+
             addMenu(surfacesMenu);
         }
-        
+
         delete altSurfaces;
     }
 
@@ -399,7 +399,7 @@ QMenu* SelectionPopup::createObjectMenu(PlanetarySystem* sys,
                     }
                     menu = new QMenu(title, this);
                 }
-                
+
                 QAction* act = new QAction(QString::fromUtf8(body->getName(true).c_str()), menu);
                 act->setData(i);
                 connect(act, SIGNAL(triggered()), this, SLOT(slotSelectChildObject()));
@@ -414,7 +414,7 @@ QMenu* SelectionPopup::createObjectMenu(PlanetarySystem* sys,
 
 void SelectionPopup::addObjectMenus(PlanetarySystem* sys)
 {
-	setStyleSheet("QMenu { menu-scrollable: 1; }"); //popupmenu with scrollbar
+    setStyleSheet("QMenu { menu-scrollable: 1; }"); //popupmenu with scrollbar
     QMenu* planetsMenu = createObjectMenu(sys, Body::Planet);
     if (planetsMenu != NULL)
         addMenu(planetsMenu);
@@ -522,7 +522,7 @@ void SelectionPopup::slotSelectChildObject()
                     if (solarSys)
                         sys = solarSys->getPlanets();
                 }
-            }   
+            }
 
             if (sys != NULL)
             {
@@ -629,6 +629,6 @@ void SelectionPopup::slotInfo()
 
 void SelectionPopup::slotToggleVisibility(bool visible)
 {
-	assert(selection.body() != NULL);
-	selection.body()->setVisible(visible);	
+    assert(selection.body() != NULL);
+    selection.body()->setVisible(visible);
 }
diff --git a/src/celestia/qt/qtselectionpopup.h b/src/celestia/qt/qtselectionpopup.h
index 60bac843d..dc3b6161a 100644
--- a/src/celestia/qt/qtselectionpopup.h
+++ b/src/celestia/qt/qtselectionpopup.h
@@ -48,7 +48,7 @@ Q_OBJECT
     void slotGotoStartDate();
     void slotGotoEndDate();
     void slotInfo();
-	void slotToggleVisibility(bool);
+    void slotToggleVisibility(bool);
 
     void popupAtGoto(const QPoint& p);
     void popupAtCenter(const QPoint& p);
diff --git a/src/celestia/qt/qtsettimedialog.cpp b/src/celestia/qt/qtsettimedialog.cpp
index 7fbe055a3..40429d197 100644
--- a/src/celestia/qt/qtsettimedialog.cpp
+++ b/src/celestia/qt/qtsettimedialog.cpp
@@ -59,7 +59,7 @@ SetTimeDialog::SetTimeDialog(double currentTimeTDB,
 
     bool useLocalTime = appCore->getTimeZoneBias() != 0;
     timeZoneBox->setCurrentIndex(useLocalTime ? 1 : 0);
-    
+
     timeZoneBox->setToolTip(_("Select Time Zone"));
     timeLayout->addWidget(timeZoneBox, 0, 1, 1, 5);
     connect(timeZoneBox, SIGNAL(currentIndexChanged(const QString &)), this, SLOT(slotTimeZoneChanged()));
diff --git a/src/celestia/qt/qtsolarsystembrowser.cpp b/src/celestia/qt/qtsolarsystembrowser.cpp
index 4e291a017..81199fc97 100644
--- a/src/celestia/qt/qtsolarsystembrowser.cpp
+++ b/src/celestia/qt/qtsolarsystembrowser.cpp
@@ -207,7 +207,7 @@ SolarSystemTreeModel::addTreeItemChildren(TreeItem* item,
         item->nChildren += orbitingStars->size();
     if (sys != NULL)
         item->nChildren += sys->getSystemSize();
-    
+
     if (item->nChildren != 0)
     {
         int childIndex = 0;
@@ -252,15 +252,15 @@ SolarSystemTreeModel::addTreeItemChildrenGrouped(TreeItem* item,
     vector<Body*> asteroids;
     vector<Body*> spacecraft;
     vector<Body*> minorMoons;
-	vector<Body*> surfaceFeatures;
-	vector<Body*> components;
+    vector<Body*> surfaceFeatures;
+    vector<Body*> components;
     vector<Body*> other;
     vector<Body*> normal;
 
     bool groupAsteroids = true;
     bool groupSpacecraft = true;
-	bool groupComponents = true;
-	bool groupSurfaceFeatures = true;
+    bool groupComponents = true;
+    bool groupSurfaceFeatures = true;
     if (parent.body())
     {
         // Don't put asteroid moons in the asteroid group; make them
@@ -301,18 +301,18 @@ SolarSystemTreeModel::addTreeItemChildrenGrouped(TreeItem* item,
             else
                 normal.push_back(body);
             break;
-		case Body::Component:
-			if (groupComponents)
-				components.push_back(body);
-			else
-				normal.push_back(body);
-			break;
-		case Body::SurfaceFeature:
-			if (groupSurfaceFeatures)
-				surfaceFeatures.push_back(body);
-			else
-				normal.push_back(body);
-			break;
+        case Body::Component:
+            if (groupComponents)
+                components.push_back(body);
+            else
+                normal.push_back(body);
+            break;
+        case Body::SurfaceFeature:
+            if (groupSurfaceFeatures)
+                surfaceFeatures.push_back(body);
+            else
+                normal.push_back(body);
+            break;
         default:
             other.push_back(body);
             break;
@@ -331,10 +331,10 @@ SolarSystemTreeModel::addTreeItemChildrenGrouped(TreeItem* item,
         item->nChildren++;
     if (!minorMoons.empty())
         item->nChildren++;
-	if (!surfaceFeatures.empty())
-		item->nChildren++;
-	if (!components.empty())
-		item->nChildren++;
+    if (!surfaceFeatures.empty())
+        item->nChildren++;
+    if (!components.empty())
+        item->nChildren++;
     if (!other.empty())
         item->nChildren++;
 
@@ -386,21 +386,21 @@ SolarSystemTreeModel::addTreeItemChildrenGrouped(TreeItem* item,
                 childIndex++;
             }
 
-			if (!surfaceFeatures.empty())
-			{
+            if (!surfaceFeatures.empty())
+            {
                 item->children[childIndex] = createGroupTreeItem(Body::SurfaceFeature,
                                                                  surfaceFeatures,
                                                                  item, childIndex);
                 childIndex++;
-			}
+            }
 
-			if (!components.empty())
-			{
+            if (!components.empty())
+            {
                 item->children[childIndex] = createGroupTreeItem(Body::Component,
                                                                  components,
                                                                  item, childIndex);
                 childIndex++;
-			}
+            }
 
             if (!other.empty())
             {
@@ -526,10 +526,10 @@ static QString objectTypeName(const Selection& sel)
             return _("Spacecraft");
         else if (classification == Body::Invisible)
             return _("Reference point");
-		else if (classification == Body::Component)
-			return _("Component");
-		else if (classification == Body::SurfaceFeature)
-			return _("Surface feature");
+        else if (classification == Body::Component)
+            return _("Component");
+        else if (classification == Body::SurfaceFeature)
+            return _("Surface feature");
     }
 
     return _("Unknown");
@@ -550,10 +550,10 @@ static QString classificationName(int classification)
         return _("Reference points");
     else if (classification == Body::MinorMoon)
         return _("Minor moons");
-	else if (classification == Body::Component)
-		return _("Components");
-	else if (classification == Body::SurfaceFeature)
-		return _("Surface features");
+    else if (classification == Body::Component)
+        return _("Components");
+    else if (classification == Body::SurfaceFeature)
+        return _("Surface features");
     else
         return _("Other objects");
 }
@@ -696,7 +696,7 @@ SolarSystemBrowser::~SolarSystemBrowser()
 void SolarSystemBrowser::slotRefreshTree()
 {
     Simulation* sim = appCore->getSimulation();
-    
+
     // Update the browser with the solar system closest to the active observer
     SolarSystem* solarSys = sim->getUniverse()->getNearestSolarSystem(sim->getActiveObserver()->getPosition());
 
@@ -732,7 +732,7 @@ void SolarSystemBrowser::slotRefreshTree()
             treeView->setExpanded(secondary, true);
         }
     }
-    
+
 }
 
 
@@ -762,7 +762,7 @@ void SolarSystemBrowser::slotMarkSelected()
     Color color((float) markerColor.redF(),
                 (float) markerColor.greenF(),
                 (float) markerColor.blueF());
-    
+
     Universe* universe = appCore->getSimulation()->getUniverse();
     string label;
 
diff --git a/src/celestia/qt/qttimetoolbar.cpp b/src/celestia/qt/qttimetoolbar.cpp
index c76644a4a..4657e29db 100644
--- a/src/celestia/qt/qttimetoolbar.cpp
+++ b/src/celestia/qt/qttimetoolbar.cpp
@@ -63,7 +63,7 @@ TimeToolBar::TimeToolBar(CelestiaCore* _appCore,
 
     connect(slowTimeAction, SIGNAL(triggered()), this, SLOT(slotSlower()));
     addAction(slowTimeAction);
-    
+
     connect(halfTimeAction, SIGNAL(triggered()), this, SLOT(slotHalfTime()));
     addAction(halfTimeAction);
 
diff --git a/src/celestia/qt/xbel.cpp b/src/celestia/qt/xbel.cpp
index b3caf6c49..e5c44a547 100644
--- a/src/celestia/qt/xbel.cpp
+++ b/src/celestia/qt/xbel.cpp
@@ -210,7 +210,7 @@ XbelReader::skipUnknownElement()
 
 XbelWriter::XbelWriter(QIODevice* device) :
     QXmlStreamWriter(device)
-{  
+{
     setAutoFormatting(true);
 }
 
diff --git a/src/celestia/url.cpp b/src/celestia/url.cpp
index 24134a5b2..6505996da 100644
--- a/src/celestia/url.cpp
+++ b/src/celestia/url.cpp
@@ -54,30 +54,30 @@ CelestiaState::captureState(CelestiaCore* appCore)
 {
     Simulation *sim = appCore->getSimulation();
     Renderer *renderer = appCore->getRenderer();
-    
+
     const ObserverFrame* frame = sim->getFrame();
-    
+
     coordSys = frame->getCoordinateSystem();
     if (coordSys != ObserverFrame::Universal)
     {
         refBodyName = getEncodedObjectName(frame->getRefObject(), appCore);
-        if (coordSys == ObserverFrame::PhaseLock) 
+        if (coordSys == ObserverFrame::PhaseLock)
         {
             targetBodyName = getEncodedObjectName(frame->getTargetObject(), appCore);
         }
     }
-    
+
     tdb = sim->getTime();
-    
+
     // Store the position and orientation of the observer in the current
     // frame.
     observerPosition = sim->getObserver().getPosition();
     observerPosition = frame->convertFromUniversal(observerPosition, tdb);
-        
+
     Quaterniond q = sim->getObserver().getOrientation();
     q = frame->convertFromUniversal(q, tdb);
     observerOrientation = q.cast<float>();
-        
+
     Selection tracked = sim->getTrackedObject();
     trackedBodyName = getEncodedObjectName(tracked, appCore);
     Selection selected = sim->getSelection();
@@ -97,11 +97,11 @@ bool CelestiaState::loadState(std::map<std::string, std::string> params)
     sscanf(timeString.c_str(), "%d-%d-%dT%d:%d:%lf",
            &date.year, &date.month, &date.day,
            &date.hour, &date.minute, &date.seconds);
-    
+
     observerPosition = UniversalCoord(BigFix(params["x"]),
                                       BigFix(params["y"]),
                                       BigFix(params["z"]));
-    
+
     float ow = 0.0f;
     float ox = 0.0f;
     float oy = 0.0f;
@@ -113,9 +113,9 @@ bool CelestiaState::loadState(std::map<std::string, std::string> params)
     {
         return false;
     }
-    
+
     orientation = Quatf(ow, ox, oy, oz);
-    
+
     if (params["select"] != "")
         selectedBodyName = params["select"];
     if (params["track"] != "")
@@ -124,19 +124,19 @@ bool CelestiaState::loadState(std::map<std::string, std::string> params)
         lightTimeDelay = (strcmp(params["ltd"].c_str(), "1") == 0);
     else
         lightTimeDelay = false;
-    
+
     if (params["fov"] != "")
     {
         if (sscanf(params["fov"].c_str(), "%f", &fieldOfView) != 1.0f)
             return false;
     }
-    
-    if (params["ts"] != "") 
+
+    if (params["ts"] != "")
     {
         if (sscanf(params["ts"].c_str(), "%f", &timeScale) != 1.0f)
             return false;
     }
-    
+
     int paused = 0;
     if (params["p"] != "")
     {
@@ -146,7 +146,7 @@ bool CelestiaState::loadState(std::map<std::string, std::string> params)
             return false;
         pauseState = paused == 1;
     }
-    
+
     // Render settings
     if (params["rf"] != "")
     {
@@ -193,7 +193,7 @@ Url::Url(const std::string& str, CelestiaCore *core):
     {
         version = 1;
     }
-    
+
     pos = urlStr.find("/", 6);
     if (pos == std::string::npos)
         pos = urlStr.find("?", 6);
@@ -233,13 +233,13 @@ Url::Url(const std::string& str, CelestiaCore *core):
         type = Settings;
         nbBodies = 0;
     }
-    
+
     if (nbBodies == -1)
     {
         urlStr = "";
         return; // Mode not recognized
     }
-    
+
     endPrevious = pos;
     int nb = nbBodies, i=1;
     while (nb != 0 && endPrevious != std::string::npos) {
@@ -249,7 +249,7 @@ Url::Url(const std::string& str, CelestiaCore *core):
         if (pos == std::string::npos) bodyName = urlStr.substr(endPrevious + 1);
         else bodyName = urlStr.substr(endPrevious + 1, pos - endPrevious - 1);
         endPrevious = pos;
-        
+
         bodyName = decodeString(bodyName);
         pos = 0;
         if (i==1) body1 = bodyName;
@@ -258,30 +258,30 @@ Url::Url(const std::string& str, CelestiaCore *core):
             pos = bodyName.find(":", pos + 1);
             if (pos != std::string::npos) bodyName[pos]='/';
         }
-        
+
         bodies.push_back(sim->findObjectFromPath(bodyName));
-        
+
         nb--;
         i++;
     }
-    
+
     if (nb != 0) {
         urlStr = "";
         return; // Number of bodies in Url doesn't match Mode
     }
-    
+
     if (nbBodies == 0) ref = ObserverFrame();
     if (nbBodies == 1) ref = ObserverFrame(mode, bodies[0]);
     if (nbBodies == 2) ref = ObserverFrame(mode, bodies[0], bodies[1]);
     fromString = true;
-        
+
     std::string time="";
     pos = urlStr.find("?", endPrevious + 1);
     if (pos == std::string::npos)
         time = urlStr.substr(endPrevious + 1);
     else time = urlStr.substr(endPrevious + 1, pos - endPrevious -1);
         time = decodeString(time);
-        
+
     switch (version)
     {
     case 1:
@@ -305,7 +305,7 @@ Url::Url(CelestiaCore* core, UrlType type)
     appCore = core;
     version = 2;
     timeSource = UseUrlTime;
-    
+
     Simulation *sim = appCore->getSimulation();
     Renderer *renderer = appCore->getRenderer();
 
@@ -325,7 +325,7 @@ Url::Url(CelestiaCore* core, UrlType type)
     }
 
     double simTime = sim->getTime();
-    
+
     char date_str[50];
     date = astro::Date(simTime);
     char buff[255];
@@ -397,23 +397,23 @@ Url::Url(CelestiaCore* core, UrlType type)
 Url::Url(const CelestiaState& appState, unsigned int _version, TimeSource _timeSource)
 {
     ostringstream u;
-    
+
     appCore = NULL;
-    
+
     assert(_version >= 3);
     version = _version;
     timeSource = _timeSource;
     type = Absolute;
-    
+
     modeStr      = getCoordSysName(appState.coordSys);
     body1        = appState.refBodyName;
     body2        = appState.targetBodyName;
     selectedStr  = appState.selectedBodyName;
     trackedStr   = appState.trackedBodyName;
-    
+
     coord        = appState.observerPosition;
     orientation  = appState.observerOrientation;
-    
+
     //ref =
     //selected =
     //tracked =
@@ -422,18 +422,18 @@ Url::Url(const CelestiaState& appState, unsigned int _version, TimeSource _timeS
         nbBodies = 0;
     else if (appState.coordSys ==  ObserverFrame::PhaseLock)
         nbBodies = 2;
-    
+
     fieldOfView      = appState.fieldOfView;
     renderFlags      = appState.renderFlags;
     labelMode        = appState.labelMode;
-    
+
     date             = astro::Date(appState.tdb);
     timeScale        = appState.timeScale;
     pauseState       = appState.pauseState;
-    lightTimeDelay   = appState.lightTimeDelay;    
-    
+    lightTimeDelay   = appState.lightTimeDelay;
+
     u << "cel://" << modeStr;
-    
+
     if (appState.coordSys != ObserverFrame::Universal)
     {
         u << "/" << appState.refBodyName;
@@ -442,22 +442,22 @@ Url::Url(const CelestiaState& appState, unsigned int _version, TimeSource _timeS
             u << "/" << appState.targetBodyName;
         }
     }
-        
+
     char date_str[50];
     snprintf(date_str, sizeof(date_str), "%04d-%02d-%02dT%02d:%02d:%08.5f",
              date.year, date.month, date.day, date.hour, date.minute, date.seconds);
     u << "/" << date_str;
-        
+
     // observer position
     u << "?x=" << coord.x.toString() << "&y=" << coord.y.toString() << "&z=" << coord.z.toString();
-    
+
     // observer orientation
     u << "&ow=" << orientation.w()
       << "&ox=" << orientation.x()
       << "&oy=" << orientation.y()
       << "&oz=" << orientation.z();
-    
-    if (trackedStr != "") 
+
+    if (trackedStr != "")
         u << "&track=" << trackedStr;
     if (selectedStr != "")
         u << "&select=" << selectedStr;
@@ -481,7 +481,7 @@ Url::Url(const CelestiaState& appState, unsigned int _version, TimeSource _timeS
 
 
 void Url::initVersion2(std::map<std::string, std::string>& params,
-                       const std::string& timeString) 
+                       const std::string& timeString)
 {
     if (type != Settings)
     {
@@ -490,26 +490,26 @@ void Url::initVersion2(std::map<std::string, std::string>& params,
         else
             type = Absolute;
     }
-    
+
     switch (type) {
         case Absolute:
             date = astro::Date(0.0);
             sscanf(timeString.c_str(), "%d-%d-%dT%d:%d:%lf",
                    &date.year, &date.month, &date.day,
                    &date.hour, &date.minute, &date.seconds);
-            
+
             coord = UniversalCoord(BigFix(params["x"]),
                                    BigFix(params["y"]),
                                    BigFix(params["z"]));
-            
+
             float ow, ox, oy, oz;
             sscanf(params["ow"].c_str(), "%f", &ow);
             sscanf(params["ox"].c_str(), "%f", &ox);
             sscanf(params["oy"].c_str(), "%f", &oy);
             sscanf(params["oz"].c_str(), "%f", &oz);
-            
+
             orientation = Quaternionf(ow, ox, oy, oz);
-            
+
             // Intentional Fall-Through
         case Relative:
             if (params["dist"] != "") {
@@ -547,14 +547,14 @@ void Url::initVersion2(std::map<std::string, std::string>& params,
         case Settings:
             break;
     }
-    
+
     if (params["rf"] != "") {
         sscanf(params["rf"].c_str(), "%d", &renderFlags);
     }
     if (params["lm"] != "") {
         sscanf(params["lm"].c_str(), "%d", &labelMode);
     }
-    
+
 }
 
 
@@ -564,24 +564,24 @@ void Url::initVersion3(std::map<std::string, std::string>& params,
     // Type field not used for version 3 urls; position is always relative
     // to the frame center. Time setting is controlled by the time source.
     type = Absolute;
-    
+
     date = astro::Date(0.0);
     sscanf(timeString.c_str(), "%d-%d-%dT%d:%d:%lf",
            &date.year, &date.month, &date.day,
            &date.hour, &date.minute, &date.seconds);
-    
+
     coord = UniversalCoord(BigFix(params["x"]),
                            BigFix(params["y"]),
                            BigFix(params["z"]));
-    
+
     float ow, ox, oy, oz;
     sscanf(params["ow"].c_str(), "%f", &ow);
     sscanf(params["ox"].c_str(), "%f", &ox);
     sscanf(params["oy"].c_str(), "%f", &oy);
     sscanf(params["oz"].c_str(), "%f", &oz);
-    
+
     orientation = Quaternionf(ow, ox, oy, oz);
-    
+
     if (params["select"] != "")
         selectedStr = params["select"];
     if (params["track"] != "")
@@ -590,12 +590,12 @@ void Url::initVersion3(std::map<std::string, std::string>& params,
         lightTimeDelay = (strcmp(params["ltd"].c_str(), "1") == 0);
     else
         lightTimeDelay = false;
-    
+
     if (params["fov"] != "")
         sscanf(params["fov"].c_str(), "%f", &fieldOfView);
-    if (params["ts"] != "") 
+    if (params["ts"] != "")
         sscanf(params["ts"].c_str(), "%f", &timeScale);
-    
+
     int paused = 0;
     if (params["p"] != "")
         sscanf(params["p"].c_str(), "%d", &paused);
@@ -606,7 +606,7 @@ void Url::initVersion3(std::map<std::string, std::string>& params,
         sscanf(params["rf"].c_str(), "%d", &renderFlags);
     if (params["lm"] != "")
         sscanf(params["lm"].c_str(), "%d", &labelMode);
-        
+
     int timeSourceInt = 0;
     if (params["tsrc"] != "")
         sscanf(params["tsrc"].c_str(), "%d", &timeSourceInt);
@@ -727,7 +727,7 @@ static std::string getBodyName(Universe* universe, Body* body)
     else
         assert(0);
         // TODO: Figure out why the line below was added.
-        //parentBody = body->getOrbitBarycenter();  
+        //parentBody = body->getOrbitBarycenter();
 
     while (parentBody != NULL)
     {
@@ -825,7 +825,7 @@ void Url::goTo()
             default:
                 break;
         }
-        
+
         // Position and orientation stored in frame coordinates; convert them
         // to universal and set the observer position.
         double tdb = sim->getTime();
@@ -937,13 +937,13 @@ getEncodedObjectName(const Selection& selection, const CelestiaCore* appCore)
 {
     Universe *universe = appCore->getSimulation()->getUniverse();
     string name;
-    
+
     switch (selection.getType())
     {
         case Selection::Type_Body:
             name = getBodyName(universe, selection.body());
             break;
-            
+
         case Selection::Type_Star:
             name = universe->getStarCatalog()->getStarName(*selection.star());
             break;
@@ -960,7 +960,7 @@ getEncodedObjectName(const Selection& selection, const CelestiaCore* appCore)
                     name = getBodyName(universe, parentBody) + ":" + name;
             }
             break;
-            
+
         default:
             return "";
     }
diff --git a/src/celestia/url.h b/src/celestia/url.h
index f8d3fb3a8..4854fb4f6 100644
--- a/src/celestia/url.h
+++ b/src/celestia/url.h
@@ -56,9 +56,9 @@ public:
         UseSystemTime     = 2,
         TimeSourceCount   = 3,
     };
-   
+
     Url();
-    
+
     // parses str
     Url(const std::string& str, CelestiaCore *core);
     // current url of appCore
@@ -76,11 +76,11 @@ public:
 
     static std::string decodeString(const std::string& str);
     static std::string encodeString(const std::string& str);
-    
+
 private:
     void initVersion2(std::map<std::string, std::string>& params, const std::string& timeString);
     void initVersion3(std::map<std::string, std::string>& params, const std::string& timeString);
-    
+
 private:
     std::string urlStr;
     std::string name;
@@ -114,14 +114,14 @@ private:
     UrlType type;
     TimeSource timeSource;
     unsigned int version;
-    
+
     void evalName();
-    
+
     // Variables specific to Global Urls
     UniversalCoord coord;
     astro::Date date;
     Eigen::Quaternionf orientation;
-    
+
     // Variables specific to Relative Urls
     double distance, longitude, latitude;
 };
@@ -141,11 +141,11 @@ public:
     EIGEN_MAKE_ALIGNED_OPERATOR_NEW
 
     CelestiaState();
-    
+
     bool loadState(std::map<std::string, std::string>& params);
     void saveState(std::map<std::string, std::string>& params);
     void captureState(CelestiaCore* appCore);
-    
+
     // Observer frame, position, and orientation. For multiview, there needs
     // be one instance of these parameters per view saved.
     ObserverFrame::CoordinateSystem coordSys;
@@ -155,15 +155,15 @@ public:
     UniversalCoord observerPosition;
     Eigen::Quaternionf observerOrientation;
     float fieldOfView;
-    
+
     // Time parameters
     double tdb;
     float timeScale;
     bool pauseState;
     bool lightTimeDelay;
-    
+
     string selectedBodyName;
-    
+
     int labelMode;
     int renderFlags;
 };
diff --git a/src/celestia/win32/ODMenu.cpp b/src/celestia/win32/ODMenu.cpp
index 9b0c36a46..9ad8074fc 100644
--- a/src/celestia/win32/ODMenu.cpp
+++ b/src/celestia/win32/ODMenu.cpp
@@ -151,12 +151,12 @@ void ODMenu::SetMenuItemOwnerDrawn(HMENU hMenu, UINT item, UINT type)
 {
     //Set menu item type to owner-drawn and set itemdata to sequence number.
     MENUITEMINFO miInfo;
-  
+
     miInfo.cbSize = sizeof(MENUITEMINFO);
     miInfo.fMask = MIIM_TYPE | MIIM_DATA;
     miInfo.fType = type | MFT_OWNERDRAW;
     miInfo.dwItemData = m_seqNumber++;
-    
+
     SetMenuItemInfo(hMenu, item, TRUE, &miInfo);
 }
 
@@ -465,10 +465,10 @@ void ODMenu::DrawTransparentBitmap(HDC hDC, HBITMAP hBitmap, short xStart,
             {
                 col = GetPixel(hdcTemp, x, y);
                 r = GetRValue(col);
-				g = GetGValue(col);
-				b = GetBValue(col);
+                g = GetGValue(col);
+                b = GetBValue(col);
                 avgcol = (r + g + b) / 3;
-				factor = avgcol / 255.0;
+                factor = avgcol / 255.0;
                 SetPixel(hdcTemp, x, y, LightenColor(discol, factor));
             }
         }
@@ -515,25 +515,25 @@ void ODMenu::DrawCheckMark(HDC hDC, short x, short y, bool bNarrow)
 
     //Draw the check mark
     MoveToEx(hDC, x, y + 2, NULL);
-	LineTo(hDC, x, y + 5 - dp);
-	
-	MoveToEx(hDC, x + 1, y + 3, NULL);
-	LineTo(hDC, x + 1, y + 6 - dp);
-	
-	MoveToEx(hDC, x + 2, y + 4, NULL);
-	LineTo(hDC, x + 2, y + 7 - dp);
-	
-	MoveToEx(hDC, x + 3, y + 3, NULL);
-	LineTo(hDC, x + 3, y + 6 - dp);
-	
-	MoveToEx(hDC, x + 4, y + 2, NULL);
-	LineTo(hDC, x + 4, y + 5 - dp);
-	
-	MoveToEx(hDC, x + 5, y + 1, NULL);
-	LineTo(hDC, x + 5, y + 4 - dp);
-	
-	MoveToEx(hDC, x + 6, y, NULL);
-	LineTo(hDC, x + 6, y + 3 - dp);
+    LineTo(hDC, x, y + 5 - dp);
+
+    MoveToEx(hDC, x + 1, y + 3, NULL);
+    LineTo(hDC, x + 1, y + 6 - dp);
+
+    MoveToEx(hDC, x + 2, y + 4, NULL);
+    LineTo(hDC, x + 2, y + 7 - dp);
+
+    MoveToEx(hDC, x + 3, y + 3, NULL);
+    LineTo(hDC, x + 3, y + 6 - dp);
+
+    MoveToEx(hDC, x + 4, y + 2, NULL);
+    LineTo(hDC, x + 4, y + 5 - dp);
+
+    MoveToEx(hDC, x + 5, y + 1, NULL);
+    LineTo(hDC, x + 5, y + 4 - dp);
+
+    MoveToEx(hDC, x + 6, y, NULL);
+    LineTo(hDC, x + 6, y + 3 - dp);
 
     //Restore original DC pen
     SelectObject(hDC, hOldPen);
@@ -541,35 +541,35 @@ void ODMenu::DrawCheckMark(HDC hDC, short x, short y, bool bNarrow)
 
 COLORREF ODMenu::LightenColor(COLORREF col, double factor)
 {
-	if(factor > 0.0 && factor <= 1.0)
+    if(factor > 0.0 && factor <= 1.0)
     {
-		BYTE red, green, blue, lightred, lightgreen, lightblue;
-		red = GetRValue(col);
-		green = GetGValue(col);
-		blue = GetBValue(col);
-		lightred = (BYTE)((factor*(255 - red)) + red);
-		lightgreen = (BYTE)((factor*(255 - green)) + green);
-		lightblue = (BYTE)((factor*(255 - blue)) + blue);
-		col = RGB(lightred, lightgreen, lightblue);
-	}
+        BYTE red, green, blue, lightred, lightgreen, lightblue;
+        red = GetRValue(col);
+        green = GetGValue(col);
+        blue = GetBValue(col);
+        lightred = (BYTE)((factor*(255 - red)) + red);
+        lightgreen = (BYTE)((factor*(255 - green)) + green);
+        lightblue = (BYTE)((factor*(255 - blue)) + blue);
+        col = RGB(lightred, lightgreen, lightblue);
+    }
 
-	return col;
+    return col;
 }
 
 COLORREF ODMenu::DarkenColor(COLORREF col, double factor)
 {
-	if(factor > 0.0 && factor <= 1.0)
+    if(factor > 0.0 && factor <= 1.0)
     {
-		BYTE red, green, blue, lightred, lightgreen, lightblue;
-		red = GetRValue(col);
-		green = GetGValue(col);
-		blue = GetBValue(col);
-		lightred = (BYTE)(red - (factor*red));
-		lightgreen = (BYTE)(green - (factor*green));
-		lightblue = (BYTE)(blue - (factor*blue));
-		col = RGB(lightred, lightgreen, lightblue);
-	}
-	return col;
+        BYTE red, green, blue, lightred, lightgreen, lightblue;
+        red = GetRValue(col);
+        green = GetGValue(col);
+        blue = GetBValue(col);
+        lightred = (BYTE)(red - (factor*red));
+        lightgreen = (BYTE)(green - (factor*green));
+        lightblue = (BYTE)(blue - (factor*blue));
+        col = RGB(lightred, lightgreen, lightblue);
+    }
+    return col;
 }
 
 COLORREF ODMenu::AverageColor(COLORREF col1, COLORREF col2, double weight)
@@ -578,8 +578,8 @@ COLORREF ODMenu::AverageColor(COLORREF col1, COLORREF col2, double weight)
 
     if (weight <= 0.0)
         return col1;
-	else if (weight > 1.0)
-		return col2;
+    else if (weight > 1.0)
+        return col2;
 
     avgRed   = (BYTE) (GetRValue(col1) * weight + GetRValue(col2) * (1.0 - weight));
     avgGreen = (BYTE) (GetGValue(col1) * weight + GetGValue(col2) * (1.0 - weight));
@@ -594,7 +594,7 @@ double ODMenu::GetColorIntensity(COLORREF col)
 
     red = GetRValue(col);
     green = GetGValue(col);
-	blue = GetBValue(col);
+    blue = GetBValue(col);
 
     //denominator of 765 is (255*3)
     return (double)red/765.0 + (double)green/765.0 + (double)blue/765.0;
@@ -663,16 +663,16 @@ void ODMenu::DrawItem(HWND hWnd, LPARAM lParam)
     //Draw based on type of item
     if(item.displayText.length() > 0)
     {
-        // Set the appropriate foreground and background colors. 
+        // Set the appropriate foreground and background colors.
         if(item.topMost)
         {
             if(lpdis->itemState & ODS_SELECTED)
-            { 
+            {
                 clrPrevText = SetTextColor(lpdis->hDC, m_clrHighlightItemText);
                 clrPrevBkgnd = SetBkColor(lpdis->hDC, m_clrHighlightItemBackground);
             }
             else
-            { 
+            {
                 clrPrevText = SetTextColor(lpdis->hDC, m_clrItemText);
                 clrPrevBkgnd = SetBkColor(lpdis->hDC, GetSysColor(COLOR_MENU));
             }
@@ -690,7 +690,7 @@ void ODMenu::DrawItem(HWND hWnd, LPARAM lParam)
                 clrPrevBkgnd = SetBkColor(lpdis->hDC, m_clrHighlightItemBackground);
             }
             else
-            { 
+            {
                 clrPrevText = SetTextColor(lpdis->hDC, m_clrItemText);
                 clrPrevBkgnd = SetBkColor(lpdis->hDC, m_clrItemBackground);
             }
@@ -710,7 +710,7 @@ void ODMenu::DrawItem(HWND hWnd, LPARAM lParam)
     }
     else if(item.dwType & MFT_SEPARATOR)
     {
-		//Fill menu space with menu background, first.
+        //Fill menu space with menu background, first.
         RECT rect;
         memcpy(&rect, &lpdis->rcItem, sizeof(RECT));
         rect.left += (m_iconWidth + 2*m_iconBarMargin);
diff --git a/src/celestia/win32/ODMenu.h b/src/celestia/win32/ODMenu.h
index feb5192d5..3c828b6b9 100644
--- a/src/celestia/win32/ODMenu.h
+++ b/src/celestia/win32/ODMenu.h
@@ -9,7 +9,7 @@ using namespace std;
 
 enum bitmapType {eNormal, eDisabled, eShadow, eFaded};
 
-typedef struct tagODMENUITEM 
+typedef struct tagODMENUITEM
 {
     UINT dwType;
     UINT wID;
@@ -51,18 +51,18 @@ class ODMenu
     HBRUSH m_hIconShadowBrush;
     HBRUSH m_hCheckMarkBackgroundBrush;
     HBRUSH m_hCheckMarkBackgroundHighlightBrush;
-	HBRUSH m_hItemBackground;
+    HBRUSH m_hItemBackground;
     HBRUSH m_hHighlightItemBackgroundBrush;
     HPEN m_hSelectionOutlinePen;
     HPEN m_hSeparatorPen;
     HPEN m_hCheckMarkPen;
     HFONT m_hFont;
-    
+
     UINT m_seqNumber;
     HMENU m_hRootMenu;
     TCHAR m_szItemText[256];
     ODMENUITEMS m_menuItems;
-    
+
     int m_alpDx[256];
 
     void EnumMenuItems(HMENU hMenu);
diff --git a/src/celestia/win32/res/resource.h b/src/celestia/win32/res/resource.h
index db42817ef..7e7a7746b 100644
--- a/src/celestia/win32/res/resource.h
+++ b/src/celestia/win32/res/resource.h
@@ -264,7 +264,7 @@
 #define ID_FIRST_SCRIPT                 42000
 
 // Next default values for new objects
-// 
+//
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        142
diff --git a/src/celestia/win32/wglext.cpp b/src/celestia/win32/wglext.cpp
index 49243f296..ecf7afaba 100644
--- a/src/celestia/win32/wglext.cpp
+++ b/src/celestia/win32/wglext.cpp
@@ -99,34 +99,34 @@ static void WGLCallback(HWND wnd)
 {
     if (wnd == NULL)
         return;
-    
-    HDC	hdc = GetDC(wnd);
+
+    HDC hdc = GetDC(wnd);
 
     if (hdc == NULL)
         return;
 
-    PIXELFORMATDESCRIPTOR pfd = { 
-        sizeof(PIXELFORMATDESCRIPTOR),  //  size of this pfd 
-        1,                              // version number 
-        PFD_DRAW_TO_WINDOW |            // support window 
-        PFD_SUPPORT_OPENGL |            // support OpenGL 
-        PFD_DOUBLEBUFFER,		// double buffered 
-        PFD_TYPE_RGBA,                  // RGBA type 
-        24,                             // 24-bit color depth 
-        0, 0, 0, 0, 0, 0,		// color bits ignored 
-        0,                              // no alpha buffer 
-        0,                              // shift bit ignored 
-        0,                              // no accumulation buffer 
-        0, 0, 0, 0,                     // accum bits ignored 
-        24,                             // 24-bit z-buffer     
-        0,                              // no stencil buffer 
-        0,                              // no auxiliary buffer 
-        PFD_MAIN_PLANE,                 // main layer 
-        0,                              // reserved 
-        0, 0, 0                         // layer masks ignored 
-    }; 
+    PIXELFORMATDESCRIPTOR pfd = {
+        sizeof(PIXELFORMATDESCRIPTOR),  //  size of this pfd
+        1,                              // version number
+        PFD_DRAW_TO_WINDOW |            // support window
+        PFD_SUPPORT_OPENGL |            // support OpenGL
+        PFD_DOUBLEBUFFER,        // double buffered
+        PFD_TYPE_RGBA,                  // RGBA type
+        24,                             // 24-bit color depth
+        0, 0, 0, 0, 0, 0,        // color bits ignored
+        0,                              // no alpha buffer
+        0,                              // shift bit ignored
+        0,                              // no accumulation buffer
+        0, 0, 0, 0,                     // accum bits ignored
+        24,                             // 24-bit z-buffer
+        0,                              // no stencil buffer
+        0,                              // no auxiliary buffer
+        PFD_MAIN_PLANE,                 // main layer
+        0,                              // reserved
+        0, 0, 0                         // layer masks ignored
+    };
 
-    unsigned int	pixelFormat = ChoosePixelFormat(hdc, &pfd);
+    unsigned int pixelFormat = ChoosePixelFormat(hdc, &pfd);
 
     DescribePixelFormat(hdc, pixelFormat, sizeof(PIXELFORMATDESCRIPTOR), &pfd);
     if (!SetPixelFormat(hdc, pixelFormat, &pfd))
@@ -142,8 +142,8 @@ static void WGLCallback(HWND wnd)
     if (wglGetExtensionsStringARB == NULL)
         return;
 
-    const char	*ext = wglGetExtensionsStringARB(hdc);
-    char        buff[100];
+    const char *ext = wglGetExtensionsStringARB(hdc);
+    char       buff[100];
 
     if (ext == NULL)
         return;
@@ -160,7 +160,7 @@ static void WGLCallback(HWND wnd)
             wglGetPixelFormatAttribivARB = (PFNWGLGETPIXELFORMATATTRIBIVARBPROC) wglGetProcAddress("wglGetPixelFormatAttribivARB");
             wglGetPixelFormatAttribfvARB = (PFNWGLGETPIXELFORMATATTRIBFVARBPROC) wglGetProcAddress("wglGetPixelFormatAttribfvARB");
             wglChoosePixelFormatARB      = (PFNWGLCHOOSEPIXELFORMATARBPROC) wglGetProcAddress("wglChoosePixelFormatARB");
-            
+
             if (wglChoosePixelFormatARB      != NULL &&
                 wglGetPixelFormatAttribivARB != NULL &&
                 wglGetPixelFormatAttribfvARB != NULL)
@@ -197,9 +197,9 @@ static void WGLCallback(HWND wnd)
         {
         }
 
-        ext += strlen(buff) + 1;					
+        ext += strlen(buff) + 1;
     }
-    
+
     // Close down this context
     wglMakeCurrent(NULL, NULL);
     wglDeleteContext(context);
@@ -210,20 +210,20 @@ static void WGLCallback(HWND wnd)
 // This window exists only to call WGLCallback when its created
 static LRESULT CALLBACK WGLWindProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
-    switch (uMsg) 
-    { 
+    switch (uMsg)
+    {
     case WM_CREATE:
         {
             CREATESTRUCT *cs = (CREATESTRUCT *) lParam;
             WGLCallback(hwnd);
-            return -1; 
-	}
- 
-    default: 
-        return DefWindowProc(hwnd, uMsg, wParam, lParam); 
-    } 
+            return -1;
+        }
 
-    return 0; 
+    default:
+        return DefWindowProc(hwnd, uMsg, wParam, lParam);
+    }
+
+    return 0;
 }
 
 
@@ -233,7 +233,7 @@ void InitWGLExtensions(HINSTANCE appInstance)
     WNDCLASS wglClass = {
         0, WGLWindProc, 0, 0, appInstance, NULL, NULL, NULL, NULL, "InitWGL"
     };
-    ATOM classId  = RegisterClass(&wglClass);	
+    ATOM classId  = RegisterClass(&wglClass);
     HWND hwnd = CreateWindow("InitWGL", "",
                              0, 0, 0, 0, 0,
                              (HWND) NULL,
diff --git a/src/celestia/win32/wglext.h b/src/celestia/win32/wglext.h
index be8dc2cc3..339dd93ae 100644
--- a/src/celestia/win32/wglext.h
+++ b/src/celestia/win32/wglext.h
@@ -13,21 +13,21 @@ extern "C" {
 ** this file except in compliance with the License. You may obtain a copy
 ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
 ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
-** 
+**
 ** http://oss.sgi.com/projects/FreeB
-** 
+**
 ** Note that, as provided in the License, the Software is distributed on an
 ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
 ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
 ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
 ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
-** 
+**
 ** Original Code. The Original Code is: OpenGL Sample Implementation,
 ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
 ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
 ** Copyright in any portions created by third parties is as indicated
 ** elsewhere herein. All Rights Reserved.
-** 
+**
 ** Additional Notice Provisions: This software was created using the
 ** OpenGL(R) version 1.2.1 Sample Implementation published by SGI, but has
 ** not been independently verified as being compliant with the OpenGL(R)
@@ -270,8 +270,8 @@ extern "C" {
 #endif
 
 #ifndef WGL_ARB_multisample
-#define WGL_SAMPLE_BUFFERS_ARB	0x2041
-#define WGL_SAMPLES_ARB		0x2042
+#define WGL_SAMPLE_BUFFERS_ARB  0x2041
+#define WGL_SAMPLES_ARB         0x2042
 #endif
 
 #ifndef WGL_ATI_pixel_format_float
@@ -470,7 +470,7 @@ typedef int (WINAPI * PFNWGLGETSWAPINTERVALEXTPROC) (void);
 #define WGL_NV_allocate_memory 1
 #ifdef WGL_WGLEXT_PROTOTYPES
 extern void * wglAllocateMemoryNV(int size, float readfreq, float writefreq, float priority);
-extern void wglFreeMemoryNV(void * pointer); 
+extern void wglFreeMemoryNV(void * pointer);
 #endif
 typedef void * (APIENTRY * PFNWGLALLOCATEMEMORYNVPROC) (int size, float readfreq, float writefreq, float priority);
 typedef void (APIENTRY * PFNWGLFREEMEMORYNVPROC) (void *pointer);
diff --git a/src/celestia/win32/winbookmarks.cpp b/src/celestia/win32/winbookmarks.cpp
index 903d12531..4774b7ab5 100644
--- a/src/celestia/win32/winbookmarks.cpp
+++ b/src/celestia/win32/winbookmarks.cpp
@@ -1,5 +1,5 @@
 // winbookmarks.cpp
-// 
+//
 // Copyright (C) 2002, Chris Laurel <claurel@shatters.net>
 //
 // Miscellaneous utilities for Locations UI implementation.
@@ -37,17 +37,17 @@ HTREEITEM PopulateBookmarksTree(HWND hTree, CelestiaCore* appCore, HINSTANCE app
     HICON hIcon;
     HTREEITEM hParent=NULL, hParentItem;
 
-    //Create a masked image list large enough to hold the icons. 
+    //Create a masked image list large enough to hold the icons.
     himlIcons = ImageList_Create(16, 16, ILC_COLOR32, 3, 0);
- 
+
     // Load the icon resources, and add the icons to the image list.
-    hIcon = LoadIcon(appInstance, MAKEINTRESOURCE(IDI_CLOSEDFOLDER)); 
+    hIcon = LoadIcon(appInstance, MAKEINTRESOURCE(IDI_CLOSEDFOLDER));
     ImageList_AddIcon(himlIcons, hIcon);
-    hIcon = LoadIcon(appInstance, MAKEINTRESOURCE(IDI_OPENFOLDER)); 
+    hIcon = LoadIcon(appInstance, MAKEINTRESOURCE(IDI_OPENFOLDER));
     ImageList_AddIcon(himlIcons, hIcon);
-    hIcon = LoadIcon(appInstance, MAKEINTRESOURCE(IDI_ROOTFOLDER)); 
+    hIcon = LoadIcon(appInstance, MAKEINTRESOURCE(IDI_ROOTFOLDER));
     ImageList_AddIcon(himlIcons, hIcon);
-    hIcon = LoadIcon(appInstance, MAKEINTRESOURCE(IDI_BOOKMARK)); 
+    hIcon = LoadIcon(appInstance, MAKEINTRESOURCE(IDI_BOOKMARK));
     ImageList_AddIcon(himlIcons, hIcon);
 
     // Associate the image list with the tree-view control.
@@ -144,15 +144,15 @@ HTREEITEM PopulateBookmarkFolders(HWND hTree, CelestiaCore* appCore, HINSTANCE a
     HIMAGELIST himlIcons;
     HICON hIcon;
 
-    //Create a masked image list large enough to hold the icons. 
+    //Create a masked image list large enough to hold the icons.
     himlIcons = ImageList_Create(16, 16, ILC_COLOR32, 3, 0);
- 
+
     // Load the icon resources, and add the icons to the image list.
-    hIcon = LoadIcon(appInstance, MAKEINTRESOURCE(IDI_CLOSEDFOLDER)); 
+    hIcon = LoadIcon(appInstance, MAKEINTRESOURCE(IDI_CLOSEDFOLDER));
     ImageList_AddIcon(himlIcons, hIcon);
-    hIcon = LoadIcon(appInstance, MAKEINTRESOURCE(IDI_OPENFOLDER)); 
+    hIcon = LoadIcon(appInstance, MAKEINTRESOURCE(IDI_OPENFOLDER));
     ImageList_AddIcon(himlIcons, hIcon);
-    hIcon = LoadIcon(appInstance, MAKEINTRESOURCE(IDI_ROOTFOLDER)); 
+    hIcon = LoadIcon(appInstance, MAKEINTRESOURCE(IDI_ROOTFOLDER));
     ImageList_AddIcon(himlIcons, hIcon);
 
     // Associate the image list with the tree-view control.
@@ -468,7 +468,7 @@ void SyncTreeFoldersWithFavoriteFolders(HWND hTree, CelestiaCore* appCore)
                     {
                         // If not found in favorites, add it.
                         // We want all folders to appear before root items so this
-                        // new folder must be inserted after the last item of the 
+                        // new folder must be inserted after the last item of the
                         // last folder.
                         // Locate position of last folder.
                         FavoritesList::iterator folderIter = favorites->begin();
@@ -484,7 +484,7 @@ void SyncTreeFoldersWithFavoriteFolders(HWND hTree, CelestiaCore* appCore)
                         folderIter++;
                         while (folderIter != favorites->end() && (*folderIter)->parentFolder != "")
                             folderIter++;
-                        
+
                         //Insert item
                         appCore->addFavoriteFolder(name, &folderIter);
                     }
@@ -594,7 +594,7 @@ void RenameBookmarkInFavorites(HWND hTree, char* newName, CelestiaCore* appCore)
     if (!hItem)
         return;
 
-    // Get the item text 
+    // Get the item text
     tvItem.hItem = hItem;
     tvItem.mask = TVIF_TEXT | TVIF_HANDLE;
     tvItem.pszText = itemName;
@@ -605,7 +605,7 @@ void RenameBookmarkInFavorites(HWND hTree, char* newName, CelestiaCore* appCore)
     FavoritesEntry* fav = reinterpret_cast<FavoritesEntry*>(tvItem.lParam);
     if (fav == NULL)
         return;
-    
+
     tvItem.hItem = hItem;
     tvItem.mask = TVIF_TEXT | TVIF_HANDLE;
     tvItem.pszText = newName;
@@ -661,7 +661,7 @@ void MoveBookmarkInFavorites(HWND hTree, CelestiaCore* appCore)
     if (TreeView_GetItem(hTree, &tvItem))
     {
         draggedFav = reinterpret_cast<FavoritesEntry*>(tvItem.lParam);
-            
+
         // Get the dragged item folder
         if (hDragItemFolder = TreeView_GetParent(hTree, hDragItem))
         {
@@ -691,7 +691,7 @@ void MoveBookmarkInFavorites(HWND hTree, CelestiaCore* appCore)
                         if (hDropItem = TreeView_InsertItem(hTree, &tvis))
                         {
                             TreeView_Expand(hTree, hDropTargetItem, TVE_EXPAND);
-                                
+
                             // Make the dropped item selected
                             TreeView_SelectItem(hTree, hDropItem);
 
@@ -861,8 +861,8 @@ void DragDropAutoScroll(HWND hTree)
 
 /*
 /////////////////////////////////////////////////////////////////////////////
-//	This function returns the handle of the tree item specified using standard
-//	path notation.
+//    This function returns the handle of the tree item specified using standard
+//    path notation.
 /////////////////////////////////////////////////////////////////////////////
 HTREEITEM GetTreeViewItemHandle(HWND hTree, char* path, HTREEITEM hParent)
 {
@@ -878,7 +878,7 @@ HTREEITEM GetTreeViewItemHandle(HWND hTree, char* path, HTREEITEM hParent)
     strcpy(pathBuf, path);
 
     if (cP = strchr(pathBuf, '/'))
-	    *cP = '\0';
+        *cP = '\0';
 
     hItem = NULL;
     itemName[0] = '\0';
@@ -888,8 +888,8 @@ HTREEITEM GetTreeViewItemHandle(HWND hTree, char* path, HTREEITEM hParent)
     Item.hItem = hParent;
     if (TreeView_GetItem(hTree, &Item))
     {
-	    while (strcmp(pathBuf, itemName))
-	    {
+        while (strcmp(pathBuf, itemName))
+        {
             Item.hItem = TreeView_GetNextSibling(hTree, Item.hItem);
             if (!Item.hItem)
                 break;
diff --git a/src/celestia/win32/winbookmarks.h b/src/celestia/win32/winbookmarks.h
index f1139ef86..8f72019fb 100644
--- a/src/celestia/win32/winbookmarks.h
+++ b/src/celestia/win32/winbookmarks.h
@@ -1,5 +1,5 @@
 // winbookmarks.h
-// 
+//
 // Copyright (C) 2002, Chris Laurel <claurel@shatters.net>
 //
 // Miscellaneous utilities for Locations UI implementation.
diff --git a/src/celestia/win32/windatepicker.cpp b/src/celestia/win32/windatepicker.cpp
index a01a4fe27..e924dd766 100644
--- a/src/celestia/win32/windatepicker.cpp
+++ b/src/celestia/win32/windatepicker.cpp
@@ -22,7 +22,7 @@
 // for astronomical applications:
 //
 // - The standard Windows date picker does not permit setting years
-//   prior to 1752, the point that the US and UK switched to the 
+//   prior to 1752, the point that the US and UK switched to the
 //   Gregorian calendar. Celestia's date picker allows setting any
 //   year from -9999 to 9999.
 //
@@ -38,7 +38,7 @@
 // - No invalid date is permitted, including the skipped days in
 //   October 1582.
 
-static char* Months[12] = 
+static char* Months[12] =
 {
     "Jan", "Feb", "Mar", "Apr", "May", "Jun",
     "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
@@ -58,7 +58,7 @@ class DatePicker
 public:
     DatePicker(HWND _hwnd, CREATESTRUCT& cs);
     ~DatePicker();
-    
+
     LRESULT paint(HDC hdc);
     void redraw(HDC hdc);
     LRESULT keyDown(DWORD vkcode, LPARAM lParam);
@@ -91,7 +91,7 @@ private:
     char textBuffer[64];
     HFONT hFont;
     DWORD style;
-    
+
     bool haveFocus;
     bool firstDigit;
 
@@ -191,13 +191,13 @@ DatePicker::redraw(HDC hdc)
             HBRUSH hbrush = CreateSolidBrush(GetSysColor(COLOR_HIGHLIGHT));
             FillRect(hdc, &r, hbrush);
             DeleteObject(hbrush);
-			
-			SetTextColor(hdc, GetSysColor(COLOR_HIGHLIGHTTEXT));
+
+            SetTextColor(hdc, GetSysColor(COLOR_HIGHLIGHTTEXT));
+        }
+        else
+        {
+            SetTextColor(hdc, GetSysColor(COLOR_WINDOWTEXT));
         }
-		else
-		{
-			SetTextColor(hdc, GetSysColor(COLOR_WINDOWTEXT));
-		}
 
         DrawText(hdc, fieldText[i], strlen(fieldText[i]), &fieldRects[i], DT_RIGHT | DT_VCENTER | DT_SINGLELINE);
     }
@@ -289,7 +289,7 @@ DatePicker::keyDown(DWORD vkcode, LPARAM flags)
                     date.day = day;
                 }
                 break;
-            
+
             case MonthField:
                 {
                     unsigned int month = date.month * 10 + digit;
@@ -300,7 +300,7 @@ DatePicker::keyDown(DWORD vkcode, LPARAM flags)
                     date.month = month;
                 }
                 break;
-                
+
             case YearField:
                 {
                     unsigned int year = date.year * 10 + digit;
@@ -333,7 +333,7 @@ DatePicker::keyDown(DWORD vkcode, LPARAM flags)
         case VK_LEFT:
             if ((int) selectedField == 0)
                 selectedField = DatePickerField((int) NumFields - 1);
-            else 
+            else
                 selectedField = DatePickerField((int) selectedField - 1);
             break;
 
@@ -343,7 +343,7 @@ DatePicker::keyDown(DWORD vkcode, LPARAM flags)
             else
                 selectedField = DatePickerField((int) selectedField + 1);
             break;
-            
+
         case VK_UP:
             incrementField();
             notifyDateChanged();
@@ -353,7 +353,7 @@ DatePicker::keyDown(DWORD vkcode, LPARAM flags)
             decrementField();
             notifyDateChanged();
             break;
-            
+
         default:
             break;
         }
@@ -380,8 +380,8 @@ DatePicker::leftButtonDown(WORD key, int x, int y)
         selectedField = YearField;
 
     InvalidateRect(hwnd, NULL, TRUE);
-	
-	::SetFocus(hwnd); // note that this is the Win32 API function, not the class method
+
+    ::SetFocus(hwnd); // note that this is the Win32 API function, not the class method
 
     return 0;
 }
@@ -399,7 +399,7 @@ DatePicker::setFocus(HWND lostFocus)
     firstDigit = true;
 
     InvalidateRect(hwnd, NULL, TRUE);
-    
+
     return 0;
 }
 
@@ -602,7 +602,7 @@ DatePicker::getSystemTime(SYSTEMTIME* sysTime)
         sysTime->wMonth = date.month;
         sysTime->wDay = date.day;
     }
-    
+
     return GDT_VALID;
 }
 
@@ -611,7 +611,7 @@ static LRESULT
 DatePickerNCCreate(HWND hwnd, CREATESTRUCT& cs)
 {
     DWORD exStyle = GetWindowLong(hwnd, GWL_EXSTYLE);
-    
+
     exStyle |= WS_EX_CLIENTEDGE;
     SetWindowLong(hwnd, GWL_EXSTYLE, exStyle);
 
@@ -646,7 +646,7 @@ DatePickerProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
     case DTM_SETSYSTEMTIME:
         return dp->setSystemTime(wParam, reinterpret_cast<SYSTEMTIME*>(lParam));
         break;
-        
+
     case DTM_GETSYSTEMTIME:
         return dp->getSystemTime(reinterpret_cast<SYSTEMTIME*>(lParam));
         break;
diff --git a/src/celestia/win32/wineclipses.cpp b/src/celestia/win32/wineclipses.cpp
index 1073c07b8..6a59c71da 100644
--- a/src/celestia/win32/wineclipses.cpp
+++ b/src/celestia/win32/wineclipses.cpp
@@ -1,6 +1,6 @@
 // wineclipses.cpp by Kendrix <kendrix@wanadoo.fr>
 // modified by Chris Laurel
-// 
+//
 // Compute Solar Eclipses for our Solar System planets
 //
 // This program is free software; you can redistribute it and/or
@@ -119,10 +119,10 @@ void EclipseFinderDisplayItem(LPNMLVDISPINFOA nm)
             nm->item.pszText = callbackScratch;
         }
         break;
-            
+
     case 1:
         {
-            if (!strcmp(eclipse->planete.c_str(),"None")) 
+            if (!strcmp(eclipse->planete.c_str(),"None"))
             {
                 sprintf(callbackScratch,"");
                 nm->item.pszText = callbackScratch;
@@ -150,7 +150,7 @@ void EclipseFinderDisplayItem(LPNMLVDISPINFOA nm)
             bind_textdomain_codeset("celestia", "UTF8");
         }
         break;
-            
+
     case 3:
         {
             astro::Date startDate(eclipse->startTime);
@@ -167,7 +167,7 @@ void EclipseFinderDisplayItem(LPNMLVDISPINFOA nm)
 
     case 4:
         {
-            if (!strcmp(eclipse->planete.c_str(),"None")) 
+            if (!strcmp(eclipse->planete.c_str(),"None"))
             {
                 sprintf(callbackScratch,"");
                 nm->item.pszText = callbackScratch;
@@ -297,7 +297,7 @@ BOOL APIENTRY EclipseFinderProc(HWND hDlg,
                                 LPARAM lParam)
 {
     //EclipseFinderDialog* eclipseFinderDlg = reinterpret_cast<EclipseFinderDialog*>(GetWindowLong(hDlg, DWL_USER));
-	EclipseFinderDialog* eclipseFinderDlg = reinterpret_cast<EclipseFinderDialog*>(GetWindowLongPtr(hDlg, DWLP_USER));
+    EclipseFinderDialog* eclipseFinderDlg = reinterpret_cast<EclipseFinderDialog*>(GetWindowLongPtr(hDlg, DWLP_USER));
 
     switch (message)
     {
@@ -307,7 +307,7 @@ BOOL APIENTRY EclipseFinderProc(HWND hDlg,
             if (efd == NULL)
                 return EndDialog(hDlg, 0);
             //SetWindowLong(hDlg, DWL_USER, lParam);
-			SetWindowLongPtr(hDlg, DWLP_USER, lParam);
+            SetWindowLongPtr(hDlg, DWLP_USER, lParam);
             HWND hwnd = GetDlgItem(hDlg, IDC_ECLIPSES_LIST);
             InitEclipseFinderColumns(hwnd);
             SendDlgItemMessage(hDlg, IDC_ECLIPSES_LIST, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, LVS_EX_FULLROWSELECT);
@@ -331,8 +331,8 @@ BOOL APIENTRY EclipseFinderProc(HWND hDlg,
             // Subclass the ListView to intercept WM_LBUTTONUP messages
             HWND hCtrl;
             if (hCtrl = GetDlgItem(hDlg, IDC_ECLIPSES_LIST))
-				oldListViewProc = (WNDPROC)SetWindowLongPtr(hCtrl, GWLP_WNDPROC, (LPARAM)EclipseListViewProc);
-			    //oldListViewProc = (WNDPROC) SetWindowLong(hCtrl, GWL_WNDPROC, (DWORD) EclipseListViewProc);
+                oldListViewProc = (WNDPROC)SetWindowLongPtr(hCtrl, GWLP_WNDPROC, (LPARAM)EclipseListViewProc);
+                //oldListViewProc = (WNDPROC) SetWindowLong(hCtrl, GWL_WNDPROC, (DWORD) EclipseListViewProc);
         }
         return(TRUE);
 
@@ -402,7 +402,7 @@ BOOL APIENTRY EclipseFinderProc(HWND hDlg,
                 sim->update(0.0);
 
                 double distance = target.radius() * 4.0;
-                sim->gotoLocation(UniversalCoord::Zero().offsetKm(Vector3d::UnitX() * distance), 
+                sim->gotoLocation(UniversalCoord::Zero().offsetKm(Vector3d::UnitX() * distance),
                                   YRotation(-PI / 2) * XRotation(-PI / 2),
                                   2.5);
             }
@@ -460,7 +460,7 @@ BOOL APIENTRY EclipseFinderProc(HWND hDlg,
                             Eclipse* eclipse = reinterpret_cast<Eclipse*>(nm->lParam);
                             if (eclipse != NULL)
                             {
-                                eclipseFinderDlg->TimetoSet_ = 
+                                eclipseFinderDlg->TimetoSet_ =
                                     (eclipse->startTime + eclipse->endTime) / 2.0f;
                                 eclipseFinderDlg->BodytoSet_ = eclipse->body;
                             }
diff --git a/src/celestia/win32/wineclipses.h b/src/celestia/win32/wineclipses.h
index 38c0149d9..cc3edb811 100644
--- a/src/celestia/win32/wineclipses.h
+++ b/src/celestia/win32/wineclipses.h
@@ -1,5 +1,5 @@
 // wineclipses.h by Kendrix <kendrix@wanadoo.fr>
-// 
+//
 // Copyright (C) 2001, Chris Laurel <claurel@shatters.net>
 //
 // Compute Solar Eclipses for our Solar System planets
diff --git a/src/celestia/win32/wingotodlg.cpp b/src/celestia/win32/wingotodlg.cpp
index fd4f58acd..48233469d 100644
--- a/src/celestia/win32/wingotodlg.cpp
+++ b/src/celestia/win32/wingotodlg.cpp
@@ -1,5 +1,5 @@
 // wingotodlg.cpp
-// 
+//
 // Copyright (C) 2001, Chris Laurel <claurel@shatters.net>
 //
 // Goto object dialog for Windows.
@@ -22,7 +22,7 @@ using namespace std;
 static bool GetDialogFloat(HWND hDlg, int id, float& f)
 {
     char buf[128];
-    
+
     if (GetDlgItemText(hDlg, id, buf, sizeof buf) > 0 &&
         sscanf(buf, " %f", &f) == 1)
         return true;
@@ -93,13 +93,13 @@ static BOOL APIENTRY GotoObjectProc(HWND hDlg,
 
             Simulation* sim = gotoDlg->appCore->getSimulation();
             Selection sel;
-            if (len > 0) 
+            if (len > 0)
             {
                 int wlen = MultiByteToWideChar(CP_ACP, 0, buf, -1, wbuff, sizeof(wbuff));
                 WideCharToMultiByte(CP_UTF8, 0, wbuff, wlen, out, sizeof(out), NULL, NULL);
                 sel = sim->findObjectFromPath(string(out), true);
             }
-            
+
             if (!sel.empty())
             {
                 sim->setSelection(sel);
@@ -113,7 +113,7 @@ static BOOL APIENTRY GotoObjectProc(HWND hDlg,
                         distance = astro::AUtoKilometers(distance);
                     else if (IsDlgButtonChecked(hDlg, IDC_RADIO_RADII) == BST_CHECKED)
                         distance = distance * (float) sel.radius();
-                    
+
                     distance += (float) sel.radius();
                 }
 
diff --git a/src/celestia/win32/wingotodlg.h b/src/celestia/win32/wingotodlg.h
index f1b2b5528..fd09744b6 100644
--- a/src/celestia/win32/wingotodlg.h
+++ b/src/celestia/win32/wingotodlg.h
@@ -1,5 +1,5 @@
 // wingotodlg.h
-// 
+//
 // Copyright (C) 2001, Chris Laurel <claurel@shatters.net>
 //
 // Goto object dialog for Windows.
diff --git a/src/celestia/win32/winlocations.cpp b/src/celestia/win32/winlocations.cpp
index eeca4f33b..f9f51b1b7 100644
--- a/src/celestia/win32/winlocations.cpp
+++ b/src/celestia/win32/winlocations.cpp
@@ -1,5 +1,5 @@
 // winlocations.cpp
-// 
+//
 // Copyright (C) 2002, Chris Laurel <claurel@shatters.net>
 //
 // Miscellaneous utilities for Locations UI implementation.
@@ -61,7 +61,7 @@ static BOOL APIENTRY LocationsProc(HWND hDlg,
     {
         Observer* obs = dlg->appCore->getSimulation()->getActiveObserver();
         uint32 locationFilter = obs->getLocationFilter();
-        
+
         switch (LOWORD(wParam))
         {
         case IDC_SHOW_CITIES:
@@ -136,20 +136,20 @@ static BOOL APIENTRY LocationsProc(HWND hDlg,
         {
             WORD sbValue = LOWORD(wParam);
             LRESULT sliderPos;
-            
+
             if (sbValue == SB_THUMBTRACK)
                 sliderPos = HIWORD(wParam);
-            else                            
+            else
                 sliderPos = SendMessage(GetDlgItem(hDlg, IDC_SLIDER_FEATURE_SIZE), TBM_GETPOS, 0, 0);
-                
+
             char val[16];
             HWND hwnd = GetDlgItem(hDlg, IDC_EDIT_FEATURE_SIZE);
             float featureSize = (float) sliderPos / (float) FeatureSizeSliderRange;
             featureSize = MinFeatureSize + (MaxFeatureSize - MinFeatureSize) * featureSize;
             sprintf(val, "%d", (int) featureSize);
             SetWindowText(hwnd, val);
-            
-            dlg->appCore->getRenderer()->setMinimumFeatureSize(featureSize);					
+
+            dlg->appCore->getRenderer()->setMinimumFeatureSize(featureSize);
         }
     }
 
@@ -213,7 +213,7 @@ void LocationsDialog::SetControls(HWND hDlg)
                        TBM_SETPOS,
                        (WPARAM) TRUE,
                        (LPARAM) sliderPos);
-    
+
     char val[16];
     HWND hwnd = GetDlgItem(hDlg, IDC_EDIT_FEATURE_SIZE);
     sprintf(val, "%d", (int) featureSize);
diff --git a/src/celestia/win32/winlocations.h b/src/celestia/win32/winlocations.h
index 6c0311f1b..a4f2a6785 100644
--- a/src/celestia/win32/winlocations.h
+++ b/src/celestia/win32/winlocations.h
@@ -1,5 +1,5 @@
 // winlocations.h
-// 
+//
 // Copyright (C) 2003, Chris Laurel <claurel@shatters.net>
 //
 // Miscellaneous utilities for Locations UI implementation.
diff --git a/src/celestia/win32/winmain.cpp b/src/celestia/win32/winmain.cpp
index 215a8bce2..bdd7fe047 100644
--- a/src/celestia/win32/winmain.cpp
+++ b/src/celestia/win32/winmain.cpp
@@ -326,7 +326,7 @@ CelestiaDropTarget::Drop(IDataObject* pDataObject,
                 if (medium.tymed == TYMED_HGLOBAL && medium.hGlobal != 0)
                 {
                     char* s = (char*) GlobalLock(medium.hGlobal);
-					appCore->goToUrl(s);
+                    appCore->goToUrl(s);
                     GlobalUnlock(medium.hGlobal);
                     break;
                 }
@@ -456,7 +456,7 @@ static bool CopyStateURLToClipboard()
 
     CelestiaState appState;
     appState.captureState(appCore);
-    
+
     Url url(appState, Url::CurrentVersion);
     string urlString = url.getAsString();
 
@@ -1802,7 +1802,7 @@ bool EnableFullScreen(const DEVMODE& dm)
     if (ChangeDisplaySettings(&devMode, CDS_FULLSCREEN) !=
         DISP_CHANGE_SUCCESSFUL)
     {
-	MessageBox(NULL,
+        MessageBox(NULL,
                    "Unable to switch to full screen mode; running in window mode",
                    "Error",
                    MB_OK | MB_ICONERROR);
@@ -1824,13 +1824,13 @@ ChooseBestMSAAPixelFormat(HDC hdc, int *formats, unsigned int numFormats,
                           int samplesRequested)
 {
     int idealFormat = 0;
-    int	bestFormat  = 0;
-    int	bestSamples = 0;
+    int bestFormat  = 0;
+    int bestSamples = 0;
 
     for (unsigned int i = 0; i < numFormats; i++)
     {
         int query = WGL_SAMPLES_ARB;
-    	int result = 0;
+        int result = 0;
         bool isFloatFormat = false;
 
         query = WGL_SAMPLES_ARB;
@@ -1863,23 +1863,23 @@ bool SetDCPixelFormat(HDC hDC)
     {
         msaa = true;
     }
-        
+
     if (!msaa)
     {
         static PIXELFORMATDESCRIPTOR pfd = {
-            sizeof(PIXELFORMATDESCRIPTOR),	// Size of this structure
-            1,				// Version of this structure
-            PFD_DRAW_TO_WINDOW |	// Draw to Window (not to bitmap)
-            PFD_SUPPORT_OPENGL |	// Support OpenGL calls in window
-            PFD_DOUBLEBUFFER,		// Double buffered mode
-            PFD_TYPE_RGBA,		// RGBA Color mode
+            sizeof(PIXELFORMATDESCRIPTOR),    // Size of this structure
+            1,                // Version of this structure
+            PFD_DRAW_TO_WINDOW |    // Draw to Window (not to bitmap)
+            PFD_SUPPORT_OPENGL |    // Support OpenGL calls in window
+            PFD_DOUBLEBUFFER,        // Double buffered mode
+            PFD_TYPE_RGBA,        // RGBA Color mode
             GetDeviceCaps(hDC, BITSPIXEL),// Want the display bit depth
-            0,0,0,0,0,0,		  // Not used to select mode
-            0,0,			// Not used to select mode
-            0,0,0,0,0,			// Not used to select mode
-            24,				// Size of depth buffer
-            0,				// Not used to select mode
-            0,				// Not used to select mode
+            0,0,0,0,0,0,          // Not used to select mode
+            0,0,            // Not used to select mode
+            0,0,0,0,0,            // Not used to select mode
+            24,                // Size of depth buffer
+            0,                // Not used to select mode
+            0,                // Not used to select mode
             PFD_MAIN_PLANE,             // Draw in main plane
             0,                          // Not used to select mode
             0,0,0                       // Not used to select mode
@@ -2019,7 +2019,7 @@ HWND CreateOpenGLWindow(int x, int y, int width, int height,
         MessageBox(NULL,
                    "Could not get appropriate pixel format for OpenGL rendering.", "Fatal Error",
                    MB_OK | MB_ICONERROR);
-		return NULL;
+        return NULL;
     }
 
     if (newMode == 0)
@@ -2027,24 +2027,24 @@ HWND CreateOpenGLWindow(int x, int y, int width, int height,
     else
         hideMenuBar = true;
 
-	bool firstContext = false;
+    bool firstContext = false;
     if (glContext == NULL)
-	{
+    {
         glContext = wglCreateContext(deviceContext);
-		firstContext = true;
-	}
+        firstContext = true;
+    }
     wglMakeCurrent(deviceContext, glContext);
 
-	if (firstContext)
-	{
-		GLenum glewErr = glewInit();
-		if (glewErr != GLEW_OK)
-		{
-			MessageBox(NULL, "Could not set up OpenGL extensions.", "Fatal Error",
-					   MB_OK | MB_ICONERROR);
-			return NULL;
-		}
-	}
+    if (firstContext)
+    {
+        GLenum glewErr = glewInit();
+        if (glewErr != GLEW_OK)
+        {
+            MessageBox(NULL, "Could not set up OpenGL extensions.", "Fatal Error",
+                       MB_OK | MB_ICONERROR);
+            return NULL;
+        }
+    }
 
     return hwnd;
 }
@@ -2233,7 +2233,7 @@ static void BuildScriptsMenu(HMENU menuBar, const string& scriptsDir)
         EnableMenuItem(fileMenu, ID_FILE_SCRIPTS, MF_GRAYED);
         return;
     }
-    
+
     MENUITEMINFO info;
     memset(&info, sizeof(info), 0);
     info.cbSize = sizeof(info);
@@ -2297,9 +2297,9 @@ static void syncMenusWithRendererState()
     CheckMenuItem(menuBar, ID_RENDER_STARSTYLE_DISCS,
                   style == Renderer::ScaledDiscStars ? MF_CHECKED : MF_UNCHECKED);
 
-	const ColorTemperatureTable* color = appCore->getRenderer()->getStarColorTable();
-	CheckMenuItem(menuBar, ID_STARCOLOR_DISABLED, color == GetStarColorTable(ColorTable_Enhanced) ? MF_CHECKED : MF_UNCHECKED);
-	CheckMenuItem(menuBar, ID_STARCOLOR_ENABLED,  color == GetStarColorTable(ColorTable_Blackbody_D65) ? MF_CHECKED : MF_UNCHECKED);		  
+    const ColorTemperatureTable* color = appCore->getRenderer()->getStarColorTable();
+    CheckMenuItem(menuBar, ID_STARCOLOR_DISABLED, color == GetStarColorTable(ColorTable_Enhanced) ? MF_CHECKED : MF_UNCHECKED);
+    CheckMenuItem(menuBar, ID_STARCOLOR_ENABLED,  color == GetStarColorTable(ColorTable_Blackbody_D65) ? MF_CHECKED : MF_UNCHECKED);
 
     CheckMenuItem(menuBar, ID_RENDER_TEXTURERES_LOW,
                   textureRes == 0 ? MF_CHECKED : MF_UNCHECKED);
@@ -2337,9 +2337,9 @@ public:
 
     void fatalError(const std::string& msg)
     {
-		if (s_splash != NULL)
-			s_splash->close();
-			
+        if (s_splash != NULL)
+            s_splash->close();
+
         MessageBox(NULL,
                    msg.c_str(),
                    "Fatal Error",
@@ -2517,8 +2517,8 @@ static bool LoadPreferencesFromRegistry(LPTSTR regkey, AppPreferences& prefs)
     GetRegistryValue(key, "StarsColor", &prefs.starsColor, sizeof(prefs.starsColor));
     prefs.starStyle = Renderer::FuzzyPointStars;
     GetRegistryValue(key, "StarStyle", &prefs.starStyle, sizeof(prefs.starStyle));
-	prefs.renderPath = GLContext::GLPath_Basic;
-	prefs.renderPathSet = GetRegistryValue(key, "RenderPath", &prefs.renderPath, sizeof(prefs.renderPath));
+    prefs.renderPath = GLContext::GLPath_Basic;
+    prefs.renderPathSet = GetRegistryValue(key, "RenderPath", &prefs.renderPath, sizeof(prefs.renderPath));
 
     GetRegistryValue(key, "LastVersion", &prefs.lastVersion, sizeof(prefs.lastVersion));
     GetRegistryValue(key, "TextureResolution", &prefs.textureResolution, sizeof(prefs.textureResolution));
@@ -3177,12 +3177,12 @@ class WinSplashProgressNotifier : public ProgressNotifier
 public:
     WinSplashProgressNotifier(SplashWindow* _splash) : splash(_splash) {};
     virtual ~WinSplashProgressNotifier() {};
-    
+
     virtual void update(const string& filename)
     {
         splash->setMessage(UTF8ToCurrentCP(_("Loading: ")) + filename);
     }
-    
+
 private:
     SplashWindow* splash;
 };
@@ -3192,7 +3192,7 @@ int APIENTRY WinMain(HINSTANCE hInstance,
                      LPSTR     lpCmdLine,
                      int       nCmdShow)
 {
-        
+
     // Say we're not ready to render yet.
     bReady = false;
 
@@ -3237,11 +3237,11 @@ int APIENTRY WinMain(HINSTANCE hInstance,
     if (startDirectory != "")
         SetCurrentDirectory(startDirectory.c_str());
 
-	s_splash = new SplashWindow("splash.png");
+    s_splash = new SplashWindow("splash.png");
     s_splash->setMessage("Loading data files...");
     if (!skipSplashScreen)
         s_splash->showSplash();
-    
+
     OleInitialize(NULL);
     dropTarget = new CelestiaDropTarget();
     if (dropTarget)
@@ -3332,20 +3332,20 @@ int APIENTRY WinMain(HINSTANCE hInstance,
             delete s_splash;
             s_splash = NULL;
         }
-		
+
         MessageBox(NULL,
                    "Out of memory.", "Fatal Error",
-                   MB_OK | MB_ICONERROR | MB_TOPMOST);		   
+                   MB_OK | MB_ICONERROR | MB_TOPMOST);
         return false;
     }
 
     // Gettext integration
-    setlocale(LC_ALL, ""); 
-    setlocale(LC_NUMERIC, "C"); 
+    setlocale(LC_ALL, "");
+    setlocale(LC_NUMERIC, "C");
     bindtextdomain("celestia","locale");
-    bind_textdomain_codeset("celestia", "UTF-8"); 
+    bind_textdomain_codeset("celestia", "UTF-8");
     bindtextdomain("celestia_constellations","locale");
-    bind_textdomain_codeset("celestia_constellations", "UTF-8"); 
+    bind_textdomain_codeset("celestia_constellations", "UTF-8");
     textdomain("celestia");
 
     // Loading localized resources
@@ -3364,23 +3364,23 @@ int APIENTRY WinMain(HINSTANCE hInstance,
     WinSplashProgressNotifier* progressNotifier = NULL;
     if (!skipSplashScreen)
         progressNotifier = new WinSplashProgressNotifier(s_splash);
-        
+
     string* altConfig = useAlternateConfigFile ? &configFileName : NULL;
     bool initSucceeded = appCore->initSimulation(altConfig, &extrasDirectories, progressNotifier);
-    
+
     delete progressNotifier;
 
     // Close the splash screen after all data has been loaded
-	if (s_splash != NULL)
-	{
-		s_splash->close();
-		delete s_splash;
+    if (s_splash != NULL)
+    {
+        s_splash->close();
+        delete s_splash;
         s_splash = NULL;
-	}
-	
-	// Give up now if we failed initialization
-	if (!initSucceeded)
-		return 1;
+    }
+
+    // Give up now if we failed initialization
+    if (!initSucceeded)
+        return 1;
 
     if (startURL != "")
         appCore->setStartURL(startURL);
@@ -3426,7 +3426,7 @@ int APIENTRY WinMain(HINSTANCE hInstance,
         MessageBox(NULL,
                    "Failed to create the application window.",
                    "Fatal Error",
-	           MB_OK | MB_ICONERROR);
+                   MB_OK | MB_ICONERROR);
         return FALSE;
     }
 
@@ -3494,7 +3494,7 @@ int APIENTRY WinMain(HINSTANCE hInstance,
         // Set default render flags for a new installation
         appCore->getRenderer()->setRenderFlags(Renderer::DefaultRenderFlags);
     }
-    
+
     BuildFavoritesMenu(menuBar, appCore, appInstance, &odAppMenu);
     BuildScriptsMenu(menuBar, ScriptsDirectory);
     syncMenusWithRendererState();
@@ -3502,7 +3502,7 @@ int APIENTRY WinMain(HINSTANCE hInstance,
     appCore->setContextMenuCallback(ContextMenu);
 
     bReady = true;
-    
+
     // Get the current time
     time_t systime = time(NULL);
     struct tm *gmt = gmtime(&systime);
@@ -3712,9 +3712,9 @@ LRESULT CALLBACK MainWindowProc(HWND hWnd,
 
     case WM_MOUSEMOVE:
         {
-	    int x, y;
-	    x = LOWORD(lParam);
-	    y = HIWORD(lParam);
+            int x, y;
+            x = LOWORD(lParam);
+            y = HIWORD(lParam);
 
             bool reallyMoved = x != lastMouseMove.x || y != lastMouseMove.y;
             lastMouseMove.x = x;
@@ -4261,7 +4261,7 @@ LRESULT CALLBACK MainWindowProc(HWND hWnd,
             break;
         case ID_TIME_SETTIME:
             ShowSetTimeDialog(hRes, hWnd, appCore);
-            
+
             // Update the local time menu item--since the set time dialog handles setting the time zone,
             // should we just get rid of the menu item?
             if (appCore->getTimeZoneBias() == 0)
@@ -4371,7 +4371,7 @@ LRESULT CALLBACK MainWindowProc(HWND hWnd,
                 if (urlString != NULL)
                 {
                     appCore->flash(string("URL: ") + string(urlString));
-					appCore->goToUrl(urlString);
+                    appCore->goToUrl(urlString);
                 }
             }
             break;
@@ -4384,7 +4384,7 @@ LRESULT CALLBACK MainWindowProc(HWND hWnd,
                     MarkerRepresentation markerRep(MarkerRepresentation::Diamond,
                                                    10.0f,
                                                    Color(0.0f, 1.0f, 0.0f, 0.9f));
-						 
+
                     sim->getUniverse()->markObject(sim->getSelection(),
                                                    markerRep,
                                                    1);
diff --git a/src/celestia/win32/winsplash.cpp b/src/celestia/win32/winsplash.cpp
index 451b6887e..1c9b6a969 100644
--- a/src/celestia/win32/winsplash.cpp
+++ b/src/celestia/win32/winsplash.cpp
@@ -34,7 +34,7 @@ typedef BOOL (WINAPI *lpfnUpdateLayeredWindow)
 lpfnSetLayeredWindowAttributes winSetLayeredWindowAttributes = NULL;
 lpfnUpdateLayeredWindow        winUpdateLayeredWindow = NULL;
 
-#define WS_EX_LAYERED 0x00080000 
+#define WS_EX_LAYERED 0x00080000
 #define LWA_COLORKEY  1
 #define LWA_ALPHA     2
 
@@ -46,12 +46,12 @@ lpfnUpdateLayeredWindow        winUpdateLayeredWindow = NULL;
 static LRESULT CALLBACK SplashWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     static SplashWindow *splash = NULL;
-    
+
     if (uMsg == WM_CREATE)
     {
         splash = reinterpret_cast<SplashWindow*>(reinterpret_cast<CREATESTRUCT*>(lParam)->lpCreateParams);
     }
-    
+
     if (splash)
         return splash->windowProc(hwnd, uMsg, wParam, lParam);
     else
@@ -96,7 +96,7 @@ SplashWindow::windowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
                 paint(hDC);
                 EndPaint(hwnd, &ps);
             }
-            return TRUE;            
+            return TRUE;
     }
 
     return DefWindowProc (hwnd, uMsg, wParam, lParam) ;
@@ -112,36 +112,36 @@ SplashWindow::paint(HDC hDC)
     if (hBitmap)
     {
         // Display the splash image
-        HDC hMemDC      = ::CreateCompatibleDC(hDC);   
+        HDC hMemDC      = ::CreateCompatibleDC(hDC);
         HBITMAP hOldBitmap = (HBITMAP) ::SelectObject(hMemDC, hBitmap);
-    
+
         BitBlt(hDC, 0, 0, winWidth, winHeight, hMemDC, 0, 0, SRCCOPY);
-        
+
         ::SelectObject(hMemDC, hOldBitmap);
         ::DeleteDC(hMemDC);
-        
+
         SetTextColor(hDC, RGB(255, 255, 255));
-        SetBkMode(hDC, TRANSPARENT);        
+        SetBkMode(hDC, TRANSPARENT);
     }
     else
     {
         // If the splash image couldn't be loaded, just paint a black background
         HBRUSH hbrush = CreateSolidBrush(RGB(0, 0, 0));
         FillRect(hDC, &rect, hbrush);
-        DeleteObject(hbrush);        
+        DeleteObject(hbrush);
     }
-    
+
     // Show the message text
     RECT r;
     r.left   = rect.right - 250;
     r.top    = rect.bottom - 70;
     r.right  = rect.right;
     r.bottom = r.top + 30;
-        
+
     HFONT hFont = reinterpret_cast<HFONT>(GetStockObject(DEFAULT_GUI_FONT));
     SelectObject(hDC, hFont);
  //   string s;
- //   s += UTF8ToCurrentCP(_("Version: "));    
+ //   s += UTF8ToCurrentCP(_("Version: "));
     string text = UTF8ToCurrentCP(_("Version: ")) + string(VERSION_STRING "\n") + message;
     DrawText(hDC, text.c_str(), text.length(), &r, DT_LEFT | DT_VCENTER);
 }
@@ -158,11 +158,11 @@ SplashWindow::init()
 
     winSetLayeredWindowAttributes = (lpfnSetLayeredWindowAttributes) GetProcAddress(user32, "SetLayeredWindowAttributes");
     winUpdateLayeredWindow = (lpfnUpdateLayeredWindow) GetProcAddress(user32, "UpdateLayeredWindow");
-    
+
     if (winSetLayeredWindowAttributes != NULL && winUpdateLayeredWindow != NULL)
         useLayeredWindow = true;
-        
-    image = LoadImageFromFile(imageFileName);    
+
+    image = LoadImageFromFile(imageFileName);
 }
 
 
@@ -176,10 +176,10 @@ SplashWindow::updateWindow()
     {
         HDC hwndDC = GetDC(hwnd);
         HDC hDC = CreateCompatibleDC(hwndDC);
-        
+
         HBITMAP hOldBitmap = (HBITMAP) ::SelectObject(hDC, hCompositionBitmap);
         paint(hDC);
-        
+
         SIZE size;
         POINT origin = { 0, 0 };
         size.cx = winWidth;
@@ -194,7 +194,7 @@ SplashWindow::updateWindow()
         ::SelectObject(hDC, hOldBitmap);
         ::DeleteDC(hDC);
     }
-    
+
     ::UpdateWindow(hwnd);
 }
 
@@ -231,28 +231,28 @@ SplashWindow::createWindow()
 
     int x = (nScrWidth  - winWidth) / 2;
     int y = (nScrHeight - winHeight) / 2;
-    hwnd = ::CreateWindowEx(WS_EX_TOPMOST | WS_EX_TOOLWINDOW, className, 
-                            TEXT("Banner"), WS_POPUP, x, y, 
+    hwnd = ::CreateWindowEx(WS_EX_TOPMOST | WS_EX_TOOLWINDOW, className,
+                            TEXT("Banner"), WS_POPUP, x, y,
                             winWidth, winHeight, NULL, NULL, NULL, this);
 
     if (hwnd)
     {
         createBitmap();
-        
+
         // If this version of Windows supports layered windows, set the window
         // style to layered.
         if (useLayeredWindow)
         {
             SetWindowLong(hwnd, GWL_EXSTYLE, GetWindowLong(hwnd, GWL_EXSTYLE) | WS_EX_LAYERED);
         }
-        
+
         ShowWindow(hwnd, SW_SHOW);
         updateWindow();
     }
- 
+
     delete image;
     image = NULL;
- 
+
     return hwnd;
 }
 
@@ -274,12 +274,12 @@ SplashWindow::createBitmap()
 
         HDC hwndDC = GetDC(hwnd);
         HDC hDC = CreateCompatibleDC(hwndDC);
-        
+
         void* bmPixels = NULL;
-        
+
         // create our DIB section and select the bitmap into the dc
         hBitmap = CreateDIBSection(hDC, &bmi, DIB_RGB_COLORS, &bmPixels, NULL, 0x0);
-        
+
         // Windows bitmaps are upside-down and the order of the color channels is different
         // than for a PNG. When copying pixels to the bitmap, we remap the color channels and
         // flip the image vertically.
@@ -287,14 +287,14 @@ SplashWindow::createBitmap()
         {
             unsigned char* src = image->getPixels();
             unsigned char* dst = reinterpret_cast<unsigned char*>(bmPixels);
-            
+
             for (unsigned int i = 0; i < (unsigned int) image->getHeight(); i++)
             {
                 for (unsigned int j = 0; j < (unsigned int) image->getWidth(); j++)
                 {
                     unsigned char* srcPix = &src[4 * (image->getWidth() * (image->getHeight() - i - 1) + j)];
                     unsigned char* dstPix = &dst[4 * (image->getWidth() * i + j)];
-                    
+
                     // Windows requires that we premultiply by alpha
                     unsigned int alpha = srcPix[3];
                     dstPix[0] = (unsigned char) ((srcPix[2] * alpha) / 255);
@@ -304,9 +304,9 @@ SplashWindow::createBitmap()
                 }
             }
         }
-        
+
         DeleteDC(hDC);
-        
+
         // Create the composition bitmap (always created, though it's only used when we've got
         // layered window support.)
         if (hBitmap)
@@ -314,7 +314,7 @@ SplashWindow::createBitmap()
             hCompositionBitmap = CreateCompatibleBitmap(hwndDC, image->getWidth(), image->getHeight());
         }
     }
-    
+
     return hBitmap != 0 && hCompositionBitmap != 0;
 }
 
@@ -353,7 +353,7 @@ void SplashWindow::showSplash()
 
 int SplashWindow::close()
 {
-    
+
     if (hwnd)
     {
         DestroyWindow(hwnd);
@@ -361,6 +361,6 @@ int SplashWindow::close()
         UnregisterClass(className, ::GetModuleHandle(NULL));
         return 1;
     }
-    
+
     return 0;
 }
diff --git a/src/celestia/win32/winsplash.h b/src/celestia/win32/winsplash.h
index d610cb648..723f5353c 100644
--- a/src/celestia/win32/winsplash.h
+++ b/src/celestia/win32/winsplash.h
@@ -29,9 +29,9 @@ public:
     int close();
     bool createBitmap();
     void updateWindow();
-    
+
     void setMessage(const std::string& msg);
-    
+
 private:
     HWND hwnd;
     char* className;
diff --git a/src/celestia/win32/winssbrowser.cpp b/src/celestia/win32/winssbrowser.cpp
index 8daad794a..80cb9c699 100644
--- a/src/celestia/win32/winssbrowser.cpp
+++ b/src/celestia/win32/winssbrowser.cpp
@@ -1,5 +1,5 @@
 // winssbrowser.h
-// 
+//
 // Copyright (C) 2001, Chris Laurel <claurel@shatters.net>
 //
 // Solar system browser tool for Windows.
@@ -25,47 +25,47 @@ using namespace std;
 
 HTREEITEM AddItemToTree(HWND hwndTV, LPSTR lpszItem, int nLevel, void* data,
                         HTREEITEM parent)
-{ 
-    TVITEM tvi; 
-    TVINSERTSTRUCT tvins; 
-    static HTREEITEM hPrev = (HTREEITEM) TVI_FIRST; 
+{
+    TVITEM tvi;
+    TVINSERTSTRUCT tvins;
+    static HTREEITEM hPrev = (HTREEITEM) TVI_FIRST;
 
-#if 0 
-    tvi.mask = TVIF_TEXT | TVIF_IMAGE | TVIF_SELECTEDIMAGE | TVIF_PARAM; 
+#if 0
+    tvi.mask = TVIF_TEXT | TVIF_IMAGE | TVIF_SELECTEDIMAGE | TVIF_PARAM;
 #endif
     tvi.mask = TVIF_TEXT | TVIF_PARAM;
- 
-    // Set the text of the item. 
-    tvi.pszText = lpszItem; 
-    tvi.cchTextMax = lstrlen(lpszItem); 
 
-    // Save the heading level in the item's application-defined 
-    // data area. 
-    tvi.lParam = (LPARAM) data; 
- 
-    tvins.item = tvi; 
-    tvins.hInsertAfter = hPrev; 
+    // Set the text of the item.
+    tvi.pszText = lpszItem;
+    tvi.cchTextMax = lstrlen(lpszItem);
+
+    // Save the heading level in the item's application-defined
+    // data area.
+    tvi.lParam = (LPARAM) data;
+
+    tvins.item = tvi;
+    tvins.hInsertAfter = hPrev;
     tvins.hParent = parent;
- 
-    // Add the item to the tree view control. 
-    hPrev = (HTREEITEM) SendMessage(hwndTV, TVM_INSERTITEM, 0, 
-                                    (LPARAM) (LPTVINSERTSTRUCT) &tvins); 
- 
-#if 0 
-    // The new item is a child item. Give the parent item a 
-    // closed folder bitmap to indicate it now has child items. 
+
+    // Add the item to the tree view control.
+    hPrev = (HTREEITEM) SendMessage(hwndTV, TVM_INSERTITEM, 0,
+                                    (LPARAM) (LPTVINSERTSTRUCT) &tvins);
+
+#if 0
+    // The new item is a child item. Give the parent item a
+    // closed folder bitmap to indicate it now has child items.
     if (nLevel > 1)
-    { 
-        hti = TreeView_GetParent(hwndTV, hPrev); 
-        tvi.mask = TVIF_IMAGE | TVIF_SELECTEDIMAGE; 
-        tvi.hItem = hti; 
-        // tvi.iImage = g_nClosed; 
-        // tvi.iSelectedImage = g_nClosed; 
-        TreeView_SetItem(hwndTV, &tvi); 
+    {
+        hti = TreeView_GetParent(hwndTV, hPrev);
+        tvi.mask = TVIF_IMAGE | TVIF_SELECTEDIMAGE;
+        tvi.hItem = hti;
+        // tvi.iImage = g_nClosed;
+        // tvi.iSelectedImage = g_nClosed;
+        TreeView_SetItem(hwndTV, &tvi);
     }
-#endif 
- 
-    return hPrev; 
+#endif
+
+    return hPrev;
 }
 
 
@@ -77,7 +77,7 @@ void AddPlanetarySystemToTree(const PlanetarySystem* sys, HWND treeView, int lev
         if (world != NULL && world->getClassification() != Body::Invisible && !world->getName().empty())
         {
             HTREEITEM item;
-            item = AddItemToTree(treeView, 
+            item = AddItemToTree(treeView,
                                  const_cast<char*>(UTF8ToCurrentCP(world->getName(true)).c_str()),
                                  level,
                                  static_cast<void*>(world),
@@ -119,7 +119,7 @@ BOOL APIENTRY SolarSystemBrowserProc(HWND hDlg,
                 if (planets != NULL)
                     AddPlanetarySystemToTree(planets, hwnd, 2, rootItem);
 
-                SendMessage(hwnd, TVM_EXPAND, TVE_EXPAND, (LPARAM) rootItem); 
+                SendMessage(hwnd, TVM_EXPAND, TVE_EXPAND, (LPARAM) rootItem);
             }
         }
         return(TRUE);
@@ -156,7 +156,7 @@ BOOL APIENTRY SolarSystemBrowserProc(HWND hDlg,
     case WM_NOTIFY:
         {
             LPNMHDR hdr = (LPNMHDR) lParam;
-            
+
             if (hdr->code == TVN_SELCHANGED)
             {
                 LPNMTREEVIEW nm = (LPNMTREEVIEW) lParam;
diff --git a/src/celestia/win32/winssbrowser.h b/src/celestia/win32/winssbrowser.h
index 96e2ae498..f25907c75 100644
--- a/src/celestia/win32/winssbrowser.h
+++ b/src/celestia/win32/winssbrowser.h
@@ -1,5 +1,5 @@
 // winssbrowser.h
-// 
+//
 // Copyright (C) 2001, Chris Laurel <claurel@shatters.net>
 //
 // Solar system browser tool for Windows.
diff --git a/src/celestia/win32/winstarbrowser.cpp b/src/celestia/win32/winstarbrowser.cpp
index 7f408b1d6..bf219587d 100644
--- a/src/celestia/win32/winstarbrowser.cpp
+++ b/src/celestia/win32/winstarbrowser.cpp
@@ -1,5 +1,5 @@
 // winstarbrowser.cpp
-// 
+//
 // Copyright (C) 2001, Chris Laurel <claurel@shatters.net>
 //
 // Star browser tool for Windows.
@@ -91,7 +91,7 @@ struct CloserStarPredicate
     {
         return ((pos - star0->getPosition()).squaredNorm() <
                 (pos - star1->getPosition()).squaredNorm());
-                               
+
     }
 };
 
@@ -263,7 +263,7 @@ bool InitStarBrowserItems(HWND listView, StarBrowser* browser)
     default:
         return false;
     }
-            
+
     bool succeeded = InitStarBrowserLVItems(listView, *stars);
     delete stars;
 
@@ -351,7 +351,7 @@ void StarBrowserDisplayItem(LPNMLVDISPINFOA nm, StarBrowser* browser)
             nm->item.pszText = const_cast<char*>(starNameString.c_str());
         }
         break;
-            
+
     case 1:
         {
             Vector3d r = star->getPosition(tdb).offsetFromKm(browser->ucPos);
@@ -369,7 +369,7 @@ void StarBrowserDisplayItem(LPNMLVDISPINFOA nm, StarBrowser* browser)
             nm->item.pszText = callbackScratch;
         }
         break;
-            
+
     case 3:
         sprintf(callbackScratch, "%.2f", star->getAbsoluteMagnitude());
         nm->item.pszText = callbackScratch;
@@ -434,7 +434,7 @@ BOOL APIENTRY StarBrowserProc(HWND hDlg,
                 (WPARAM)TRUE, (LPARAM)MAKELONG(MinListStars, MaxListStars));
             SendDlgItemMessage(hDlg, IDC_MAXSTARS_SLIDER, TBM_SETPOS,
                 (WPARAM)TRUE, (LPARAM)DefaultListStars);
-            
+
             return(TRUE);
         }
 
diff --git a/src/celestia/win32/winstarbrowser.h b/src/celestia/win32/winstarbrowser.h
index c74615f74..76a1151af 100644
--- a/src/celestia/win32/winstarbrowser.h
+++ b/src/celestia/win32/winstarbrowser.h
@@ -1,5 +1,5 @@
 // winstarbrowser.h
-// 
+//
 // Copyright (C) 2001, Chris Laurel <claurel@shatters.net>
 //
 // Star browser tool for Windows.
diff --git a/src/celestia/win32/wintime.cpp b/src/celestia/win32/wintime.cpp
index 7d088a6b1..097e1f209 100644
--- a/src/celestia/win32/wintime.cpp
+++ b/src/celestia/win32/wintime.cpp
@@ -30,12 +30,12 @@ public:
     void init(HWND _hDlg);
     double getTime() const;
     void setTime(const double _tdb);
-    
+
     void updateControls();
-    
+
     LRESULT command(WPARAM wParam, LPARAM lParam);
     LRESULT notify(int id, const NMHDR& nmhdr);
-    
+
 private:
     HWND hDlg;
     CelestiaCore* appCore;
@@ -43,7 +43,7 @@ private:
     bool useLocalTime;
     bool useUTCOffset;
     int localTimeZoneBiasInSeconds;
-    
+
     void getLocalTimeZoneInfo();
 };
 
@@ -83,7 +83,7 @@ void
 SetTimeDialog::init(HWND _hDlg)
 {
     hDlg = _hDlg;
-    
+
     SetWindowLongPtr(hDlg, DWLP_USER, reinterpret_cast<LPARAM>(this));
     getLocalTimeZoneInfo();
 
@@ -97,7 +97,7 @@ SetTimeDialog::init(HWND _hDlg)
     SendDlgItemMessage(hDlg, IDC_COMBOBOX_DATE_FORMAT, CB_ADDSTRING, 0, (LPARAM) _("Time Zone Name"));
     SendDlgItemMessage(hDlg, IDC_COMBOBOX_DATE_FORMAT, CB_ADDSTRING, 0, (LPARAM) _("UTC Offset"));
     bind_textdomain_codeset("celestia", "UTF8");
-    
+
     SendDlgItemMessage(hDlg, IDC_COMBOBOX_TIMEZONE, CB_SETCURSEL, useLocalTime ? 1 : 0, 0);
     SendDlgItemMessage(hDlg, IDC_COMBOBOX_DATE_FORMAT, CB_SETCURSEL, useUTCOffset ? 1 : 0, 0);
 
@@ -158,9 +158,9 @@ SetTimeDialog::updateControls()
 
     if (useLocalTime)
         tztdb += localTimeZoneBiasInSeconds / 86400.0;
-        
+
     astro::Date newTime = astro::TDBtoUTC(tztdb);
-    
+
     sysTime.wYear = newTime.year;
     sysTime.wMonth = newTime.month;
     sysTime.wDay = newTime.day;
@@ -207,17 +207,17 @@ SetTimeDialog::command(WPARAM wParam, LPARAM lParam)
             appCore->setDateFormat((astro::Date::Format) (useLocalTime && useUTCOffset ? 2 : 1));
             EndDialog(hDlg, 0);
             return TRUE;
-            
+
         case IDCANCEL:
             EndDialog(hDlg, 0);
             return TRUE;
-    
+
         case IDC_SETCURRENTTIME:
             // Set time to the current system time
             setTime(astro::UTCtoTDB((double) time(NULL) / 86400.0 + (double) astro::Date(1970, 1, 1)));
             updateControls();
             return TRUE;
-            
+
         case IDC_COMBOBOX_TIMEZONE:
             if (HIWORD(wParam) == CBN_SELCHANGE)
             {
@@ -226,7 +226,7 @@ SetTimeDialog::command(WPARAM wParam, LPARAM lParam)
                 EnableWindow (GetDlgItem (hDlg, IDC_COMBOBOX_DATE_FORMAT), useLocalTime);
                 updateControls();
             }
-            return TRUE;          
+            return TRUE;
 
         case IDC_COMBOBOX_DATE_FORMAT:
             if (HIWORD(wParam) == CBN_SELCHANGE)
@@ -235,7 +235,7 @@ SetTimeDialog::command(WPARAM wParam, LPARAM lParam)
                 useUTCOffset = (selection == 1);
                 updateControls();
             }
-            return TRUE;  
+            return TRUE;
 
         case IDC_JDPICKER:
             if (HIWORD(wParam) == EN_KILLFOCUS)
@@ -257,7 +257,7 @@ LRESULT
 SetTimeDialog::notify(int id, const NMHDR& hdr)
 {
     astro::Date newTime(tdb);
-    
+
     if (hdr.code == DTN_DATETIMECHANGE)
     {
         LPNMDATETIMECHANGE change = (LPNMDATETIMECHANGE) &hdr;
@@ -275,7 +275,7 @@ SetTimeDialog::notify(int id, const NMHDR& hdr)
                 newTime.hour = sysTime.wHour;
                 newTime.minute = sysTime.wMinute;
                 newTime.seconds = sysTime.wSecond + (double) sysTime.wMilliseconds / 1000.0;
-                
+
                 tdb = astro::UTCtoTDB(newTime);
                 if (useLocalTime)
                     tdb -= localTimeZoneBiasInSeconds / 86400.0;
@@ -284,12 +284,12 @@ SetTimeDialog::notify(int id, const NMHDR& hdr)
             }
         }
     }
-        
+
     return TRUE;
 }
 
 
-static BOOL APIENTRY 
+static BOOL APIENTRY
 SetTimeProc(HWND hDlg,
             UINT message,
             WPARAM wParam,
@@ -311,7 +311,7 @@ SetTimeProc(HWND hDlg,
 
     case WM_COMMAND:
         return timeDialog->command(wParam, lParam);
-        
+
     case WM_NOTIFY:
         return timeDialog->notify((int) wParam, *reinterpret_cast<NMHDR*>(lParam));
     }
@@ -326,8 +326,8 @@ ShowSetTimeDialog(HINSTANCE appInstance,
                   CelestiaCore* appCore)
 {
     SetTimeDialog* timeDialog = new SetTimeDialog(appCore);
-    
+
     DialogBoxParam(appInstance, MAKEINTRESOURCE(IDD_SETTIME), appWindow, (DLGPROC)SetTimeProc, reinterpret_cast<LPARAM>(timeDialog));
-    
+
     delete timeDialog;
 }
diff --git a/src/celestia/win32/wintourguide.cpp b/src/celestia/win32/wintourguide.cpp
index 0c87a32ba..57f727f1c 100644
--- a/src/celestia/win32/wintourguide.cpp
+++ b/src/celestia/win32/wintourguide.cpp
@@ -1,5 +1,5 @@
 // wintourguide.cpp
-// 
+//
 // Copyright (C) 2001, Chris Laurel <claurel@shatters.net>
 //
 // Space 'tour guide' dialog for Windows.
@@ -45,8 +45,8 @@ BOOL APIENTRY TourGuideProc(HWND hDlg,
 
             HWND hwnd = GetDlgItem(hDlg, IDC_COMBO_TOURGUIDE);
             const DestinationList* destinations = guide->appCore->getDestinations();
-			Destination* dest = (*destinations)[0];
-			guide->selectedDest = dest;
+            Destination* dest = (*destinations)[0];
+            guide->selectedDest = dest;
             if (hwnd != NULL && destinations != NULL)
             {
                 for (DestinationList::const_iterator iter = destinations->begin();
diff --git a/src/celestia/win32/wintourguide.h b/src/celestia/win32/wintourguide.h
index 6ab1349bc..240279282 100644
--- a/src/celestia/win32/wintourguide.h
+++ b/src/celestia/win32/wintourguide.h
@@ -1,5 +1,5 @@
 // wintourguide.h
-// 
+//
 // Copyright (C) 2001, Chris Laurel <claurel@shatters.net>
 //
 // Space 'tour guide' dialog for Windows.
diff --git a/src/celestia/win32/winviewoptsdlg.cpp b/src/celestia/win32/winviewoptsdlg.cpp
index 2e7406c10..01702ca25 100644
--- a/src/celestia/win32/winviewoptsdlg.cpp
+++ b/src/celestia/win32/winviewoptsdlg.cpp
@@ -1,5 +1,5 @@
 // winviewoptsdlg.cpp
-// 
+//
 // Copyright (C) 2001, Chris Laurel <claurel@shatters.net>
 //
 // View Options dialog for Windows.
@@ -158,15 +158,15 @@ static BOOL APIENTRY ViewOptionsProc(HWND hDlg,
         case IDC_LABELGALAXIES:
             renderer->setLabelMode(labelMode ^ Renderer::GalaxyLabels);
             break;
-		    case IDC_LABELGLOBULARS:
-			      renderer->setLabelMode(labelMode ^ Renderer::GlobularLabels);
-			      break;
-		    case IDC_LABELNEBULAE:
-			      renderer->setLabelMode(labelMode ^ Renderer::NebulaLabels);
-			      break;
-		    case IDC_LABELOPENCLUSTERS:
-			      renderer->setLabelMode(labelMode ^ Renderer::OpenClusterLabels);
-			      break;
+        case IDC_LABELGLOBULARS:
+            renderer->setLabelMode(labelMode ^ Renderer::GlobularLabels);
+            break;
+        case IDC_LABELNEBULAE:
+            renderer->setLabelMode(labelMode ^ Renderer::NebulaLabels);
+            break;
+        case IDC_LABELOPENCLUSTERS:
+            renderer->setLabelMode(labelMode ^ Renderer::OpenClusterLabels);
+            break;
         case IDC_LABELPLANETS:
             renderer->setLabelMode(labelMode ^ Renderer::PlanetLabels);
             break;
@@ -243,7 +243,7 @@ static BOOL APIENTRY ViewOptionsProc(HWND hDlg,
                     HWND hwnd = GetDlgItem(hDlg, IDC_EDIT_FILTER_DISTANCE);
                     float logDistanceLimit = (float) HIWORD(wParam) /
                         (float) DistanceSliderRange;
-                    float distanceLimit = (float) pow(MaxDistanceLimit, 
+                    float distanceLimit = (float) pow(MaxDistanceLimit,
                                                  logDistanceLimit);
                     sprintf(val, "%d", (int) distanceLimit);
                     SetWindowText(hwnd, val);
@@ -355,9 +355,9 @@ void ViewOptionsDialog::SetControls(HWND hDlg)
     SendDlgItemMessage(hDlg, IDC_LABELCONSTELLATIONSLATIN, BM_SETCHECK,
                        ((labelMode & Renderer::I18nConstellationLabels) == 0) ? BST_CHECKED : BST_UNCHECKED, 0);
     dlgCheck(hDlg, IDC_LABELGALAXIES,   labelMode, Renderer::GalaxyLabels);
-	  dlgCheck(hDlg, IDC_LABELGLOBULARS, labelMode, Renderer::GlobularLabels);
-	  dlgCheck(hDlg, IDC_LABELNEBULAE,    labelMode, Renderer::NebulaLabels);
-	  dlgCheck(hDlg, IDC_LABELOPENCLUSTERS, labelMode, Renderer::OpenClusterLabels);
+    dlgCheck(hDlg, IDC_LABELGLOBULARS, labelMode, Renderer::GlobularLabels);
+    dlgCheck(hDlg, IDC_LABELNEBULAE,    labelMode, Renderer::NebulaLabels);
+    dlgCheck(hDlg, IDC_LABELOPENCLUSTERS, labelMode, Renderer::OpenClusterLabels);
     dlgCheck(hDlg, IDC_LABELSTARS,      labelMode, Renderer::StarLabels);
     dlgCheck(hDlg, IDC_LABELPLANETS,    labelMode, Renderer::PlanetLabels);
     dlgCheck(hDlg, IDC_LABELDWARFPLANETS,    labelMode, Renderer::DwarfPlanetLabels);
@@ -376,7 +376,7 @@ void ViewOptionsDialog::SetControls(HWND hDlg)
                        (WPARAM)TRUE,
                        (LPARAM) MAKELONG(0, DistanceSliderRange));
     float distanceLimit = appCore->getRenderer()->getDistanceLimit();
-    float logDistanceLimit = (float) (log(distanceLimit) / 
+    float logDistanceLimit = (float) (log(distanceLimit) /
                                       log(MaxDistanceLimit));
     SendDlgItemMessage(hDlg,
                        IDC_SLIDER_FILTER_DISTANCE,
diff --git a/src/celestia/win32/winviewoptsdlg.h b/src/celestia/win32/winviewoptsdlg.h
index 00906dcf1..c41aa5302 100644
--- a/src/celestia/win32/winviewoptsdlg.h
+++ b/src/celestia/win32/winviewoptsdlg.h
@@ -1,5 +1,5 @@
 // winviewoptsdlg.h
-// 
+//
 // Copyright (C) 2001, Chris Laurel <claurel@shatters.net>
 //
 // View Options dialog for Windows.
diff --git a/src/celmath/aabox.h b/src/celmath/aabox.h
index 1edc79771..d00f3a377 100644
--- a/src/celmath/aabox.h
+++ b/src/celmath/aabox.h
@@ -34,7 +34,7 @@ class AxisAlignedBox
     inline void include(const Point3f&);
     inline void include(const AxisAlignedBox&);
 
- private:    
+ private:
     Point3f minimum;
     Point3f maximum;
 };
diff --git a/src/celmath/capsule.h b/src/celmath/capsule.h
index b4c362d36..b2477731b 100644
--- a/src/celmath/capsule.h
+++ b/src/celmath/capsule.h
@@ -2,7 +2,7 @@
 //
 // Implementation of a capsule bounding volume. A capsule is a sphere
 // swept along a line, parameterized in this class as a starting point,
-// an axis, and a radius. 
+// an axis, and a radius.
 //
 // Copyright (C) 2007, Chris Laurel <claurel@shatters.net>
 //
@@ -22,7 +22,7 @@ template<class T> class Capsule
     Capsule();
     Capsule(const Vector3<T>& _axis, T _radius);
     Capsule(const Point3<T>& _origin, const Vector3<T>& _axis, T _radius);
- 
+
  public:
     Point3<T> origin;
     Vector3<T> axis;
@@ -40,15 +40,15 @@ template<class T> Capsule<T>::Capsule() :
 
 
 template<class T> Capsule<T>::Capsule(const Vector3<T>& _axis,
-				      T _radius) :
+                                      T _radius) :
     origin(0, 0, 0), axis(_axis), radius(_radius)
 {
 }
 
 
 template<class T> Capsule<T>::Capsule(const Point3<T>& _origin,
-				      const Vector3<T>& _axis,
-				      T _radius) :
+                                      const Vector3<T>& _axis,
+                                      T _radius) :
     origin(_origin), axis(_axis), radius(_radius)
 {
 }
diff --git a/src/celmath/distance.h b/src/celmath/distance.h
index 40743d2ce..2b92f6383 100644
--- a/src/celmath/distance.h
+++ b/src/celmath/distance.h
@@ -50,8 +50,8 @@ template<class T> T distance(const Eigen::Matrix<T, 3, 1>& p, const Ray3<T>& r)
 
 // Distance between a point and a segment defined by orig+dir*t, 0 <= t <= 1
 template<class T> T distanceToSegment(const Point3<T>& p,
-				      const Point3<T>& origin,
-				      const Vector3<T>& direction)
+                                      const Point3<T>& origin,
+                                      const Vector3<T>& direction)
 {
     T t = ((p - origin) * direction) / (direction * direction);
     if (t <= 0)
diff --git a/src/celmath/ellipsoid.h b/src/celmath/ellipsoid.h
index 8ad1d688c..27b648302 100644
--- a/src/celmath/ellipsoid.h
+++ b/src/celmath/ellipsoid.h
@@ -83,7 +83,7 @@ template<class T> class Ellipsoid
         v = Vector3<T>(v.x / axes.x, v.y / axes.y, v.z / axes.z);
         return v * v <= (T) 1.0;
     }
- 
+
  public:
     Eigen::Matrix<T, 3, 1> center;
     Eigen::Matrix<T, 3, 1> axes;
diff --git a/src/celmath/frustum.cpp b/src/celmath/frustum.cpp
index 03e48d0ee..773ea659f 100644
--- a/src/celmath/frustum.cpp
+++ b/src/celmath/frustum.cpp
@@ -1,5 +1,5 @@
 // frustum.cpp
-// 
+//
 // Copyright (C) 2000, Chris Laurel <claurel@shatters.net>
 //
 // This program is free software; you can redistribute it and/or
@@ -129,7 +129,7 @@ Frustum::Aspect Frustum::testCapsule(const Capsulef& capsule) const
     int nPlanes = infinite ? 5 : 6;
     int intersections = 0;
     float r2 = capsule.radius * capsule.radius;
-    
+
     // TODO: Unnecessary after Eigen conversion of Capsule class
     Vector3f capsuleOrigin(capsule.origin.x, capsule.origin.y, capsule.origin.z);
     Vector3f capsuleAxis(capsule.axis.x, capsule.axis.y, capsule.axis.z);
diff --git a/src/celmath/frustum.h b/src/celmath/frustum.h
index 2f47bc99a..350582385 100644
--- a/src/celmath/frustum.h
+++ b/src/celmath/frustum.h
@@ -1,5 +1,5 @@
 // frustum.h
-// 
+//
 // Copyright (C) 2000-2008, Chris Laurel <claurel@shatters.net>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/celmath/geomutil.h b/src/celmath/geomutil.h
index 35a08eeb8..fe6ec213c 100644
--- a/src/celmath/geomutil.h
+++ b/src/celmath/geomutil.h
@@ -44,7 +44,7 @@ ZRotation(T radians)
  *  from the observer to the target, with the y-axis pointing in direction
  *  of the component of 'up' that is orthogonal to the z-axis.
  */
-template<class T> Eigen::Quaternion<T> 
+template<class T> Eigen::Quaternion<T>
 LookAt(Eigen::Matrix<T, 3, 1> from, Eigen::Matrix<T, 3, 1> to, Eigen::Matrix<T, 3, 1> up)
 {
     Eigen::Matrix<T, 3, 1> n = to - from;
diff --git a/src/celmath/intersect.h b/src/celmath/intersect.h
index eae5b3bd7..e228812ed 100644
--- a/src/celmath/intersect.h
+++ b/src/celmath/intersect.h
@@ -74,9 +74,9 @@ template<class T> bool testIntersection(const Ray3<T>& ray,
                                         T& distance)
 {
     Eigen::Matrix<T, 3, 1> diff = ray.origin - e.center;
-	Eigen::Matrix<T, 3, 1> s = e.axes.cwiseInverse().array().square();
-	Eigen::Matrix<T, 3, 1> sdir = ray.direction.cwiseProduct(s);
-	Eigen::Matrix<T, 3, 1> sdiff = diff.cwiseProduct(s);
+    Eigen::Matrix<T, 3, 1> s = e.axes.cwiseInverse().array().square();
+    Eigen::Matrix<T, 3, 1> sdir = ray.direction.cwiseProduct(s);
+    Eigen::Matrix<T, 3, 1> sdiff = diff.cwiseProduct(s);
 
     T a = ray.direction.dot(sdir);
     T b = ray.direction.dot(sdiff);
diff --git a/src/celmath/mathlib.h b/src/celmath/mathlib.h
index ff2040946..1705708bd 100644
--- a/src/celmath/mathlib.h
+++ b/src/celmath/mathlib.h
@@ -1,5 +1,5 @@
 // mathlib.h
-// 
+//
 // Copyright (C) 2001-2008, Chris Laurel <claurel@shatters.net>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/celmath/perlin.cpp b/src/celmath/perlin.cpp
index 72c5c8781..bc36bcb5c 100644
--- a/src/celmath/perlin.cpp
+++ b/src/celmath/perlin.cpp
@@ -18,27 +18,27 @@ float gain(float a, float b)
     float p = (float) (log(1.0 - b) / log(0.5));
 
     if (a < 0.001f)
-	return 0.0f;
+        return 0.0f;
     else if (a > 0.999f)
-	return 1.0f;
+        return 1.0f;
 
     if (a < 0.5f)
-	return (float) pow(2 * a, p) / 2;
+        return (float) pow(2 * a, p) / 2;
     else
-	return 1.0f - (float) pow(2.0 * (1.0 - a), (double) p) / 2;
+        return 1.0f - (float) pow(2.0 * (1.0 - a), (double) p) / 2;
 }
 
 float noise(float vec[], int len)
 {
     switch (len) {
     case 0:
-	return 0.;
+        return 0.;
     case 1:
-	return noise1(vec[0]);
+        return noise1(vec[0]);
     case 2:
-	return noise2(vec);
+        return noise2(vec);
     default:
-	return noise3(vec);
+        return noise3(vec);
     }
 }
 
@@ -48,10 +48,10 @@ float turbulence(float v[], float freq)
     float t, vec[3];
 
     for (t = 0. ; freq >= 1. ; freq /= 2) {
-	vec[0] = freq * v[0];
-	vec[1] = freq * v[1];
-	vec[2] = freq * v[2];
-	t += (float) fabs(noise3(vec)) / freq;
+        vec[0] = freq * v[0];
+        vec[1] = freq * v[1];
+        vec[2] = freq * v[2];
+        t += (float) fabs(noise3(vec)) / freq;
     }
     return t;
 }
@@ -64,9 +64,9 @@ float turbulence(const Vector2f& p, float freq)
 
     for (t = 0.0f; freq >= 1.0f; freq *= 0.5f)
     {
-    vec[0] = freq * p.x();
-    vec[1] = freq * p.y();
-	t += (float) fabs(noise2(vec)) / freq;
+        vec[0] = freq * p.x();
+        vec[1] = freq * p.y();
+        t += (float) fabs(noise2(vec)) / freq;
     }
 
     return t;
@@ -80,10 +80,10 @@ float turbulence(const Vector3f& p, float freq)
 
     for (t = 0.0f; freq >= 1.0f; freq *= 0.5f)
     {
-    vec[0] = freq * p.x();
-    vec[1] = freq * p.y();
-    vec[2] = freq * p.z();
-	t += (float) fabs(noise3(vec)) / freq;
+        vec[0] = freq * p.x();
+        vec[1] = freq * p.y();
+        vec[2] = freq * p.z();
+        t += (float) fabs(noise3(vec)) / freq;
     }
 
     return t;
@@ -96,10 +96,10 @@ float fractalsum(float v[], float freq)
     float vec[3];
 
     for (t = 0.0f ; freq >= 1.0f ; freq /= 2.0f) {
-	vec[0] = freq * v[0];
-	vec[1] = freq * v[1];
-	vec[2] = freq * v[2];
-	t += noise3(vec) / freq;
+        vec[0] = freq * v[0];
+        vec[1] = freq * v[1];
+        vec[2] = freq * v[2];
+        t += noise3(vec) / freq;
     }
 
     return t;
@@ -113,9 +113,9 @@ float fractalsum(const Vector2f& p, float freq)
 
     for (t = 0.0f; freq >= 1.0f; freq *= 0.5f)
     {
-    vec[0] = freq * p.x();
-    vec[1] = freq * p.y();
-	t += noise2(vec) / freq;
+        vec[0] = freq * p.x();
+        vec[1] = freq * p.y();
+        t += noise2(vec) / freq;
     }
 
     return t;
@@ -129,10 +129,10 @@ float fractalsum(const Vector3f& p, float freq)
 
     for (t = 0.0f; freq >= 1.0f; freq *= 0.5f)
     {
-    vec[0] = freq * p.x();
-    vec[1] = freq * p.y();
-    vec[2] = freq * p.z();
-	t += noise3(vec) / freq;
+        vec[0] = freq * p.x();
+        vec[1] = freq * p.y();
+        vec[2] = freq * p.z();
+        t += noise3(vec) / freq;
     }
 
     return t;
@@ -160,11 +160,11 @@ static void init(void);
 #define s_curve(t) ( t * t * (3.0f - 2.0f * t) )
 
 #define setup(i, b0, b1, r0, r1) \
-	t = vec[i] + N;\
-	b0 = ((int)t) & BM;\
-	b1 = (b0+1) & BM;\
-	r0 = t - (int)t;\
-	r1 = r0 - 1.0f;
+              t = vec[i] + N;\
+              b0 = ((int)t) & BM;\
+              b1 = (b0+1) & BM;\
+              r0 = t - (int)t;\
+              r1 = r0 - 1.0f;
 
 float noise1(float arg)
 {
@@ -186,88 +186,88 @@ float noise1(float arg)
 
 float noise2(float vec[2])
 {
-	int bx0, bx1, by0, by1, b00, b10, b01, b11;
-	float rx0, rx1, ry0, ry1, *q, sx, sy, a, b, t, u, v;
-	int i, j;
+    int bx0, bx1, by0, by1, b00, b10, b01, b11;
+    float rx0, rx1, ry0, ry1, *q, sx, sy, a, b, t, u, v;
+    int i, j;
 
-	if (!initialized)
-	    init();
+    if (!initialized)
+        init();
 
-	setup(0, bx0,bx1, rx0,rx1);
-	setup(1, by0,by1, ry0,ry1);
+    setup(0, bx0,bx1, rx0,rx1);
+    setup(1, by0,by1, ry0,ry1);
 
-	i = p[ bx0 ];
-	j = p[ bx1 ];
+    i = p[ bx0 ];
+    j = p[ bx1 ];
 
-	b00 = p[ i + by0 ];
-	b10 = p[ j + by0 ];
-	b01 = p[ i + by1 ];
-	b11 = p[ j + by1 ];
+    b00 = p[ i + by0 ];
+    b10 = p[ j + by0 ];
+    b01 = p[ i + by1 ];
+    b11 = p[ j + by1 ];
 
-	sx = s_curve(rx0);
-	sy = s_curve(ry0);
+    sx = s_curve(rx0);
+    sy = s_curve(ry0);
 
 #define at2(rx,ry) ( rx * q[0] + ry * q[1] )
 
-	q = g2[ b00 ] ; u = at2(rx0,ry0);
-	q = g2[ b10 ] ; v = at2(rx1,ry0);
-	a = Mathf::lerp(sx, u, v);
+    q = g2[ b00 ] ; u = at2(rx0,ry0);
+    q = g2[ b10 ] ; v = at2(rx1,ry0);
+    a = Mathf::lerp(sx, u, v);
 
-	q = g2[ b01 ] ; u = at2(rx0,ry1);
-	q = g2[ b11 ] ; v = at2(rx1,ry1);
-	b = Mathf::lerp(sx, u, v);
+    q = g2[ b01 ] ; u = at2(rx0,ry1);
+    q = g2[ b11 ] ; v = at2(rx1,ry1);
+    b = Mathf::lerp(sx, u, v);
 
-	return Mathf::lerp(sy, a, b);
+    return Mathf::lerp(sy, a, b);
 }
 
 float noise3(float vec[3])
 {
-	if (!initialized)
-	    init();
+    if (!initialized)
+        init();
 
-	int bx0, bx1, by0, by1, bz0, bz1, b00, b10, b01, b11;
-	float rx0, rx1, ry0, ry1, rz0, rz1, *q, sy, sz, a, b, c, d, t, u, v;
-	int i, j;
+    int bx0, bx1, by0, by1, bz0, bz1, b00, b10, b01, b11;
+    float rx0, rx1, ry0, ry1, rz0, rz1, *q, sy, sz, a, b, c, d, t, u, v;
+    int i, j;
 
-	setup(0, bx0,bx1, rx0,rx1);
-	setup(1, by0,by1, ry0,ry1);
-	setup(2, bz0,bz1, rz0,rz1);
+    setup(0, bx0,bx1, rx0,rx1);
+    setup(1, by0,by1, ry0,ry1);
+    setup(2, bz0,bz1, rz0,rz1);
 
-	i = p[ bx0 ];
-	j = p[ bx1 ];
+    i = p[ bx0 ];
+    j = p[ bx1 ];
 
-	b00 = p[ i + by0 ];
-	b10 = p[ j + by0 ];
-	b01 = p[ i + by1 ];
-	b11 = p[ j + by1 ];
+    b00 = p[ i + by0 ];
+    b10 = p[ j + by0 ];
+    b01 = p[ i + by1 ];
+    b11 = p[ j + by1 ];
 
-	t  = s_curve(rx0);
-	sy = s_curve(ry0);
-	sz = s_curve(rz0);
+    t  = s_curve(rx0);
+    sy = s_curve(ry0);
+    sz = s_curve(rz0);
 
 #define at3(rx,ry,rz) ( rx * q[0] + ry * q[1] + rz * q[2] )
 
-	q = g3[ b00 + bz0 ] ; u = at3(rx0,ry0,rz0);
-	q = g3[ b10 + bz0 ] ; v = at3(rx1,ry0,rz0);
-	a = Mathf::lerp(t, u, v);
+    q = g3[ b00 + bz0 ] ; u = at3(rx0,ry0,rz0);
+    q = g3[ b10 + bz0 ] ; v = at3(rx1,ry0,rz0);
+    a = Mathf::lerp(t, u, v);
 
-	q = g3[ b01 + bz0 ] ; u = at3(rx0,ry1,rz0);
-	q = g3[ b11 + bz0 ] ; v = at3(rx1,ry1,rz0);
-	b = Mathf::lerp(t, u, v);
+    q = g3[ b01 + bz0 ] ; u = at3(rx0,ry1,rz0);
+    q = g3[ b11 + bz0 ] ; v = at3(rx1,ry1,rz0);
+    b = Mathf::lerp(t, u, v);
 
-	c = Mathf::lerp(sy, a, b);
+    c = Mathf::lerp(sy, a, b);
 
-	q = g3[ b00 + bz1 ] ; u = at3(rx0,ry0,rz1);
-	q = g3[ b10 + bz1 ] ; v = at3(rx1,ry0,rz1);
-	a = Mathf::lerp(t, u, v);
+    q = g3[ b00 + bz1 ] ; u = at3(rx0,ry0,rz1);
+    q = g3[ b10 + bz1 ] ; v = at3(rx1,ry0,rz1);
+    a = Mathf::lerp(t, u, v);
 
-	q = g3[ b01 + bz1 ] ; u = at3(rx0,ry1,rz1);
-	q = g3[ b11 + bz1 ] ; v = at3(rx1,ry1,rz1);
-	b = Mathf::lerp(t, u, v);
+    q = g3[ b01 + bz1 ] ; u = at3(rx0,ry1,rz1);
+    q = g3[ b11 + bz1 ] ; v = at3(rx1,ry1,rz1);
+    b = Mathf::lerp(t, u, v);
 
-	d = Mathf::lerp(sy, a, b);
+    d = Mathf::lerp(sy, a, b);
 
-	return Mathf::lerp(sz, c, d);
+    return Mathf::lerp(sz, c, d);
 }
 
 static void normalize2(float v[2])
@@ -318,7 +318,7 @@ static void init()
     }
 
     // Duplicate values to accelerate table lookups
-    for (i = 0; i < B + 2; i++) 
+    for (i = 0; i < B + 2; i++)
     {
         p[B + i] = p[i];
         g1[B + i]    = g1[i];
diff --git a/src/celmath/plane.h b/src/celmath/plane.h
index c9a6cb444..9666e30fa 100644
--- a/src/celmath/plane.h
+++ b/src/celmath/plane.h
@@ -1,5 +1,5 @@
 // plane.h
-// 
+//
 // Copyright (C) 2000-2008, Chris Laurel <claurel@shatters.net>
 //
 // This program is free software; you can redistribute it and/or
@@ -70,7 +70,7 @@ template<class T> T Plane<T>::distanceToSegment(const Point3<T>& origin,
 {
     T u = (direction * normal);
     T dist;
-    
+
     // Avoid divide by zero; near-zero values shouldn't cause problems
     if (u == 0)
     {
@@ -94,7 +94,7 @@ template<class T> T Plane<T>::distanceToSegment(const Point3<T>& origin,
             dist = 0.0;
         }
     }
-    
+
     return dist;
 }
 
diff --git a/src/celmath/quaternion.h b/src/celmath/quaternion.h
index 0a6c9da3d..693ffd60e 100644
--- a/src/celmath/quaternion.h
+++ b/src/celmath/quaternion.h
@@ -1,5 +1,5 @@
 // quaternion.h
-// 
+//
 // Copyright (C) 2000-2006, Chris Laurel <claurel@shatters.net>
 //
 // Template-ized quaternion math library.
@@ -62,7 +62,7 @@ public:
     static Quat<T> yrotation(T);
     static Quat<T> zrotation(T);
 
-	static Quat<T> lookAt(const Point3<T>& from, const Point3<T>& to, const Vector3<T>& up);
+    static Quat<T> lookAt(const Point3<T>& from, const Point3<T>& to, const Vector3<T>& up);
 
     T w, x, y, z;
 };
@@ -158,7 +158,7 @@ template<class T> Quat<T>& Quat<T>::operator*=(Quat<T> q)
                           w * q.x + x * q.w + y * q.z - z * q.y,
                           w * q.y + y * q.w + z * q.x - x * q.z,
                           w * q.z + z * q.w + x * q.y - y * q.x);
-                          
+
     return *this;
 }
 
@@ -447,7 +447,7 @@ template<class T> T Quat<T>::normalize()
 template<class T> void Quat<T>::setAxisAngle(Vector3<T> axis, T angle)
 {
     T s, c;
-    
+
     Math<T>::sincos(angle * (T) 0.5, s, c);
     x = s * axis.x;
     y = s * axis.y;
@@ -740,7 +740,7 @@ template<class T> Quat<T> Quat<T>::zrotation(T angle)
  *  from the observer to the target, with the y-axis pointing in direction
  *  of the component of 'up' that is orthogonal to the z-axis.
  */
-template<class T> Quat<T> 
+template<class T> Quat<T>
 Quat<T>::lookAt(const Point3<T>& from, const Point3<T>& to, const Vector3<T>& up)
 {
     Vector3<T> n = to - from;
diff --git a/src/celmath/ray.h b/src/celmath/ray.h
index 4b5635e47..efde5e877 100644
--- a/src/celmath/ray.h
+++ b/src/celmath/ray.h
@@ -22,14 +22,14 @@ template<class T> class Ray3
     Ray3(const Eigen::Matrix<T, 3, 1>& origin, const Eigen::Matrix<T, 3, 1>& direction);
     // Compatibility
     Ray3(const Point3<T>&, const Vector3<T>&);
- 
+
     Eigen::Matrix<T, 3, 1> point(T) const;
 
     Ray3<T> transform(const Eigen::Matrix<T, 3, 3>& m) const
     {
         return Ray3<T>(m * origin, m * direction);
     }
-   
+
  public:
     Eigen::Matrix<T, 3, 1> origin;
     Eigen::Matrix<T, 3, 1> direction;
diff --git a/src/celmath/solve.h b/src/celmath/solve.h
index eed8363e0..2b33483ef 100644
--- a/src/celmath/solve.h
+++ b/src/celmath/solve.h
@@ -1,5 +1,5 @@
 // solve.h
-// 
+//
 // Copyright (C) 2001, Chris Laurel <claurel@shatters.net>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/celmath/sphere.h b/src/celmath/sphere.h
index 2dcf1acf5..a1e6b217d 100644
--- a/src/celmath/sphere.h
+++ b/src/celmath/sphere.h
@@ -42,7 +42,7 @@ template<class T> class Sphere
         radius(_radius)
     {
     }
- 
+
  public:
     Eigen::Matrix<T, 3, 1> center;
     T radius;
diff --git a/src/celmath/vecmath.h b/src/celmath/vecmath.h
index 234de2db1..b2fc5ae2d 100644
--- a/src/celmath/vecmath.h
+++ b/src/celmath/vecmath.h
@@ -634,8 +634,8 @@ template<class T> Matrix3<T>& Matrix3<T>::operator*=(T s)
 template<class T> Vector3<T> operator*(const Matrix3<T>& m, const Vector3<T>& v)
 {
     return Vector3<T>(m.r[0].x * v.x + m.r[0].y * v.y + m.r[0].z * v.z,
-		      m.r[1].x * v.x + m.r[1].y * v.y + m.r[1].z * v.z,
-		      m.r[2].x * v.x + m.r[2].y * v.y + m.r[2].z * v.z);
+                      m.r[1].x * v.x + m.r[1].y * v.y + m.r[1].z * v.z,
+                      m.r[2].x * v.x + m.r[2].y * v.y + m.r[2].z * v.z);
 }
 
 
@@ -661,8 +661,8 @@ template<class T> Point3<T> operator*(const Matrix3<T>& m, const Point3<T>& p)
 template<class T> Point3<T> operator*(const Point3<T>& p, const Matrix3<T>& m)
 {
     return Point3<T>(m.r[0].x * p.x + m.r[1].x * p.y + m.r[2].x * p.z,
-		     m.r[0].y * p.x + m.r[1].y * p.y + m.r[2].y * p.z,
-		     m.r[0].z * p.x + m.r[1].z * p.y + m.r[2].z * p.z);
+                     m.r[0].y * p.x + m.r[1].y * p.y + m.r[2].y * p.z,
+                     m.r[0].z * p.x + m.r[1].z * p.y + m.r[2].z * p.z);
 }
 
 
@@ -951,8 +951,8 @@ template<class T> Matrix4<T> Matrix4<T>::scaling(T scale)
 template<class T> Vector3<T> operator*(const Matrix4<T>& m, const Vector3<T>& v)
 {
     return Vector3<T>(m.r[0].x * v.x + m.r[0].y * v.y + m.r[0].z * v.z,
-		      m.r[1].x * v.x + m.r[1].y * v.y + m.r[1].z * v.z,
-		      m.r[2].x * v.x + m.r[2].y * v.y + m.r[2].z * v.z);
+                      m.r[1].x * v.x + m.r[1].y * v.y + m.r[1].z * v.z,
+                      m.r[2].x * v.x + m.r[2].y * v.y + m.r[2].z * v.z);
 }
 
 // multiply row vector by a 4x4 matrix
@@ -975,17 +975,17 @@ template<class T> Point3<T> operator*(const Matrix4<T>& m, const Point3<T>& p)
 template<class T> Point3<T> operator*(const Point3<T>& p, const Matrix4<T>& m)
 {
     return Point3<T>(m.r[0].x * p.x + m.r[1].x * p.y + m.r[2].x * p.z + m.r[3].x,
-		     m.r[0].y * p.x + m.r[1].y * p.y + m.r[2].y * p.z + m.r[3].y,
-		     m.r[0].z * p.x + m.r[1].z * p.y + m.r[2].z * p.z + m.r[3].z);
+                     m.r[0].y * p.x + m.r[1].y * p.y + m.r[2].y * p.z + m.r[3].y,
+                     m.r[0].z * p.x + m.r[1].z * p.y + m.r[2].z * p.z + m.r[3].z);
 }
 
 // multiply column vector by a 4x4 matrix
 template<class T> Vector4<T> operator*(const Matrix4<T>& m, const Vector4<T>& v)
 {
     return Vector4<T>(m.r[0].x * v.x + m.r[0].y * v.y + m.r[0].z * v.z + m.r[0].w * v.w,
-		      m.r[1].x * v.x + m.r[1].y * v.y + m.r[1].z * v.z + m.r[1].w * v.w,
-		      m.r[2].x * v.x + m.r[2].y * v.y + m.r[2].z * v.z + m.r[2].w * v.w,
-		      m.r[3].x * v.x + m.r[3].y * v.y + m.r[3].z * v.z + m.r[3].w * v.w);
+                      m.r[1].x * v.x + m.r[1].y * v.y + m.r[1].z * v.z + m.r[1].w * v.w,
+                      m.r[2].x * v.x + m.r[2].y * v.y + m.r[2].z * v.z + m.r[2].w * v.w,
+                      m.r[3].x * v.x + m.r[3].y * v.y + m.r[3].z * v.z + m.r[3].w * v.w);
 }
 
 // multiply row vector by a 4x4 matrix
diff --git a/src/celmodel/mesh.cpp b/src/celmodel/mesh.cpp
index fc10b6fd1..66d68a010 100644
--- a/src/celmodel/mesh.cpp
+++ b/src/celmodel/mesh.cpp
@@ -521,7 +521,7 @@ Mesh::getBoundingBox() const
         // primitives, point sprite vertices have a non-zero size.
         int pointSizeOffset = (int) vertexDesc.getAttribute(PointSize).offset -
             (int) vertexDesc.getAttribute(Position).offset;
-        
+
         for (unsigned int i = 0; i < nVertices; i++, vdata += vertexDesc.stride)
         {
             Vector3f center = Map<Vector3f>(reinterpret_cast<float*>(vdata));
diff --git a/src/celmodel/mesh.h b/src/celmodel/mesh.h
index 07012a817..4626808da 100644
--- a/src/celmodel/mesh.h
+++ b/src/celmodel/mesh.h
@@ -104,7 +104,7 @@ class Mesh
     private:
         void clearSemanticMap();
         void buildSemanticMap();
-        
+
         // Vertex attributes indexed by semantic
         VertexAttribute semanticMap[SemanticMax];
     };
@@ -129,7 +129,7 @@ class Mesh
         ~PrimitiveGroup();
 
         unsigned int getPrimitiveCount() const;
-        
+
         PrimitiveGroupType prim;
         unsigned int materialIndex;
         index32* indices;
diff --git a/src/celmodel/model.h b/src/celmodel/model.h
index 13f5e24ee..21ea742a3 100644
--- a/src/celmodel/model.h
+++ b/src/celmodel/model.h
@@ -80,7 +80,7 @@ class Model
      */
     bool pick(const Eigen::Vector3d& rayOrigin,
               const Eigen::Vector3d& rayDirection,
-              double& distance) const;    
+              double& distance) const;
 
     void transform(const Eigen::Vector3f& translation, float scale);
 
diff --git a/src/celmodel/modelfile.cpp b/src/celmodel/modelfile.cpp
index 249ffc0dc..da67a0472 100644
--- a/src/celmodel/modelfile.cpp
+++ b/src/celmodel/modelfile.cpp
@@ -90,7 +90,7 @@ public:
             return false;
         }
     }
-    
+
     bool operator!=(const Token& other) const
     {
         return !(*this == other);
@@ -494,7 +494,7 @@ Token TokenStream::nextToken()
                 double x = numberFromParts(integerValue, fractionValue, fracExp, exponentValue, exponentSign, sign);
                 newToken = Token::NumberToken(x);
             }
-            else 
+            else
             {
                 syntaxError("Bad character in number");
             }
diff --git a/src/celtxf/texturefont.cpp b/src/celtxf/texturefont.cpp
index 727a6928e..d3cb8b4fa 100644
--- a/src/celtxf/texturefont.cpp
+++ b/src/celtxf/texturefont.cpp
@@ -110,11 +110,11 @@ void TextureFont::render(const string& s) const
 
     float xoffset = 0.0f;
 
-	while (i < len && validChar) {
+    while (i < len && validChar) {
         wchar_t ch = 0;
         validChar = UTF8Decode(s, i, ch);
         i += UTF8EncodedSize(ch);
-        
+
         render(ch, xoffset, 0.0f);
 
         const Glyph* glyph = getGlyph(ch);
@@ -136,11 +136,11 @@ void TextureFont::render(const string& s, float xoffset, float yoffset) const
     bool validChar = true;
     int i = 0;
 
-	while (i < len && validChar) {
+    while (i < len && validChar) {
         wchar_t ch = 0;
         validChar = UTF8Decode(s, i, ch);
         i += UTF8EncodedSize(ch);
-        
+
         render(ch, xoffset, yoffset);
 
         const Glyph* glyph = getGlyph(ch);
@@ -156,7 +156,7 @@ int TextureFont::getWidth(const string& s) const
     int width = 0;
     int len = s.length();
     bool validChar = true;
-	int i = 0;
+    int i = 0;
 
     while (i < len && validChar)
     {
@@ -404,7 +404,7 @@ TextureFont* TextureFont::load(istream& in)
         readInt8(in);
         glyph.x = readInt16(in, byteSwap);
         glyph.y = readInt16(in, byteSwap);
-        
+
         if (!in)
         {
             DPRINTF(0, "Error reading glyph %ud from texture font stream.\n", i);
diff --git a/src/celutil/bigfix.cpp b/src/celutil/bigfix.cpp
index 1eacc5e24..077ca7476 100644
--- a/src/celutil/bigfix.cpp
+++ b/src/celutil/bigfix.cpp
@@ -67,22 +67,22 @@ BigFix::BigFix(double d)
     // then inverting the converted value.
     if (d < 0)
     {
-	isNegative = true;
-	d = -d;
+        isNegative = true;
+        d = -d;
     }
-    
+
     // Need to break the number into 32-bit chunks because a 64-bit
     // integer has more bits of precision than a double.
     double e = floor(d * (1.0 / WORD3_FACTOR));
     if (e < POW2_31)
     {
-	uint32 w3 = (uint32) e;
-	d -= w3 * WORD3_FACTOR;
-	uint32 w2 = (uint32) (d * (1.0 / WORD2_FACTOR));
-	d -= w2 * WORD2_FACTOR;
-	uint32 w1 = (uint32) (d * (1.0 / WORD1_FACTOR));
-	d -= w1 * WORD1_FACTOR;
-	uint32 w0 = (uint32) (d * (1.0 / WORD0_FACTOR));
+        uint32 w3 = (uint32) e;
+        d -= w3 * WORD3_FACTOR;
+        uint32 w2 = (uint32) (d * (1.0 / WORD2_FACTOR));
+        d -= w2 * WORD2_FACTOR;
+        uint32 w1 = (uint32) (d * (1.0 / WORD1_FACTOR));
+        d -= w1 * WORD1_FACTOR;
+        uint32 w0 = (uint32) (d * (1.0 / WORD0_FACTOR));
 
         hi = ((uint64) w3 << 32) | w2;
         lo = ((uint64) w1 << 32) | w0;
@@ -266,7 +266,7 @@ BigFix operator*(const BigFix& a, const BigFix& b)
 
 int BigFix::sign() const
 {
-    
+
     if (hi == 0 && lo == 0)
         return 0;
     else if (hi > INT64_MAX)
diff --git a/src/celutil/bytes.h b/src/celutil/bytes.h
index 7c2c34ab2..95e78d39d 100644
--- a/src/celutil/bytes.h
+++ b/src/celutil/bytes.h
@@ -1,5 +1,5 @@
 // bytes.h
-// 
+//
 // Copyright (C) 2001, Colin Walters <walters@verbum.org>
 //
 // This program is free software; you can redistribute it and/or
@@ -63,7 +63,7 @@ inline double bswap_double(double d)
 
 #define LE_TO_CPU_INT16(ret, val) (ret = bswap_16(val))
 
-#define	LE_TO_CPU_INT32(ret, val) (ret = bswap_32(val))
+#define LE_TO_CPU_INT32(ret, val) (ret = bswap_32(val))
 
 #define LE_TO_CPU_FLOAT(ret, val) SWAP_FLOAT(ret, val)
 
@@ -81,7 +81,7 @@ inline double bswap_double(double d)
 
 #define BE_TO_CPU_INT16(ret, val) (ret = bswap_16(val))
 
-#define	BE_TO_CPU_INT32(ret, val) (ret = bswap_32(val))
+#define BE_TO_CPU_INT32(ret, val) (ret = bswap_32(val))
 
 #define BE_TO_CPU_FLOAT(ret, val) SWAP_FLOAT(ret, val)
 
diff --git a/src/celutil/color.cpp b/src/celutil/color.cpp
index a0fc4c79f..925fe4fee 100644
--- a/src/celutil/color.cpp
+++ b/src/celutil/color.cpp
@@ -72,7 +72,7 @@ Color::Color(const Color& color, float alpha)
 
 
 /*! Parse a color string and return true if it was a valid color, otherwise
- *  false.  Accetable inputs are HTML/X11 style #xxxxxx colors (where x is 
+ *  false.  Accetable inputs are HTML/X11 style #xxxxxx colors (where x is
  *  hexadecimal digit) or one of a list of named colors.
  */
 bool Color::parse(const char* s, Color& c)
@@ -96,7 +96,7 @@ bool Color::parse(const char* s, Color& c)
             if (!isxdigit(s[i]))
                 return false;
         }
-        
+
         unsigned int n;
         sscanf(s, "%x", &n);
         if (length == 3)
@@ -138,13 +138,13 @@ void Color::buildX11ColorMap()
 {
     x11Colors["aliceblue"]            = Color((unsigned char)240, (unsigned char)248, (unsigned char)255);
     x11Colors["antiquewhite"]         = Color((unsigned char)250, (unsigned char)235, (unsigned char)215);
-    x11Colors["aqua"]                 = Color((unsigned char)0,   (unsigned char)255, (unsigned char)255);  
-    x11Colors["aquamarine"]           = Color((unsigned char)127, (unsigned char)255, (unsigned char)212);  
+    x11Colors["aqua"]                 = Color((unsigned char)0,   (unsigned char)255, (unsigned char)255);
+    x11Colors["aquamarine"]           = Color((unsigned char)127, (unsigned char)255, (unsigned char)212);
     x11Colors["azure"]                = Color((unsigned char)240, (unsigned char)255, (unsigned char)255);
     x11Colors["beige"]                = Color((unsigned char)245, (unsigned char)245, (unsigned char)220);
     x11Colors["bisque"]               = Color((unsigned char)255, (unsigned char)228, (unsigned char)196);
     x11Colors["black"]                = Color((unsigned char)0,   (unsigned char)0,   (unsigned char)0);
-    x11Colors["blanchedalmond"]       = Color((unsigned char)255, (unsigned char)235, (unsigned char)205);  
+    x11Colors["blanchedalmond"]       = Color((unsigned char)255, (unsigned char)235, (unsigned char)205);
     x11Colors["blue"]                 = Color((unsigned char)0,   (unsigned char)0,   (unsigned char)255);
     x11Colors["blueviolet"]           = Color((unsigned char)138, (unsigned char)43,  (unsigned char)226);
     x11Colors["brown"]                = Color((unsigned char)165, (unsigned char)42,  (unsigned char)42);
@@ -153,7 +153,7 @@ void Color::buildX11ColorMap()
     x11Colors["chartreuse"]           = Color((unsigned char)127, (unsigned char)255, (unsigned char)0);
     x11Colors["chocolate"]            = Color((unsigned char)210, (unsigned char)105, (unsigned char)30);
     x11Colors["coral"]                = Color((unsigned char)255, (unsigned char)127, (unsigned char)80);
-    x11Colors["cornflowerblue"]       = Color((unsigned char)100, (unsigned char)149, (unsigned char)237);  
+    x11Colors["cornflowerblue"]       = Color((unsigned char)100, (unsigned char)149, (unsigned char)237);
     x11Colors["cornsilk"]             = Color((unsigned char)255, (unsigned char)248, (unsigned char)220);
     x11Colors["crimson"]              = Color((unsigned char)220, (unsigned char)20,  (unsigned char)60);
     x11Colors["cyan"]                 = Color((unsigned char)0,   (unsigned char)255, (unsigned char)255);
@@ -171,24 +171,24 @@ void Color::buildX11ColorMap()
     x11Colors["darksalmon"]           = Color((unsigned char)233, (unsigned char)150, (unsigned char)122);
     x11Colors["darkseagreen"]         = Color((unsigned char)143, (unsigned char)188, (unsigned char)143);
     x11Colors["darkslateblue"]        = Color((unsigned char)72,  (unsigned char)61,  (unsigned char)139);
-    x11Colors["darkslategray"]        = Color((unsigned char)47,  (unsigned char)79,  (unsigned char)79); 
-    x11Colors["darkturquoise"]        = Color((unsigned char)0,   (unsigned char)206, (unsigned char)209);  
+    x11Colors["darkslategray"]        = Color((unsigned char)47,  (unsigned char)79,  (unsigned char)79);
+    x11Colors["darkturquoise"]        = Color((unsigned char)0,   (unsigned char)206, (unsigned char)209);
     x11Colors["darkviolet"]           = Color((unsigned char)148, (unsigned char)0,   (unsigned char)211);
     x11Colors["deeppink"]             = Color((unsigned char)255, (unsigned char)20,  (unsigned char)147);
     x11Colors["deepskyblue"]          = Color((unsigned char)0,   (unsigned char)191, (unsigned char)255);
     x11Colors["dimgray"]              = Color((unsigned char)105, (unsigned char)105, (unsigned char)105);
     x11Colors["dodgerblue"]           = Color((unsigned char)30,  (unsigned char)144, (unsigned char)255);
     x11Colors["firebrick"]            = Color((unsigned char)178, (unsigned char)34,  (unsigned char)34);
-    x11Colors["floralwhite"]          = Color((unsigned char)255, (unsigned char)250, (unsigned char)240);  
+    x11Colors["floralwhite"]          = Color((unsigned char)255, (unsigned char)250, (unsigned char)240);
     x11Colors["forestgreen"]          = Color((unsigned char)34,  (unsigned char)139, (unsigned char)34);
     x11Colors["fuchsia"]              = Color((unsigned char)255, (unsigned char)0,   (unsigned char)255);
     x11Colors["gainsboro"]            = Color((unsigned char)220, (unsigned char)220, (unsigned char)220);
-    x11Colors["ghostwhite"]           = Color((unsigned char)248, (unsigned char)248, (unsigned char)255); 
+    x11Colors["ghostwhite"]           = Color((unsigned char)248, (unsigned char)248, (unsigned char)255);
     x11Colors["gold"]                 = Color((unsigned char)255, (unsigned char)215, (unsigned char)0);
     x11Colors["goldenrod"]            = Color((unsigned char)218, (unsigned char)165, (unsigned char)32);
     x11Colors["gray"]                 = Color((unsigned char)128, (unsigned char)128, (unsigned char)128);
     x11Colors["green"]                = Color((unsigned char)0,   (unsigned char)128, (unsigned char)0);
-    x11Colors["greenyellow"]          = Color((unsigned char)173, (unsigned char)255, (unsigned char)47); 
+    x11Colors["greenyellow"]          = Color((unsigned char)173, (unsigned char)255, (unsigned char)47);
     x11Colors["honeydew"]             = Color((unsigned char)240, (unsigned char)255, (unsigned char)240);
     x11Colors["hotpink"]              = Color((unsigned char)255, (unsigned char)105, (unsigned char)180);
     x11Colors["indianred"]            = Color((unsigned char)205, (unsigned char)92,  (unsigned char)92);
@@ -196,13 +196,13 @@ void Color::buildX11ColorMap()
     x11Colors["ivory"]                = Color((unsigned char)255, (unsigned char)255, (unsigned char)240);
     x11Colors["khaki"]                = Color((unsigned char)240, (unsigned char)230, (unsigned char)140);
     x11Colors["lavender"]             = Color((unsigned char)230, (unsigned char)230, (unsigned char)250);
-    x11Colors["lavenderblush"]        = Color((unsigned char)255, (unsigned char)240, (unsigned char)245 ); 
+    x11Colors["lavenderblush"]        = Color((unsigned char)255, (unsigned char)240, (unsigned char)245 );
     x11Colors["lawngreen"]            = Color((unsigned char)124, (unsigned char)252, (unsigned char)0);
-    x11Colors["lemonchiffon"]         = Color((unsigned char)255, (unsigned char)250, (unsigned char)205);  
+    x11Colors["lemonchiffon"]         = Color((unsigned char)255, (unsigned char)250, (unsigned char)205);
     x11Colors["lightblue"]            = Color((unsigned char)173, (unsigned char)216, (unsigned char)230);
     x11Colors["lightcoral"]           = Color((unsigned char)240, (unsigned char)128, (unsigned char)128);
     x11Colors["lightcyan"]            = Color((unsigned char)224, (unsigned char)255, (unsigned char)255);
-    x11Colors["lightgoldenrodyellow"] = Color((unsigned char)250, (unsigned char)250, (unsigned char)210);  
+    x11Colors["lightgoldenrodyellow"] = Color((unsigned char)250, (unsigned char)250, (unsigned char)210);
     x11Colors["lightgreen"]           = Color((unsigned char)144, (unsigned char)238, (unsigned char)144);
     x11Colors["lightgrey"]            = Color((unsigned char)211, (unsigned char)211, (unsigned char)211);
     x11Colors["lightpink"]            = Color((unsigned char)255, (unsigned char)182, (unsigned char)193);
@@ -232,16 +232,16 @@ void Color::buildX11ColorMap()
     x11Colors["moccasin"]             = Color((unsigned char)255, (unsigned char)228, (unsigned char)181);
     x11Colors["navajowhite"]          = Color((unsigned char)255, (unsigned char)222, (unsigned char)173);
     x11Colors["navy"]                 = Color((unsigned char)0,   (unsigned char)0,   (unsigned char)128);
-    x11Colors["oldlace"]              = Color((unsigned char)253, (unsigned char)245, (unsigned char)230);  
+    x11Colors["oldlace"]              = Color((unsigned char)253, (unsigned char)245, (unsigned char)230);
     x11Colors["olive"]                = Color((unsigned char)128, (unsigned char)128, (unsigned char)0);
-    x11Colors["olivedrab"]            = Color((unsigned char)107, (unsigned char)142, (unsigned char)35);  
+    x11Colors["olivedrab"]            = Color((unsigned char)107, (unsigned char)142, (unsigned char)35);
     x11Colors["orange"]               = Color((unsigned char)255, (unsigned char)165, (unsigned char)0);
     x11Colors["orangered"]            = Color((unsigned char)255, (unsigned char)69,  (unsigned char)0);
     x11Colors["orchid"]               = Color((unsigned char)218, (unsigned char)112, (unsigned char)214);
-    x11Colors["palegoldenrod"]        = Color((unsigned char)238, (unsigned char)232, (unsigned char)170); 
+    x11Colors["palegoldenrod"]        = Color((unsigned char)238, (unsigned char)232, (unsigned char)170);
     x11Colors["palegreen"]            = Color((unsigned char)152, (unsigned char)251, (unsigned char)152);
-    x11Colors["paleturquoise"]        = Color((unsigned char)175, (unsigned char)238, (unsigned char)238); 
-    x11Colors["palevioletred"]        = Color((unsigned char)219, (unsigned char)112, (unsigned char)147); 
+    x11Colors["paleturquoise"]        = Color((unsigned char)175, (unsigned char)238, (unsigned char)238);
+    x11Colors["palevioletred"]        = Color((unsigned char)219, (unsigned char)112, (unsigned char)147);
     x11Colors["papayawhip"]           = Color((unsigned char)255, (unsigned char)239, (unsigned char)213);
     x11Colors["peachpuff"]            = Color((unsigned char)255, (unsigned char)218, (unsigned char)185);
     x11Colors["peru"]                 = Color((unsigned char)205, (unsigned char)133, (unsigned char)63);
diff --git a/src/celutil/color.h b/src/celutil/color.h
index 3112179e0..d8214d43a 100644
--- a/src/celutil/color.h
+++ b/src/celutil/color.h
@@ -36,10 +36,10 @@ class Color
     inline float blue() const;
     inline float alpha() const;
     inline void get(unsigned char*) const;
-    
+
     inline Eigen::Vector3f toVector3() const;
     inline Eigen::Vector4f toVector4() const;
- 
+
     friend bool operator==(Color, Color);
     friend bool operator!=(Color, Color);
     friend Color operator*(Color, Color);
diff --git a/src/celutil/directory.cpp b/src/celutil/directory.cpp
index ff42d2b00..cd5df868c 100644
--- a/src/celutil/directory.cpp
+++ b/src/celutil/directory.cpp
@@ -1,5 +1,5 @@
 // directory.h
-// 
+//
 // Copyright (C) 2003, Chris Laurel <claurel@shatters.net>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/celutil/directory.h b/src/celutil/directory.h
index 5ef800e42..ff658f7e8 100644
--- a/src/celutil/directory.h
+++ b/src/celutil/directory.h
@@ -1,5 +1,5 @@
 // directory.h
-// 
+//
 // Copyright (C) 2002, Chris Laurel <claurel@shatters.net>
 //
 // This program is free software; you can redistribute it and/or
@@ -21,7 +21,7 @@ class EnumFilesHandler
 
     void pushDir(const std::string&);
     void popDir();
-    const std::string& getPath() const; 
+    const std::string& getPath() const;
 
     virtual bool process(const std::string& filename) = 0;
 
diff --git a/src/celutil/formatnum.cpp b/src/celutil/formatnum.cpp
index 158fecb9f..dfa2b221e 100644
--- a/src/celutil/formatnum.cpp
+++ b/src/celutil/formatnum.cpp
@@ -1,5 +1,5 @@
 // formatnum.cpp
-// 
+//
 // Copyright (C) 2003, Chris Laurel <claurel@shatters.net>
 //
 // This program is free software; you can redistribute it and/or
@@ -103,7 +103,7 @@ std::ostream& operator<<(std::ostream& out, const FormattedNumber& num)
             --i;
             --j;
         }
-        
+
         const char *g = grouping;
         bool does_grouping = *g != 0;
         while (i >= 0)
diff --git a/src/celutil/formatnum.h b/src/celutil/formatnum.h
index 805b58fe9..827bd6d4b 100644
--- a/src/celutil/formatnum.h
+++ b/src/celutil/formatnum.h
@@ -1,5 +1,5 @@
 // formatnum.h
-// 
+//
 // Copyright (C) 2003, Chris Laurel <claurel@shatters.net>
 //
 // This program is free software; you can redistribute it and/or
@@ -20,12 +20,12 @@ public:
     double getValue() const;
     double getRoundedValue() const;
 
-    enum 
+    enum
     {
         GroupThousands    = 0x1,
         SignificantDigits = 0x2,
     };
-    
+
     friend std::ostream& operator<<(std::ostream& out, const FormattedNumber& num);
 
 private:
diff --git a/src/celutil/memorypool.cpp b/src/celutil/memorypool.cpp
index 266ba67e0..cd69a4ae3 100644
--- a/src/celutil/memorypool.cpp
+++ b/src/celutil/memorypool.cpp
@@ -61,13 +61,13 @@ MemoryPool::allocate(unsigned int size)
 {
     if (size > m_blockSize)
         return NULL;
-    
+
     // See if the current block has enough room
     if (m_blockOffset + size > m_blockSize)
     {
         m_currentBlock++;
     }
-    
+
     // See if we need to allocate a new block
     if (m_currentBlock == m_blockList.end())
     {
@@ -78,13 +78,13 @@ MemoryPool::allocate(unsigned int size)
         m_currentBlock = m_blockList.insert(m_currentBlock, block);
         m_blockOffset = 0;
     }
-    
+
     void* memory = m_currentBlock->m_memory + m_blockOffset;
-    
+
     // Advance
     unsigned int padSize = (size + m_alignment - 1) & ~(m_alignment - 1);
     m_blockOffset += padSize;
-    
+
     return memory;
 }
 
diff --git a/src/celutil/memorypool.h b/src/celutil/memorypool.h
index 369209c07..32bb5cf18 100644
--- a/src/celutil/memorypool.h
+++ b/src/celutil/memorypool.h
@@ -21,13 +21,13 @@ class MemoryPool
 public:
     MemoryPool(unsigned int alignment, unsigned int blockSize);
     ~MemoryPool();
-    
+
     void* allocate(unsigned int size);
     void freeAll();
-    
+
     unsigned int blockSize() const;
     unsigned int alignment() const;
-    
+
 private:
     unsigned int m_alignment;
     unsigned int m_blockSize;
@@ -36,7 +36,7 @@ private:
     {
         char* m_memory;
     };
-    
+
     std::list<Block> m_blockList;
     std::list<Block>::iterator m_currentBlock;
     unsigned int m_blockOffset;
diff --git a/src/celutil/timer.h b/src/celutil/timer.h
index 25be02b77..ff7e41298 100644
--- a/src/celutil/timer.h
+++ b/src/celutil/timer.h
@@ -1,5 +1,5 @@
 // timer.h
-// 
+//
 // Copyright (C) 2001, Chris Laurel <claurel@shatters.net>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/celutil/unixdirectory.cpp b/src/celutil/unixdirectory.cpp
index 9a1b05497..2c197f681 100644
--- a/src/celutil/unixdirectory.cpp
+++ b/src/celutil/unixdirectory.cpp
@@ -1,5 +1,5 @@
 // unixdirectory.cpp
-// 
+//
 // Copyright (C) 2002, Chris Laurel <claurel@shatters.net>
 //
 // This program is free software; you can redistribute it and/or
@@ -105,9 +105,9 @@ bool IsDirectory(const std::string& filename)
     return S_ISDIR(buf.st_mode);
 }
 
-std::string WordExp(const std::string& filename) 
+std::string WordExp(const std::string& filename)
 {
-#ifndef WORDEXP_PROBLEM   
+#ifndef WORDEXP_PROBLEM
     wordexp_t result;
     std::string expanded;
 
diff --git a/src/celutil/unixtimer.cpp b/src/celutil/unixtimer.cpp
index a67998ea5..0e4ce4b2b 100644
--- a/src/celutil/unixtimer.cpp
+++ b/src/celutil/unixtimer.cpp
@@ -1,5 +1,5 @@
 // unixtimer.h
-// 
+//
 // Copyright (C) 2001, Chris Laurel <claurel@shatters.net>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/celutil/watcher.h b/src/celutil/watcher.h
index 6cbe86e36..7793c5102 100644
--- a/src/celutil/watcher.h
+++ b/src/celutil/watcher.h
@@ -1,5 +1,5 @@
 // watcher.h
-// 
+//
 // Copyright (C) 2002, Chris Laurel <claurel@shatters.net>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/celutil/windirectory.cpp b/src/celutil/windirectory.cpp
index 473199a8a..a67c6498f 100644
--- a/src/celutil/windirectory.cpp
+++ b/src/celutil/windirectory.cpp
@@ -1,5 +1,5 @@
 // windirectory.cpp
-// 
+//
 // Copyright (C) 2002, Chris Laurel <claurel@shatters.net>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/celutil/wintimer.cpp b/src/celutil/wintimer.cpp
index 49606ed47..f5bbc59ed 100644
--- a/src/celutil/wintimer.cpp
+++ b/src/celutil/wintimer.cpp
@@ -1,5 +1,5 @@
 // wintimer.h
-// 
+//
 // Copyright (C) 2001, Chris Laurel <claurel@shatters.net>
 //
 // This program is free software; you can redistribute it and/or
diff --git a/src/celutil/winutil.cpp b/src/celutil/winutil.cpp
index c7d383f38..2726d4735 100644
--- a/src/celutil/winutil.cpp
+++ b/src/celutil/winutil.cpp
@@ -1,5 +1,5 @@
 // winutil.h
-// 
+//
 // Copyright (C) 2002, Chris Laurel <claurel@shatters.net>
 //
 // This program is free software; you can redistribute it and/or
@@ -11,10 +11,10 @@
 
 void SetMouseCursor(LPCTSTR lpCursor)
 {
-	HCURSOR hNewCrsr;
-	
-	if (hNewCrsr = LoadCursor(NULL, lpCursor))
-	    SetCursor(hNewCrsr);
+    HCURSOR hNewCrsr;
+
+    if (hNewCrsr = LoadCursor(NULL, lpCursor))
+        SetCursor(hNewCrsr);
 }
 
 void CenterWindow(HWND hParent, HWND hWnd)
@@ -40,15 +40,15 @@ void CenterWindow(HWND hParent, HWND hWnd)
 void RemoveButtonDefaultStyle(HWND hWnd)
 {
     SetWindowLong(hWnd, GWL_STYLE,
-		::GetWindowLong(hWnd, GWL_STYLE) & ~BS_DEFPUSHBUTTON);
-	InvalidateRect(hWnd, NULL, TRUE);
+        ::GetWindowLong(hWnd, GWL_STYLE) & ~BS_DEFPUSHBUTTON);
+    InvalidateRect(hWnd, NULL, TRUE);
 }
 
 void AddButtonDefaultStyle(HWND hWnd)
 {
     SetWindowLong(hWnd, GWL_STYLE,
         ::GetWindowLong(hWnd, GWL_STYLE) | BS_DEFPUSHBUTTON);
-	InvalidateRect(hWnd, NULL, TRUE);
+    InvalidateRect(hWnd, NULL, TRUE);
 }
 
 const char* CurrentCP()
diff --git a/src/packdb.cpp b/src/packdb.cpp
index 905bc4e1d..5e9267924 100644
--- a/src/packdb.cpp
+++ b/src/packdb.cpp
@@ -87,11 +87,11 @@ int CompareHDNameEnt(const void *a, const void *b)
     int hdb = ((HDNameEnt *) b)->HD;
 
     if (hda <  hdb)
-	return -1;
+        return -1;
     else if (hda > hdb)
-	return 1;
+        return 1;
     else
-	return 0;
+        return 0;
 }
 
 
@@ -130,7 +130,7 @@ unsigned short PackSpectralType(char *spectralType)
       case 'K':
         letter = SPECTRAL_K;
         break;
-      case 'M':      
+      case 'M':
         letter = SPECTRAL_M;
         break;
       case 'R':
@@ -143,17 +143,17 @@ unsigned short PackSpectralType(char *spectralType)
         letter = SPECTRAL_S;
         break;
       case 'W':
-	i++;
-	if (spectralType[i] == 'C')
- 	    letter = SPECTRAL_WC;
-	else if (spectralType[i] == 'N')
-	    letter = SPECTRAL_WN;
-	else
-	    i--;
-	break;
+        i++;
+        if (spectralType[i] == 'C')
+            letter = SPECTRAL_WC;
+        else if (spectralType[i] == 'N')
+            letter = SPECTRAL_WN;
+        else
+            i--;
+        break;
       case 'D':
         letter = SPECTRAL_WHITE_DWARF;
-	break;
+        break;
       default:
         letter = SPECTRAL_UNKNOWN;
         break;
@@ -168,8 +168,7 @@ unsigned short PackSpectralType(char *spectralType)
     else
         number = 0;
 
-    if (luminosity != LUM_VI)
-    {
+    if (luminosity != LUM_VI) {
         i++;
         luminosity = LUM_V;
         while (i < 13 && spectralType[i] != '\0') {
@@ -215,42 +214,40 @@ HDNameEnt *ReadCommonNames(FILE *fp)
 
     hdNames = (HDNameEnt *) malloc(sizeof(HDNameEnt) * 3000);
     if (hdNames == NULL)
-	return NULL;
+        return NULL;
 
     for (i = 0; ; i++) {
-	char *name1, *name2, len;
-	if (fgets(buf, 256, fp) == NULL)
-	    break;
+        char *name1, *name2, len;
+        if (fgets(buf, 256, fp) == NULL)
+            break;
 
-	/* Strip trailing newline */
-	len = strlen(buf);
-	if (len > 0 && buf[len - 1] == '\n')
-	    buf[len - 1] = '\0';
+        /* Strip trailing newline */
+        len = strlen(buf);
+        if (len > 0 && buf[len - 1] == '\n')
+            buf[len - 1] = '\0';
 
-	name1 = index(buf, ':');
-	if (name1 == NULL)
-	    break;
-	name1[0] = '\0';
-	name1++;
-	name2 = index(name1, ':');
-	if (name2 == NULL)
-	    break;
-	name2[0] = '\0';
-	name2++;
-	
-	{
-	    int hd;
-	    if (sscanf(buf, "%d", &hd) != 1)
-		break;
-	    hdNames[i].HD = hd;
-	    if (name1[0] != '\0') {
-	        hdNames[i].commonName = (char *) malloc(strlen(name1) + 1);
-		strcpy(hdNames[i].commonName, name1);
-	    } else if (name2[0] != '\0') {
-		hdNames[i].commonName = (char *) malloc(strlen(name2) + 1);
-		strcpy(hdNames[i].commonName, name2);
-	    }		
-	}
+        name1 = index(buf, ':');
+        if (name1 == NULL)
+           break;
+        name1[0] = '\0';
+        name1++;
+        name2 = index(name1, ':');
+        if (name2 == NULL)
+            break;
+        name2[0] = '\0';
+        name2++;
+
+        int hd;
+        if (sscanf(buf, "%d", &hd) != 1)
+            break;
+        hdNames[i].HD = hd;
+        if (name1[0] != '\0') {
+            hdNames[i].commonName = (char *) malloc(strlen(name1) + 1);
+            strcpy(hdNames[i].commonName, name1);
+        } else if (name2[0] != '\0') {
+            hdNames[i].commonName = (char *) malloc(strlen(name2) + 1);
+            strcpy(hdNames[i].commonName, name2);
+        }
     }
 
     nHDNames = i;
@@ -267,12 +264,12 @@ char *LookupName(int HD)
 
     key.HD = HD;
     found = (HDNameEnt *) bsearch((void *) &key, (void *) hdNames,
-				  nHDNames, sizeof(HDNameEnt),
-				  CompareHDNameEnt);
+                  nHDNames, sizeof(HDNameEnt),
+                  CompareHDNameEnt);
     if (found == NULL)
-	return NULL;
+        return NULL;
     else
-	return found->commonName;
+        return found->commonName;
 }
 
 
@@ -310,70 +307,67 @@ Star *ReadHipparcosCatalog(FILE *fp)
     stars = (Star *) malloc(maxStars * sizeof(Star));
     if (stars == NULL) {
         fprintf(stderr, "Unable to allocate memory for stars.\n");
-	return NULL;
+        return NULL;
     }
 
     for (i = 0; ; i++) {
-	int hh, mm, deg;
-	float seconds;
-	float parallaxError;
-	char degSign;
-	
-	if (fgets(buf, HIPPARCOS_RECORD_LENGTH, fp) == NULL)
-	    break;
-	sscanf(buf + 2, "%d", &stars[i].HIP);
-	if (sscanf(buf + 390, "%d", &stars[i].HD) != 1)
-	    stars[i].HD = ID_NONE;
-	sscanf(buf + 41, "%f", &stars[i].appMag);
-	sscanf(buf + 79, "%f", &stars[i].parallax);
-	sscanf(buf + 17, "%d %d %f", &hh, &mm, &seconds);
-	stars[i].RA = hh + (float) mm / 60.0f + (float) seconds / 3600.0f;
-	sscanf(buf + 29, "%c%d %d %f", &degSign, &deg, &mm, &seconds);
-	stars[i].dec = deg + (float) mm / 60.0f + (float) seconds / 3600.0f;
-	if (degSign == '-')
-	    stars[i].dec = -stars[i].dec;
-	sscanf(buf + 435, "%12s", &stars[i].spectral);
-	sscanf(buf + 119, "%f", &parallaxError);
-	if (stars[i].parallax <= 0 || parallaxError / stars[i].parallax > 1)
-        {
-	    stars[i].parallaxError = (unsigned char) 255;
-	}
-	else
-        {
-	    stars[i].parallaxError =
-		(unsigned char) (parallaxError / stars[i].parallax * 200);
-	}
+        int hh, mm, deg;
+        float seconds;
+        float parallaxError;
+        char degSign;
 
-	if (/* stars[i].appMag < 4.0f */
+        if (fgets(buf, HIPPARCOS_RECORD_LENGTH, fp) == NULL)
+            break;
+        sscanf(buf + 2, "%d", &stars[i].HIP);
+        if (sscanf(buf + 390, "%d", &stars[i].HD) != 1)
+            stars[i].HD = ID_NONE;
+        sscanf(buf + 41, "%f", &stars[i].appMag);
+        sscanf(buf + 79, "%f", &stars[i].parallax);
+        sscanf(buf + 17, "%d %d %f", &hh, &mm, &seconds);
+        stars[i].RA = hh + (float) mm / 60.0f + (float) seconds / 3600.0f;
+        sscanf(buf + 29, "%c%d %d %f", &degSign, &deg, &mm, &seconds);
+        stars[i].dec = deg + (float) mm / 60.0f + (float) seconds / 3600.0f;
+        if (degSign == '-')
+            stars[i].dec = -stars[i].dec;
+        sscanf(buf + 435, "%12s", &stars[i].spectral);
+        sscanf(buf + 119, "%f", &parallaxError);
+        if (stars[i].parallax <= 0 || parallaxError / stars[i].parallax > 1) {
+            stars[i].parallaxError = (unsigned char) 255;
+        } else {
+            stars[i].parallaxError =
+            (unsigned char) (parallaxError / stars[i].parallax * 200);
+        }
+
+        if (/* stars[i].appMag < 4.0f */
             stars[i].parallax > 0 && 3260 / stars[i].parallax < 20) {
-	    nBright++;
+            nBright++;
 #if 0
-	    if (parallaxError / stars[i].parallax > 0.25f ||
-		parallaxError / stars[i].parallax < 0.0f) {
+            if (parallaxError / stars[i].parallax > 0.25f ||
+                parallaxError / stars[i].parallax < 0.0f) {
 #endif
-	    if (0) {
-		char *name = LookupName(stars[i].HD);
+            if (0) {
+                char *name = LookupName(stars[i].HD);
 
-		if (name == NULL) {
-		    if (stars[i].HD != ID_NONE) {
-			sprintf(nameBuf, "HD%d", stars[i].HD);
-			name = nameBuf;
-		    } else {
-			sprintf(nameBuf, "HIP%d", stars[i].HIP);
-			name = nameBuf;
-		    }
-		}
-		printf("%-20s %5.2f %6.2f %3d%% %12s %5.2f %5.2f\n",
-		       name,
-		       stars[i].appMag,
-		       3260.0f / stars[i].parallax,
-		       (int) (100.0f * parallaxError / stars[i].parallax),
-		       stars[i].spectral,
-		       stars[i].RA, stars[i].dec);
-	    } else {
-		nGood++;
-	    }
-	}
+                if (name == NULL) {
+                    if (stars[i].HD != ID_NONE) {
+                        sprintf(nameBuf, "HD%d", stars[i].HD);
+                        name = nameBuf;
+                    } else {
+                        sprintf(nameBuf, "HIP%d", stars[i].HIP);
+                        name = nameBuf;
+                    }
+                }
+                printf("%-20s %5.2f %6.2f %3d%% %12s %5.2f %5.2f\n",
+                       name,
+                       stars[i].appMag,
+                       3260.0f / stars[i].parallax,
+                       (int) (100.0f * parallaxError / stars[i].parallax),
+                       stars[i].spectral,
+                       stars[i].RA, stars[i].dec);
+            } else {
+                nGood++;
+            }
+        }
     }
 
     nStars = i;
@@ -389,57 +383,53 @@ int main(int argc, char *argv[])
 
     fp = fopen(COMMON_NAMES_DB, "r");
     if (fp == NULL) {
-	fprintf(stderr, "Error opening %s\n", COMMON_NAMES_DB);
-	return 1;
+        fprintf(stderr, "Error opening %s\n", COMMON_NAMES_DB);
+        return 1;
     }
     hdNames = ReadCommonNames(fp);
     fclose(fp);
     fp = NULL;
     if (hdNames == NULL) {
-	fprintf(stderr, "Error reading names file.\n");
-	return 1;
+        fprintf(stderr, "Error reading names file.\n");
+        return 1;
     }
 
     fp = fopen(HIPPARCOS_MAIN_DB, "r");
     if (fp == NULL) {
-	fprintf(stderr, "Error opening %s\n", HIPPARCOS_MAIN_DB);
-	return 1;
+        fprintf(stderr, "Error opening %s\n", HIPPARCOS_MAIN_DB);
+        return 1;
     }
     Stars = ReadHipparcosCatalog(fp);
     fclose(fp);
     if (Stars == NULL) {
-	fprintf(stderr, "Error reading HIPPARCOS database.");
-	return 1;
+        fprintf(stderr, "Error reading HIPPARCOS database.");
+        return 1;
     }
 #if 0
     {
-	int i;
+    int i;
 
-	for (i = 0; i < nStars; i++) {
-	    if (Stars[i].spectral[0] == 'O') {
-		char *name = LookupName(Stars[i].HD);
-		if (name != NULL)
-		    printf("%s ", name);
-		printf("%6d %6.3f %6.3f %s\n",
-		       Stars[i].HD, Stars[i].RA, Stars[i].dec, Stars[i].spectral);
-	    }
-	}
+    for (i = 0; i < nStars; i++) {
+        if (Stars[i].spectral[0] == 'O') {
+        char *name = LookupName(Stars[i].HD);
+        if (name != NULL)
+            printf("%s ", name);
+        printf("%6d %6.3f %6.3f %s\n",
+               Stars[i].HD, Stars[i].RA, Stars[i].dec, Stars[i].spectral);
+        }
+    }
     }
 #endif
 
-    {
-        int i;
+    FILE *fp = fopen("out", "wb");
+    if (fp == NULL) {
+        fprintf(stderr, "Error opening output file.\n");
+        exit(1);
+    }
 
-        FILE *fp = fopen("out", "wb");
-        if (fp == NULL) {
-	   fprintf(stderr, "Error opening output file.\n");
-           exit(1);
-        }
-
-	BINWRITE(fp, nStars);
-        for (i = 0; i < nStars; i++)
-           WriteStar(fp, &Stars[i]);
-        
+    BINWRITE(fp, nStars);
+    for (int i = 0; i < nStars; i++)
+        WriteStar(fp, &Stars[i]);
         fclose(fp);
     }
     printf("Stars in catalog = %d\n", nStars);
diff --git a/src/packnames.cpp b/src/packnames.cpp
index 19da22527..8059db4d5 100644
--- a/src/packnames.cpp
+++ b/src/packnames.cpp
@@ -48,78 +48,76 @@ int main(int argc, char *argv[])
 
     for (;;)
     {
-	unsigned int catalogNumber;
-	char sep;
+        unsigned int catalogNumber;
+        char sep;
 
-	cin >> catalogNumber;
-	if (cin.eof())
+        cin >> catalogNumber;
+        if (cin.eof())
         {
-	    break;
-	}
-	else if (cin.bad())
-	{
-	    cerr << "Error reading names file.\n";
-	    break;
-	}
-
-	cin >> sep;
-	if (sep != ':')
+            break;
+        }
+        else if (cin.bad())
         {
-	    cerr < "Missing ':' in names file.\n";
-	    break;
-	}
+            cerr << "Error reading names file.\n";
+            break;
+        }
 
-	// Get the rest of the line
-	getline(cin, s);
-
-	int nextSep = s.find_first_of(':');
-	if (nextSep == string::npos)
+        cin >> sep;
+        if (sep != ':')
         {
-	    cerr << "Missing ':' in names file.\n";
-	    break;
-	}
+            cerr < "Missing ':' in names file.\n";
+            break;
+        }
 
-	string common, designation;
-	string conAbbr;
-	string conName;
-	string bayerLetter;
-	
-	if (nextSep != 0)
-	    common = s.substr(0, nextSep);
-	designation = s.substr(nextSep + 1, string::npos);
+        // Get the rest of the line
+        getline(cin, s);
 
-	if (designation != "")
+        int nextSep = s.find_first_of(':');
+        if (nextSep == string::npos)
         {
-	    nextSep = designation.find_last_of(' ');
-	    if (nextSep != string::npos)
-	    {
-		bayerLetter = designation.substr(0, nextSep);
-		conAbbr = designation.substr(nextSep + 1, string::npos);
-	    }
-	}
+            cerr << "Missing ':' in names file.\n";
+            break;
+        }
 
-	Constellation *constel;
-	for (int i = 0; i < 88; i++)
+        string common, designation;
+        string conAbbr;
+        string conName;
+        string bayerLetter;
+
+        if (nextSep != 0)
+            common = s.substr(0, nextSep);
+        designation = s.substr(nextSep + 1, string::npos);
+
+        if (designation != "")
         {
-	    constel = Constellation::getConstellation(i);
-	    if (constel == NULL)
-   	    {
-		cerr << "Error getting constellation " << i << '\n';
-		break;
-  	    }
-	    if (constel->getAbbreviation() == conAbbr)
- 	    {
-		conName = constel->getName();
-		break;
-	    }
-	}
+            nextSep = designation.find_last_of(' ');
+            if (nextSep != string::npos)
+            {
+                bayerLetter = designation.substr(0, nextSep);
+                conAbbr = designation.substr(nextSep + 1, string::npos);
+            }
+        }
 
-	if (constel != NULL && bayerLetter != "")
+        Constellation *constel;
+        for (int i = 0; i < 88; i++)
         {
-	    StarName sn(common, bayerLetter, constel);
-	    cout << sn.getDesignation() << ' ' << constel->getAbbreviation() << '\n';
-	}
+            constel = Constellation::getConstellation(i);
+            if (constel == NULL)
+            {
+                cerr << "Error getting constellation " << i << '\n';
+                break;
+            }
+            if (constel->getAbbreviation() == conAbbr)
+            {
+                conName = constel->getName();
+                break;
+            }
+        }
 
-	
+        if (constel != NULL && bayerLetter != "")
+        {
+            StarName sn(common, bayerLetter, constel);
+            cout << sn.getDesignation() << ' ' << constel->getAbbreviation() << '\n';
+        }
     }
 }
diff --git a/src/readstars.cpp b/src/readstars.cpp
index fc8ed9701..aa72ca999 100644
--- a/src/readstars.cpp
+++ b/src/readstars.cpp
@@ -26,53 +26,53 @@ int main(int argc, char *argv[])
     float brightest = 100000;
 
     while (nStars < MAX_STARS) {
-	uint32 catNo = 0;
-	float RA = 0, dec = 0, parallax = 0;
-	int16 appMag;
-	uint16 stellarClass;
+        uint32 catNo = 0;
+        float RA = 0, dec = 0, parallax = 0;
+        int16 appMag;
+        uint16 stellarClass;
 
-	cin.read((void *) &catNo, sizeof catNo);
-	cin.read((void *) &RA, sizeof RA);
-	cin.read((void *) &dec, sizeof dec);
-	cin.read((void *) &parallax, sizeof parallax);
-	cin.read((void *) &appMag, sizeof appMag);
-	cin.read((void *) &stellarClass, sizeof stellarClass);
-	if (!cin.good())
-	    break;
+        cin.read((void *) &catNo, sizeof catNo);
+        cin.read((void *) &RA, sizeof RA);
+        cin.read((void *) &dec, sizeof dec);
+        cin.read((void *) &parallax, sizeof parallax);
+        cin.read((void *) &appMag, sizeof appMag);
+        cin.read((void *) &stellarClass, sizeof stellarClass);
+        if (!cin.good())
+            break;
 
-	Star *star = &stars[nStars];
+        Star *star = &stars[nStars];
 
-	// Compute distance based on parallax
-	double distance = 3.26 / (parallax > 0.0 ? parallax / 1000.0 : 1e-6);
+        // Compute distance based on parallax
+        double distance = 3.26 / (parallax > 0.0 ? parallax / 1000.0 : 1e-6);
 
-	// Convert from RA, dec spherical to cartesian coordinates
-	double theta = RA / 24.0 * PI * 2;
-	double phi = (1.0 - dec / 90.0) * PI / 2;
-	double x = cos(theta) * sin(phi) * distance;
-	double y = cos(phi) * distance;
-	double z = sin(theta) * sin(phi) * distance;
-	star->setPosition((float) x, (float) y, (float) z);
+        // Convert from RA, dec spherical to cartesian coordinates
+        double theta = RA / 24.0 * PI * 2;
+        double phi = (1.0 - dec / 90.0) * PI / 2;
+        double x = cos(theta) * sin(phi) * distance;
+        double y = cos(phi) * distance;
+        double z = sin(theta) * sin(phi) * distance;
+        star->setPosition((float) x, (float) y, (float) z);
 
-	// Use apparent magnitude and distance to determine the absolute
-	// magnitude of the star.
-	star->setAbsoluteMagnitude((float) (appMag / 256.0 + 5 -
-					    5 * log10(distance / 3.26)));
+        // Use apparent magnitude and distance to determine the absolute
+        // magnitude of the star.
+        star->setAbsoluteMagnitude((float) (appMag / 256.0 + 5 -
+                                            5 * log10(distance / 3.26)));
 
-	StellarClass sc((StellarClass::StarType) (stellarClass >> 12),
-			(StellarClass::SpectralClass)(stellarClass >> 8 & 0xf),
-			(unsigned int) (stellarClass >> 4 & 0xf),
-			(StellarClass::LuminosityClass) (stellarClass & 0xf));
-	star->setStellarClass(sc);
+        StellarClass sc((StellarClass::StarType) (stellarClass >> 12),
+                        (StellarClass::SpectralClass)(stellarClass >> 8 & 0xf),
+                        (unsigned int) (stellarClass >> 4 & 0xf),
+                        (StellarClass::LuminosityClass) (stellarClass & 0xf));
+        star->setStellarClass(sc);
 
-	star->setCatalogNumber(catNo);
+        star->setCatalogNumber(catNo);
 
-	if (parallax > 0.0 && star->getAbsoluteMagnitude() < brightest)
+        if (parallax > 0.0 && star->getAbsoluteMagnitude() < brightest)
         {
-	    brightest = star->getAbsoluteMagnitude();
-	    cout << brightest << ' ' << sc << '\n';
-	}
+            brightest = star->getAbsoluteMagnitude();
+            cout << brightest << ' ' << sc << '\n';
+        }
 
-	nStars++;
+        nStars++;
     }
 
     cout << nStars << '\n';
diff --git a/src/tools/atmosphere/scattersim.cpp b/src/tools/atmosphere/scattersim.cpp
index 20ba2b79e..2a38a4e92 100644
--- a/src/tools/atmosphere/scattersim.cpp
+++ b/src/tools/atmosphere/scattersim.cpp
@@ -146,7 +146,7 @@ public:
         else
         {
             double phi = -viewportY * fov / 2.0 + PI / 2.0;
-            double theta = viewportX * fov / 2.0 + PI / 2.0; 
+            double theta = viewportX * fov / 2.0 + PI / 2.0;
             viewDir.x = sin(phi) * cos(theta);
             viewDir.y = cos(phi);
             viewDir.z = sin(phi) * sin(theta);
@@ -254,7 +254,7 @@ class LUT2
 {
 public:
     LUT2(unsigned int w, unsigned int h);
-    
+
     Vec3d getValue(unsigned int x, unsigned int y) const;
     void setValue(unsigned int x, unsigned int y, const Vec3d&);
     Vec3d lookup(double x, double y) const;
@@ -272,7 +272,7 @@ class LUT3
 {
 public:
     LUT3(unsigned int w, unsigned int h, unsigned int d);
-    
+
     Vec4d getValue(unsigned int x, unsigned int y, unsigned int z) const;
     void setValue(unsigned int x, unsigned int y, unsigned int z, const Vec4d&);
     Vec4d lookup(double x, double y, double z) const;
@@ -292,7 +292,7 @@ class Scene
 {
 public:
     Scene() {};
-    
+
     void setParameters(ParameterSet& params);
 
     Color raytrace(const Ray3d& ray) const;
@@ -336,7 +336,7 @@ public:
                    unsigned int w,
                    unsigned int h)
     {
-        
+
         uint8 r = floatToByte(color.r);
         uint8 g = floatToByte(color.g);
         uint8 b = floatToByte(color.b);
@@ -398,7 +398,7 @@ static void PNGWriteData(png_structp png_ptr, png_bytep data, png_size_t length)
 
 
 bool WritePNG(const string& filename, const RGBImage& image)
-              
+
 {
     int rowStride = image.width * 3;
 
@@ -759,7 +759,7 @@ double mu2g(double mu)
     // improved Henyey-Greenstein(HG) phase function:
     // mu = <cosTheta>= 3*g *(g^2 + 4)/(5*(2+g^2))
 
-    double mu2 = mu * mu; 
+    double mu2 = mu * mu;
     double x = 0.5555555556 * mu + 0.17146776 * mu * mu2 + sqrt(max(2.3703704 - 1.3374486 * mu2 + 0.57155921 * mu2 * mu2, 0.0));
     double y = pow(x, 0.33333333333);
     return 0.55555555556 * mu - (1.33333333333 - 0.30864198 * mu2) / y + y;
@@ -767,8 +767,8 @@ double mu2g(double mu)
 
 
 double phaseHenyeyGreenstein_CS(double cosTheta, double g)
-{ 
-    // improved HG - phase function -> Rayleigh phase function for 
+{
+    // improved HG - phase function -> Rayleigh phase function for
     // g -> 0, -> HG-phase function for g -> 1.
     double g2 = g * g;
     return 1.5 * (1.0 - g2) * (1.0 + cosTheta * cosTheta) /((2.0 + g2) * pow(1.0 + g2 - 2.0 * g * cosTheta, 1.5));
@@ -850,7 +850,7 @@ OpticalDepths integrateOpticalDepth(const Scene& scene,
         depth.rayleigh   += scene.atmosphere.rayleighDensity(h) * stepDist;
         depth.mie        += scene.atmosphere.mieDensity(h)      * stepDist;
         depth.absorption += scene.atmosphere.absorbDensity(h)   * stepDist;
-        
+
         samplePoint += stepDist * dir;
     }
 
@@ -942,7 +942,7 @@ Vec3d integrateInscattering(const Scene& scene,
         // Add the inscattered light from Rayleigh and Mie scattering particles
         rayleighScatter += scene.atmosphere.rayleighDensity(h) * stepDist * extinction;
         mieScatter +=      scene.atmosphere.mieDensity(h)      * stepDist * extinction;
-        
+
         samplePoint += stepDist * dir;
     }
 
@@ -1002,7 +1002,7 @@ Vec4d integrateInscatteringFactors(const Scene& scene,
         // Add the inscattered light from Rayleigh and Mie scattering particles
         rayleighScatter += scene.atmosphere.rayleighDensity(h) * stepDist * extinction;
         mieScatter +=      scene.atmosphere.mieDensity(h)      * stepDist * extinction;
-        
+
         samplePoint += stepDist * dir;
     }
 
@@ -1052,7 +1052,7 @@ buildExtinctionLUT(const Scene& scene)
             double cosAngle = (double) j / (ExtinctionLUTViewAngleSteps - 1) * 2.0 - 1.0;
             double sinAngle = sqrt(1.0 - min(1.0, cosAngle * cosAngle));
             Vec3d viewDir(cosAngle, sinAngle, 0.0);
-            
+
             Ray3d ray(atmStart, viewDir);
             double dist = 0.0;
 
@@ -1115,7 +1115,7 @@ buildOpticalDepthLUT(const Scene& scene)
             double cosAngle = (double) j / (ExtinctionLUTViewAngleSteps - 1) * 2.0 - 1.0;
             double sinAngle = sqrt(1.0 - min(1.0, cosAngle * cosAngle));
             Vec3d dir(cosAngle, sinAngle, 0.0);
-            
+
             Ray3d ray(atmStart, dir);
             double dist = 0.0;
 
@@ -1230,7 +1230,7 @@ Vec3d integrateInscattering_LUT(const Scene& scene,
         // Add the inscattered light from Rayleigh and Mie scattering particles
         rayleighScatter += scene.atmosphere.rayleighDensity(h) * stepDist * extinction;
         mieScatter      += scene.atmosphere.mieDensity(h)      * stepDist * extinction;
-        
+
         samplePoint += stepDist * viewDir;
     }
 
@@ -1307,7 +1307,7 @@ Vec4d integrateInscatteringFactors_LUT(const Scene& scene,
         // Add the inscattered light from Rayleigh and Mie scattering particles
         rayleighScatter += scene.atmosphere.rayleighDensity(h) * stepDist * extinction;
         mieScatter      += scene.atmosphere.mieDensity(h) * stepDist * extinction;
-        
+
         samplePoint += stepDist * viewDir;
     }
 
@@ -1353,7 +1353,7 @@ buildScatteringLUT(const Scene& scene)
                 double sinLightAngle = sqrt(1.0 - min(1.0, cosLightAngle * cosLightAngle));
                 Vec3d lightDir(cosLightAngle, sinLightAngle, 0.0);
 
-#if 0                
+#if 0
                 Vec4d inscatter = integrateInscatteringFactors_LUT(scene,
                                                                    atmStart,
                                                                    atmEnd,
@@ -1440,7 +1440,7 @@ Color Scene::raytrace(const Ray3d& ray) const
             normal.normalize();
             Vec3d lightDir = -light.direction;
             double diffuse = max(0.0, normal * lightDir);
-            
+
             Point3d surfacePt = Point3d(0.0, 0.0, 0.0) + (intersectPoint - planet.center);
             Color planetColor = getPlanetColor(*this, surfacePt);
 
@@ -1464,7 +1464,7 @@ Color Scene::raytrace(const Ray3d& ray) const
             // Reflected color of planet surface is:
             //   surface color * sun color * atmospheric extinction
             baseColor = (planetColor * extinction) * light.color * diffuse;
-            
+
             atmEnd = ray.origin + dist * ray.direction;
         }
 
@@ -1529,7 +1529,7 @@ Scene::raytrace_LUT(const Ray3d& ray) const
             Ray3d sunRay(surfacePt, lightDir);
             double sunDist = 0.0;
             testIntersection(sunRay, shell, sunDist);
-            
+
             // Compute color of sunlight filtered by the atmosphere; consider extinction
             // along both the sun-to-surface and surface-to-eye paths.
             Vec3d sunExt = lookupExtinction(*this, surfacePt, sunRay.point(sunDist));
@@ -1570,7 +1570,7 @@ Scene::raytrace_LUT(const Ray3d& ray) const
 #if 1
                 if (!hit || planetEnter < 0.0)
                 {
-                    rayleighScatter = 
+                    rayleighScatter =
                         lookupScattering(*this, eyePt, atmEnd, -light.direction);
                 }
                 else
@@ -1578,7 +1578,7 @@ Scene::raytrace_LUT(const Ray3d& ray) const
                     atmEnd = atmStart;
                     atmStart = mray.point(planetEnter);
                     //cout << atmEnter << ", " << planetEnter << ", " << atmExit << "\n";
-                    rayleighScatter = 
+                    rayleighScatter =
                         lookupScattering(*this, atmStart, atmEnd, -light.direction) -
                         lookupScattering(*this, eyePt, atmEnd, -light.direction);
 
@@ -1682,7 +1682,7 @@ void Scene::setParameters(ParameterSet& params)
     if (phaseFunc == 0)
     {
         double mu                      = params["MieAsymmetry"];
-	atmosphere.mieAsymmetry        = mu2g(mu);
+        atmosphere.mieAsymmetry        = mu2g(mu);
         atmosphere.miePhaseFunction    = phaseHenyeyGreenstein_CS;
     }
     else if (phaseFunc == 1)
@@ -1696,7 +1696,7 @@ void Scene::setParameters(ParameterSet& params)
         atmosphere.mieAsymmetry        = schlick_g2k(k);
         atmosphere.miePhaseFunction    = phaseSchlick;
     }
-    
+
     atmosphere.absorbScaleHeight   = params["AbsorbScaleHeight"];
     atmosphere.absorbCoeff.x       = params["AbsorbRed"];
     atmosphere.absorbCoeff.y       = params["AbsorbGreen"];
@@ -1723,7 +1723,7 @@ void setSceneDefaults(ParameterSet& params)
     params["RayleighRed"]         = 0.0;
     params["RayleighGreen"]       = 0.0;
     params["RayleighBlue"]        = 0.0;
-    
+
     params["MieScaleHeight"]      = 1.2;
     params["Mie"]                 = 0.0;
     params["MieAsymmetry"]        = 0.0;
@@ -1802,7 +1802,7 @@ bool LoadParameterSet(ParameterSet& params, const string& filename)
 
 
 
-template<class T> static Matrix4<T> 
+template<class T> static Matrix4<T>
 lookAt(Point3<T> from, Point3<T> to, Vector3<T> up)
 {
     Vector3<T> n = to - from;
@@ -2037,14 +2037,14 @@ int main(int argc, char* argv[])
     Camera cameraHighPhase;
     cameraHighPhase.fov = degToRad(45.0);
     cameraHighPhase.front = 1.0;
-    cameraHighPhase.transform = 
+    cameraHighPhase.transform =
         Mat4d::translation(Point3d(0.0, 0.0, -cameraFarDist)) *
         Mat4d::yrotation(degToRad(160.0));
 
     Camera cameraClose;
     cameraClose.fov = degToRad(45.0);
     cameraClose.front = 1.0;
-    cameraClose.transform = 
+    cameraClose.transform =
         Mat4d::xrotation(degToRad(55.0)) *
         Mat4d::translation(Point3d(0.0, 0.0, -cameraCloseDist)) *
         Mat4d::yrotation(degToRad(50.0));
@@ -2052,7 +2052,7 @@ int main(int argc, char* argv[])
     Camera cameraSurface;
     cameraSurface.fov = degToRad(45.0);
     cameraSurface.front = 1.0;
-    cameraSurface.transform = 
+    cameraSurface.transform =
         Mat4d::xrotation(degToRad(85.0)) *
         Mat4d::translation(Point3d(0.0, 0.0, -planetRadius * 1.0002)) *
         Mat4d::yrotation(degToRad(20.0));
@@ -2064,7 +2064,7 @@ int main(int argc, char* argv[])
     Camera cameraFisheyeMidday;
     cameraFisheyeMidday.fov = fisheyeFOV;
     cameraFisheyeMidday.type = Camera::Spherical;
-    cameraFisheyeMidday.transform = 
+    cameraFisheyeMidday.transform =
         Mat4d::xrotation(degToRad(85.0)) *
         Mat4d::translation(Point3d(0.0, 0.0, -planetRadius * 1.0002)) *
         Mat4d::yrotation(degToRad(20.0));
@@ -2072,7 +2072,7 @@ int main(int argc, char* argv[])
     Camera cameraFisheyeSunset;
     cameraFisheyeSunset.fov = degToRad(180.0);
     cameraFisheyeSunset.type = Camera::Spherical;
-    cameraFisheyeSunset.transform = 
+    cameraFisheyeSunset.transform =
         Mat4d::zrotation(degToRad(-5.0)) *
         Mat4d::yrotation(degToRad(90.0)) *
         Mat4d::xrotation(degToRad(85.0)) *
diff --git a/src/tools/atmosphere/scattertable.cpp b/src/tools/atmosphere/scattertable.cpp
index 0ae57e664..bd565693e 100644
--- a/src/tools/atmosphere/scattertable.cpp
+++ b/src/tools/atmosphere/scattertable.cpp
@@ -316,7 +316,7 @@ Atmosphere::computeInscatterTable() const
                     float distanceToViewer = stepLength * m;
                     float rx2 = x.squaredNorm();
                     float rx = sqrt(rx2);
-                    
+
                     // Compute the transmittance along the path to the viewer
                     Vector3f viewPathTransmittance = transmittance(r, mu, distanceToViewer, *this);
 
@@ -437,7 +437,7 @@ void SetDefaultParameters(ParameterSet& params)
     params["RayleighRed"]         = rayleighCoeff.x() * km;
     params["RayleighGreen"]       = rayleighCoeff.y() * km;
     params["RayleighBlue"]        = rayleighCoeff.z() * km;
-    
+
     params["MieScaleHeight"]      = 1.2;
     params["Mie"]                 = 2.1e-6f * km;
 
@@ -902,7 +902,7 @@ static void WriteTransmittanceTableDDS(ostream& out, Vector3f* transmittanceTabl
     //dds.setMipMapLevels();
 
     WriteDDSHeader(out, dds);
-    
+
     unsigned int sampleCount = ViewAngleSamples * HeightSamples;
     for (unsigned int i = 0; i < sampleCount; ++i)
     {
@@ -963,11 +963,11 @@ int main(int argc, char* argv[])
 
     cout << "Generating inscatter table (" << SunAngleSamples << "x"
          << ViewAngleSamples << "x" << HeightSamples << ")...\n";
-        
+
     Vector4f* inscatterTable = atmosphere.computeInscatterTable();
 
     ByteSwapRequired = !IsLittleEndian();
-    
+
 #if 0
     // Write tables in a single file
     ofstream out(OutputFileName.c_str(), ostream::binary);
diff --git a/src/tools/buildstardb.cpp b/src/tools/buildstardb.cpp
index 5ca50601c..03f43b69f 100644
--- a/src/tools/buildstardb.cpp
+++ b/src/tools/buildstardb.cpp
@@ -37,7 +37,7 @@ public:
     HipparcosStar();
 
     void write(ostream&);
-  
+
     uint32 HIPCatalogNumber;
     uint32 HDCatalogNumber;
     float ascension;
@@ -215,7 +215,7 @@ StellarClass ParseStellarClass(char *starType)
     case 'K':
         specClass = StellarClass::Spectral_K;
         break;
-    case 'M':      
+    case 'M':
         specClass = StellarClass::Spectral_M;
         break;
     case 'R':
@@ -228,19 +228,17 @@ StellarClass ParseStellarClass(char *starType)
         specClass = StellarClass::Spectral_N;
         break;
     case 'W':
-	i++;
-	if (starType[i] == 'C')
- 	    specClass = StellarClass::Spectral_WC;
-	else if (starType[i] == 'N')
-	    specClass = StellarClass::Spectral_WN;
-	else
-	    i--;
-	break;
-
+        i++;
+        if (starType[i] == 'C')
+            specClass = StellarClass::Spectral_WC;
+        else if (starType[i] == 'N')
+            specClass = StellarClass::Spectral_WN;
+        else
+            i--;
+        break;
     case 'D':
         type = StellarClass::WhiteDwarf;
         return StellarClass(type, specClass, 0, lum);
-
     default:
         specClass = StellarClass::Spectral_Unknown;
         break;
@@ -325,7 +323,7 @@ bool ReadStarRecord(istream& in)
     char buf[HipStarRecordLength];
 
     in.read(buf, HipStarRecordLength);
-    
+
     if (sscanf(buf + 2, "%d", &star.HIPCatalogNumber) != 1)
     {
         cout << "Error reading catalog number.\n";
@@ -366,7 +364,7 @@ bool ReadStarRecord(istream& in)
             return false;
         }
         star.ascension = hh + (float) mm / 60.0f + (float) seconds / 3600.0f;
-    
+
         char decSign;
         int deg;
         if (sscanf(buf + 29, "%c%d %d %f", &decSign, &deg, &mm, &seconds) != 4)
@@ -407,7 +405,7 @@ bool ReadStarRecord(istream& in)
         else
             star.parallaxError = (int8) (parallaxError / star.parallax * 200);
     }
-    
+
     stars.insert(stars.end(), star);
 
     return true;
@@ -648,7 +646,7 @@ void CreateCompanionList()
                 HipparcosStar star;
 
                 star.HDCatalogNumber = NullCatalogNumber;
-                star.HIPCatalogNumber = iter->star->HIPCatalogNumber | 
+                star.HIPCatalogNumber = iter->star->HIPCatalogNumber |
                     (componentNumber << 25);
 
                 star.ascension = iter->ascension;
@@ -734,7 +732,7 @@ int main(int argc, char* argv[])
         random_shuffle(starIndex.begin(), starIndex.end());
         sort(starIndex.begin(), starIndex.end(), pred);
     }
-        
+
     // Read component records
     {
         ifstream componentDatabase(ComponentDatabaseFile.c_str(),
@@ -753,7 +751,7 @@ int main(int argc, char* argv[])
     }
     cout << "Read " << components.size() << " components.\n";
 
-    {    
+    {
         int aComp = 0, bComp = 0, cComp = 0, dComp = 0, eComp = 0, otherComp = 0;
         int bvComp = 0;
         for (int i = 0; i < components.size(); i++)
@@ -776,14 +774,14 @@ int main(int argc, char* argv[])
             if (components[i].hasBV && components[i].componentID != 'A')
                 bvComp++;
         }
-        
+
         cout << "A:" << aComp << "  B:" << bComp << "  C:" << cComp << "  D:" << dComp << "  E:" << eComp << '\n';
         cout << "Components with B-V mag: " << bvComp << '\n';
     }
 
     cout << "Building catalog of multiple star systems.\n";
     BuildMultistarSystemCatalog();
-    
+
     int nMultipleSystems = starSystems.size();
     cout << "Stars in multiple star systems: " << nMultipleSystems << '\n';
 
@@ -820,7 +818,7 @@ int main(int argc, char* argv[])
 
 #if 0
     char* hdOutputFile = "hdxref.dat";
-    
+
     cout << "Writing out HD cross reference to " << hdOutputFile << '\n';
     ofstream hdout(hdOutputFile, ios::out | ios::binary);
     if (!out.good())
@@ -840,7 +838,7 @@ int main(int argc, char* argv[])
         binwrite(hdout, nHD);
 
         cout << nHD << " stars have HD numbers.\n";
-        
+
         for (iter = stars.begin(); iter != stars.end(); iter++)
         {
             if (iter->HDCatalogNumber != NullCatalogNumber)
@@ -848,7 +846,7 @@ int main(int argc, char* argv[])
                 binwrite(hdout, iter->HDCatalogNumber);
                 binwrite(hdout, iter->HIPCatalogNumber);
             }
-        }        
+        }
     }
 #endif
 
diff --git a/src/tools/cmod/cmodfix/cmodfix.cpp b/src/tools/cmod/cmodfix/cmodfix.cpp
index 5705a46b3..82c4c07d5 100644
--- a/src/tools/cmod/cmodfix/cmodfix.cpp
+++ b/src/tools/cmod/cmodfix/cmodfix.cpp
@@ -86,7 +86,7 @@ public:
 
     bool operator()(const Vertex& a, const Vertex& b) const
     {
-	return compare(a, b);
+        return compare(a, b);
     }
 };
 
@@ -159,8 +159,8 @@ class PointTexCoordOrderingPredicate : public VertexComparator
 {
 public:
     PointTexCoordOrderingPredicate(uint32 _posOffset,
-				   uint32 _texCoordOffset,
-				   bool _wrap) :
+                                   uint32 _texCoordOffset,
+                                   bool _wrap) :
         posOffset(_posOffset),
         texCoordOffset(_texCoordOffset),
         wrap(_wrap)
@@ -250,7 +250,7 @@ public:
                 approxEqual(p0->y(),  p1->y(), tolerance) &&
                 approxEqual(p0->z(),  p1->z(), tolerance));
     }
-		
+
 private:
     uint32 posOffset;
     float tolerance;
@@ -261,13 +261,13 @@ class PointTexCoordEquivalencePredicate : public VertexComparator
 {
 public:
     PointTexCoordEquivalencePredicate(uint32 _posOffset,
-				      uint32 _texCoordOffset,
-				      bool _wrap,
-				      float _tolerance) :
+                                      uint32 _texCoordOffset,
+                                      bool _wrap,
+                                      float _tolerance) :
         posOffset(_posOffset),
         texCoordOffset(_texCoordOffset),
         wrap(_wrap),
-	tolerance(_tolerance)
+        tolerance(_tolerance)
     {
     }
 
@@ -286,7 +286,7 @@ public:
                 approxEqual(tc0->x(), tc1->x(), tolerance) &&
                 approxEqual(tc0->y(), tc1->y(), tolerance));
     }
-		
+
 private:
     uint32 posOffset;
     uint32 texCoordOffset;
@@ -441,7 +441,7 @@ bool uniquifyVertices(Mesh& mesh)
         if (i == 0 || !equal(vertices[i - 1], vertices[i], desc.stride))
             uniqueVertexCount++;
     }
-    
+
     // No work left to do if we couldn't eliminate any vertices
     if (uniqueVertexCount == nVertices)
         return true;
@@ -481,7 +481,7 @@ getVertex(const void* vertexData,
           uint32 index)
 {
     const float* fdata = reinterpret_cast<const float*>(reinterpret_cast<const char*>(vertexData) + stride * index + positionOffset);
-    
+
     return Vector3f(fdata[0], fdata[1], fdata[2]);
 }
 
@@ -493,7 +493,7 @@ getTexCoord(const void* vertexData,
             uint32 index)
 {
     const float* fdata = reinterpret_cast<const float*>(reinterpret_cast<const char*>(vertexData) + stride * index + texCoordOffset);
-    
+
     return Vector2f(fdata[0], fdata[1]);
 }
 
@@ -558,7 +558,7 @@ augmentVertexDescription(Mesh::VertexDescription& desc,
     uint32 stride = 0;
     uint32 nAttributes = 0;
     bool foundMatch = false;
-    
+
     for (uint32 i = 0; i < desc.nAttributes; i++)
     {
         if (semantic == desc.attributes[i].semantic &&
@@ -596,10 +596,10 @@ augmentVertexDescription(Mesh::VertexDescription& desc,
 
 template<typename T, typename U> void
 joinVertices(vector<Face>& faces,
-	     const void* vertexData,
-	     const Mesh::VertexDescription& desc,
-	     const T& orderingPredicate,
-	     const U& equivalencePredicate)
+             const void* vertexData,
+             const Mesh::VertexDescription& desc,
+             const T& orderingPredicate,
+             const U& equivalencePredicate)
 {
     // Don't do anything if we're given no data
     if (faces.size() == 0)
@@ -623,7 +623,7 @@ joinVertices(vector<Face>& faces,
             uint32 index = faces[f].i[j];
             vertices[f * 3 + j] = Vertex(index,
                                          vertexPoints + desc.stride * index);
-                                         
+
         }
     }
 
@@ -636,10 +636,10 @@ joinVertices(vector<Face>& faces,
     uint32 uniqueCount = 0;
     for (uint32 i = 0; i < nVertices; i++)
     {
-	if (i == 0 || !equivalencePredicate(vertices[i - 1], vertices[i]))
-	{
+        if (i == 0 || !equivalencePredicate(vertices[i - 1], vertices[i]))
+        {
             lastUnique = i;
-	    uniqueCount++;
+            uniqueCount++;
         }
 
         mergeMap[vertices[i].index] = vertices[lastUnique].index;
@@ -670,13 +670,13 @@ generateNormals(Mesh& mesh,
         return NULL;
     }
     uint32 posOffset = desc.getAttribute(Mesh::Position).offset;
- 
+
     uint32 nFaces = 0;
     uint32 i;
     for (i = 0; mesh.getGroup(i) != NULL; i++)
     {
         const Mesh::PrimitiveGroup* group = mesh.getGroup(i);
-        
+
         switch (group->prim)
         {
         case Mesh::TriList:
@@ -712,7 +712,7 @@ generateNormals(Mesh& mesh,
     for (i = 0; mesh.getGroup(i) != NULL; i++)
     {
         const Mesh::PrimitiveGroup* group = mesh.getGroup(i);
-        
+
         switch (group->prim)
         {
         case Mesh::TriList:
@@ -928,23 +928,23 @@ generateNormals(Mesh& mesh,
     {
         const Mesh::PrimitiveGroup* group = mesh.getGroup(groupIndex);
         unsigned int faceCount = 0;
-        
+
         switch (group->prim)
         {
         case Mesh::TriList:
-	    faceCount = group->nIndices / 3;
+            faceCount = group->nIndices / 3;
             break;
         case Mesh::TriStrip:
         case Mesh::TriFan:
-	    faceCount = group->nIndices - 2;
-	    break;
+            faceCount = group->nIndices - 2;
+            break;
         default:
             assert(0);
             break;
         }
 
-	newMesh->addGroup(Mesh::TriList, mesh.getGroup(groupIndex)->materialIndex, faceCount * 3, indices + firstIndex);
-	firstIndex += faceCount * 3;
+        newMesh->addGroup(Mesh::TriList, mesh.getGroup(groupIndex)->materialIndex, faceCount * 3, indices + firstIndex);
+        firstIndex += faceCount * 3;
     }
 
     // Clean up
@@ -1011,7 +1011,7 @@ generateTangents(Mesh& mesh,
             return NULL;
         }
     }
-    
+
     // Build the array of faces; this may require decomposing triangle strips
     // and fans into triangle lists.
     vector<Face> faces(nFaces);
@@ -1020,7 +1020,7 @@ generateTangents(Mesh& mesh,
     for (i = 0; mesh.getGroup(i) != NULL; i++)
     {
         const Mesh::PrimitiveGroup* group = mesh.getGroup(i);
-        
+
         switch (group->prim)
         {
         case Mesh::TriList:
@@ -1043,7 +1043,7 @@ generateTangents(Mesh& mesh,
     uint32 texCoordOffset = desc.getAttribute(Mesh::Texture0).offset;
 
     const void* vertexData = mesh.getVertexData();
-    
+
     // Compute tangents for faces
     for (f = 0; f < nFaces; f++)
     {
@@ -1080,10 +1080,10 @@ generateTangents(Mesh& mesh,
     // points and merge them.  Otherwise, the point indices will be the same
     // as the attribute indices.
     if (weld)
-    { 
+    {
         joinVertices(faces, vertexData, desc,
-		     PointTexCoordOrderingPredicate(posOffset, texCoordOffset, true),
-		     PointTexCoordEquivalencePredicate(posOffset, texCoordOffset, true, 1.0e-5f));
+                     PointTexCoordOrderingPredicate(posOffset, texCoordOffset, true),
+                     PointTexCoordEquivalencePredicate(posOffset, texCoordOffset, true, 1.0e-5f));
     }
     else
     {
@@ -1205,23 +1205,23 @@ generateTangents(Mesh& mesh,
     {
         const Mesh::PrimitiveGroup* group = mesh.getGroup(groupIndex);
         unsigned int faceCount = 0;
-        
+
         switch (group->prim)
         {
         case Mesh::TriList:
-	    faceCount = group->nIndices / 3;
+            faceCount = group->nIndices / 3;
             break;
         case Mesh::TriStrip:
         case Mesh::TriFan:
-	    faceCount = group->nIndices - 2;
-	    break;
+            faceCount = group->nIndices - 2;
+            break;
         default:
             assert(0);
             break;
         }
 
-	newMesh->addGroup(Mesh::TriList, mesh.getGroup(groupIndex)->materialIndex, faceCount * 3, indices + firstIndex);
-	firstIndex += faceCount * 3;
+        newMesh->addGroup(Mesh::TriList, mesh.getGroup(groupIndex)->materialIndex, faceCount * 3, indices + firstIndex);
+        firstIndex += faceCount * 3;
     }
 
     // Clean up
@@ -1281,7 +1281,7 @@ mergeModelMeshes(const Model& model)
     {
         const Mesh::VertexDescription& desc =
             meshes[meshIndex]->getVertexDescription();
-        
+
         // Count the number of matching meshes
         uint32 nMatchingMeshes;
         for (nMatchingMeshes = 1;
@@ -1308,7 +1308,7 @@ mergeModelMeshes(const Model& model)
         Mesh* mergedMesh = new Mesh();
         mergedMesh->setVertexDescription(desc);
         mergedMesh->setVertices(totalVertices, vertexData);
-        
+
         // Copy the vertex data and reindex and add primitive groups
         uint32 vertexCount = 0;
         for (j = meshIndex; j < meshIndex + nMatchingMeshes; j++)
@@ -1413,7 +1413,7 @@ convertToStrips(Mesh& mesh)
                 newGroup->indices = new uint32[newGroup->nIndices];
                 for (uint32 k = 0; k < newGroup->nIndices; k++)
                     newGroup->indices[k] = strips[j].indices[k];
-                
+
                 groups.push_back(newGroup);
             }
         }
@@ -1545,10 +1545,10 @@ int main(int argc, char* argv[])
     {
         model = LoadModel(cin);
     }
-    
+
     if (model == NULL)
         return 1;
-    
+
     if (genNormals || genTangents)
     {
         Model* newModel = new Model();
diff --git a/src/tools/cmod/cmodsphere/cmodsphere.cpp b/src/tools/cmod/cmodsphere/cmodsphere.cpp
index 1ff5f998d..dd3318dca 100644
--- a/src/tools/cmod/cmodsphere/cmodsphere.cpp
+++ b/src/tools/cmod/cmodsphere/cmodsphere.cpp
@@ -160,7 +160,7 @@ void triangleMesh(unsigned int subdiv,
         {
             unsigned int t0 = baseIndex + trinum(i) + j;
             unsigned int t1 = baseIndex + trinum(i + 1) + j;
-            
+
             cout << t0 << " " << t1 << " " << t1 + 1 << "\n";
             if (j != i)
                 cout << t0 << " " << t1 + 1 << " " << t0 + 1 << "\n";
diff --git a/src/tools/cmod/cmodtangent.cpp b/src/tools/cmod/cmodtangent.cpp
index 7f85ffd05..4eaccc2bc 100644
--- a/src/tools/cmod/cmodtangent.cpp
+++ b/src/tools/cmod/cmodtangent.cpp
@@ -12,5 +12,5 @@
 
 int main(int argc, char* argv[])
 {
-    
+
 }
diff --git a/src/tools/cmod/common/cmodops.cpp b/src/tools/cmod/common/cmodops.cpp
index cdeb2d255..f90832113 100644
--- a/src/tools/cmod/common/cmodops.cpp
+++ b/src/tools/cmod/common/cmodops.cpp
@@ -32,7 +32,7 @@ public:
 
     bool operator()(const Vertex& a, const Vertex& b) const
     {
-	return compare(a, b);
+        return compare(a, b);
     }
 };
 
@@ -105,8 +105,8 @@ class PointTexCoordOrderingPredicate : public VertexComparator
 {
 public:
     PointTexCoordOrderingPredicate(uint32 _posOffset,
-				   uint32 _texCoordOffset,
-				   bool _wrap) :
+                                   uint32 _texCoordOffset,
+                                   bool _wrap) :
         posOffset(_posOffset),
         texCoordOffset(_texCoordOffset),
         wrap(_wrap)
@@ -196,7 +196,7 @@ public:
                 approxEqual(p0->y(),  p1->y(), tolerance) &&
                 approxEqual(p0->z(),  p1->z(), tolerance));
     }
-		
+
 private:
     uint32 posOffset;
     float tolerance;
@@ -207,13 +207,13 @@ class PointTexCoordEquivalencePredicate : public VertexComparator
 {
 public:
     PointTexCoordEquivalencePredicate(uint32 _posOffset,
-				      uint32 _texCoordOffset,
-				      bool _wrap,
-				      float _tolerance) :
+                                      uint32 _texCoordOffset,
+                                      bool _wrap,
+                                      float _tolerance) :
         posOffset(_posOffset),
         texCoordOffset(_texCoordOffset),
         wrap(_wrap),
-	tolerance(_tolerance)
+        tolerance(_tolerance)
     {
     }
 
@@ -232,7 +232,7 @@ public:
                 approxEqual(tc0->x(), tc1->x(), tolerance) &&
                 approxEqual(tc0->y(), tc1->y(), tolerance));
     }
-		
+
 private:
     uint32 posOffset;
     uint32 texCoordOffset;
@@ -357,7 +357,7 @@ private:
 
 
 
-bool 
+bool
 UniquifyVertices(Mesh& mesh)
 {
     uint32 nVertices = mesh.getVertexCount();
@@ -388,7 +388,7 @@ UniquifyVertices(Mesh& mesh)
         if (i == 0 || !equal(vertices[i - 1], vertices[i], desc.stride))
             uniqueVertexCount++;
     }
-    
+
     // No work left to do if we couldn't eliminate any vertices
     if (uniqueVertexCount == nVertices)
         return true;
@@ -428,7 +428,7 @@ getVertex(const void* vertexData,
           uint32 index)
 {
     const float* fdata = reinterpret_cast<const float*>(reinterpret_cast<const char*>(vertexData) + stride * index + positionOffset);
-    
+
     return Vector3f(fdata[0], fdata[1], fdata[2]);
 }
 
@@ -440,7 +440,7 @@ getTexCoord(const void* vertexData,
             uint32 index)
 {
     const float* fdata = reinterpret_cast<const float*>(reinterpret_cast<const char*>(vertexData) + stride * index + texCoordOffset);
-    
+
     return Vector2f(fdata[0], fdata[1]);
 }
 
@@ -505,7 +505,7 @@ augmentVertexDescription(Mesh::VertexDescription& desc,
     uint32 stride = 0;
     uint32 nAttributes = 0;
     bool foundMatch = false;
-    
+
     for (uint32 i = 0; i < desc.nAttributes; i++)
     {
         if (semantic == desc.attributes[i].semantic &&
@@ -566,13 +566,13 @@ GenerateNormals(const cmod::Mesh& mesh, float smoothAngle, bool weld, float weld
         return NULL;
     }
     uint32 posOffset = desc.getAttribute(Mesh::Position).offset;
- 
+
     uint32 nFaces = 0;
     uint32 i;
     for (i = 0; mesh.getGroup(i) != NULL; i++)
     {
         const Mesh::PrimitiveGroup* group = mesh.getGroup(i);
-        
+
         switch (group->prim)
         {
         case Mesh::TriList:
@@ -608,7 +608,7 @@ GenerateNormals(const cmod::Mesh& mesh, float smoothAngle, bool weld, float weld
     for (i = 0; mesh.getGroup(i) != NULL; i++)
     {
         const Mesh::PrimitiveGroup* group = mesh.getGroup(i);
-        
+
         switch (group->prim)
         {
         case Mesh::TriList:
@@ -826,16 +826,16 @@ GenerateNormals(const cmod::Mesh& mesh, float smoothAngle, bool weld, float weld
     {
         const Mesh::PrimitiveGroup* group = mesh.getGroup(groupIndex);
         unsigned int faceCount = 0;
-        
+
         switch (group->prim)
         {
         case Mesh::TriList:
-	    faceCount = group->nIndices / 3;
+            faceCount = group->nIndices / 3;
             break;
         case Mesh::TriStrip:
         case Mesh::TriFan:
-	    faceCount = group->nIndices - 2;
-	    break;
+            faceCount = group->nIndices - 2;
+            break;
         default:
             assert(0);
             break;
@@ -908,7 +908,7 @@ GenerateTangents(const Mesh& mesh, bool weld)
             return NULL;
         }
     }
-    
+
     // Build the array of faces; this may require decomposing triangle strips
     // and fans into triangle lists.
     vector<Face> faces(nFaces);
@@ -917,7 +917,7 @@ GenerateTangents(const Mesh& mesh, bool weld)
     for (i = 0; mesh.getGroup(i) != NULL; i++)
     {
         const Mesh::PrimitiveGroup* group = mesh.getGroup(i);
-        
+
         switch (group->prim)
         {
         case Mesh::TriList:
@@ -942,7 +942,7 @@ GenerateTangents(const Mesh& mesh, bool weld)
     uint32 texCoordOffset = desc.getAttribute(Mesh::Texture0).offset;
 
     const void* vertexData = mesh.getVertexData();
-    
+
     // Compute tangents for faces
     for (f = 0; f < nFaces; f++)
     {
@@ -979,10 +979,10 @@ GenerateTangents(const Mesh& mesh, bool weld)
     // points and merge them.  Otherwise, the point indices will be the same
     // as the attribute indices.
     if (weld)
-    { 
+    {
         JoinVertices(faces, vertexData, desc,
-		     PointTexCoordOrderingPredicate(posOffset, texCoordOffset, true),
-		     PointTexCoordEquivalencePredicate(posOffset, texCoordOffset, true, 1.0e-5f));
+                     PointTexCoordOrderingPredicate(posOffset, texCoordOffset, true),
+                     PointTexCoordEquivalencePredicate(posOffset, texCoordOffset, true, 1.0e-5f));
     }
     else
     {
@@ -1104,23 +1104,23 @@ GenerateTangents(const Mesh& mesh, bool weld)
     {
         const Mesh::PrimitiveGroup* group = mesh.getGroup(groupIndex);
         unsigned int faceCount = 0;
-        
+
         switch (group->prim)
         {
         case Mesh::TriList:
-	    faceCount = group->nIndices / 3;
+            faceCount = group->nIndices / 3;
             break;
         case Mesh::TriStrip:
         case Mesh::TriFan:
-	    faceCount = group->nIndices - 2;
-	    break;
+            faceCount = group->nIndices - 2;
+            break;
         default:
             assert(0);
             break;
         }
 
-	newMesh->addGroup(Mesh::TriList, mesh.getGroup(groupIndex)->materialIndex, faceCount * 3, indices + firstIndex);
-	firstIndex += faceCount * 3;
+        newMesh->addGroup(Mesh::TriList, mesh.getGroup(groupIndex)->materialIndex, faceCount * 3, indices + firstIndex);
+        firstIndex += faceCount * 3;
     }
 
     // Clean up
@@ -1180,7 +1180,7 @@ MergeModelMeshes(const Model& model)
     {
         const Mesh::VertexDescription& desc =
             meshes[meshIndex]->getVertexDescription();
-        
+
         // Count the number of matching meshes
         uint32 nMatchingMeshes;
         for (nMatchingMeshes = 1;
@@ -1207,7 +1207,7 @@ MergeModelMeshes(const Model& model)
         Mesh* mergedMesh = new Mesh();
         mergedMesh->setVertexDescription(desc);
         mergedMesh->setVertices(totalVertices, vertexData);
-        
+
         // Copy the vertex data and reindex and add primitive groups
         uint32 vertexCount = 0;
         for (j = meshIndex; j < meshIndex + nMatchingMeshes; j++)
@@ -1378,7 +1378,7 @@ convertToStrips(Mesh& mesh)
                 newGroup->indices = new uint32[newGroup->nIndices];
                 for (uint32 k = 0; k < newGroup->nIndices; k++)
                     newGroup->indices[k] = strips[j].indices[k];
-                
+
                 groups.push_back(newGroup);
             }
         }
diff --git a/src/tools/cmod/common/cmodops.h b/src/tools/cmod/common/cmodops.h
index 1fe6b42ae..a9fe80991 100644
--- a/src/tools/cmod/common/cmodops.h
+++ b/src/tools/cmod/common/cmodops.h
@@ -78,7 +78,7 @@ JoinVertices(std::vector<Face>& faces,
             uint32 index = faces[f].i[j];
             vertices[f * 3 + j] = Vertex(index,
                                          vertexPoints + desc.stride * index);
-                                         
+
         }
     }
 
diff --git a/src/tools/cmod/common/convertobj.cpp b/src/tools/cmod/common/convertobj.cpp
index e263876d8..9d8f546f7 100644
--- a/src/tools/cmod/common/convertobj.cpp
+++ b/src/tools/cmod/common/convertobj.cpp
@@ -98,7 +98,7 @@ WavefrontLoader::load()
     int currentMaterialIndex = -1;
 
     m_model = new Model();
-    
+
     while (getline(m_in, line))
     {
         m_lineNumber++;
diff --git a/src/tools/cmod/itokawa/txt2cmod.cpp b/src/tools/cmod/itokawa/txt2cmod.cpp
index 3f5adb508..7efc39750 100644
--- a/src/tools/cmod/itokawa/txt2cmod.cpp
+++ b/src/tools/cmod/itokawa/txt2cmod.cpp
@@ -23,7 +23,7 @@
 // ...
 //
 // face and vertex ids are 1-based
-// vertex positions are floating point values 
+// vertex positions are floating point values
 //
 // The resulting cmod file should be processed by cmodfix to generate
 // normals and convert to the binary cmod format. I use this command line:
@@ -49,7 +49,7 @@ int main(int argc, char* argv[])
     cout << "position f3\n";
     cout << "end_vertexdesc\n";
     cout << "\n";
-    
+
     // Get the vertex count
     unsigned int vertexCount;
     cin >> vertexCount;
diff --git a/src/tools/cmod/xtocmod.cpp b/src/tools/cmod/xtocmod.cpp
index c259cfadf..72d0c0dcf 100644
--- a/src/tools/cmod/xtocmod.cpp
+++ b/src/tools/cmod/xtocmod.cpp
@@ -13,7 +13,7 @@ static IDirect3D9* g_d3d = NULL;
 static IDirect3DDevice9* g_d3dDev = NULL;
 static HWND g_mainWindow = NULL;
 
-char* D3DErrorString(HRESULT);    
+char* D3DErrorString(HRESULT);
 void ShowD3DErrorMessage(char* info, HRESULT hr);
 
 
@@ -50,7 +50,7 @@ struct VertexAttribute
 char* AttribFormatNames[] =
 { "f1", "f2", "f3", "f4", "ub4" };
 
-char* AttribNames[] = { 
+char* AttribNames[] = {
     "position",
     "color0",
     "color1",
@@ -176,7 +176,7 @@ template<class T> int DumpTriStrip(DWORD nTris,
 {
     meshfile << "tristrip ";
     meshfile << materialIndex << ' ' << (nTris + 2) << '\n';
-            
+
     DWORD indexCount = nTris + 2;
 
     for (DWORD j = 0; j < indexCount; j++)
@@ -201,7 +201,7 @@ template<class T> void DumpTriStripAsFan(DWORD nTris,
 {
     meshfile << "trifan ";
     meshfile << materialIndex << ' ' << (nTris / 2 + 3) << '\n';
-            
+
     DWORD indexCount = nTris + 2;
 
     T anchor = indices[anchorOffset];
@@ -260,7 +260,7 @@ bool StripifyMeshSubset(ID3DXMesh* mesh,
 
     cout << "Converted to " << numStrips << " strips\n";
     cout << "Strip buffer size: " << strips->GetBufferSize() << '\n';
-    if (numStrips != strips->GetBufferSize() / 4) 
+    if (numStrips != strips->GetBufferSize() / 4)
     {
         cout << "Strip count is incorrect!\n";
         return false;
@@ -398,7 +398,7 @@ bool DumpMeshVertices(ID3DXMesh* mesh,
             {
                 char* chardata = vertexData + i * stride + vertexMap[attr].offset;
                 float* floatdata = reinterpret_cast<float*>(chardata);
-                                                            
+
                 switch (vertexMap[attr].format)
                 {
                 case VertexAttribute::Float1:
@@ -587,10 +587,10 @@ int APIENTRY WinMain(HINSTANCE hInstance,
     wc.lpszClassName = "xtocmod";
     if (RegisterClass(&wc) == 0)
     {
-	MessageBox(NULL,
+        MessageBox(NULL,
                    "Failed to register the window class.", "Fatal Error",
                    MB_OK | MB_ICONERROR);
-	return NULL;
+        return NULL;
     }
 
     DWORD windowStyle = (WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU |
@@ -635,7 +635,7 @@ int APIENTRY WinMain(HINSTANCE hInstance,
     presentParams.PresentationInterval = D3DPRESENT_INTERVAL_IMMEDIATE;
     presentParams.Windowed = TRUE;
 #endif
-    
+
     HRESULT hr = g_d3d->CreateDevice(D3DADAPTER_DEFAULT,
                                      D3DDEVTYPE_HAL,
                                      g_mainWindow,
@@ -657,7 +657,7 @@ int APIENTRY WinMain(HINSTANCE hInstance,
     ID3DXBuffer* materialBuf = NULL;
     ID3DXBuffer* effects = NULL;
     DWORD numMaterials;
-    
+
     hr = D3DXLoadMeshFromX(inputFilename.c_str(),
                            0,
                            g_d3dDev,
@@ -733,7 +733,7 @@ int APIENTRY WinMain(HINSTANCE hInstance,
         ShowD3DErrorMessage("Optimize failed: ", hr);
         return 1;
     }
-    
+
     // Attribute table
     DWORD attribTableSize = 0;
     hr = optMesh->GetAttributeTable(NULL, &attribTableSize);
@@ -763,7 +763,7 @@ int APIENTRY WinMain(HINSTANCE hInstance,
 
     if (!DumpMeshVertices(optMesh, vertexMap, stride, meshfile))
         return 1;
-    
+
     // output the indices
     for (DWORD attr = 0; attr < attribTableSize; attr++)
     {
@@ -804,7 +804,7 @@ int main(int argc, char* argv[])
     ID3DXBuffer* adjacency = NULL;
     ID3DXBuffer* materials = NULL;
     ID3DXBuffer* effects = NULL;
-    
+
     return 0;
 }
 
@@ -886,7 +886,7 @@ char* D3DErrorString(HRESULT hr)
 void ShowD3DErrorMessage(char* info, HRESULT hr)
 {
     char buf[1024];
-    
+
     sprintf(buf, "%s - %s", info, D3DErrorString(hr));
     MessageBox(g_mainWindow,
                buf, "Fatal Error",
diff --git a/src/tools/spice2xyzv/spice2xyzv.cpp b/src/tools/spice2xyzv/spice2xyzv.cpp
index 4f01e4e02..181c01db1 100644
--- a/src/tools/spice2xyzv/spice2xyzv.cpp
+++ b/src/tools/spice2xyzv/spice2xyzv.cpp
@@ -148,7 +148,7 @@ istream& operator>>(istream& in, QuotedString& qs)
     }
 
     string s;
-    
+
     in >> c;
     while (in && c != '"')
     {
@@ -392,7 +392,7 @@ bool convertSpkToXyzv(const Configuration& config,
         Vec3d pTest = getStateVector(targetID, tmid, config.frameName, observerID).position;
         Vec3d pInterp = cubicInterpolate(lastState.position,
                                          lastState.velocity * dt,
-                                         s1.position, 
+                                         s1.position,
                                          s1.velocity * dt,
                                          0.5);
         nTests++;
@@ -445,7 +445,7 @@ bool convertSpkToXyzv(const Configuration& config,
                 positionError = (pInterp - pTest).length();
             }
         }
-    
+
         t = t + dt;
         lastState = s1;
 
@@ -547,7 +547,7 @@ int main(int argc, char* argv[])
         return 1;
     }
 
-    
+
     Configuration config;
     if (!readConfig(configFile, config))
     {
diff --git a/src/tools/stardb/celdat2txt.cpp b/src/tools/stardb/celdat2txt.cpp
index fbe3af81c..77095597d 100644
--- a/src/tools/stardb/celdat2txt.cpp
+++ b/src/tools/stardb/celdat2txt.cpp
@@ -4,7 +4,7 @@
 //
 // Based on original code of startextdump.cpp & makeindex.cpp
 // Copyright (C) 2004, Chris Laurel <claurel@shatters.net>
-// 
+//
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License
 // as published by the Free Software Foundation; either version 2
@@ -19,7 +19,7 @@
 #include <cctype>
 #include <cassert>
 #include <stdio.h>
-#include <math.h>       /* All mathematics        */
+#include <math.h>       /* All mathematics */
 #include <celutil/basictypes.h>
 #include <celutil/bytes.h>
 #include <celengine/astro.h>
@@ -30,14 +30,14 @@ using namespace std;
 #define PI 3.14159265358979323846
 #define HEADER_NEW  "HIP number;RAdeg;DECdeg;RA(hms);DEC(dms);Distance(LY);Parallax;AppMag;AbsMag;StellarClass\n"
 
-#define DCOS	cos
-#define DSIN	sin
-#define DATAN2	atan2
-#define DASIN	asin
+#define DCOS     cos
+#define DSIN     sin
+#define DATAN2   atan2
+#define DASIN    asin
 
-#define X1(i)	x1[i-1]
-#define X2(i)	x2[i-1]
-#define R(i,j)	r[i-1][j-1]
+#define X1(i)    x1[i-1]
+#define X2(i)    x2[i-1]
+#define R(i,j)   r[i-1][j-1]
 
 static string inputFilename;
 static string outputFilename;
@@ -55,18 +55,18 @@ static double PI4 = 6.28318530717948;
 static double E75 = 1875.;
 double ARAD,DRAD,A,D,E,RAH,RA,DEC,RAL,RAU,DECL,DECD;
 double Ein ;
-char buf[BUFSIZ], *p ;
-char *dEin = "1991.25";	
+char buf[BUFSIZ], *p;
+char *dEin = "1991.25";
 int StringLength(char []);
 
-double *RA1, *DEC1, *EPOCH1, *EPOCH2, *RA2, *DEC2 ;
+double *RA1, *DEC1, *EPOCH1, *EPOCH2, *RA2, *DEC2;
 double RA2c,DE2c;
 
 FILE *f2 = 0;
 
 extern "C"
 {
-void HGTPRC(double*,double*,double*,double*,double*,double*) ;
+void HGTPRC(double*,double*,double*,double*,double*,double*);
 }
 
 
@@ -78,12 +78,12 @@ void Usage()
     cerr << "    no options          : Dumps data from stardb.dat to text (HIPnr,RAdeg,DECdeg,\n";
     cerr << "                          absMag, distance and stellarclass).\n";
     cerr << "    --list (or -l)      : Make a list of Constellations from stardb.dat in\n";
-    cerr << "                          csv-format with calculated RA,dec from Epoch JYYYY.nn\n";              
+    cerr << "                          csv-format with calculated RA,dec from Epoch JYYYY.nn\n";
     cerr << "    --convert (or -c)   : Convert stardb.dat to extended csv-format including RA(hh:mm:ss.ss),\n";
-	cerr << "                          dec(dd:mm:ss.ss),distance(ly),absMag,appMag,pa,stellarclass)\n";              
-	cerr << "    --convert --all     : Convert stardb.dat to extended csv-format\n";
+    cerr << "                          dec(dd:mm:ss.ss),distance(ly),absMag,appMag,pa,stellarclass)\n";
+    cerr << "    --convert --all     : Convert stardb.dat to extended csv-format\n";
     cerr << "          (or -c -a)      as above and add Constellation.\n\n";
-    cerr << "    --index (or -x)     : dump new HD or SAO binary x-ref catalogs to text\n\n";     
+    cerr << "    --index (or -x)     : dump new HD or SAO binary x-ref catalogs to text\n\n";
 }
 
 static uint32 readUint(istream& in)
@@ -129,13 +129,13 @@ void printStellarClass(uint16 sc, ostream& out)
 {
     StellarClass::StarType st = (StellarClass::StarType) (sc >> 12);
     if (st == StellarClass::WhiteDwarf)
-    {                
-		unsigned int spectralClass = (sc >> 8 & 0xf);				
-        unsigned int spectralSubclass = (sc >> 4 & 0xf);		       
+    {
+        unsigned int spectralClass = (sc >> 8 & 0xf);
+        unsigned int spectralSubclass = (sc >> 4 & 0xf);
         unsigned int luminosityClass = (sc & 0xf);
-		out << "D";                               // Better than just "WD".
-		out << "ABCOQZGXVPHE"[spectralClass];     // A guess for Whitedwarfs
-		out << "0123456789?"[spectralSubclass];   // "?" added to avoid NULL chars.
+        out << "D";                               // Better than just "WD".
+        out << "ABCOQZGXVPHE"[spectralClass];     // A guess for Whitedwarfs
+        out << "0123456789?"[spectralSubclass];   // "?" added to avoid NULL chars.
     }
     else if (st == StellarClass::NeutronStar)
     {
@@ -160,7 +160,7 @@ void printStellarClass(uint16 sc, ostream& out)
             out << "OBAFGKMRSNWW?LTC"[spectralClass];
             out << "0123456789?"[spectralSubclass]; //add ? because a 10(hex a) is declared as a unknown subclass.
             switch (luminosityClass)                //without this questionmark a nullchar is written to the file
-            {                                       //causing that a dump of stardb is not a textfile but binary. 
+            {                                       //causing that a dump of stardb is not a textfile but binary.
             case StellarClass::Lum_Ia0:
                 out << "I-a0";
                 break;
@@ -186,7 +186,7 @@ void printStellarClass(uint16 sc, ostream& out)
                 out << "VI";
                 break;
             case StellarClass::Lum_Unknown:
-                out << "?";  //Add ? because the Lum is classified in stardb as unknown 
+                out << "?";  //Add ? because the Lum is classified in stardb as unknown
                 break;
             }
         }
@@ -199,31 +199,28 @@ void printStellarClass(uint16 sc, ostream& out)
 
 bool DumpxRefDatabase(istream& in, ostream& out)
 {
-    
-
-    // Verify that the star database file has a correct header    
-        char header[8];
-        in.read(header, sizeof header);
-        if (strncmp(header, "CELINDEX", sizeof header))
-        {
-            cerr << "Bad header for cross index\n";
-            return false;
-        }        
+    // Verify that the star database file has a correct header
+    char header[8];
+    in.read(header, sizeof header);
+    if (strncmp(header, "CELINDEX", sizeof header))
+    {
+        cerr << "Bad header for cross index\n";
+        return false;
+    }
 
     // Verify the version
-        uint16 version = readUshort(in);
-        if (version != 0x0100)
-        {
-            cerr << "Bad version for cross index\n";
-            return false;
-        }
+    uint16 version = readUshort(in);
+    if (version != 0x0100)
+    {
+        cerr << "Bad version for cross index\n";
+        return false;
+    }
 
 
     uint32 record = 0;
     for (;;)
     {
-    	
-    	if (!in.good())
+        if (!in.good())
         {
             cerr << "Error reading from star database at record " << record << endl;
             return false;
@@ -233,7 +230,7 @@ bool DumpxRefDatabase(istream& in, ostream& out)
         if (in.eof())
             break;
         uint32 celcatalogNum = readUint(in);    //HIP number
- 
+
         out << catalogNum << ' ';
         out << celcatalogNum << '\n';
         //out << '\n';
@@ -247,7 +244,7 @@ char con2find(double Ein, double RA2c, double DE2c)
 /*-------------------------------------------------------
 C PROGRAM TO FIND CONSTELLATION NAME  FROM A POSITION
 C ---> Modified FO, CDS Strasbourg, DARSIN is NOT a standard F77 function...
-C	... but DASIN !!!
+C    ... but DASIN !!!
 C
 C THE FIRST RECORD IN THE DATA SET MUST BE THE EQUINOX FOR THE POSITIONS
 C  IN THE FORMAT XXXX.X
@@ -259,592 +256,595 @@ C  ABBREVIATION OF THE CONSTELLATION IN WHICH IT IS LOCATED
 C
 -------------------------------------------------------*/
 {
- 
-      f2 = fopen("data.dat", "r"); if (!f2) perror("data.dat") ;
-      
-      E = Ein ; //(ICRS, Epoch=JJJJ.nn)
-    
-      RAH = RA2c; DECD = DE2c;
-      /* PRECESS POSITION TO 1875.0 EQUINOX */
-      ARAD = CONVH * RAH ;
-      DRAD = CONVD * DECD ;
-      HGTPRC(&ARAD,&DRAD,&E,&E75,&A,&D) ;
-      if(A <  0.)A=A+PI4 ;
-      if(A >= PI4)A=A-PI4 ;
-      RA= A/CONVH ;
-      DEC=D/CONVD ;
+    f2 = fopen("data.dat", "r"); if (!f2) perror("data.dat") ;
+
+    E = Ein; //(ICRS, Epoch=JJJJ.nn)
+
+    RAH = RA2c;
+    DECD = DE2c;
+    /* PRECESS POSITION TO 1875.0 EQUINOX */
+    ARAD = CONVH * RAH;
+    DRAD = CONVD * DECD;
+    HGTPRC(&ARAD,&DRAD,&E,&E75,&A,&D);
+    if (A < 0.)
+        A = A + PI4;
+    if (A >= PI4)
+        A = A - PI4;
+    RA  = A/CONVH;
+    DEC = D/CONVD;
 
     /* FIND CONSTELLATION SUCH THAT THE DECLINATION ENTERED IS HIGHER THAN
        THE LOWER BOUNDARY OF THE CONSTELLATION WHEN THE UPPER AND LOWER
        RIGHT ASCENSIONS FOR THE CONSTELLATION BOUND THE ENTERED RIGHT
        ASCENSION
     */
-      fseek(f2, 0, 0) ;
-      while(fgets(buf, sizeof(buf), f2)) {
-	for (p=buf; isspace(*p); p++) ;
-	RAL = atof(p); while(isgraph(*p)) p++; while(isspace(*p)) p++ ;
-	RAU = atof(p); while(isgraph(*p)) p++; while(isspace(*p)) p++ ;
-	DECL= atof(p); while(isgraph(*p)) p++; while(isspace(*p)) p++ ;
-	CON = p; while(isgraph(*p)) p++; *p = 0;
-      	if(DECL >  DEC) continue ;
-   	if (RAU <= RA) continue ;
-   	if(RAL >  RA) continue ;
-	/* if CONSTELLATION HAS BEEN FOUND, WRITE RESULT AND RERUN PROGRAM FOR
-	   NEXT ENTRY.  OTHERWISE, CONTINUE THE SEARCH BY RETURNING TO RAU
-	*/
-	if (RA >= RAL &&  RA <  RAU &&  DECL <= DEC)
-		{ 
+    fseek(f2, 0, 0);
+    while(fgets(buf, sizeof(buf), f2)) {
+        for (p=buf; isspace(*p); p++);
+        RAL = atof(p); while(isgraph(*p)) p++; while(isspace(*p)) p++;
+        RAU = atof(p); while(isgraph(*p)) p++; while(isspace(*p)) p++;
+        DECL= atof(p); while(isgraph(*p)) p++; while(isspace(*p)) p++;
+        CON = p; while(isgraph(*p)) p++; *p = 0;
+        if (DECL > DEC) continue;
+        if (RAU <= RA) continue;
+        if (RAL >  RA) continue;
+    /* if CONSTELLATION HAS BEEN FOUND, WRITE RESULT AND RERUN PROGRAM FOR
+       NEXT ENTRY.  OTHERWISE, CONTINUE THE SEARCH BY RETURNING TO RAU
+    */
+        if (RA >= RAL &&  RA <  RAU &&  DECL <= DEC)
+        {
           //con = *CON;
-		  //printf("%s",CON);
-		  fclose(f2);
-		  return *CON;
-		}
-    else 
-		if(RAU <  RA) continue ;
-    else 
-		{		
-		fclose(f2);
-		break;
-		}	
-      }
+          //printf("%s",CON);
+          fclose(f2);
+          return *CON;
+        }
+        else
+            if(RAU <  RA)
+                continue;
+            else
+            {
+                fclose(f2);
+                break;
+            }
+    }
     return *CON;
 }
 
 bool DumpStarDatabase(istream& in, ostream& out)
-{ 
-    uint32 hi;		// HI catalog number
+{
+    uint32 hi;         // HI catalog number
     double rafrh;
     double rafrm;
-    double rah;		// right ascension hh
-    double ram;		// right ascension mm
-    double ras;		// right ascension ss
+    double rah;        // right ascension hh
+    double ram;        // right ascension mm
+    double ras;        // right ascension ss
     char *sign;
     double defrh;
-    double defrm;            
-    double ded;		// declination degrees
-    double dem;		// declination minutes
-    double des;		// declination seconds
-    uint16 sc;		// stellar class
-    double ly;		// light years
-    char buf[256];	// character buffer
-    
+    double defrm;
+    double ded;        // declination degrees
+    double dem;        // declination minutes
+    double des;        // declination seconds
+    uint16 sc;         // stellar class
+    double ly;         // light years
+    char buf[256];     // character buffer
 
-     	char header[8];
-	    in.read(header, sizeof header);
-	    if (strncmp(header, "CELSTARS", sizeof header))
-	    {
-	        cerr << "Missing header in star database.\n";
-	        return false;
-	    }
-	
-	    uint16 version = readUshort(in);
-	    if (version != 0x0100)
-	    {
-	        cerr << "Unsupported file version " << (version >> 8) << '.' <<
-	            (version & 0xff) << '\n';
-	        return false;
-	    }
-	
-	    uint32 nStarsInFile = readUint(in);
-	    if (!in.good())
-	    {
-	        cerr << "Error reading count of stars from database.\n";
-	        return false;
-	    }
 
-	    out << nStarsInFile << '\n';
-	    buf[0] = 0;
-	    printf("\n\nStart converting %d",nStarsInFile);
-	    printf(" records.\n");
-	
-	    for (uint32 i = 0; i < nStarsInFile; i++)
-	    {
-	        if (!in.good())
-	        {
-	            cerr << "Error reading from star database at record " << i << endl;
-	            return false;
-	        }
-		      if (i % 5000 == 0)
-	            printf(".");
-	            
-	        uint32 catalogNum    = readUint(in);			
-	        float  x            = readFloat(in);
-	        float  y            = readFloat(in);
-	        float  z            = readFloat(in);
-	        int16  absMag        = readShort(in);
-	        uint16 stellarClass  = readUshort(in);
-	        double pi = 3.14159265358979323846;
-	        
-			//distance = sqrt(x^2 + y^2 + z^2) in ly
-	        double distance = sqrt(pow(x,2)+pow(y,2)+pow(z,2));
-	        
-			//ecliptic longitude lambda = atan(-z/x) ==> 
-	        //(atan2 > gives correct quadrant for all atan functions)
-	        double lambda = atan2(-z,x);
-	        
-			//ecliptic latitude beta = atan2(y/sqrt(x^2+z^2))       											  
-	        double beta = atan2(y,(sqrt(pow(x,2)+pow(z,2))));
-	        
-			//J2000.0 obliquity of the ecliptic (epsilon) = 23.4392911 deg (deg2rad)     
-	        double epsilon = 23.4392911/180.0*pi;
-	       
-			//Convert ecliptic coordinates to RA (alpha)
-	        double RAc = (atan2((sin(lambda)*cos(epsilon)-tan(beta)*sin(epsilon)),(cos(lambda))))*(180.0f/pi);
-	        if (RAc < 0)
-	        	{
-	        	RAc = RAc + 360;
-	        	}
-	        
-			//Convert ecliptic coordinates to declination (delta)	
-	        double dec = (asin(sin(beta)*cos(epsilon)+cos(beta)*sin(epsilon)*sin(lambda)))* (180.0f/pi);
-			
-			// 1 parsec is 3.26167 ly > 1 ly = 0,30659141 parsec
-	        double appMag = absMag/256.0 - 5.0 + 5.0*log10(distance/3.26167f);     
-	        double parallax = 3.26167f/distance*1000;
-	        
-	        hi = catalogNum;
-	        double ra = RAc;
-		    double de = dec;
-		    double pa = parallax;
-	        double am = appMag;			
-			sc = stellarClass;		
-			ly = distance;
-        
-			rafrh=modf((ra/15.0),&rah);
-			rafrm=modf((rafrh*60),&ram);
-			ras=rafrm*60;
-			defrh=modf(de,&ded);
-			defrm=modf((defrh*60),&dem);
-			des=defrm*60;
-			if (de < 0.0)
-				{
-					sign="-";
-					ded=-ded;
-					dem=-dem;
-				des=-des;
-				}
-			else if (de > 0.0)
-				sign= "+";
-				
-			// write HIP number
-			sprintf(buf,"%d  ",hi);
-			out << std::setfill (' ') << std::setw(8) << buf;
-			
-			// write data
-			sprintf(buf,"%.9f ",ra);   // ra in degrees
-			out << std::setfill (' ') << std::setw(14) << buf;            
-	    
-			sprintf(buf,"%s",sign);     // +/-sign
-			out << buf;
-			double abs_de = abs(de);
-			sprintf(buf,"%.9f ",abs_de);    //de in degrees
-			out << std::setfill ('0') << std::setw(13) << buf;     
-		
-			sprintf(buf,"%.6f ",ly);
-			out << std::setfill (' ') << std::setw(12) << buf;		             
-	
-			sprintf(buf,"%.2f ",am);
-			out << std::setfill (' ') << std::setw(6) << buf;
-			//For test purpose only - write the sc-bytes in hex(0xnnnn):
-			//   out << "0x" << std::setfill ('0') << std::setw(4) << hex << stellarClass;
-			//   out << ' ';
-			printStellarClass(sc, out);
-							
-			// write system end tag
-			sprintf(buf,"\n",hi);
-			out << buf;
-       }
-                 		
+    char header[8];
+    in.read(header, sizeof header);
+    if (strncmp(header, "CELSTARS", sizeof header))
+    {
+        cerr << "Missing header in star database.\n";
+        return false;
+    }
+
+    uint16 version = readUshort(in);
+    if (version != 0x0100)
+    {
+        cerr << "Unsupported file version " << (version >> 8) << '.' <<
+                (version & 0xff) << '\n';
+        return false;
+    }
+
+    uint32 nStarsInFile = readUint(in);
+    if (!in.good())
+    {
+        cerr << "Error reading count of stars from database.\n";
+        return false;
+    }
+
+    out << nStarsInFile << '\n';
+    buf[0] = 0;
+    printf("\n\nStart converting %d", nStarsInFile);
+    printf(" records.\n");
+
+    for (uint32 i = 0; i < nStarsInFile; i++)
+    {
+        if (!in.good())
+        {
+            cerr << "Error reading from star database at record " << i << endl;
+            return false;
+        }
+        if (i % 5000 == 0)
+            printf(".");
+
+        uint32 catalogNum    = readUint(in);
+        float  x             = readFloat(in);
+        float  y             = readFloat(in);
+        float  z             = readFloat(in);
+        int16  absMag        = readShort(in);
+        uint16 stellarClass  = readUshort(in);
+        double pi = 3.14159265358979323846;
+
+        //distance = sqrt(x^2 + y^2 + z^2) in ly
+        double distance = sqrt(pow(x,2)+pow(y,2)+pow(z,2));
+
+        //ecliptic longitude lambda = atan(-z/x) ==>
+        //(atan2 > gives correct quadrant for all atan functions)
+        double lambda = atan2(-z,x);
+
+        //ecliptic latitude beta = atan2(y/sqrt(x^2+z^2))
+        double beta = atan2(y,(sqrt(pow(x,2)+pow(z,2))));
+
+        //J2000.0 obliquity of the ecliptic (epsilon) = 23.4392911 deg (deg2rad)
+        double epsilon = 23.4392911/180.0*pi;
+
+        //Convert ecliptic coordinates to RA (alpha)
+        double RAc = (atan2((sin(lambda)*cos(epsilon)-tan(beta)*sin(epsilon)),(cos(lambda))))*(180.0f/pi);
+        if (RAc < 0)
+        {
+            RAc = RAc + 360;
+        }
+
+        //Convert ecliptic coordinates to declination (delta)
+        double dec = (asin(sin(beta)*cos(epsilon)+cos(beta)*sin(epsilon)*sin(lambda)))* (180.0f/pi);
+
+        // 1 parsec is 3.26167 ly > 1 ly = 0,30659141 parsec
+        double appMag = absMag/256.0 - 5.0 + 5.0*log10(distance/3.26167f);
+        double parallax = 3.26167f/distance*1000;
+
+        hi = catalogNum;
+        double ra = RAc;
+        double de = dec;
+        double pa = parallax;
+        double am = appMag;
+        sc = stellarClass;
+        ly = distance;
+
+        rafrh=modf((ra/15.0),&rah);
+        rafrm=modf((rafrh*60),&ram);
+        ras=rafrm*60;
+        defrh=modf(de,&ded);
+        defrm=modf((defrh*60),&dem);
+        des=defrm*60;
+        if (de < 0.0)
+        {
+            sign = "-";
+            ded = -ded;
+            dem = -dem;
+            des = -des;
+        }
+        else if (de > 0.0)
+            sign= "+";
+
+        // write HIP number
+        sprintf(buf,"%d  ",hi);
+        out << std::setfill (' ') << std::setw(8) << buf;
+
+        // write data
+        sprintf(buf,"%.9f ",ra);   // ra in degrees
+        out << std::setfill (' ') << std::setw(14) << buf;
+
+        sprintf(buf,"%s",sign);     // +/-sign
+        out << buf;
+        double abs_de = abs(de);
+        sprintf(buf,"%.9f ",abs_de);    //de in degrees
+        out << std::setfill ('0') << std::setw(13) << buf;
+
+        sprintf(buf,"%.6f ",ly);
+        out << std::setfill (' ') << std::setw(12) << buf;
+
+        sprintf(buf,"%.2f ",am);
+        out << std::setfill (' ') << std::setw(6) << buf;
+        //For test purpose only - write the sc-bytes in hex(0xnnnn):
+        //   out << "0x" << std::setfill ('0') << std::setw(4) << hex << stellarClass;
+        //   out << ' ';
+        printStellarClass(sc, out);
+
+        // write system end tag
+        sprintf(buf,"\n",hi);
+        out << buf;
+   }
+
    printf("\n\n      Done....!\n");
-   return true;	
+   return true;
 }
 
 bool Convert2csv(istream& in, ostream& out,bool all)
-{ 
-    uint32 hi;		// HI catalog number
+{
+    uint32 hi;        // HI catalog number
     double rafrh;
     double rafrm;
-    double rah;		// right ascension hh
-    double ram;		// right ascension mm
-    double ras;		// right ascension ss
+    double rah;       // right ascension hh
+    double ram;       // right ascension mm
+    double ras;       // right ascension ss
     char *sign;
     double defrh;
-    double defrm;            
-    double ded;		// declination degrees
-    double dem;		// declination minutes
-    double des;		// declination seconds
-    uint16 sc;		// stellar class
-    double ly;		// light years
-    char buf[256];	// character buffer
-    
+    double defrm;
+    double ded;       // declination degrees
+    double dem;       // declination minutes
+    double des;       // declination seconds
+    uint16 sc;        // stellar class
+    double ly;        // light years
+    char buf[256];    // character buffer
 
-     	char header[8];
-	    in.read(header, sizeof header);
-	    if (strncmp(header, "CELSTARS", sizeof header))
-	    {
-	        cerr << "Missing header in star database.\n";
-	        return false;
-	    }
-	
-	    uint16 version = readUshort(in);
-	    if (version != 0x0100)
-	    {
-	        cerr << "Unsupported file version " << (version >> 8) << '.' <<
-	            (version & 0xff) << '\n';
-	        return false;
-	    }
-	
-	    uint32 nStarsInFile = readUint(in);
-	    if (!in.good())
-	    {
-	        cerr << "Error reading count of stars from database.\n";
-	        return false;
-	    }
 
-		if (all)
-		{	 
-			buf[0] = 0;
-			int len = 0;
-			printf("\n");
-			printf("  Enter a year. and 2 digits. Leave empty for Epoch J1991.25\n");
-			printf("  as been used for RA and DEC in the Hipparcos table.\n\n");
-			printf("  CONSTELLATIONS derived from POSITION for Epoch(JJJJ.nn): ") ;
-			gets(buf) ;
-			len = StringLength(buf);
-			printf("%d", len);
-			if ( len > 4)
-			{ 
-				Ein = atof(buf) ;
-			}
-			else if (len == 0 )
-			{
-				sprintf(buf,"%s",dEin);
-				Ein = atof(buf);
-			}
-			else
-			{
-				printf("\nWrong input. Epoch 1991.25 will be used instead.");
-				sprintf(buf,"%s",dEin);
-				Ein = atof(buf);
-			}
-			printf("\n");
-			printf(" %d ", len);
-		    printf("Start converting %d",nStarsInFile);
-		    printf(" records for Epoch %6.2f",Ein);
-		    printf("\n");
-	         // write header
-			sprintf(buf,"HIP number;Constellation(J%6.2f);RAdeg(J%6.2f);DECdeg(J%6.2f);",Ein,Ein,Ein);
-	        out << buf;
-			sprintf(buf,"RA(hms);DEC(dms);Distance(LY);Parallax;AppMag;AbsMag;Stellar Class\n");
-			out << buf;
-		}
-		else 
-			out << HEADER_NEW;
+    char header[8];
+    in.read(header, sizeof header);
+    if (strncmp(header, "CELSTARS", sizeof header))
+    {
+        cerr << "Missing header in star database.\n";
+        return false;
+    }
+
+    uint16 version = readUshort(in);
+    if (version != 0x0100)
+    {
+        cerr << "Unsupported file version " << (version >> 8) << '.' <<
+                (version & 0xff) << '\n';
+        return false;
+    }
+
+    uint32 nStarsInFile = readUint(in);
+    if (!in.good())
+    {
+        cerr << "Error reading count of stars from database.\n";
+        return false;
+    }
+
+    if (all)
+    {
+        buf[0] = 0;
+        int len = 0;
+        printf("\n");
+        printf("  Enter a year. and 2 digits. Leave empty for Epoch J1991.25\n");
+        printf("  as been used for RA and DEC in the Hipparcos table.\n\n");
+        printf("  CONSTELLATIONS derived from POSITION for Epoch(JJJJ.nn): ");
+        gets(buf);
+        len = StringLength(buf);
+        printf("%d", len);
+        if (len > 4)
+        {
+            Ein = atof(buf) ;
+        }
+        else if (len == 0 )
+        {
+            sprintf(buf,"%s",dEin);
+            Ein = atof(buf);
+        }
+        else
+        {
+            printf("\nWrong input. Epoch 1991.25 will be used instead.");
+            sprintf(buf,"%s",dEin);
+            Ein = atof(buf);
+        }
+        printf("\n");
+        printf(" %d ", len);
+        printf("Start converting %d",nStarsInFile);
+        printf(" records for Epoch %6.2f",Ein);
+        printf("\n");
+        // write header
+        sprintf(buf,"HIP number;Constellation(J%6.2f);RAdeg(J%6.2f);DECdeg(J%6.2f);",Ein,Ein,Ein);
+        out << buf;
+        sprintf(buf,"RA(hms);DEC(dms);Distance(LY);Parallax;AppMag;AbsMag;Stellar Class\n");
+        out << buf;
+    }
+    else
+        out << HEADER_NEW;
         //HEADER_NEW = "HIP number;RAdeg;DECdeg;RA(hms);DEC(dms);Distance(LY);Parallax;AppMag;AbsMag;StellarClass\n"
-	    
-		for (uint32 i = 0; i < nStarsInFile; i++)
-	    {
-	        if (!in.good())
-	        {
-	            cerr << "Error reading from star database at record " << i << endl;
-	            return false;
-	        }
-		if (i % 5000 == 0)
-	            printf(".");
-	            
-		uint32 catalogNum    = readUint(in);
-	    float  x            = readFloat(in);
-	    float  y            = readFloat(in);
-	    float  z            = readFloat(in);
-	    int16  absMag        = readShort(in);
-	    uint16 stellarClass  = readUshort(in);
-	        
-	    double pi = 3.14159265358979323846;
-	    double distance = sqrt(pow(x,2)+pow(y,2)+pow(z,2));
-	    double lambda = atan2(-z,x);       
-	    double beta = atan2(y,(sqrt(pow(x,2)+pow(z,2))));    
-	    double epsilon = 23.4392911/180.0*pi;
-	    double RAc = (atan2((sin(lambda)*cos(epsilon)-tan(beta)*sin(epsilon)),(cos(lambda))))*(180.0f/pi);
-	    if (RAc < 0)
-		{
-	    	RAc = RAc + 360;
-		}
-	    double dec = (asin(sin(beta)*cos(epsilon)+cos(beta)*sin(epsilon)*sin(lambda)))* (180.0f/pi); 
-        double appMag = absMag/256.0 - 5.0 + 5.0*log10(distance/3.26167f);     
+
+    for (uint32 i = 0; i < nStarsInFile; i++)
+    {
+        if (!in.good())
+        {
+            cerr << "Error reading from star database at record " << i << endl;
+            return false;
+        }
+        if (i % 5000 == 0)
+            printf(".");
+
+        uint32 catalogNum   = readUint(in);
+        float  x            = readFloat(in);
+        float  y            = readFloat(in);
+        float  z            = readFloat(in);
+        int16  absMag       = readShort(in);
+        uint16 stellarClass = readUshort(in);
+
+        double pi = 3.14159265358979323846;
+        double distance = sqrt(pow(x,2)+pow(y,2)+pow(z,2));
+        double lambda = atan2(-z,x);
+        double beta = atan2(y,(sqrt(pow(x,2)+pow(z,2))));
+        double epsilon = 23.4392911/180.0*pi;
+        double RAc = (atan2((sin(lambda)*cos(epsilon)-tan(beta)*sin(epsilon)),(cos(lambda))))*(180.0f/pi);
+        if (RAc < 0)
+        {
+            RAc = RAc + 360;
+        }
+        double dec = (asin(sin(beta)*cos(epsilon)+cos(beta)*sin(epsilon)*sin(lambda)))* (180.0f/pi);
+        double appMag = absMag/256.0 - 5.0 + 5.0*log10(distance/3.26167f);
         double parallax = 3.26167f/distance*1000;
-	        
+
         hi = catalogNum;
         double ra = RAc;
-		double de = dec;
-		double pa = parallax;
-        double am = appMag;			
-		sc = stellarClass;		
-		ly = distance;
-        
-        rafrh=modf((ra/15.0),&rah);
-		rafrm=modf((rafrh*60),&ram);
-		ras=rafrm*60;
-		defrh=modf(de,&ded);
-		defrm=modf((defrh*60),&dem);
-		des=defrm*60;
-		if (de < 0.0)
-			{
-				sign="-";
-				ded=-ded;
-				dem=-dem;
-				des=-des;
-			}
-		else if (de >= 0.0)		   	
-			   sign= "+";
+        double de = dec;
+        double pa = parallax;
+        double am = appMag;
+        sc = stellarClass;
+        ly = distance;
 
-		// write HIP number
-		sprintf(buf,"%d;",hi);
-		out << buf;
-			
-		// write data
-		if (all)
-			{
-			  con2find(Ein,RA2c,DE2c);
-		
-		      sprintf(buf,"%s;",CON);
-		      out << buf;
-			}
-		sprintf(buf,"%.9f;",ra);   // ra in degrees
-		out << buf;
-		
-		sprintf(buf,"%.9f;",de);    //de in degrees
+        rafrh=modf((ra/15.0),&rah);
+        rafrm=modf((rafrh*60),&ram);
+        ras=rafrm*60;
+        defrh=modf(de,&ded);
+        defrm=modf((defrh*60),&dem);
+        des=defrm*60;
+        if (de < 0.0)
+        {
+            sign="-";
+            ded=-ded;
+            dem=-dem;
+            des=-des;
+        }
+        else if (de >= 0.0)
+            sign= "+";
+
+        // write HIP number
+        sprintf(buf,"%d;",hi);
         out << buf;
 
-		sprintf(buf,"%.f:",rah);
-		out << std::setfill ('0') << std::setw(3) << buf;
-		sprintf(buf,"%.f:",ram);
-		out << std::setfill ('0') << std::setw(3) << buf;	
-		sprintf(buf,"%.2f;",ras);
-		out << buf;       
-	
-		sprintf(buf,"%s",sign);     // +/-sign
-		out << buf;       	
-		sprintf(buf,"%.f:",ded);     //de in degrees
-		out << std::setfill ('0') << std::setw(3) << buf;	       	
-		sprintf(buf,"%.f:",dem);     //de minutes
-		out << std::setfill ('0') << std::setw(3) << buf;      	
-		sprintf(buf,"%.2f;",des);     //de seconds
-		out << buf;
+        // write data
+        if (all)
+        {
+            con2find(Ein,RA2c,DE2c);
 
-	    sprintf(buf,"%.3f;",ly);
-		out << buf;
+            sprintf(buf,"%s;",CON);
+            out << buf;
+        }
+        sprintf(buf,"%.9f;",ra);   // ra in degrees
+        out << buf;
 
-		sprintf(buf,"%.2f;",pa);
-		out << buf;
+        sprintf(buf,"%.9f;",de);    //de in degrees
+        out << buf;
 
-		sprintf(buf,"%.2f;",am);
-		out << buf;
-	
-		sprintf(buf,"%.4f;",((float) absMag / 256.0f));
-		out << buf;	
-		
-		RA2c = ra * 24.0 / 360.0;
-		DE2c = de;
-			
-		printStellarClass(stellarClass, out);
-								
-		// write system end tag
-		sprintf(buf,"  \n",hi);
-		out << buf;
-      }
-                 		
-   printf("\n\n      Done....!\n");
-   return true;	
+        sprintf(buf,"%.f:",rah);
+        out << std::setfill ('0') << std::setw(3) << buf;
+        sprintf(buf,"%.f:",ram);
+        out << std::setfill ('0') << std::setw(3) << buf;
+        sprintf(buf,"%.2f;",ras);
+        out << buf;
+
+        sprintf(buf,"%s",sign);     // +/-sign
+        out << buf;
+        sprintf(buf,"%.f:",ded);     //de in degrees
+        out << std::setfill ('0') << std::setw(3) << buf;
+        sprintf(buf,"%.f:",dem);     //de minutes
+        out << std::setfill ('0') << std::setw(3) << buf;
+        sprintf(buf,"%.2f;",des);     //de seconds
+        out << buf;
+
+        sprintf(buf,"%.3f;",ly);
+        out << buf;
+
+        sprintf(buf,"%.2f;",pa);
+        out << buf;
+
+        sprintf(buf,"%.2f;",am);
+        out << buf;
+
+        sprintf(buf,"%.4f;",((float) absMag / 256.0f));
+        out << buf;
+
+        RA2c = ra * 24.0 / 360.0;
+        DE2c = de;
+
+        printStellarClass(stellarClass, out);
+
+        // write system end tag
+        sprintf(buf,"  \n",hi);
+        out << buf;
+    }
+
+    printf("\n\n      Done....!\n");
+    return true;
 }
 
 bool Const2csv(istream& in, ostream& out)
-{ 
-    uint32 hi;		// HI catalog number
+{
+    uint32 hi;        // HI catalog number
     double rafrh;
     double rafrm;
-    double rah;		// right ascension hh
-    double ram;		// right ascension mm
-    double ras;		// right ascension ss
+    double rah;       // right ascension hh
+    double ram;       // right ascension mm
+    double ras;       // right ascension ss
     char *sign;
     double defrh;
-    double defrm;            
-    double ded;		// declination degrees
-    double dem;		// declination minutes
-    double des;		// declination seconds
-    uint16 sc;		// stellar class
-    double ly;		// light years
-    char buf[256];	// character buffer
+    double defrm;
+    double ded;       // declination degrees
+    double dem;       // declination minutes
+    double des;       // declination seconds
+    uint16 sc;        // stellar class
+    double ly;        // light years
+    char buf[256];    // character buffer
 
-     	char header[8];
-	    in.read(header, sizeof header);
-	    if (strncmp(header, "CELSTARS", sizeof header))
-	    {
-	        cerr << "Missing header in star database.\n";
-	        return false;
-	    }
-	
-	    uint16 version = readUshort(in);
-	    if (version != 0x0100)
-	    {
-	        cerr << "Unsupported file version " << (version >> 8) << '.' <<
-	            (version & 0xff) << '\n';
-	        return false;
-	    }
-	
-	    uint32 nStarsInFile = readUint(in);
-	    if (!in.good())
-	    {
-	        cerr << "Error reading count of stars from database.\n";
-	        return false;
-	    }
-		    	 
-	    buf[0] = 0;
-		int len = 0;
-		printf("\n");
-	    printf("  Enter a year. and 2 digits. Leave empty is Epoch J1991.25\n");
-	    printf("  as been used for RA and DEC in the Hipparcos table.\n\n");
-	    printf("  CONSTELLATIONS derived from POSITION for Epoch(JJJJ.nn): ") ;
- 		gets(buf) ;
-		len = StringLength(buf);
-		
-		if ( len > 4)
-		{ 
- 			Ein = atof(buf) ;
-		}
-		else if (len == 0 )
-		{
-			sprintf(buf,"%s",dEin);
-			Ein = atof(buf);
-		}
-		else
-		{
-			printf("\nWrong input. Epoch 1991.25 will be used instead.");
-			sprintf(buf,"%s",dEin);
-			Ein = atof(buf);
-		}
-		printf("\n\n");
-		printf(" %d ", len);
-	    printf("Start converting %d",nStarsInFile);
-	    printf(" records for Epoch %6.2f",Ein);
-	    printf("\n");
+    char header[8];
+    in.read(header, sizeof header);
+    if (strncmp(header, "CELSTARS", sizeof header))
+    {
+        cerr << "Missing header in star database.\n";
+        return false;
+    }
 
-	    // write header
-		sprintf(buf,"HIP number;Constellation(J%6.2f);RAdeg(J%6.2f);DecDeg(J%6.2f);",Ein,Ein,Ein);
-        out << buf;
-		sprintf(buf,"RA2c(h);DE2c(Deg);RAh(B1875.0);DECdeg(B1875.0)\n");
-		out << buf;
-        
-		// calculate data for each star
-	    for (uint32 i = 0; i < nStarsInFile; i++)
-	    {
-	        if (!in.good())
-	        {
-	            cerr << "Error reading from star database at record " << i << endl;
-	            return false;
-	        }
-		if (i % 5000 == 0)
-	            printf(".");
-	    // read stardb.dat        
-	    uint32 catalogNum    = readUint(in);
-	    float  x            = readFloat(in);
-	    float  y            = readFloat(in);
-	    float  z            = readFloat(in);
-	    int16  absMag        = readShort(in);
-	    uint16 stellarClass  = readUshort(in);
+    uint16 version = readUshort(in);
+    if (version != 0x0100)
+    {
+        cerr << "Unsupported file version " << (version >> 8) << '.' <<
+                (version & 0xff) << '\n';
+        return false;
+    }
 
-	    double pi = 3.14159265358979323846;
-	    double distance = sqrt(pow(x,2)+pow(y,2)+pow(z,2));
-	    double lambda = atan2(-z,x);       
-	    double beta = atan2(y,(sqrt(pow(x,2)+pow(z,2))));    
-	    double epsilon = 23.4392911/180.0*pi;
-	    double RAc = (atan2((sin(lambda)*cos(epsilon)-tan(beta)*sin(epsilon)),(cos(lambda))))*(180.0f/pi);
-	    if (RAc < 0)
-	        {
-	          RAc = RAc + 360;
-	        }
-	    double dec = (asin(sin(beta)*cos(epsilon)+cos(beta)*sin(epsilon)*sin(lambda)))* (180.0f/pi); 
-	    double appMag = absMag/256.0 - 5.0 + 5.0*log10(distance/3.26167f);     
-	    double parallax = 3.26167f/distance*1000;	        
-	    hi = catalogNum;
-	    double ra = RAc;
-		double de = dec;
-		double pa = parallax;
-	    double am = appMag;			
-		sc = stellarClass;		
-		ly = distance;        
+    uint32 nStarsInFile = readUint(in);
+    if (!in.good())
+    {
+        cerr << "Error reading count of stars from database.\n";
+        return false;
+    }
+
+    buf[0] = 0;
+    int len = 0;
+    printf("\n");
+    printf("  Enter a year. and 2 digits. Leave empty is Epoch J1991.25\n");
+    printf("  as been used for RA and DEC in the Hipparcos table.\n\n");
+    printf("  CONSTELLATIONS derived from POSITION for Epoch(JJJJ.nn): ") ;
+    gets(buf);
+    len = StringLength(buf);
+
+    if (len > 4)
+    {
+        Ein = atof(buf) ;
+    }
+    else if (len == 0 )
+    {
+        sprintf(buf,"%s",dEin);
+        Ein = atof(buf);
+    }
+    else
+    {
+        printf("\nWrong input. Epoch 1991.25 will be used instead.");
+        sprintf(buf,"%s",dEin);
+        Ein = atof(buf);
+    }
+    printf("\n\n");
+    printf(" %d ", len);
+    printf("Start converting %d",nStarsInFile);
+    printf(" records for Epoch %6.2f",Ein);
+    printf("\n");
+
+    // write header
+    sprintf(buf,"HIP number;Constellation(J%6.2f);RAdeg(J%6.2f);DecDeg(J%6.2f);",Ein,Ein,Ein);
+    out << buf;
+    sprintf(buf,"RA2c(h);DE2c(Deg);RAh(B1875.0);DECdeg(B1875.0)\n");
+    out << buf;
+
+    // calculate data for each star
+    for (uint32 i = 0; i < nStarsInFile; i++)
+    {
+        if (!in.good())
+        {
+            cerr << "Error reading from star database at record " << i << endl;
+            return false;
+        }
+        if (i % 5000 == 0)
+             printf(".");
+        // read stardb.dat
+        uint32 catalogNum   = readUint(in);
+        float  x            = readFloat(in);
+        float  y            = readFloat(in);
+        float  z            = readFloat(in);
+        int16  absMag       = readShort(in);
+        uint16 stellarClass = readUshort(in);
+
+        double pi = 3.14159265358979323846;
+        double distance = sqrt(pow(x,2)+pow(y,2)+pow(z,2));
+        double lambda = atan2(-z,x);
+        double beta = atan2(y,(sqrt(pow(x,2)+pow(z,2))));
+        double epsilon = 23.4392911/180.0*pi;
+        double RAc = (atan2((sin(lambda)*cos(epsilon)-tan(beta)*sin(epsilon)),(cos(lambda))))*(180.0f/pi);
+        if (RAc < 0)
+        {
+            RAc = RAc + 360;
+        }
+        double dec = (asin(sin(beta)*cos(epsilon)+cos(beta)*sin(epsilon)*sin(lambda)))* (180.0f/pi);
+        double appMag = absMag/256.0 - 5.0 + 5.0*log10(distance/3.26167f);
+        double parallax = 3.26167f/distance*1000;
+        hi = catalogNum;
+        double ra = RAc;
+        double de = dec;
+        double pa = parallax;
+        double am = appMag;
+        sc = stellarClass;
+        ly = distance;
         rafrh=modf((ra/15.0),&rah);
-		rafrm=modf((rafrh*60),&ram);
-		ras=rafrm*60;
-		defrh=modf(de,&ded);
-		defrm=modf((defrh*60),&dem);
-		des=defrm*60;
-		if (de < 0.0)
-			{
-				sign="-";
-				ded=-ded;
-				dem=-dem;
-				des=-des;
-			}
-		else sign= "+";
-		RA2c = ra * 24.0 / 360.0;   // to be used for constellation
-		DE2c = de;
-		//Determine Constellation
+        rafrm=modf((rafrh*60),&ram);
+        ras=rafrm*60;
+        defrh=modf(de,&ded);
+        defrm=modf((defrh*60),&dem);
+        des=defrm*60;
+        if (de < 0.0)
+        {
+            sign="-";
+            ded=-ded;
+            dem=-dem;
+            des=-des;
+        }
+        else sign= "+";
+        RA2c = ra * 24.0 / 360.0;   // to be used for constellation
+        DE2c = de;
+        //Determine Constellation
         con2find(Ein,RA2c,DE2c);
 
-		// write HIP number
-		sprintf(buf,"%d;",hi);
-		out << buf;
+        // write HIP number
+        sprintf(buf,"%d;",hi);
+        out << buf;
 
-		// write Constellation
-		sprintf(buf,"%s;",CON);
-		out << buf;
+        // write Constellation
+        sprintf(buf,"%s;",CON);
+        out << buf;
 
         // write data
 
         // ra in degrees for Epoch JYYYY.nn (default = J1991.25 > Hipparcos)
-		sprintf(buf,"%.9f;",ra);
-		out << buf;
+        sprintf(buf,"%.9f;",ra);
+        out << buf;
 
-	    //de in degrees for Epoch JYYYY.nn (default = J1991.25 > Hipparcos)
-		sprintf(buf,"%.9f;",de);
-		out << buf;
+        //de in degrees for Epoch JYYYY.nn (default = J1991.25 > Hipparcos)
+        sprintf(buf,"%.9f;",de);
+        out << buf;
 
         // ra in hh.ddddd - input for determine constellation
-		sprintf(buf,"%.8f;",RA2c);
-		out << buf;
+        sprintf(buf,"%.8f;",RA2c);
+        out << buf;
 
-	    //de in degrees - input for determine constellation
-		sprintf(buf,"%.8f;",DE2c);
-		out << buf;
+        //de in degrees - input for determine constellation
+        sprintf(buf,"%.8f;",DE2c);
+        out << buf;
 
         // ra in hh.ddddd - output RA Epoch B1875.0
-		sprintf(buf,"%.8f;",RA);
-		out << buf;
+        sprintf(buf,"%.8f;",RA);
+        out << buf;
+
+        //de in degrees - output DE Epoch B1875.0
+        sprintf(buf,"%.8f",DEC);
+        out << buf;
+
+        // write system end tag
+        sprintf(buf,"  \n",hi);
+        out << buf;
+   }
 
-	    //de in degrees - output DE Epoch B1875.0
-		sprintf(buf,"%.8f",DEC);
-		out << buf;      
-		
-		// write system end tag
-		sprintf(buf,"  \n",hi);
-		out << buf;
-            }
-                 		
    printf("\n\n      Done....!\n");
-   return true;	
+   return true;
 }
 
 int StringLength (char x[])
 {
-	int counter = 0;
-	for (int index = 0; index < 80; index++)
-	{
-		if (x[index] == '\0')
-			break;
-			counter ++;
-		
-	}
-	return counter;
+    int counter = 0;
+    for (int index = 0; index < 80; index++)
+    {
+        if (x[index] == '\0')
+            break;
+        counter++;
+
+    }
+    return counter;
 }
 bool parseCommandLine(int argc, char* argv[])
 {
@@ -854,12 +854,12 @@ bool parseCommandLine(int argc, char* argv[])
     while (i < argc)
     {
         if (argv[i][0] == '-')
-        {           
+        {
             if (!strcmp(argv[i], "-a") || !strcmp(argv[i], "--all"))
-            {               				
-				DumpAll = true;
+            {
+                DumpAll = true;
             }
-			else if (!strcmp(argv[i], "-c") || !strcmp(argv[i], "--convert"))
+            else if (!strcmp(argv[i], "-c") || !strcmp(argv[i], "--convert"))
             {
                 convert = true;
             }
@@ -867,7 +867,7 @@ bool parseCommandLine(int argc, char* argv[])
             {
                 useXindexDump = true;
             }
-			else if (!strcmp(argv[i], "-l") || !strcmp(argv[i], "--list"))
+            else if (!strcmp(argv[i], "-l") || !strcmp(argv[i], "--list"))
             {
                 ConstDump = true;
             }
@@ -911,14 +911,14 @@ int main(int argc, char* argv[])
         Usage();
         return 1;
     }
-    
+
     ifstream stardbFile(inputFilename.c_str(), ios::in | ios::binary);
     if (!stardbFile.good())
     {
         cerr << "Error opening star database file " << inputFilename << '\n';
         return 1;
     }
-    
+
     bool success;
     ostream* out = &cout;
     if (!outputFilename.empty())
@@ -931,21 +931,21 @@ int main(int argc, char* argv[])
         }
     }
 
-    if (useXindexDump)    
+    if (useXindexDump)
     {
         success = DumpxRefDatabase(stardbFile, *out);
     }
-    else if (convert)    
-    {   
+    else if (convert)
+    {
         success = Convert2csv(stardbFile, *out,DumpAll);
     }
-	else if (ConstDump)    
-    {   	        
-		success = Const2csv(stardbFile, *out);
+    else if (ConstDump)
+    {
+        success = Const2csv(stardbFile, *out);
     }
     else
     {
         success = DumpStarDatabase(stardbFile, *out);
     }
     return success ? 0 : 1;
-}
\ No newline at end of file
+}
diff --git a/src/tools/stardb/makexindex.cpp b/src/tools/stardb/makexindex.cpp
index ae5504f8a..d0b6dd2ab 100644
--- a/src/tools/stardb/makexindex.cpp
+++ b/src/tools/stardb/makexindex.cpp
@@ -89,7 +89,7 @@ bool WriteCrossIndex(istream& in, ostream& out)
 
     // Write the version
     writeShort(out, 0x0100);
-    
+
     unsigned int record = 0;
     while (!in.eof())
     {
diff --git a/src/tools/stardb/startextdump.cpp b/src/tools/stardb/startextdump.cpp
index 560c881d8..cfb240345 100644
--- a/src/tools/stardb/startextdump.cpp
+++ b/src/tools/stardb/startextdump.cpp
@@ -173,8 +173,8 @@ bool DumpOldStarDatabase(istream& in, ostream& out, ostream* hdOut,
         uint16 stellarClass  = readUshort(in);
         uint8  parallaxError = readUbyte(in);
 
-	// Compute distance based on parallax
-	double distance = LY_PER_PARSEC / (parallax > 0.0 ? parallax / 1000.0 : 1e-6);
+        // Compute distance based on parallax
+        double distance = LY_PER_PARSEC / (parallax > 0.0 ? parallax / 1000.0 : 1e-6);
         out << catalogNum << ' ';
         out << setprecision(8);