diff --git a/core/src/main/kotlin/com/deflatedpickle/quiver/Quiver.kt b/core/src/main/kotlin/com/deflatedpickle/quiver/Quiver.kt
index 718c0a8..3ab40bc 100644
--- a/core/src/main/kotlin/com/deflatedpickle/quiver/Quiver.kt
+++ b/core/src/main/kotlin/com/deflatedpickle/quiver/Quiver.kt
@@ -1,11 +1,10 @@
-/* Copyright (c) 2020 DeflatedPickle under the MIT license */
+/* Copyright (c) 2020-2021 DeflatedPickle under the MIT license */
 
 package com.deflatedpickle.quiver
 
 import com.deflatedpickle.haruhi.api.plugin.Plugin
 import com.deflatedpickle.haruhi.api.plugin.PluginType
 import com.deflatedpickle.quiver.backend.event.EventNewDocument
-import com.deflatedpickle.quiver.backend.event.EventSearchFolder
 import com.deflatedpickle.quiver.backend.event.EventSelectFile
 import com.deflatedpickle.quiver.backend.event.EventSelectFolder
 import java.io.File
diff --git a/core/src/main/kotlin/com/deflatedpickle/quiver/backend/api/exceptions/UnsupportedPackVersion.kt b/core/src/main/kotlin/com/deflatedpickle/quiver/backend/api/exceptions/UnsupportedPackVersion.kt
index 49189b0..67b4d48 100644
--- a/core/src/main/kotlin/com/deflatedpickle/quiver/backend/api/exceptions/UnsupportedPackVersion.kt
+++ b/core/src/main/kotlin/com/deflatedpickle/quiver/backend/api/exceptions/UnsupportedPackVersion.kt
@@ -1,3 +1,5 @@
+/* Copyright (c) 2021 DeflatedPickle under the MIT license */
+
 package com.deflatedpickle.quiver.backend.api.exceptions
 
 class UnsupportedPackVersion(
diff --git a/core/src/main/kotlin/com/deflatedpickle/quiver/backend/extension/OSUtil.kt b/core/src/main/kotlin/com/deflatedpickle/quiver/backend/extension/OSUtil.kt
index 8109c00..22642f8 100644
--- a/core/src/main/kotlin/com/deflatedpickle/quiver/backend/extension/OSUtil.kt
+++ b/core/src/main/kotlin/com/deflatedpickle/quiver/backend/extension/OSUtil.kt
@@ -1,11 +1,13 @@
+/* Copyright (c) 2021 DeflatedPickle under the MIT license */
+
 package com.deflatedpickle.quiver.backend.extension
 
-import com.deflatedpickle.quiver.backend.util.Filters
 import com.deflatedpickle.marvin.util.OSUtil
+import com.deflatedpickle.quiver.backend.util.Filters
 import so.madprogrammer.PatternFilter
 
 fun OSUtil.OS.toPatternFilter(): PatternFilter = if (this == OSUtil.OS.WINDOWS) {
     Filters.PATH_WINDOWS
 } else {
     Filters.PATH_UNIX
-}
\ No newline at end of file
+}
diff --git a/core/src/main/kotlin/com/deflatedpickle/quiver/frontend/extension/JToolBar.kt b/core/src/main/kotlin/com/deflatedpickle/quiver/frontend/extension/JToolBar.kt
index 6e0d086..69ed7b4 100644
--- a/core/src/main/kotlin/com/deflatedpickle/quiver/frontend/extension/JToolBar.kt
+++ b/core/src/main/kotlin/com/deflatedpickle/quiver/frontend/extension/JToolBar.kt
@@ -2,10 +2,9 @@
 
 package com.deflatedpickle.quiver.frontend.extension
 
-import java.awt.Component
+import javax.swing.Icon
 import javax.swing.JToolBar
 import org.jdesktop.swingx.JXButton
-import javax.swing.Icon
 
 fun JToolBar.add(text: String, action: () -> Unit): JXButton =
     JXButton(text).apply {
diff --git a/core/src/main/kotlin/com/deflatedpickle/quiver/frontend/widget/SearchToolbar.kt b/core/src/main/kotlin/com/deflatedpickle/quiver/frontend/widget/SearchToolbar.kt
index 50a702d..2befc4e 100644
--- a/core/src/main/kotlin/com/deflatedpickle/quiver/frontend/widget/SearchToolbar.kt
+++ b/core/src/main/kotlin/com/deflatedpickle/quiver/frontend/widget/SearchToolbar.kt
@@ -1,10 +1,13 @@
+/* Copyright (c) 2021 DeflatedPickle under the MIT license */
+
 package com.deflatedpickle.quiver.frontend.widget
 
 import com.deflatedpickle.nagato.NagatoIcon
+import java.util.regex.Pattern
+import javax.swing.JToggleButton
+import javax.swing.JToolBar
 import org.jdesktop.swingx.JXSearchField
 import org.jdesktop.swingx.search.Searchable
-import java.util.regex.Pattern
-import javax.swing.*
 
 class SearchToolbar(
     private val searchable: Searchable
@@ -72,4 +75,4 @@ class SearchToolbar(
             -1,
             this.backwardsCheckbox.isSelected
         )
-}
\ No newline at end of file
+}
diff --git a/filepanel/src/main/kotlin/com/deflatedpickle/quiver/filepanel/FilePanel.kt b/filepanel/src/main/kotlin/com/deflatedpickle/quiver/filepanel/FilePanel.kt
index d08d6f1..c96886d 100644
--- a/filepanel/src/main/kotlin/com/deflatedpickle/quiver/filepanel/FilePanel.kt
+++ b/filepanel/src/main/kotlin/com/deflatedpickle/quiver/filepanel/FilePanel.kt
@@ -17,11 +17,15 @@ import com.deflatedpickle.rawky.ui.constraints.StickWest
 import java.awt.BorderLayout
 import java.awt.Desktop
 import java.awt.GridBagLayout
+import javax.swing.BorderFactory
+import javax.swing.JComponent
+import javax.swing.JPopupMenu
+import javax.swing.JSeparator
+import javax.swing.SwingConstants
 import org.jdesktop.swingx.JXButton
 import org.jdesktop.swingx.JXLabel
 import org.jdesktop.swingx.JXPanel
 import org.jdesktop.swingx.JXTextField
-import javax.swing.*
 
 object FilePanel : PluginPanel() {
     private val nameLabel = JXLabel("Name")
diff --git a/filepanel/src/main/kotlin/com/deflatedpickle/quiver/filepanel/widget/ReplaceButton.kt b/filepanel/src/main/kotlin/com/deflatedpickle/quiver/filepanel/widget/ReplaceButton.kt
index 19df658..c00772b 100644
--- a/filepanel/src/main/kotlin/com/deflatedpickle/quiver/filepanel/widget/ReplaceButton.kt
+++ b/filepanel/src/main/kotlin/com/deflatedpickle/quiver/filepanel/widget/ReplaceButton.kt
@@ -6,7 +6,6 @@ import com.deflatedpickle.haruhi.util.PluginUtil
 import com.deflatedpickle.nagato.NagatoIcon
 import com.deflatedpickle.quiver.Quiver
 import com.deflatedpickle.quiver.backend.event.EventReplaceFile
-import com.deflatedpickle.quiver.filepanel.FilePanelPlugin
 import java.awt.datatransfer.DataFlavor
 import java.awt.dnd.DnDConstants
 import java.awt.dnd.DropTarget
diff --git a/filetable/src/main/kotlin/com/deflatedpickle/quiver/filetable/Component.kt b/filetable/src/main/kotlin/com/deflatedpickle/quiver/filetable/Component.kt
index 663f596..efba0f0 100644
--- a/filetable/src/main/kotlin/com/deflatedpickle/quiver/filetable/Component.kt
+++ b/filetable/src/main/kotlin/com/deflatedpickle/quiver/filetable/Component.kt
@@ -3,9 +3,7 @@
 package com.deflatedpickle.quiver.filetable
 
 import com.deflatedpickle.haruhi.component.PluginPanel
-import com.deflatedpickle.rawky.ui.constraints.FillBothFinishLine
 import java.awt.BorderLayout
-import java.awt.GridBagLayout
 import javax.swing.JScrollPane
 
 object Component : PluginPanel() {
diff --git a/foldertree/src/main/kotlin/com/deflatedpickle/quiver/foldertree/Component.kt b/foldertree/src/main/kotlin/com/deflatedpickle/quiver/foldertree/Component.kt
index acd4cf0..5fff310 100644
--- a/foldertree/src/main/kotlin/com/deflatedpickle/quiver/foldertree/Component.kt
+++ b/foldertree/src/main/kotlin/com/deflatedpickle/quiver/foldertree/Component.kt
@@ -3,9 +3,7 @@
 package com.deflatedpickle.quiver.foldertree
 
 import com.deflatedpickle.haruhi.component.PluginPanel
-import com.deflatedpickle.rawky.ui.constraints.FillBothFinishLine
 import java.awt.BorderLayout
-import java.awt.GridBagLayout
 import javax.swing.JScrollPane
 
 object Component : PluginPanel() {
diff --git a/foldertree/src/main/kotlin/com/deflatedpickle/quiver/foldertree/FolderTreePlugin.kt b/foldertree/src/main/kotlin/com/deflatedpickle/quiver/foldertree/FolderTreePlugin.kt
index e02e208..30a30a3 100644
--- a/foldertree/src/main/kotlin/com/deflatedpickle/quiver/foldertree/FolderTreePlugin.kt
+++ b/foldertree/src/main/kotlin/com/deflatedpickle/quiver/foldertree/FolderTreePlugin.kt
@@ -4,7 +4,6 @@ package com.deflatedpickle.quiver.foldertree
 
 import com.deflatedpickle.haruhi.api.plugin.Plugin
 import com.deflatedpickle.haruhi.api.plugin.PluginType
-import com.deflatedpickle.haruhi.event.EventCreatePluginComponent
 import com.deflatedpickle.haruhi.event.EventProgramFinishSetup
 import com.deflatedpickle.quiver.Quiver
 import com.deflatedpickle.quiver.backend.event.EventNewDocument
diff --git a/launcher/src/main/kotlin/com/deflatedpickle/quiver/launcher/main.kt b/launcher/src/main/kotlin/com/deflatedpickle/quiver/launcher/main.kt
index d08d8d2..36a148d 100644
--- a/launcher/src/main/kotlin/com/deflatedpickle/quiver/launcher/main.kt
+++ b/launcher/src/main/kotlin/com/deflatedpickle/quiver/launcher/main.kt
@@ -19,7 +19,6 @@ import com.deflatedpickle.marvin.util.OSUtil
 import com.deflatedpickle.quiver.launcher.window.Toolbar
 import com.deflatedpickle.quiver.launcher.window.Window
 import com.deflatedpickle.quiver.launcher.window.menu.MenuBar
-import com.deflatedpickle.tosuto.ToastItem
 import java.awt.BorderLayout
 import java.awt.Dimension
 import java.io.File
diff --git a/packexport/src/main/kotlin/com/deflatedpickle/quiver/packexport/ExportPackDialog.kt b/packexport/src/main/kotlin/com/deflatedpickle/quiver/packexport/ExportPackDialog.kt
index 63bb72e..9541a95 100644
--- a/packexport/src/main/kotlin/com/deflatedpickle/quiver/packexport/ExportPackDialog.kt
+++ b/packexport/src/main/kotlin/com/deflatedpickle/quiver/packexport/ExportPackDialog.kt
@@ -1,16 +1,15 @@
+/* Copyright (c) 2021 DeflatedPickle under the MIT license */
+
 package com.deflatedpickle.quiver.packexport
 
 import com.deflatedpickle.haruhi.api.Registry
 import com.deflatedpickle.haruhi.util.PluginUtil
 import com.deflatedpickle.haruhi.util.RegistryUtil
-import com.deflatedpickle.marvin.Slug
-import com.deflatedpickle.marvin.extensions.toInt
 import com.deflatedpickle.marvin.util.OSUtil
 import com.deflatedpickle.quiver.backend.extension.toPatternFilter
 import com.deflatedpickle.quiver.backend.util.DotMinecraft
 import com.deflatedpickle.quiver.frontend.widget.ButtonField
 import com.deflatedpickle.quiver.packexport.api.ExportStep
-import com.deflatedpickle.quiver.packexport.api.ExportStepType
 import com.deflatedpickle.rawky.ui.constraints.FillBothFinishLine
 import com.deflatedpickle.rawky.ui.constraints.FillHorizontalFinishLine
 import com.deflatedpickle.rawky.ui.constraints.StickEast
@@ -118,4 +117,4 @@ class ExportPackDialog : TaskDialog(PluginUtil.window, "Export Pack") {
             border = BorderFactory.createEmptyBorder()
         }
     }
-}
\ No newline at end of file
+}
diff --git a/packexport/src/main/kotlin/com/deflatedpickle/quiver/packexport/PackExportPlugin.kt b/packexport/src/main/kotlin/com/deflatedpickle/quiver/packexport/PackExportPlugin.kt
index 3d1416a..b2d68f8 100644
--- a/packexport/src/main/kotlin/com/deflatedpickle/quiver/packexport/PackExportPlugin.kt
+++ b/packexport/src/main/kotlin/com/deflatedpickle/quiver/packexport/PackExportPlugin.kt
@@ -1,3 +1,5 @@
+/* Copyright (c) 2021 DeflatedPickle under the MIT license */
+
 package com.deflatedpickle.quiver.packexport
 
 import com.deflatedpickle.haruhi.api.Registry
@@ -18,7 +20,6 @@ import com.deflatedpickle.quiver.packexport.api.PerFileExportStep
 import com.deflatedpickle.quiver.packexport.event.EventExportFile
 import com.deflatedpickle.quiver.packexport.event.EventFinishExportStep
 import com.deflatedpickle.quiver.packexport.event.EventStartingExportStep
-import java.io.File
 import java.nio.file.Files
 import java.util.Comparator
 import javax.swing.JMenu
@@ -207,4 +208,4 @@ object PackExportPlugin {
 
         progressMonitor.setProgress(++progress)
     }
-}
\ No newline at end of file
+}
diff --git a/packexport/src/main/kotlin/com/deflatedpickle/quiver/packexport/api/BulkExportStep.kt b/packexport/src/main/kotlin/com/deflatedpickle/quiver/packexport/api/BulkExportStep.kt
index 99c64b5..de222eb 100644
--- a/packexport/src/main/kotlin/com/deflatedpickle/quiver/packexport/api/BulkExportStep.kt
+++ b/packexport/src/main/kotlin/com/deflatedpickle/quiver/packexport/api/BulkExportStep.kt
@@ -1,3 +1,5 @@
+/* Copyright (c) 2021 DeflatedPickle under the MIT license */
+
 package com.deflatedpickle.quiver.packexport.api
 
 /**
@@ -5,4 +7,4 @@ package com.deflatedpickle.quiver.packexport.api
  */
 abstract class BulkExportStep : ExportStep {
     override fun toString(): String = "BulkExportStep( ${getSlug()}: ${getType()} )"
-}
\ No newline at end of file
+}
diff --git a/packexport/src/main/kotlin/com/deflatedpickle/quiver/packexport/api/ExportStep.kt b/packexport/src/main/kotlin/com/deflatedpickle/quiver/packexport/api/ExportStep.kt
index d48ec5c..f304385 100644
--- a/packexport/src/main/kotlin/com/deflatedpickle/quiver/packexport/api/ExportStep.kt
+++ b/packexport/src/main/kotlin/com/deflatedpickle/quiver/packexport/api/ExportStep.kt
@@ -1,3 +1,5 @@
+/* Copyright (c) 2021 DeflatedPickle under the MIT license */
+
 package com.deflatedpickle.quiver.packexport.api
 
 import com.deflatedpickle.marvin.Slug
@@ -33,4 +35,4 @@ interface ExportStep {
      * This explains how the file is manipulated by this step
      */
     fun processFile(file: File, progressMonitor: ProgressMonitor)
-}
\ No newline at end of file
+}
diff --git a/packexport/src/main/kotlin/com/deflatedpickle/quiver/packexport/api/ExportStepType.kt b/packexport/src/main/kotlin/com/deflatedpickle/quiver/packexport/api/ExportStepType.kt
index 3c67c7e..080bfc4 100644
--- a/packexport/src/main/kotlin/com/deflatedpickle/quiver/packexport/api/ExportStepType.kt
+++ b/packexport/src/main/kotlin/com/deflatedpickle/quiver/packexport/api/ExportStepType.kt
@@ -1,3 +1,5 @@
+/* Copyright (c) 2021 DeflatedPickle under the MIT license */
+
 package com.deflatedpickle.quiver.packexport.api
 
 enum class ExportStepType {
@@ -10,4 +12,4 @@ enum class ExportStepType {
      * This step packages the pack as a zip
      */
     ZIPPER
-}
\ No newline at end of file
+}
diff --git a/packexport/src/main/kotlin/com/deflatedpickle/quiver/packexport/api/PerFileExportStep.kt b/packexport/src/main/kotlin/com/deflatedpickle/quiver/packexport/api/PerFileExportStep.kt
index df0822b..0a0ead0 100644
--- a/packexport/src/main/kotlin/com/deflatedpickle/quiver/packexport/api/PerFileExportStep.kt
+++ b/packexport/src/main/kotlin/com/deflatedpickle/quiver/packexport/api/PerFileExportStep.kt
@@ -1,3 +1,5 @@
+/* Copyright (c) 2021 DeflatedPickle under the MIT license */
+
 package com.deflatedpickle.quiver.packexport.api
 
 /**
@@ -15,4 +17,4 @@ abstract class PerFileExportStep(
     val affectedExtensions: Collection<String>
 ) : ExportStep {
     override fun toString(): String = "PerFileExportStep( ${getSlug()}: ${getType()}; $affectedExtensions )"
-}
\ No newline at end of file
+}
diff --git a/packexport/src/main/kotlin/com/deflatedpickle/quiver/packexport/event/EventExportFile.kt b/packexport/src/main/kotlin/com/deflatedpickle/quiver/packexport/event/EventExportFile.kt
index e6d189f..be1d586 100644
--- a/packexport/src/main/kotlin/com/deflatedpickle/quiver/packexport/event/EventExportFile.kt
+++ b/packexport/src/main/kotlin/com/deflatedpickle/quiver/packexport/event/EventExportFile.kt
@@ -1,3 +1,5 @@
+/* Copyright (c) 2021 DeflatedPickle under the MIT license */
+
 package com.deflatedpickle.quiver.packexport.event
 
 import com.deflatedpickle.haruhi.api.event.AbstractEvent
@@ -6,4 +8,4 @@ import java.io.File
 /**
  * An event that is run when a file has been exported
  */
-object EventExportFile : AbstractEvent<File>()
\ No newline at end of file
+object EventExportFile : AbstractEvent<File>()
diff --git a/packexport/src/main/kotlin/com/deflatedpickle/quiver/packexport/event/EventFinishExportStep.kt b/packexport/src/main/kotlin/com/deflatedpickle/quiver/packexport/event/EventFinishExportStep.kt
index 76baecb..577ca77 100644
--- a/packexport/src/main/kotlin/com/deflatedpickle/quiver/packexport/event/EventFinishExportStep.kt
+++ b/packexport/src/main/kotlin/com/deflatedpickle/quiver/packexport/event/EventFinishExportStep.kt
@@ -1,6 +1,8 @@
+/* Copyright (c) 2021 DeflatedPickle under the MIT license */
+
 package com.deflatedpickle.quiver.packexport.event
 
 import com.deflatedpickle.haruhi.api.event.AbstractEvent
 import com.deflatedpickle.quiver.packexport.api.ExportStep
 
-object EventFinishExportStep : AbstractEvent<ExportStep>()
\ No newline at end of file
+object EventFinishExportStep : AbstractEvent<ExportStep>()
diff --git a/packexport/src/main/kotlin/com/deflatedpickle/quiver/packexport/event/EventStartingExportStep.kt b/packexport/src/main/kotlin/com/deflatedpickle/quiver/packexport/event/EventStartingExportStep.kt
index 2820a34..8753c87 100644
--- a/packexport/src/main/kotlin/com/deflatedpickle/quiver/packexport/event/EventStartingExportStep.kt
+++ b/packexport/src/main/kotlin/com/deflatedpickle/quiver/packexport/event/EventStartingExportStep.kt
@@ -1,6 +1,8 @@
+/* Copyright (c) 2021 DeflatedPickle under the MIT license */
+
 package com.deflatedpickle.quiver.packexport.event
 
 import com.deflatedpickle.haruhi.api.event.AbstractEvent
 import com.deflatedpickle.quiver.packexport.api.ExportStep
 
-object EventStartingExportStep : AbstractEvent<ExportStep>()
\ No newline at end of file
+object EventStartingExportStep : AbstractEvent<ExportStep>()
diff --git a/packsquashstep/build.gradle b/packsquashstep/build.gradle
index a60a1d0..65685d5 100644
--- a/packsquashstep/build.gradle
+++ b/packsquashstep/build.gradle
@@ -3,70 +3,70 @@ version '1.0.0'
 sourceCompatibility = '1.8'
 
 dependencies {
-    implementation project(':core')
-    implementation project(':packexport')
+	implementation project(':core')
+	implementation project(':packexport')
 }
 
 def packSquashDir = toolDir.toPath().resolve('packsquash').toFile()
 
 task downloadLicense(type: Download) {
-    src 'https://raw.githubusercontent.com/ComunidadAylas/PackSquash/master/LICENSE'
-    //noinspection GroovyAssignabilityCheck
-    dest new File(packSquashDir, 'LICENSE')
-    overwrite false
+	src 'https://raw.githubusercontent.com/ComunidadAylas/PackSquash/master/LICENSE'
+	//noinspection GroovyAssignabilityCheck
+	dest new File(packSquashDir, 'LICENSE')
+	overwrite false
 }
 
 task downloadLinux(type: Download) {
-    src "https://github.com/ComunidadAylas/PackSquash/releases/download/$packSquashVersion/PackSquash.executable.Linux.zip"
-    dest new File(buildDir, 'PackSquash.executable.Linux.zip')
-    overwrite false
+	src "https://github.com/ComunidadAylas/PackSquash/releases/download/$packSquashVersion/PackSquash.executable.Linux.zip"
+	dest new File(buildDir, 'PackSquash.executable.Linux.zip')
+	overwrite false
 }
 
 task downloadMacOS(type: Download) {
-    src "https://github.com/ComunidadAylas/PackSquash/releases/download/$packSquashVersion/PackSquash.executable.macOS.zip"
-    dest new File(buildDir, 'PackSquash.executable.macOS.zip')
-    overwrite false
+	src "https://github.com/ComunidadAylas/PackSquash/releases/download/$packSquashVersion/PackSquash.executable.macOS.zip"
+	dest new File(buildDir, 'PackSquash.executable.macOS.zip')
+	overwrite false
 }
 
 task downloadWin(type: Download) {
-    src "https://github.com/ComunidadAylas/PackSquash/releases/download/$packSquashVersion/PackSquash.executable.Windows.zip"
-    dest new File(buildDir, 'PackSquash.executable.Windows.zip')
-    overwrite false
+	src "https://github.com/ComunidadAylas/PackSquash/releases/download/$packSquashVersion/PackSquash.executable.Windows.zip"
+	dest new File(buildDir, 'PackSquash.executable.Windows.zip')
+	overwrite false
 }
 
 task unzipLinux(dependsOn: downloadLinux, type: Copy) {
-    from zipTree(downloadLinux.dest)
-    into packSquashDir
-    rename('packsquash', 'packsquash-linux')
+	from zipTree(downloadLinux.dest)
+	into packSquashDir
+	rename('packsquash', 'packsquash-linux')
 }
 
 task unzipMacOS(dependsOn: downloadMacOS, type: Copy) {
-    from zipTree(downloadMacOS.dest)
-    into packSquashDir
-    rename('packsquash', 'packsquash-macos')
+	from zipTree(downloadMacOS.dest)
+	into packSquashDir
+	rename('packsquash', 'packsquash-macos')
 }
 
 task unzipWin(dependsOn: downloadWin, type: Copy) {
-    from zipTree(downloadWin.dest)
-    into packSquashDir
-    rename('packsquash.exe', 'packsquash.exe')
+	from zipTree(downloadWin.dest)
+	into packSquashDir
+	rename('packsquash.exe', 'packsquash.exe')
 }
 
 rootProject.tasks.getByName('run').with {
-    dependsOn downloadLicense
-    dependsOn unzipLinux
-    dependsOn unzipMacOS
-    dependsOn unzipWin
+	dependsOn downloadLicense
+	dependsOn unzipLinux
+	dependsOn unzipMacOS
+	dependsOn unzipWin
 
-    copy {
-        from "../build/tools"
-        into '../run/tools'
-    }
+	copy {
+		from "../build/tools"
+		into '../run/tools'
+	}
 }
 
 distZip.with {
-    dependsOn downloadLicense
-    dependsOn unzipLinux
-    dependsOn unzipMacOS
-    dependsOn unzipWin
+	dependsOn downloadLicense
+	dependsOn unzipLinux
+	dependsOn unzipMacOS
+	dependsOn unzipWin
 }
\ No newline at end of file
diff --git a/packsquashstep/src/main/kotlin/com/deflatedpickle/quiver/packsquashstep/PackSquashStep.kt b/packsquashstep/src/main/kotlin/com/deflatedpickle/quiver/packsquashstep/PackSquashStep.kt
index 0721100..d2ea0fa 100644
--- a/packsquashstep/src/main/kotlin/com/deflatedpickle/quiver/packsquashstep/PackSquashStep.kt
+++ b/packsquashstep/src/main/kotlin/com/deflatedpickle/quiver/packsquashstep/PackSquashStep.kt
@@ -1,3 +1,5 @@
+/* Copyright (c) 2021 DeflatedPickle under the MIT license */
+
 package com.deflatedpickle.quiver.packsquashstep
 
 import com.deflatedpickle.haruhi.util.ConfigUtil
@@ -46,7 +48,7 @@ object PackSquashStep : BulkExportStep() {
             """.trimMargin()
         // println(arguments)
 
-        val system = when(OSUtil.getOS()) {
+        val system = when (OSUtil.getOS()) {
             OSUtil.OS.WINDOWS -> ""
             OSUtil.OS.LINUX -> "linux"
             OSUtil.OS.MAC -> "macos"
@@ -104,4 +106,4 @@ object PackSquashStep : BulkExportStep() {
         }.start()
         this.logger.debug("Started the PackSquash thread")
     }
-}
\ No newline at end of file
+}
diff --git a/packsquashstep/src/main/kotlin/com/deflatedpickle/quiver/packsquashstep/PackSquashStepPlugin.kt b/packsquashstep/src/main/kotlin/com/deflatedpickle/quiver/packsquashstep/PackSquashStepPlugin.kt
index 5298e76..02cfab6 100644
--- a/packsquashstep/src/main/kotlin/com/deflatedpickle/quiver/packsquashstep/PackSquashStepPlugin.kt
+++ b/packsquashstep/src/main/kotlin/com/deflatedpickle/quiver/packsquashstep/PackSquashStepPlugin.kt
@@ -1,3 +1,5 @@
+/* Copyright (c) 2021 DeflatedPickle under the MIT license */
+
 package com.deflatedpickle.quiver.packsquashstep
 
 import com.deflatedpickle.haruhi.api.plugin.Plugin
@@ -38,4 +40,4 @@ object PackSquashStepPlugin {
             (exportStepRegistry as Registry<String, ExportStep>?)?.register("packsquash", PackSquashStep)
         }
     }
-}
\ No newline at end of file
+}
diff --git a/packsquashstep/src/main/kotlin/com/deflatedpickle/quiver/packsquashstep/PackSquashStepSettings.kt b/packsquashstep/src/main/kotlin/com/deflatedpickle/quiver/packsquashstep/PackSquashStepSettings.kt
index 2b2c044..935a57f 100644
--- a/packsquashstep/src/main/kotlin/com/deflatedpickle/quiver/packsquashstep/PackSquashStepSettings.kt
+++ b/packsquashstep/src/main/kotlin/com/deflatedpickle/quiver/packsquashstep/PackSquashStepSettings.kt
@@ -1,3 +1,5 @@
+/* Copyright (c) 2021 DeflatedPickle under the MIT license */
+
 package com.deflatedpickle.quiver.packsquashstep
 
 import kotlinx.serialization.Serializable
diff --git a/zipstep/src/main/kotlin/com/deflatedpickle/quiver/zipstep/ZipStep.kt b/zipstep/src/main/kotlin/com/deflatedpickle/quiver/zipstep/ZipStep.kt
index e37b171..5f35148 100644
--- a/zipstep/src/main/kotlin/com/deflatedpickle/quiver/zipstep/ZipStep.kt
+++ b/zipstep/src/main/kotlin/com/deflatedpickle/quiver/zipstep/ZipStep.kt
@@ -1,6 +1,7 @@
+/* Copyright (c) 2021 DeflatedPickle under the MIT license */
+
 package com.deflatedpickle.quiver.zipstep
 
-import net.lingala.zip4j.progress.ProgressMonitor as ZipProgressMonitor
 import com.deflatedpickle.haruhi.util.ConfigUtil
 import com.deflatedpickle.marvin.Slug
 import com.deflatedpickle.marvin.Version
@@ -11,6 +12,7 @@ import java.io.File
 import javax.swing.ProgressMonitor
 import net.lingala.zip4j.ZipFile
 import net.lingala.zip4j.model.ZipParameters
+import net.lingala.zip4j.progress.ProgressMonitor as ZipProgressMonitor
 import org.apache.logging.log4j.LogManager
 
 object ZipStep : BulkExportStep() {
@@ -90,4 +92,4 @@ object ZipStep : BulkExportStep() {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/zipstep/src/main/kotlin/com/deflatedpickle/quiver/zipstep/ZipStepPlugin.kt b/zipstep/src/main/kotlin/com/deflatedpickle/quiver/zipstep/ZipStepPlugin.kt
index 7f1d18d..5aa05bd 100644
--- a/zipstep/src/main/kotlin/com/deflatedpickle/quiver/zipstep/ZipStepPlugin.kt
+++ b/zipstep/src/main/kotlin/com/deflatedpickle/quiver/zipstep/ZipStepPlugin.kt
@@ -1,3 +1,5 @@
+/* Copyright (c) 2021 DeflatedPickle under the MIT license */
+
 package com.deflatedpickle.quiver.zipstep
 
 import com.deflatedpickle.haruhi.api.plugin.Plugin
@@ -6,7 +8,6 @@ import com.deflatedpickle.haruhi.api.registry.Registry
 import com.deflatedpickle.haruhi.event.EventProgramFinishSetup
 import com.deflatedpickle.haruhi.util.RegistryUtil
 import com.deflatedpickle.quiver.packexport.api.ExportStep
-import com.deflatedpickle.quiver.zipstep.ZipStep
 
 @Suppress("unused")
 @Plugin(
@@ -29,4 +30,4 @@ object ZipStepPlugin {
             (exportStepRegistry as Registry<String, ExportStep>?)?.register("zip", ZipStep)
         }
     }
-}
\ No newline at end of file
+}
diff --git a/zipstep/src/main/kotlin/com/deflatedpickle/quiver/zipstep/ZipStepSettings.kt b/zipstep/src/main/kotlin/com/deflatedpickle/quiver/zipstep/ZipStepSettings.kt
index 264a221..7e574d8 100644
--- a/zipstep/src/main/kotlin/com/deflatedpickle/quiver/zipstep/ZipStepSettings.kt
+++ b/zipstep/src/main/kotlin/com/deflatedpickle/quiver/zipstep/ZipStepSettings.kt
@@ -1,3 +1,5 @@
+/* Copyright (c) 2021 DeflatedPickle under the MIT license */
+
 package com.deflatedpickle.quiver.zipstep
 
 import kotlinx.serialization.Serializable