diff --git a/.gitattributes b/.gitattributes
index 698728543cc..d4f72456e24 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -5528,6 +5528,7 @@ res/cardsfolder/k/kaalia_of_the_vast.txt -text
 res/cardsfolder/k/kabira_crossroads.txt svneol=native#text/plain
 res/cardsfolder/k/kabira_evangel.txt -text
 res/cardsfolder/k/kabira_vindicator.txt svneol=native#text/plain
+res/cardsfolder/k/kaboom!.txt -text
 res/cardsfolder/k/kabuto_moth.txt svneol=native#text/plain
 res/cardsfolder/k/kaervek_the_merciless.txt svneol=native#text/plain
 res/cardsfolder/k/kaerveks_hex.txt svneol=native#text/plain
diff --git a/res/cardsfolder/c/comet_storm.txt b/res/cardsfolder/c/comet_storm.txt
index 9596ffd8525..b77e23e7078 100644
--- a/res/cardsfolder/c/comet_storm.txt
+++ b/res/cardsfolder/c/comet_storm.txt
@@ -7,5 +7,5 @@ SVar:TargetsNum:Count$TimesKicked/Plus.1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/comet_storm.jpg
 SVar:X:Count$xPaid
 Oracle:Multikicker {1} (You may pay an additional {1} any number of times as you cast this spell.)\nChoose target creature or player, then choose another target creature or player for each time Comet Storm was kicked. Comet Storm deals X damage to each of them.
-SetInfo:WWK Mythic
-SetInfo:CMD Mythic
+SetInfo:COM Mythic
+SetInfo:WWK Mythic
\ No newline at end of file
diff --git a/res/cardsfolder/k/kaboom!.txt b/res/cardsfolder/k/kaboom!.txt
new file mode 100644
index 00000000000..3c8aeddfb04
--- /dev/null
+++ b/res/cardsfolder/k/kaboom!.txt
@@ -0,0 +1,12 @@
+Name:Kaboom!
+ManaCost:4 R
+Types:Sorcery
+A:SP$ RepeatEach | Cost$ 4 R | ValidTgts$ Player | TargetMin$ 0 | TargetMax$ Maxplayer | References$ Maxplayer | RepeatPlayers$ Targeted | RepeatSubAbility$ DBDigUntil | StackDescription$ SpellDescription | SpellDescription$ Choose any number of target players. For each of those players, reveal cards from the top of your library until you reveal a nonland card. Kaboom deals damage equal to that card's converted mana cost to that player, then you put the revealed cards on the bottom of your library in any order.
+SVar:DBDigUntil:DB$ DigUntil | Defined$ You | Valid$ Card.nonLand | ValidDescription$ nonland card | FoundDestination$ Library | FoundLibraryPosition$ -1 | RevealedDestination$ Library | RevealedLibraryPosition$ -1 | RememberFound$ True | SubAbility$ DBDmg
+SVar:DBDmg:DB$ DealDamage | Defined$ Player.IsRemembered | NumDmg$ X | References$ X | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$Cleanup | ClearRemembered$ True
+SVar:X:Remembered$CardManaCost
+SVar:Maxplayer:PlayerCountPlayers$Amount
+SVar:Picture:http://www.wizards.com/global/images/magic/general/kaboom!.jpg
+Oracle:Choose any number of target players. For each of those players, reveal cards from the top of your library until you reveal a nonland card. Kaboom deals damage equal to that card's converted mana cost to that player, then you put the revealed cards on the bottom of your library in any order.
+SetInfo:ONS Rare
\ No newline at end of file
diff --git a/res/cardsfolder/k/karmic_justice.txt b/res/cardsfolder/k/karmic_justice.txt
index 64d72c14040..009a27a3e9e 100644
--- a/res/cardsfolder/k/karmic_justice.txt
+++ b/res/cardsfolder/k/karmic_justice.txt
@@ -4,3 +4,5 @@ Types:Enchantment
 T:Mode$ Destroyed | ValidCauser$ Player.Opponent | ValidCard$ Permanent.nonCreature+YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigDestroy | TriggerDescription$ Whenever a spell or ability an opponent controls destroys a noncreature permanent you control, you may destroy target permanent that opponent controls.
 SVar:TrigDestroy:AB$ Destroy | Cost$ 0 | ValidTgts$ Permanent | TargetsWithDefinedController$ TriggeredCauser
 SVar:Picture:http://www.wizards.com/global/images/magic/general/karmic_justice.jpg
+Oracle:Whenever a spell or ability an opponent controls destroys a noncreature permanent you control, you may destroy target permanent that opponent controls.
+SetInfo:ODY Rare
\ No newline at end of file