diff --git a/Makefile.am b/Makefile.am
index ec352131..72215d86 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,30 +3,32 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 SUBDIRS = src po doc
 
 gnome_calendardocdir = ${prefix}/doc/gnome_calendar
-gnome_calendardoc_DATA = \
-	README\
-	INSTALL\
-	NEWS
+gnome_calendardoc_DATA =        \
+  README                        \
+  INSTALL                       \
+  NEWS
 
 
-INTLTOOL_FILES = intltool-extract.in \
-	intltool-merge.in \
-	intltool-update.in
+INTLTOOL_FILES =                \
+  intltool-extract.in           \
+  intltool-merge.in             \
+  intltool-update.in
 
-EXTRA_DIST =                  \
-    $(gnome_calendardoc_DATA) \
-	$(INTLTOOL_FILES)         \
-	THANKS					  \
-    TODO                      \
+EXTRA_DIST =                    \
+  $(gnome_calendardoc_DATA)     \
+  $(INTLTOOL_FILES)             \
+  THANKS                        \
+    TODO                        \
     autogen.sh
 
 
-DISTCLEANFILES = intltool-extract \
-	intltool-merge \
-	intltool-update \
-	po/.intltool-merge-cache
+DISTCLEANFILES =                \
+  intltool-extract              \
+  intltool-merge                \
+  intltool-update               \
+  po/.intltool-merge-cache
 
 
 # Remove doc directory on uninstall
 uninstall-local:
-	-rm -r $(gnome_calendardocdir)
+  -rm -r $(gnome_calendardocdir)
diff --git a/THANKS b/THANKS
new file mode 100644
index 00000000..a0750e86
--- /dev/null
+++ b/THANKS
@@ -0,0 +1,9 @@
+First of all to the Gnome community.
+
+Now, right after that:
+ - Evolution's devs, which without know it provide a huge bunch
+   of code to this project
+ - Gnome Documents' Cosimo Cecchi, again, but this he knew his code
+   was going this ways
+ - The guys on Evolution Data Server project for being a great help
+   making me understand the internals of EDS
diff --git a/TODO b/TODO
new file mode 100644
index 00000000..69129cfd
--- /dev/null
+++ b/TODO
@@ -0,0 +1,7 @@
+TODO
+
+ - Check for the real need of adding timezone, and check everywhere
+ - Create GcalView interface or superclass of all views.
+ - Connect all dconf options to the program
+ - Remove _bodyContainer if there's no need of it in the end.
+ - Remove g_print()/log()
diff --git a/po/POTFILES.in b/po/POTFILES.in
index a0b3c552..f8df4c64 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,3 +1,4 @@
 # List of source files containing translatable strings.
 
 src/main.c
+src/gcal-application.c
diff --git a/src/Makefile.am b/src/Makefile.am
index a419fb14..658954e0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,24 +1,24 @@
-AM_CPPFLAGS = \
-	-DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \
-	-DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
-	-DPACKAGE_DATA_DIR=\""$(pkgdatadir)"\" \
-	$(CALENDAR_CFLAGS)
+AM_CPPFLAGS =                               \
+  -DPACKAGE_LOCALE_DIR=\""$(localedir)"\"   \
+  -DPACKAGE_SRC_DIR=\""$(srcdir)"\"         \
+  -DPACKAGE_DATA_DIR=\""$(pkgdatadir)"\"    \
+  $(CALENDAR_CFLAGS)
 
-AM_CFLAGS =\
-	 -Wall\
-	 -g
+AM_CFLAGS =                                 \
+   -Wall                                    \
+   -g
 
 bin_PROGRAMS = gnome-calendar
 
-gnome_calendar_SOURCES = \
-	main.c \
-	gcal-application.h \
-	gcal-application.c	
+gnome_calendar_SOURCES =                    \
+  main.c                                    \
+  gcal-application.h                        \
+  gcal-application.c
 
-gnome_calendar_LDFLAGS = \
-	-Wl,--export-dynamic
+gnome_calendar_LDFLAGS =                    \
+  -Wl,--export-dynamic
 
-gnome_calendar_LDADD = \
-	$(CALENDAR_LIBS)
+gnome_calendar_LDADD =                      \
+  $(CALENDAR_LIBS)
 
 
diff --git a/src/gcal-application.c b/src/gcal-application.c
index ab9b4720..286287c6 100644
--- a/src/gcal-application.c
+++ b/src/gcal-application.c
@@ -48,6 +48,9 @@ gcal_application_activate (GApplication *application)
     {
       app->priv->window = gtk_application_window_new (GTK_APPLICATION (app));
       gtk_window_set_title (GTK_WINDOW (app->priv->window), _("Calendar"));
+      gtk_window_set_hide_titlebar_when_maximized (
+          GTK_WINDOW (app->priv->window),
+          TRUE);
 
       gtk_widget_show_all (GTK_WIDGET (app->priv->window));
     }