diff --git a/src/OpenTK/Platform/Linux/Bindings/Evdev.cs b/src/OpenTK/Platform/Linux/Bindings/Evdev.cs
index bf49623d..50e617f8 100644
--- a/src/OpenTK/Platform/Linux/Bindings/Evdev.cs
+++ b/src/OpenTK/Platform/Linux/Bindings/Evdev.cs
@@ -472,7 +472,7 @@ namespace OpenTK.Platform.Linux
         MT_TOOL_Y       = 0x3d,    /* Center Y tool position */
 
         MAX         = 0x3f,
-        CNT         = (MAX+1),
+        CNT         = (MAX + 1),
     }
 
     internal enum EvdevButton
@@ -579,7 +579,7 @@ namespace OpenTK.Platform.Linux
         PWR = 0x16,
         FF_STATUS = 0x17,
         MAX = 0x1f,
-        CNT = (MAX+1),
+        CNT = (MAX + 1),
     }
 
     internal enum EvdevIoctl : uint
diff --git a/src/OpenTK/Platform/Windows/API.cs b/src/OpenTK/Platform/Windows/API.cs
index 3c716ba1..5992b63d 100644
--- a/src/OpenTK/Platform/Windows/API.cs
+++ b/src/OpenTK/Platform/Windows/API.cs
@@ -3326,7 +3326,7 @@ namespace OpenTK.Platform.Windows
         /*
          * NEC PC-9800 kbd definitions
          */
-        OEM_NEC_EQUAL= 0x92,  // '=' key on numpad
+        OEM_NEC_EQUAL = 0x92,  // '=' key on numpad
 
         /*
          * Fujitsu/OASYS kbd definitions
diff --git a/src/OpenTK/Platform/Windows/XInputJoystick.cs b/src/OpenTK/Platform/Windows/XInputJoystick.cs
index 8aa6823b..bf17115c 100644
--- a/src/OpenTK/Platform/Windows/XInputJoystick.cs
+++ b/src/OpenTK/Platform/Windows/XInputJoystick.cs
@@ -81,7 +81,7 @@ namespace OpenTK.Platform.Windows
         {
             XInputButtons dir = 0;
 
-            dir =XInputButtons.DPadUp | XInputButtons.DPadLeft;
+            dir = XInputButtons.DPadUp | XInputButtons.DPadLeft;
             if ((buttons & dir) == dir)
             {
                 return HatPosition.UpLeft;
diff --git a/src/OpenTK/Platform/X11/API.cs b/src/OpenTK/Platform/X11/API.cs
index 6ad1fd29..5a9f0ee0 100644
--- a/src/OpenTK/Platform/X11/API.cs
+++ b/src/OpenTK/Platform/X11/API.cs
@@ -677,7 +677,7 @@ XF86VidModeGetGammaRampSize(
 
         public override string ToString ()
         {
-            return string.Format("MotifWmHints <flags={0}, functions={1}, decorations={2}, input_mode={3}, status={4}", (MotifFlags) flags.ToInt32 (), (MotifFunctions) functions.ToInt32 (), (MotifDecorations) decorations.ToInt32 (), (MotifInputMode) input_mode.ToInt32 (), status.ToInt32 ());
+            return string.Format("MotifWmHints <flags={0}, functions={1}, decorations={2}, input_mode={3}, status={4}", (MotifFlags)flags.ToInt32 (), (MotifFunctions)functions.ToInt32 (), (MotifDecorations)decorations.ToInt32 (), (MotifInputMode)input_mode.ToInt32 (), status.ToInt32 ());
         }
     }
 
@@ -764,26 +764,26 @@ XF86VidModeGetGammaRampSize(
 
     internal enum WindowState
     {
-        Sticky           = (1<<0), /* everyone knows sticky */
-        Minimized        = (1<<1), /* ??? */
-        MaximizedVertically = (1<<2), /* window in maximized V state */
-        MaximizedHorizontally = (1<<3), /* window in maximized H state */
-        Hidden           = (1<<4), /* not on taskbar but window visible */
-        Shaded           = (1<<5), /* shaded (NeXT style), */
-        HID_WORKSPACE    = (1<<6), /* not on current desktop */
-        HID_TRANSIENT    = (1<<7), /* owner of transient is hidden */
-        FixedPosition    = (1<<8), /* window is fixed in position even */
-        ArrangeIgnore    = (1<<9),  /* ignore for auto arranging */
+        Sticky           = (1 << 0), /* everyone knows sticky */
+        Minimized        = (1 << 1), /* ??? */
+        MaximizedVertically = (1 << 2), /* window in maximized V state */
+        MaximizedHorizontally = (1 << 3), /* window in maximized H state */
+        Hidden           = (1 << 4), /* not on taskbar but window visible */
+        Shaded           = (1 << 5), /* shaded (NeXT style), */
+        HID_WORKSPACE    = (1 << 6), /* not on current desktop */
+        HID_TRANSIENT    = (1 << 7), /* owner of transient is hidden */
+        FixedPosition    = (1 << 8), /* window is fixed in position even */
+        ArrangeIgnore    = (1 << 9),  /* ignore for auto arranging */
     }
 
     internal enum WindowHints
     {
-        SkipFocus = (1<<0), /* "alt-tab" skips this win */
-        SkipWinlist = (1<<1), /* not in win list */
-        SkipTaskbar = (1<<2), /* not on taskbar */
-        GroupTransient = (1<<3), /* ??????? */
-        FocusOnClick = (1<<4), /* app only accepts focus when clicked */
-        DoNotCover = (1<<5),  /* attempt to not cover this window */
+        SkipFocus = (1 << 0), /* "alt-tab" skips this win */
+        SkipWinlist = (1 << 1), /* not in win list */
+        SkipTaskbar = (1 << 2), /* not on taskbar */
+        GroupTransient = (1 << 3), /* ??????? */
+        FocusOnClick = (1 << 4), /* app only accepts focus when clicked */
+        DoNotCover = (1 << 5),  /* attempt to not cover this window */
     }
 
     internal enum ErrorCodes : int
@@ -811,28 +811,28 @@ XF86VidModeGetGammaRampSize(
     [Flags]
     internal enum CreateWindowMask : long//: ulong
     {
-        CWBackPixmap    = (1L<<0),
-        CWBackPixel     = (1L<<1),
-        CWSaveUnder        = (1L<<10),
-        CWEventMask        = (1L<<11),
-        CWDontPropagate    = (1L<<12),
-        CWColormap      = (1L<<13),
-        CWCursor        = (1L<<14),
-        CWBorderPixmap    = (1L<<2),
-        CWBorderPixel    = (1L<<3),
-        CWBitGravity    = (1L<<4),
-        CWWinGravity    = (1L<<5),
-        CWBackingStore    = (1L<<6),
-        CWBackingPlanes    = (1L<<7),
-        CWBackingPixel     = (1L<<8),
-        CWOverrideRedirect    = (1L<<9),
+        CWBackPixmap    = (1L << 0),
+        CWBackPixel     = (1L << 1),
+        CWSaveUnder        = (1L << 10),
+        CWEventMask        = (1L << 11),
+        CWDontPropagate    = (1L << 12),
+        CWColormap      = (1L << 13),
+        CWCursor        = (1L << 14),
+        CWBorderPixmap    = (1L << 2),
+        CWBorderPixel    = (1L << 3),
+        CWBitGravity    = (1L << 4),
+        CWWinGravity    = (1L << 5),
+        CWBackingStore    = (1L << 6),
+        CWBackingPlanes    = (1L << 7),
+        CWBackingPixel     = (1L << 8),
+        CWOverrideRedirect    = (1L << 9),
 
-        //CWY    = (1<<1),
-        //CWWidth    = (1<<2),
-        //CWHeight    = (1<<3),
-        //CWBorderWidth    = (1<<4),
-        //CWSibling    = (1<<5),
-        //CWStackMode    = (1<<6),
+        //CWY    = (1 << 1),
+        //CWWidth    = (1 << 2),
+        //CWHeight    = (1 << 3),
+        //CWBorderWidth    = (1 << 4),
+        //CWSibling    = (1 << 5),
+        //CWStackMode    = (1 << 6),
     }
 
     /// <summary>
@@ -1197,7 +1197,7 @@ XF86VidModeGetGammaRampSize(
         XF86AudioPrev = 0x1008ff16,
         XF86AudioNext = 0x1008ff17,
         XF86AudioRecord = 0x1008ff1c,
-        XF86AudioPause =0x1008ff31,
+        XF86AudioPause = 0x1008ff31,
         XF86AudioRewind = 0x1008ff3e,
         XF86AudioForward = 0x1008ff97,
         XF86Phone = 0x1008ff6e,
diff --git a/src/OpenTK/Platform/X11/Structs.cs b/src/OpenTK/Platform/X11/Structs.cs
index 67180c5e..4ec993c5 100644
--- a/src/OpenTK/Platform/X11/Structs.cs
+++ b/src/OpenTK/Platform/X11/Structs.cs
@@ -5,10 +5,10 @@
 // distribute, sublicense, and/or sell copies of the Software, and to
 // permit persons to whom the Software is furnished to do so, subject to
 // the following conditions:
-// 
+//
 // The above copyright notice and this permission notice shall be
 // included in all copies or substantial portions of the Software.
-// 
+//
 // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 // EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -1050,21 +1050,21 @@ namespace OpenTK.Platform.X11
         Sibling = 1 << 5,
         StackMode = 1 << 6,
 
-        //BackPixmap    (1L<<0)
-        //BackPixel    (1L<<1)
-        //SaveUnder    (1L<<10)
-        //EventMask    (1L<<11)
-        //DontPropagate    (1L<<12)
-        //Colormap    (1L<<13)
-        //Cursor    (1L<<14)
-        //BorderPixmap    (1L<<2)
-        //BorderPixel    (1L<<3)
-        //BitGravity    (1L<<4)
-        //WinGravity    (1L<<5)
-        //BackingStore    (1L<<6)
-        //BackingPlanes    (1L<<7)
-        //BackingPixel    (1L<<8)
-        OverrideRedirect = 1<<9,
+        //BackPixmap    (1L << 0)
+        //BackPixel    (1L << 1)
+        //SaveUnder    (1L << 10)
+        //EventMask    (1L << 11)
+        //DontPropagate    (1L << 12)
+        //Colormap    (1L << 13)
+        //Cursor    (1L << 14)
+        //BorderPixmap    (1L << 2)
+        //BorderPixel    (1L << 3)
+        //BitGravity    (1L << 4)
+        //WinGravity    (1L << 5)
+        //BackingStore    (1L << 6)
+        //BackingPlanes    (1L << 7)
+        //BackingPixel    (1L << 8)
+        OverrideRedirect = 1 << 9,
     }
 
     internal enum StackMode
@@ -1816,7 +1816,7 @@ namespace OpenTK.Platform.X11
                 mask = (byte*)Marshal.AllocHGlobal(mask_len);
                 for (int i = 0; i < mask_len; i++)
                 {
-                    mask[i] = (byte)((uint)m >> i*8);
+                    mask[i] = (byte)((uint)m >> i * 8);
                 }
             }
         }
diff --git a/src/OpenTK/Platform/X11/X11DisplayDevice.cs b/src/OpenTK/Platform/X11/X11DisplayDevice.cs
index 17eea955..966d6463 100644
--- a/src/OpenTK/Platform/X11/X11DisplayDevice.cs
+++ b/src/OpenTK/Platform/X11/X11DisplayDevice.cs
@@ -149,7 +149,7 @@ namespace OpenTK.Platform.X11
                     deviceToScreen.Add(dev, 0 /*screen.ScreenNumber*/);
                 }
             }
-            return (devices.Count>0);
+            return (devices.Count > 0);
         }
 
         private bool QueryXRandR(List<DisplayDevice> devices)
@@ -356,7 +356,7 @@ namespace OpenTK.Platform.X11
                     screen, current_resolution_index, new_resolution_index);
 
                 int ret = 0;
-                short refresh_rate =(short)(resolution != null ? resolution.RefreshRate : 0);
+                short refresh_rate = (short)(resolution != null ? resolution.RefreshRate : 0);
                 if (refresh_rate > 0)
                 {
                     ret = Functions.XRRSetScreenConfigAndRate(API.DefaultDisplay,