diff --git a/share/templates.d/99-generic/live/x86.tmpl b/share/templates.d/99-generic/live/x86.tmpl
index dd241c30..775136fd 100644
--- a/share/templates.d/99-generic/live/x86.tmpl
+++ b/share/templates.d/99-generic/live/x86.tmpl
@@ -10,7 +10,7 @@ LORAXDIR="usr/share/lorax/"
 
 ## Don't allow spaces or escape characters in the iso label
 def valid_label(ch):
-return ch.isalnum() or ch == '_'
+    return ch.isalnum() or ch == '_'
 
 isolabel = ''.join(ch if valid_label(ch) else '-' for ch in isolabel)
 
@@ -19,12 +19,12 @@ from os.path import basename
 
 ## Test ${runtime_img} to see if udf is needed
 <%
-import os
-from pylorax.sysutils import joinpaths
-if os.stat(joinpaths(inroot, runtime_img)).st_size >= 4*1024**3:
-    udfargs = "-allow-limited-size"
-else:
-    udfargs = ""
+    import os
+    from pylorax.sysutils import joinpaths
+    if os.stat(joinpaths(inroot, runtime_img)).st_size >= 4*1024**3:
+        udfargs = "-allow-limited-size"
+    else:
+        udfargs = ""
 %>
 
 mkdir ${LIVEDIR}
@@ -53,44 +53,44 @@ replace @EXTRA@ '${extra_boot_args}' ${BOOTDIR}/isolinux.cfg
 ## install kernels
 mkdir ${KERNELDIR}
 %for kernel in kernels:
-%if kernel.flavor:
-    installkernel images-xen ${kernel.path} ${KERNELDIR}/vmlinuz-${kernel.flavor}
-    installinitrd images-xen ${kernel.initrd.path} ${KERNELDIR}/initrd-${kernel.flavor}.img
-%else:
-    installkernel images-${basearch} ${kernel.path} ${KERNELDIR}/vmlinuz
-    installinitrd images-${basearch} ${kernel.initrd.path} ${KERNELDIR}/initrd.img
-%endif
+    %if kernel.flavor:
+        installkernel images-xen ${kernel.path} ${KERNELDIR}/vmlinuz-${kernel.flavor}
+        installinitrd images-xen ${kernel.initrd.path} ${KERNELDIR}/initrd-${kernel.flavor}.img
+    %else:
+        installkernel images-${basearch} ${kernel.path} ${KERNELDIR}/vmlinuz
+        installinitrd images-${basearch} ${kernel.initrd.path} ${KERNELDIR}/initrd.img
+    %endif
 %endfor
 
 hardlink ${KERNELDIR}/vmlinuz ${BOOTDIR}
 hardlink ${KERNELDIR}/initrd.img ${BOOTDIR}
 %if basearch == 'x86_64':
-treeinfo images-xen kernel ${KERNELDIR}/vmlinuz
-treeinfo images-xen initrd ${KERNELDIR}/initrd.img
+    treeinfo images-xen kernel ${KERNELDIR}/vmlinuz
+    treeinfo images-xen initrd ${KERNELDIR}/initrd.img
 %endif
 
 ## WHeeeeeeee, EFI.
 <% efiargs=""; efigraft=""; efihybrid=""; efiarch32=None; efiarch64=None %>
 %if exists("boot/efi/EFI/*/gcdia32.efi"):
-<% efiarch32 = 'IA32' %>
+    <% efiarch32 = 'IA32' %>
 %endif
 %if exists("boot/efi/EFI/*/gcdx64.efi"):
-<% efiarch64 = 'X64' %>
+    <% efiarch64 = 'X64' %>
 %endif
 %if (efiarch32 or efiarch64) and basearch != 'i386':
-<%
-efigraft="EFI/BOOT={0}/EFI/BOOT".format(outroot)
-images = ["images/efiboot.img"]
-if domacboot:
-    images.append("images/macboot.img")
-%>
-%for img in images:
     <%
-    efiargs += " -eltorito-alt-boot -e {0} -no-emul-boot".format(img)
-    efigraft += " {0}={1}/{0}".format(img,outroot)
+    efigraft="EFI/BOOT={0}/EFI/BOOT".format(outroot)
+    images = ["images/efiboot.img"]
+    if domacboot:
+        images.append("images/macboot.img")
     %>
-    treeinfo images-${basearch} ${img|basename} ${img}
-%endfor
+    %for img in images:
+        <%
+        efiargs += " -eltorito-alt-boot -e {0} -no-emul-boot".format(img)
+        efigraft += " {0}={1}/{0}".format(img,outroot)
+        %>
+        treeinfo images-${basearch} ${img|basename} ${img}
+    %endfor
     <% efihybrid = "--uefi --mac" if domacboot else "--uefi" %>
     <%include file="efi.tmpl" args="configdir=configdir, KERNELDIR=KERNELDIR, efiarch32=efiarch32, efiarch64=efiarch64, isolabel=isolabel"/>
 %endif