diff --git a/bakedclay.lua b/bakedclay.lua
new file mode 100644
index 0000000..fe3106e
--- /dev/null
+++ b/bakedclay.lua
@@ -0,0 +1,22 @@
+local bakedclay = {
+	{"white",      "White"},
+	{"grey",       "Grey"},
+	{"black",      "Black"},
+	{"red",        "Red"},
+	{"yellow",     "Yellow"},
+	{"green",      "Green"},
+	{"cyan",       "Cyan"},
+	{"blue",       "Blue"},
+	{"magenta",    "Magenta"},
+	{"orange",     "Orange"},
+	{"violet",     "Violet"},
+	{"brown",      "Brown"},
+	{"pink",       "Pink"},
+	{"dark_grey",  "Dark Grey"},
+	{"dark_green", "Dark Green"},
+}
+
+for i = 1, #bakedclay do
+	local name, desc = unpack(bakedclay[i])
+   tombs.register_stones('bakedclay:'..name, 'bc'..name, desc..' Bakedclay', 'baked_clay_'..name)
+end
diff --git a/caverealms.lua b/caverealms.lua
new file mode 100644
index 0000000..6c61fcb
--- /dev/null
+++ b/caverealms.lua
@@ -0,0 +1,11 @@
+tombs.register_stones('caverealms:glow_amethyst', 'glow_amethyst', 'Glow Amethyst', 'caverealms_glow_amethyst', 5)
+tombs.register_stones('caverealms:glow_crystal', 'glow_crystal', 'Glow Crystal', 'caverealms_glow_crystal', 5)
+tombs.register_stones('caverealms:glow_ruby', 'glow_ruby', 'Glow Ruby', 'caverealms_glow_ruby', 5)
+tombs.register_stones('caverealms:glow_emerald', 'glow_emerald', 'Glow Emerald', 'caverealms_glow_emerald', 5)
+tombs.register_stones('caverealms:glow_mese', 'glow_mese', 'Glow Mese', 'caverealms_glow_mese', 5)
+tombs.register_stones('caverealms:salt_crystal', 'salt_crystal', 'Salt Crystal', 'caverealms_salt_crystal')
+tombs.register_stones('caverealms:hot_cobble', 'hot_cobble', 'Hot Cobble', 'caverealms_hot_cobble', 6)
+tombs.register_stones('caverealms:glow_obsidian', 'glow_obsidian', 'Glow Obsidian', 'caverealms_glow_obsidian', 5)
+tombs.register_stones('caverealms:glow_obsidian_2', 'glow_obsidian_2', 'Glow Obsidian', 'caverealms_glow_obsidian', 5)
+tombs.register_stones('caverealms:mushroom_cap', 'mushroom_cap', 'Mushroom Cap', 'caverealms_mushroom_cap')
+tombs.register_stones('caverealms:mushroom_stem', 'mushroom_stem', 'Mushroom Stem', 'caverealms_mushroom_stem')
diff --git a/depends.txt b/depends.txt
index 5b5461c..20d979c 100644
--- a/depends.txt
+++ b/depends.txt
@@ -1,3 +1,5 @@
 default
 bones
 wool?
+bakedclay?
+caverealms?
diff --git a/gravestones.lua b/gravestones.lua
index 1a80816..a8f5558 100644
--- a/gravestones.lua
+++ b/gravestones.lua
@@ -1,4 +1,4 @@
-function tombs.register_stones(recipe, name, desc, textures)
+function tombs.register_stones(recipe, name, desc, textures, light)
 shapes = { --mesh identifier, shape, col
    {'_0', 'Rectangle', colbox_0_0, colbox_0_1},
    {'_1', 'Cross', colbox_1_0, colbox_1_1},
@@ -25,6 +25,7 @@ for i in ipairs (shapes) do
       tiles = {textures..'.png'},
       paramtype = 'light',
       paramtype2 = 'facedir',
+      light_source = light,
       selection_box = centered_col,
       collision_box = centered_col,
       groups = {cracky=2, oddly_breakable_by_hand=1,},
@@ -46,6 +47,7 @@ for i in ipairs (shapes) do
       tiles = {textures..'.png'},
       paramtype = 'light',
       paramtype2 = 'facedir',
+      light_source = light,
       selection_box = offset_col,
       collision_box = offset_col,
       groups = {cracky=2, oddly_breakable_by_hand=1,},
diff --git a/init.lua b/init.lua
index 675cd36..dfe2ff2 100644
--- a/init.lua
+++ b/init.lua
@@ -8,10 +8,22 @@ dofile(minetest.get_modpath('tombs')..'/gravestones.lua')
 dofile(minetest.get_modpath('tombs')..'/formspec.lua')
 
 --support for other mods
+if minetest.get_modpath('bakedclay') and (minetest.settings:get_bool('tombs.load_bakedclay')) then
+   dofile(minetest.get_modpath('tombs')..'/bakedclay.lua')
+   print 'loaded bakedclay support.'
+end
+
 if minetest.get_modpath('default') and (minetest.settings:get_bool('tombs.load_default')) then
    dofile(minetest.get_modpath('tombs')..'/default.lua')
+   print 'loaded default support.'
 end
 
 if minetest.get_modpath('wool') and (minetest.settings:get_bool('tombs.load_wool')) then
    dofile(minetest.get_modpath('tombs')..'/wool.lua')
+   print 'loaded wool support.'
+end
+
+if minetest.get_modpath('caverealms') and (minetest.settings:get_bool('tombs.load_caverealms')) then
+   dofile(minetest.get_modpath('tombs')..'/caverealms.lua')
+   print 'loaded caverealms support.'
 end
diff --git a/mod.conf b/mod.conf
index 2bc2e34..1a8bc79 100644
--- a/mod.conf
+++ b/mod.conf
@@ -1,4 +1,4 @@
 name = tombs
 description = Adds many shapes and styles of tombstones.
 depends = default, bones
-optional_depends = wool
+optional_depends = wool, bakedclay, caverealms
diff --git a/settingtypes.txt b/settingtypes.txt
index 1ed9da2..507535a 100644
--- a/settingtypes.txt
+++ b/settingtypes.txt
@@ -1,2 +1,4 @@
 tombs.load_wool (Support wool mod?) bool true
 tombs.load_default (Support default mod?) bool true
+tombs.load_bakedclay (Support bakedclay mod?) bool true
+tombs.load_caverealms (Support caverealms mod?) bool true
diff --git a/wool.lua b/wool.lua
index 260b0d8..4032de7 100644
--- a/wool.lua
+++ b/wool.lua
@@ -18,5 +18,5 @@ local dyes = {
 
 for i = 1, #dyes do
 	local name, desc = unpack(dyes[i])
-   tombs.register_stones('wool:'..name, name, desc, 'wool_'..name)
+   tombs.register_stones('wool:'..name, 'w'..name, desc..' Wool', 'wool_'..name)
 end