diff --git a/plymouth.changes b/plymouth.changes
index 4648621..1bdeb8a 100644
--- a/plymouth.changes
+++ b/plymouth.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Feb 28 21:13:14 UTC 2013 - tittiatcoke@gmail.com
+
+- Changed %post scripts so only the rebuild of the initrd is 
+  omitted within the build environment
+
 -------------------------------------------------------------------
 Fri Feb 22 16:20:54 UTC 2013 - tittiatcoke@gmail.com
 
diff --git a/plymouth.spec b/plymouth.spec
index d0a0088..651bdb7 100644
--- a/plymouth.spec
+++ b/plymouth.spec
@@ -423,11 +423,17 @@ fi
 %postun -n libply2 -p /sbin/ldconfig
 
 %post theme-spinfinity
-if [ $1 -eq 1 -a ! -e /.buildenv ]; then
-   export LIB=%{_libdir}
-   if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "text" ]; then
-      %{_sbindir}/plymouth-set-default-theme -R spinfinity
-   fi
+if [ $1 -eq 1 ]; then
+  set -x
+  export LIB=%{_libdir}
+  OTHEME="$(%{_sbindir}/plymouth-set-default-theme)"
+  if [ "$OTHEME" == "text" ]; then
+     if [ ! -e /.buildenv ]; then
+       %{_sbindir}/plymouth-set-default-theme -R spinfinity
+     else
+       %{_sbindir}/plymouth-set-default-theme spinfinity
+     fi 
+  fi
 fi
 
 %postun theme-spinfinity
@@ -439,11 +445,17 @@ if [ $1 -eq 0 ]; then
 fi
 
 %post theme-fade-in
-if [ $1 -eq 1 -a ! -e /.buildenv ]; then
-   export LIB=%{_libdir}
-   if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "text" ]; then
-      %{_sbindir}/plymouth-set-default-theme -R fade-in
-   fi
+if [ $1 -eq 1 ]; then
+  set -x
+  export LIB=%{_libdir}
+  OTHEME="$(%{_sbindir}/plymouth-set-default-theme)"
+  if [ "$OTHEME" == "text" ]; then
+     if [ ! -e /.buildenv ]; then
+       %{_sbindir}/plymouth-set-default-theme -R fade-in
+     else
+       %{_sbindir}/plymouth-set-default-theme fade-in
+     fi 
+  fi
 fi
 
 %postun theme-fade-in
@@ -455,11 +467,17 @@ if [ $1 -eq 0 ]; then
 fi
 
 %post theme-solar
-if [ $1 -eq 1 -a ! -e /.buildenv ]; then
-   export LIB=%{_libdir}
-   if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "text" ]; then
-      %{_sbindir}/plymouth-set-default-theme -R solar
-   fi
+if [ $1 -eq 1 ]; then
+  set -x
+  export LIB=%{_libdir}
+  OTHEME="$(%{_sbindir}/plymouth-set-default-theme)"
+  if [ "$OTHEME" == "text" ]; then
+     if [ ! -e /.buildenv ]; then
+       %{_sbindir}/plymouth-set-default-theme -R solar
+     else
+       %{_sbindir}/plymouth-set-default-theme solar
+     fi 
+  fi
 fi
 
 %postun theme-solar