diff --git a/configure.in b/configure.in
index 7344ed3..f912d06 100644
--- a/configure.in
+++ b/configure.in
@@ -1,18 +1,23 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT(configure.in)
+AC_INIT(alarm, 0.1.0, enlightenment-devel@lists.sourceforge.net)
+AC_PREREQ(2.52)
+AC_CONFIG_SRCDIR(configure.in)
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
-
-AM_INIT_AUTOMAKE(alarm, 0.1.0)
-AM_CONFIG_HEADER(config.h)
 AC_ISC_POSIX
+
+AM_INIT_AUTOMAKE(1.6)
+AM_CONFIG_HEADER(config.h)
+
 AC_PROG_CC
 AM_PROG_CC_STDC
 AC_HEADER_STDC
 AC_C_CONST
-AM_ENABLE_SHARED
-AM_PROG_LIBTOOL
+
+define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])dnl
+define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl
+AC_PROG_LIBTOOL
 
 AM_GNU_GETTEXT([external])
 AM_GNU_GETTEXT_VERSION(0.14)
@@ -22,112 +27,34 @@ AC_SUBST(MODULE_ARCH)
 AC_DEFINE_UNQUOTED(MODULE_ARCH, "$MODULE_ARCH", "Module architecture")
 AC_DEFINE_UNQUOTED(MODULE_VERSION, "$VERSION", "Module version")
 
-if test "x${bindir}" = 'x${exec_prefix}/bin'; then
-  if test "x${exec_prefix}" = "xNONE"; then
-    if test "x${prefix}" = "xNONE"; then
-      bindir="${ac_default_prefix}/bin";
-    else
-      bindir="${prefix}/bin";
-    fi
-  else
-    if test "x${prefix}" = "xNONE"; then
-      bindir="${ac_default_prefix}/bin";
-    else
-      bindir="${prefix}/bin";
-    fi
-  fi
-fi
-
-if test "x${libdir}" = 'x${exec_prefix}/lib'; then
-  if test "x${exec_prefix}" = "xNONE"; then
-    if test "x${prefix}" = "xNONE"; then
-      libdir="${ac_default_prefix}/lib";
-    else
-      libdir="${prefix}/lib";
-    fi
-  else
-    if test "x${prefix}" = "xNONE"; then
-      libdir="${ac_default_prefix}/lib";
-    else
-      libdir="${prefix}/lib";
-    fi
-  fi
-fi
-
-dnl Set PACKAGE_BIN_DIR in config.h.
-if test "x${bindir}" = 'xNONE'; then
-  if test "x${prefix}" = "xNONE"; then
-    AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${ac_default_prefix}/bin", "Package installed binaries destination")
-  else
-    AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${prefix}/bin", "Package installed binaries destination")
-  fi
-else
-  AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${bindir}", "Package installed binaries destination")
-fi
-
-dnl Set PACKAGE_LIB_DIR in config.h.
-if test "x${libdir}" = 'xNONE'; then
-  if test "x${prefix}" = "xNONE"; then
-    AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${ac_default_prefix}/lib", "Package installed libraries destination")
-  else
-    AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${prefix}/lib", "Package installed libraries destination")
-  fi
-else
-  AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${libdir}", "Package installed libraries destination")
-fi
-
-dnl Set PACKAGE_DATA_DIR in config.h.
-if test "x${prefix}" = "xNONE"; then
-    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${HOME}/.e/e/modules/${PACKAGE}", "Package installed data destination")
-    datadir="${HOME}/.e/e/modules/${PACKAGE}"
-else
-    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${libdir}/enlightenment/modules/${PACKAGE}", "Package installed data destination")
-    datadir="${libdir}/enlightenment/modules/${PACKAGE}"    
-fi
-
-AC_PREFIX_DEFAULT(${HOME}/.e/e)
-if test "x$prefix" = "xNONE"; then
-  datarootdir=${ac_default_prefix}
-else
-  datarootdir=${prefix}/share
-fi
-localedir=${datarootdir}/locale
-AC_SUBST(LOCALEDIR, "${localedir}")
-AC_DEFINE_UNQUOTED(LOCALEDIR, "${localedir}", [Module Locale Directory])
-	  
-#AC_CHECK_LIB(dl, dlopen, dlopen_libs=-ldl)
-#AC_SUBST(dlopen_libs)
-
-PKG_CHECK_MODULES(EDJE, [edje >= 0.5.0])
-
-
-edje_cc="$(pkg-config --variable=prefix edje)/bin/edje_cc"
-AC_ARG_WITH(edje-cc,
-[  --with-edje-cc=PATH              specify a specific path to edje_cc],
-[
-  v=$withval;
-  edje_cc=$v
-  echo "  Enlightenment edje_cc explicitly set to "$edje_cc;
-],[
-  edje_cc="$(pkg-config --variable=prefix edje)/bin/edje_cc"
-])
-AC_SUBST(edje_cc)
-
 AC_ARG_WITH(enlightenment-config,
-[  --with-enlightenment-config=E_CONFIG    use enlightenment-config specified ],
-[
-  E_CONFIG=$withval;
-  echo "using "$E_CONFIG" for enlightenment-config";
-],[
-  PROG="enlightenment-config";
-  AC_PATH_PROG(E_CONFIG, $PROG, "", $PATH)
-])
+  AC_HELP_STRING([--with-enlightenment-config=E_CONFIG], [use enlightenment-config specified]),
+  [
+    E_CONFIG=$withval;
+    echo "  using "$E_CONFIG" for enlightenment-config";
+  ], [
+    PROG="enlightenment-config";
+    AC_PATH_PROG(E_CONFIG, $PROG, "", $PATH)
+  ]
+)
 e_cflags=`$E_CONFIG --cflags`
 e_libs=`$E_CONFIG --libs`
 e_modules=`$E_CONFIG --module-dir`
 AC_SUBST(e_cflags)
 AC_SUBST(e_libs)
-AC_SUBST(e_modules)
+
+dnl TODO: Fix better install for userdir
+datadir="${e_modules}/${PACKAGE}"    
+
+edje_cc="$(pkg-config --variable=prefix edje)/bin/edje_cc"
+AC_ARG_WITH(edje-cc,
+  AC_HELP_STRING([--with-edje-cc=PATH], [specify a specific path to edje_cc]),
+  [
+    edje_cc=$withval;
+    echo "  Enlightenment edje_cc explicitly set to "$edje_cc;
+  ]
+)
+AC_SUBST(edje_cc)
 
 AC_OUTPUT([
 Makefile
diff --git a/e_mod_config.c b/e_mod_config.c
index 1d96169..e0321bc 100644
--- a/e_mod_config.c
+++ b/e_mod_config.c
@@ -163,13 +163,13 @@ _common_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *c
    alarm_config_refresh_alarms_ilist(cfdata);
    e_widget_frametable_object_append(of, ob, 0, 1, 6, 1, 1, 1, 1, 1);
 
-   ob = e_widget_button_add(evas, _("Add"), NULL, _cb_alarm_add, cfdata, NULL);
+   ob = e_widget_button_add(evas, D_("Add"), NULL, _cb_alarm_add, cfdata, NULL);
    e_widget_frametable_object_append(of, ob, 0, 2, 2, 1, 1, 1, 1, 1);
-   ob = e_widget_button_add(evas, _("Delete"), NULL, _cb_alarm_del, cfdata, NULL);
+   ob = e_widget_button_add(evas, D_("Delete"), NULL, _cb_alarm_del, cfdata, NULL);
    e_widget_frametable_object_append(of, ob, 2, 2, 2, 1, 1, 1, 1, 1);
-   ob = e_widget_button_add(evas, _("Configure"), NULL, _cb_alarm_config, cfdata, NULL);
+   ob = e_widget_button_add(evas, D_("Configure"), NULL, _cb_alarm_config, cfdata, NULL);
    e_widget_frametable_object_append(of, ob, 4, 2, 1, 1, 1, 1, 1, 1);
-   ob = e_widget_button_add(evas, _("Duplicate"), NULL, _cb_alarm_duplicate, cfdata, NULL);
+   ob = e_widget_button_add(evas, D_("Duplicate"), NULL, _cb_alarm_duplicate, cfdata, NULL);
    e_widget_frametable_object_append(of, ob, 5, 2, 1, 1, 1, 1, 1, 1);
 
    e_widget_table_object_append(o, of, 0, 0, 1, 2, 1, 1, 1, 1);
diff --git a/e_mod_config_alarm.c b/e_mod_config_alarm.c
index a509520..5ec5a5d 100644
--- a/e_mod_config_alarm.c
+++ b/e_mod_config_alarm.c
@@ -189,7 +189,7 @@ _common_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *c
 
    ob = e_widget_check_add(evas, D_("Active"), &(cfdata->state));
    e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 1, 1, 1);
-   ob = e_widget_label_add(evas, _("Name"));
+   ob = e_widget_label_add(evas, D_("Name"));
    e_widget_frametable_object_append(of, ob, 0, 1, 1, 1, 1, 1, 1, 1);
    ob = e_widget_entry_add(evas, &(cfdata->name), NULL, NULL, NULL);
    e_widget_min_size_set(ob, 200, 25);
@@ -388,16 +388,16 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
 
    if (!alarm_config->alarms_autoremove_default)
      {
-        ob = e_widget_radio_add(evas, _("No [default]"), 0, rg);
+        ob = e_widget_radio_add(evas, D_("No [default]"), 0, rg);
         e_widget_frametable_object_append(of, ob, 1, 1, 1, 1, 1, 1, 1, 1);
-        ob = e_widget_radio_add(evas, _("Yes"), 1, rg);
+        ob = e_widget_radio_add(evas, D_("Yes"), 1, rg);
         e_widget_frametable_object_append(of, ob, 1, 2, 1, 1, 1, 1, 1, 1);
      }
    else
      {
-        ob = e_widget_radio_add(evas, _("No"), 0, rg);
+        ob = e_widget_radio_add(evas, D_("No"), 0, rg);
         e_widget_frametable_object_append(of, ob, 1, 1, 1, 1, 1, 1, 1, 1);
-        ob = e_widget_radio_add(evas, _("Yes [default]"), 1, rg);
+        ob = e_widget_radio_add(evas, D_("Yes [default]"), 1, rg);
         e_widget_frametable_object_append(of, ob, 1, 2, 1, 1, 1, 1, 1, 1);
      }
 
@@ -408,16 +408,16 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
 
    if (!alarm_config->alarms_open_popup_default)
      {
-        ob = e_widget_radio_add(evas, _("No [default]"), 0, rg);
+        ob = e_widget_radio_add(evas, D_("No [default]"), 0, rg);
         e_widget_frametable_object_append(of, ob, 0, 1, 1, 1, 1, 1, 1, 1);
-        ob = e_widget_radio_add(evas, _("Yes"), 1, rg);
+        ob = e_widget_radio_add(evas, D_("Yes"), 1, rg);
         e_widget_frametable_object_append(of, ob, 0, 2, 1, 1, 1, 1, 1, 1);
      }
    else
      {
-        ob = e_widget_radio_add(evas, _("No"), 0, rg);
+        ob = e_widget_radio_add(evas, D_("No"), 0, rg);
         e_widget_frametable_object_append(of, ob, 0, 1, 1, 1, 1, 1, 1, 1);
-        ob = e_widget_radio_add(evas, _("Yes [default]"), 1, rg);
+        ob = e_widget_radio_add(evas, D_("Yes [default]"), 1, rg);
         e_widget_frametable_object_append(of, ob, 0, 2, 1, 1, 1, 1, 1, 1);
      }
         
@@ -426,7 +426,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
 
    rg = e_widget_radio_group_new(&(cfdata->run_program));
 
-   ob = e_widget_radio_add(evas, _("No"), ALARM_RUN_PROGRAM_NO, rg);
+   ob = e_widget_radio_add(evas, D_("No"), ALARM_RUN_PROGRAM_NO, rg);
    e_widget_frametable_object_append(of, ob, 0, 5, 1, 1, 1, 1, 1, 1);
    ob = e_widget_radio_add(evas, D_("Run default one"), ALARM_RUN_PROGRAM_PARENT, rg);
    e_widget_frametable_object_append(of, ob, 0, 6, 1, 1, 1, 1, 1, 1);
diff --git a/e_mod_main.c b/e_mod_main.c
index 120a7e6..31a02b3 100644
--- a/e_mod_main.c
+++ b/e_mod_main.c
@@ -662,8 +662,8 @@ _alarm_snooze(Alarm *al)
    e_widget_min_size_get(o, &w, &h);
    e_dialog_content_set(dia, o, w, h);
 
-   e_dialog_button_add(dia, _("Ok"), NULL, _alarm_cb_dialog_snooze_ok, al);
-   e_dialog_button_add(dia, _("Close"), NULL, _alarm_cb_dialog_snooze_cancel, al);
+   e_dialog_button_add(dia, D_("Ok"), NULL, _alarm_cb_dialog_snooze_ok, al);
+   e_dialog_button_add(dia, D_("Close"), NULL, _alarm_cb_dialog_snooze_cancel, al);
 
    al->snooze.dia = dia;
    e_win_centered_set(dia->win, 1);
@@ -863,7 +863,7 @@ _button_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
         mi = e_menu_item_new(mn);
         e_menu_item_separator_set(mi, 1);
 	mi = e_menu_item_new(mn);
-	e_menu_item_label_set(mi, _("Configuration"));
+	e_menu_item_label_set(mi, D_("Configuration"));
 	e_util_menu_item_edje_icon_set(mi, "enlightenment/configuration");
 	e_menu_item_callback_set(mi, _menu_cb_configure, NULL);