diff --git a/photobooth.c b/photobooth.c
index 626515f..7c23439 100644
--- a/photobooth.c
+++ b/photobooth.c
@@ -127,7 +127,7 @@ GST_DEBUG_CATEGORY_STATIC (photo_booth_debug);
 
 /* GObject / GApplication */
 static void photo_booth_activate (GApplication *app);
-static void photo_booth_open (GApplication  *app, GFile **files, gint n_files, const gchar *hint);
+static void photo_booth_open (GApplication *app, GFile **files, gint n_files, const gchar *hint);
 static void photo_booth_dispose (GObject *object);
 static void photo_booth_finalize (GObject *object);
 PhotoBooth *photo_booth_new (void);
@@ -1269,9 +1269,9 @@ static GstPadProbeReturn photo_booth_screensaver_unplug_continue (GstPad * pad,
 
 	g_mutex_lock (&priv->processing_mutex);
 
-        GstPad *sinkpad;
-        sinkpad = gst_element_get_static_pad (pb->video_sink, "sink");
-        priv->sink_block_id = gst_pad_add_probe (sinkpad, GST_PAD_PROBE_TYPE_DATA_DOWNSTREAM, _gst_video_probecb, pb, NULL);
+	GstPad *sinkpad;
+	sinkpad = gst_element_get_static_pad (pb->video_sink, "sink");
+	priv->sink_block_id = gst_pad_add_probe (sinkpad, GST_PAD_PROBE_TYPE_DATA_DOWNSTREAM, _gst_video_probecb, pb, NULL);
 
 	gst_element_query_position (priv->screensaver_playbin, GST_FORMAT_TIME, &priv->last_play_pos);
 	GST_DEBUG ("stop screensaver @ %" GST_TIME_FORMAT " %" GST_PTR_FORMAT " block_id=%lu", GST_TIME_ARGS (priv->last_play_pos), pad, priv->sink_block_id );
diff --git a/photobooth.h b/photobooth.h
index 183775b..3c7d1cc 100644
--- a/photobooth.h
+++ b/photobooth.h
@@ -126,9 +126,9 @@ struct _PhotoBoothClass
 	GtkApplicationClass parent_class;
 };
 
-GType   photo_booth_get_type    (void);
+GType       photo_booth_get_type (void);
 PhotoBooth *photo_booth_new (void);
-void    photo_booth_load_settings (PhotoBooth *pb, const gchar *filename);
+void        photo_booth_load_settings (PhotoBooth *pb, const gchar *filename);
 
 G_END_DECLS
 
diff --git a/photoboothled.c b/photoboothled.c
index 3872dc7..44b62b2 100644
--- a/photoboothled.c
+++ b/photoboothled.c
@@ -36,7 +36,7 @@ static void photo_booth_led_class_init (PhotoBoothLedClass *klass)
 
 	GST_DEBUG_CATEGORY_INIT (photo_booth_led_debug, "photoboothled", GST_DEBUG_BOLD | GST_DEBUG_FG_WHITE | GST_DEBUG_BG_BLUE, "PhotoBoothLed");
 
-	gobject_class->finalize      = photo_booth_led_finalize;
+	gobject_class->finalize = photo_booth_led_finalize;
 }
 
 static void photo_booth_led_init (PhotoBoothLed *led)
@@ -152,10 +152,10 @@ void photo_booth_led_printer (PhotoBoothLed *led, gint copies)
 		g_free (cmd);
 * arduino doesn't process this correctly */
 		char cmd = LED_PRINT;
-                write (led->fd, &cmd, 1);
+		write (led->fd, &cmd, 1);
 		cmd = copies+0x30; //!HACK won't work for >9 copies
 		write (led->fd, &cmd, 1);
-                GST_DEBUG_OBJECT(led, "printing %c%i", cmd, copies);
+		GST_DEBUG_OBJECT(led, "printing %c%i", cmd, copies);
 	}
 }
 
diff --git a/photoboothwin.c b/photoboothwin.c
index b1f9f18..acea242 100644
--- a/photoboothwin.c
+++ b/photoboothwin.c
@@ -192,11 +192,11 @@ void photo_booth_window_start_countdown (PhotoBoothWindow *win, gint count)
 	priv->countdown = count+1;
 	_pbw_tick_countdown(win);
 	gtk_widget_show (GTK_WIDGET (priv->countdown_label));
-  for (int i = 1; i <= count+2; i++)
-  {
-    g_timeout_add (1000*i, (GSourceFunc) _pbw_tick_countdown, win);
-    GST_INFO ("added timeout callback at %i", 1000*i);
-  }
+	for (int i = 1; i <= count+2; i++)
+	{
+		g_timeout_add (1000*i, (GSourceFunc) _pbw_tick_countdown, win);
+		GST_INFO ("added timeout callback at %i", 1000*i);
+	}
 }
 
 void photo_booth_window_set_copies_show (PhotoBoothWindow *win, gint min, gint max, gint def)