diff --git a/configure.ac b/configure.ac
index 14e85cd..e81b17e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -122,38 +122,30 @@ AC_MSG_RESULT($GL_LIBS)
 AC_SUBST(GL_CFLAGS)
 AC_SUBST(GL_LIBS)
 
-AC_ARG_ENABLE(text,
-  [  --disable-text      Disable text plugin],
-  [use_texte=$enableval], [use_text=yes])
+PKG_CHECK_MODULES(SCALE, compiz-scale, [have_compiz_scale=yes], [have_compiz_scale=no])
+PKG_CHECK_MODULES(CAIRO, cairo-xlib-xrender cairo >= 1.0, [have_cairo=yes], [have_cairo=no])
+PKG_CHECK_MODULES(PANGO, cairo-xlib-xrender pangocairo cairo >= 1.0, [have_pango=yes], [have_pango=no])
 
-if test "x$use_text" = "xyes"; then
-  PKG_CHECK_MODULES(TEXT, cairo-xlib-xrender pangocairo cairo >= 1.0, [use_text=yes], [use_text=no])
-fi
-
-AM_CONDITIONAL(TEXT_PLUGIN, test "x$use_text" = "xyes")
-if test "$use_text" = yes; then
+AM_CONDITIONAL(TEXT_PLUGIN, test "x$have_pango" = "xyes")
+if test "x$have_pango" = "xyes"; then
   AC_DEFINE(USE_TEXT, 1, [Build text plugin])
 fi
 
-PKG_CHECK_MODULES(RESIZEINFO, cairo-xlib-xrender pangocairo cairo >= 1.0, [use_resizeinfo=yes], [use_resizeinfo=no])
-AM_CONDITIONAL(RESIZEINFO_PLUGIN, test "x$use_resizeinfo" = "xyes")
-if test "$use_resizeinfo" = yes; then
+AM_CONDITIONAL(RESIZEINFO_PLUGIN, test "x$have_pango" = "xyes")
+if test "x$have_pango" = "xyes"; then
   AC_DEFINE(USE_RESIZEINFO, 1, [Build resizeinfo plugin])
 fi
 
-PKG_CHECK_MODULES(WALL, cairo-xlib-xrender cairo >= 1.0, [use_wall=yes], [use_wall=no])
-AM_CONDITIONAL(WALL_PLUGIN, test "x$use_wall" = "xyes")
-if test "$use_wall" = yes; then
+AM_CONDITIONAL(WALL_PLUGIN, test "x$have_cairo" = "xyes")
+if test "x$have_cairo" = "xyes"; then
   AC_DEFINE(USE_WALL, 1, [Build wall plugin])
 fi
 
-PKG_CHECK_MODULES(SCALE, compiz-scale, [use_scale=yes], [use_scale=no])
-AM_CONDITIONAL(SCALE_PLUGIN, test "x$use_scale" = "xyes")
-if test "$use_scale" = yes; then
-  AC_DEFINE(USE_SCALE, 1, [Build scale plugin])
+AM_CONDITIONAL(SCALEADDON_PLUGIN, test "x$have_compiz_scale" = "xyes")
+if test "x$have_compiz_scale" = "xyes"; then
+  AC_DEFINE(USE_SCALEADDON, 1, [Build scaleaddon plugin])
 fi
 
-
 AC_ARG_ENABLE(jpeg,
   [  --disable-jpeg      Disable jpeg plugin],
   [use_jpeg=$enableval], [use_jpeg=yes])
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
old mode 100755
new mode 100644
index d2d4e4c..40c8833
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -25,7 +25,7 @@ SHELL = /bin/sh
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ..
+top_builddir = @top_builddir@
 VPATH = @srcdir@
 
 prefix = @prefix@
@@ -56,15 +56,19 @@ ALL_LINGUAS = @ALL_LINGUAS@
 
 PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi)
 
-POFILES=$(shell if test -n "$(PO_LINGUAS)"; then LINGUAS="$(PO_LINGUAS)"; else LINGUAS="$(ALL_LINGUAS)"; fi; for lang in $$LINGUAS; do printf "$$lang.po "; done)
+USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS`" -o -n "`echo $$ALINGUAS|grep ' ?$$lang ?'`"; then printf "$$lang "; fi; done; fi)
+
+USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
+
+POFILES=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
 
 DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES)
 EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS
 
 POTFILES = \
-#This Gets Replace for some reason
+# This comment gets stripped out
 
-CATALOGS=$(shell if test -n "$(PO_LINGUAS)"; then LINGUAS="$(PO_LINGUAS)"; else LINGUAS="$(ALL_LINGUAS)"; fi; for lang in $$LINGUAS; do printf "$$lang.gmo "; done)
+CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done)
 
 .SUFFIXES:
 .SUFFIXES: .po .pox .gmo .mo .msg .cat
@@ -98,11 +102,7 @@ install-data: install-data-@USE_NLS@
 install-data-no: all
 install-data-yes: all
 	$(mkdir_p) $(DESTDIR)$(itlocaledir)
-	if test -n "$(PO_LINGUAS)"; then \
-	  linguas="$(PO_LINGUAS)"; \
-	else \
-	  linguas="$(ALL_LINGUAS)"; \
-	fi; \
+	linguas="$(USE_LINGUAS)"; \
 	for lang in $$linguas; do \
 	  dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
 	  $(mkdir_p) $$dir; \
@@ -136,17 +136,18 @@ dvi info tags TAGS ID:
 installcheck:
 
 uninstall:
-	if test -n "$(PO_LINGUAS)"; then \
-	  linguas="$(PO_LINGUAS)"; \
-	else \
-	  linguas="$(ALL_LINGUAS)"; \
-	fi; \
+	linguas="$(USE_LINGUAS)"; \
 	for lang in $$linguas; do \
 	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
 	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
 	done
 
 check: all $(GETTEXT_PACKAGE).pot
+	rm -f missing notexist
+	srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m
+	if [ -r missing -o -r notexist ]; then \
+	  exit 1; \
+	fi
 
 mostlyclean:
 	rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
@@ -179,11 +180,7 @@ dist distdir: $(DISTFILES)
 update-po: Makefile
 	$(MAKE) $(GETTEXT_PACKAGE).pot
 	tmpdir=`pwd`; \
-	if test -n "$(PO_LINGUAS)"; then \
-	  linguas="$(PO_LINGUAS)"; \
-	else \
-	  linguas="$(ALL_LINGUAS)"; \
-	fi; \
+	linguas="$(USE_LINGUAS)"; \
 	for lang in $$linguas; do \
 	  echo "$$lang:"; \
 	  result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \
@@ -211,8 +208,8 @@ Makefile POTFILES: stamp-it
 	  $(MAKE) stamp-it; \
 	fi
 
-stamp-it: Makefile.in.in ../config.status POTFILES.in
-	cd .. \
+stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in
+	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \
 	       $(SHELL) ./config.status
 
diff --git a/src/resizeinfo/Makefile.am b/src/resizeinfo/Makefile.am
index 2c9d01f..d9a6f5b 100644
--- a/src/resizeinfo/Makefile.am
+++ b/src/resizeinfo/Makefile.am
@@ -3,13 +3,13 @@ PFLAGS=-module -avoid-version -no-undefined
 
 if RESIZEINFO_PLUGIN
 libresizeinfo_la_LDFLAGS = $(PFLAGS)
-libresizeinfo_la_LIBADD = @COMPIZ_LIBS@ @RESIZEINFO_LIBS@
+libresizeinfo_la_LIBADD = @COMPIZ_LIBS@ @PANGO_LIBS@
 libresizeinfo_la_SOURCES = resizeinfo_options.c resizeinfo_options.h resizeinfo.c
 endif
 
 INCLUDES =                              \
 	@COMPIZ_CFLAGS@                  \
-	@RESIZEINFO_CFLAGS@		\
+	@PANGO_CFLAGS@		\
 	-DDATADIR='"$(datadir)"'          \
 	-DLIBDIR='"$(libdir)"'              \
 	-DLOCALEDIR="\"@datadir@/locale\""  \
diff --git a/src/scaleaddon/Makefile.am b/src/scaleaddon/Makefile.am
index c68a3c0..570cc3e 100644
--- a/src/scaleaddon/Makefile.am
+++ b/src/scaleaddon/Makefile.am
@@ -1,14 +1,15 @@
 ## Process this file with automake to produce Makefile.in
 PFLAGS=-module -avoid-version -no-undefined
 
-if SCALE_PLUGIN
+if SCALEADDON_PLUGIN
 libscaleaddon_la_LDFLAGS = $(PFLAGS)
-libscaleaddon_la_LIBADD = @COMPIZ_LIBS@ @RESIZEINFO_LIBS@
+libscaleaddon_la_LIBADD = @COMPIZ_LIBS@ @SCALE_LIBS@
 libscaleaddon_la_SOURCES = scaleaddon_options.c scaleaddon_options.h scaleaddon.c
 endif
 
 INCLUDES =                              \
 	@COMPIZ_CFLAGS@                  \
+	@SCALE_CFLAGS@                   \
 	-DDATADIR='"$(datadir)"'          \
 	-DLIBDIR='"$(libdir)"'              \
 	-DLOCALEDIR="\"@datadir@/locale\""  \
@@ -17,7 +18,7 @@ INCLUDES =                              \
 
 moduledir = $(plugindir)
 
-if SCALE_PLUGIN
+if SCALEADDON_PLUGIN
 module_LTLIBRARIES = libscaleaddon.la
 endif
 
diff --git a/src/text/Makefile.am b/src/text/Makefile.am
index fdf6231..6a379b9 100644
--- a/src/text/Makefile.am
+++ b/src/text/Makefile.am
@@ -3,13 +3,13 @@ PFLAGS=-module -avoid-version -no-undefined
 
 if TEXT_PLUGIN
 libtext_la_LDFLAGS = $(PFLAGS)
-libtext_la_LIBADD = @COMPIZ_LIBS@ @TEXT_LIBS@
+libtext_la_LIBADD = @COMPIZ_LIBS@ @PANGO_LIBS@
 libtext_la_SOURCES = text.c
 endif
 
 INCLUDES =                              \
 	@COMPIZ_CFLAGS@                  \
-	@TEXT_CFLAGS@			\
+	@PANGO_CFLAGS@			\
 	-DDATADIR='"$(datadir)"'          \
 	-DLIBDIR='"$(libdir)"'              \
 	-DLOCALEDIR="\"@datadir@/locale\""  \
diff --git a/src/wall/Makefile.am b/src/wall/Makefile.am
index 3e418ca..755ccbe 100644
--- a/src/wall/Makefile.am
+++ b/src/wall/Makefile.am
@@ -3,13 +3,13 @@ PFLAGS=-module -avoid-version -no-undefined
 
 if WALL_PLUGIN
 libwall_la_LDFLAGS = $(PFLAGS)
-libwall_la_LIBADD = @COMPIZ_LIBS@ @WALL_LIBS@
+libwall_la_LIBADD = @COMPIZ_LIBS@ @CAIRO_LIBS@
 libwall_la_SOURCES = wall_options.c wall_options.h wall.c
 endif
 
 INCLUDES =                              \
 	@COMPIZ_CFLAGS@                  \
-	@WALL_CFLAGS@			\
+	@CAIRO_CFLAGS@			\
 	-DDATADIR='"$(datadir)"'          \
 	-DLIBDIR='"$(libdir)"'              \
 	-DLOCALEDIR="\"@datadir@/locale\""  \