diff --git a/plymouth.changes b/plymouth.changes
index 111c08c..9b4b407 100644
--- a/plymouth.changes
+++ b/plymouth.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu Mar 29 09:36:32 UTC 2012 - tittiatcoke@gmail.com
+
+- Ensure that both grub and grub2 are adjusted with regards to the
+  splash parameter. Running grub2-mkconfig to have the right 
+  configuration. 
+- Installation of themes are not causing any reset of the selected
+  default theme anymore. Now this only happens when a theme is 
+  installed and the default theme is set to TEXT. 
+
 -------------------------------------------------------------------
 Sun Mar 25 09:03:44 UTC 2012 - tittiatcoke@gmail.com
 
diff --git a/plymouth.spec b/plymouth.spec
index e4af974..9b46f8d 100644
--- a/plymouth.spec
+++ b/plymouth.spec
@@ -347,6 +347,10 @@ rm -rf %{buildroot}
 if [ $1 -eq 1 ]; then
    if [ -f %{_sysconfdir}/default/grub ]; then
         sed -i 's|splash=silent|splash|g' %{_sysconfdir}/default/grub
+        grub2-mkconfig -o /boot/grub2/grub.cfg
+   fi
+   if [ -f /boot/grub/menu.lst ]; then
+        sed -i 's|splash=silent|splash|g' /boot/grub/menu.lst
    fi
 fi
 
@@ -356,6 +360,10 @@ if [ $1 -eq 0 ]; then
     rm -f /boot/initrd-plymouth.img
     if [ -f %{_sysconfdir}/default/grub ]; then
        sed -i 's|splash|splash=silent|g' %{_sysconfdir}/default/grub
+       grub2-mkconfig -o /boot/grub2/grub.cfg
+    fi
+    if [ -f /boot/grub/menu.lst ]; then
+       sed -i 's|splash|splash=silent|g' /boot/grub/menu.lst
     fi
 fi
 
@@ -375,15 +383,19 @@ fi
 %postun -n libply2 -p /sbin/ldconfig
 
 %post theme-spinfinity
-export LIB=%{_libdir}
-%{_sbindir}/plymouth-set-default-theme spinfinity
-if [ -x /sbin/mkinitrd ]; then
-   /sbin/mkinitrd
+if [ $1 -eq 1 ]; then
+   export LIB=%{_libdir}
+   if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "text" ]; then
+      %{_sbindir}/plymouth-set-default-theme spinfinity
+      if [ -x /sbin/mkinitrd ]; then
+         /sbin/mkinitrd
+      fi
+   fi
 fi
 
 %postun theme-spinfinity
-export LIB=%{_libdir}
 if [ $1 -eq 0 ]; then
+    export LIB=%{_libdir}
     if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "spinfinity" ]; then
         %{_sbindir}/plymouth-set-default-theme --reset
         /sbin/mkinitrd
@@ -391,15 +403,19 @@ if [ $1 -eq 0 ]; then
 fi
 
 %post theme-fade-in
-export LIB=%{_libdir}
-%{_sbindir}/plymouth-set-default-theme fade-in
-if [ -x /sbin/mkinitrd ]; then
-   /sbin/mkinitrd
+if [ $1 -eq 1 ]; then
+   export LIB=%{_libdir}
+   if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "text" ]; then
+      %{_sbindir}/plymouth-set-default-theme fade-in
+      if [ -x /sbin/mkinitrd ]; then
+         /sbin/mkinitrd
+      fi
+   fi
 fi
 
 %postun theme-fade-in
-export LIB=%{_libdir}
 if [ $1 -eq 0 ]; then
+    export LIB=%{_libdir}
     if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "fade-in" ]; then
         %{_sbindir}/plymouth-set-default-theme --reset
         /sbin/mkinitrd
@@ -407,15 +423,19 @@ if [ $1 -eq 0 ]; then
 fi
 
 %post theme-solar
-export LIB=%{_libdir}
-%{_sbindir}/plymouth-set-default-theme solar
-if [ -x /sbin/mkinitrd ]; then
-   /sbin/mkinitrd
+if [ $1 -eq 1 ]; then
+   export LIB=%{_libdir}
+   if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "text" ]; then
+      %{_sbindir}/plymouth-set-default-theme solar
+      if [ -x /sbin/mkinitrd ]; then
+         /sbin/mkinitrd
+      fi
+   fi
 fi
 
 %postun theme-solar
-export lib=%{_libdir}
 if [ $1 -eq 0 ]; then
+    export lib=%{_libdir}
     if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "solar" ]; then
         %{_sbindir}/plymouth-set-default-theme --reset
         /sbin/mkinitrd