diff --git a/vitamins/batteries.scad b/vitamins/batteries.scad
index 755bb0a..c004427 100644
--- a/vitamins/batteries.scad
+++ b/vitamins/batteries.scad
@@ -38,14 +38,18 @@ bcontact = ["bcontact", 9.33, 9.75, 0.4, 2.86, 6, [1.6, 3, 5], [4.5, batt_spring
 //                                                                          t                   r                                             c
 //                                                                          e                                                                 t
 //                                                                          r
-LUMINTOP  = ["LUMINTOP",  "Cell LUMINTOP 18650 LION with charger",    70.7, 18.4, 13, 5,   1,   "white",          [[3.32, 5], [3.32, -5]], 4, bcontact];
+LUMINTOP  = ["LUMINTOP",  "Cell LUMINTOP 18650 LION with charger",    70.7, 18.4, 13, 5,   1,   "grey",          [[3.32, 5], [3.32, -5]], 4, bcontact];
 S25R18650 = ["S25R18650", "Cell Samsung 25R 18650 LION",              65,   18.3, 13, 10,  0,   "MediumSeaGreen", [],                      0, bcontact];
-AACELL    = ["AACELL",    "Cell AA",                                  50.5, 14.5, 11, 5.5, 1,   "grey",           [],                      0, bcontact];
-AAACELL   = ["AAACELL",   "Cell AAA",                                 44.5, 10.5,  8, 3.8, 0.8, "grey",           [],                      0, bcontact];
+AACELL    = ["AACELL",    "Cell AA",                                  50.5, 14.5, 11, 5.5, 1,   "grey",       [],                      0, bcontact];
+AAACELL   = ["AAACELL",   "Cell AAA",                                 44.5, 10.5,  8, 3.8, 0.8, "grey",       [],                      0, bcontact];
 CCELL     = ["CCELL",     "Cell C",                                   50,   26.2, 20, 7.5, 1.5, "brown",          [],                      0, bcontact];
 DCELL     = ["DCELL",     "Cell D",                                   61.5, 34.2, 22, 8.2, 2.4, "brown",          [],                      0, bcontact];
 A23CELL   = ["A23CELL",   "Cell A23 12v",                             28.5, 10.3, 5.2,5.2, 1.0, "silver",         [],                      0, bcontact];
+A23CELL   = ["A23CELL",   "Cell A23 12v",                             28.5, 10.3, 5.2,5.2, 1.0, "silver",         [],                      0, bcontact];
+LI4680    = ["L4680",     "Li-Ion/LiFePo4 4680 3.2v",                 80.2, 46.2, 35,35, 0,     "green",          [],                      0, bcontact];
+LI32700   = ["L32700",    "Li-Ion/LiFePo4 32700 3.2v",                70.2, 32.4, 25,13, 0,     "blue",           [],                      0, bcontact];
+LI16340   = ["L16340",    "Li-Ion/LiFePo4 16340 3.2v",                35.2, 16.4, 14,6, 1.0,    "blue",           [],                      0, bcontact];
 
-batteries = [AAACELL, AACELL, CCELL, DCELL, LUMINTOP, S25R18650, A23CELL];
+batteries = [AAACELL, AACELL, CCELL, DCELL, LUMINTOP, S25R18650, A23CELL, LI4680, LI32700, LI16340];
 
 use <battery.scad>
diff --git a/vitamins/battery.scad b/vitamins/battery.scad
index 02d394b..725abae 100644
--- a/vitamins/battery.scad
+++ b/vitamins/battery.scad
@@ -28,7 +28,9 @@
 include <../utils/core/core.scad>
 use <spring.scad>
 use <../utils/rounded_cylinder.scad>
+use <../utils/pcb_utils.scad>
 
+function battery_type(type)          = type[0]; //! Battery type
 function battery_length(type)        = type[2]; //! Total length including terminals
 function battery_diameter(type)      = type[3]; //! Casing diameter
 function battery_neg_dia(type)       = type[4]; //! Negative terminal diameter
@@ -109,6 +111,14 @@ module battery(type) { //! Draw a battery
     battery_led_positions(type)
         color(["red","green","blue"][$i])
             cylinder(d = 1.5, h = eps);
+
+    color("white")
+    translate([0, 0, 0])
+        rotate([0, 0, 90])
+             cylindrical_wrap(battery_diameter(type)/2)
+                resize([0, battery_diameter(type)], auto = true)
+                    rotate(90)
+                        text(battery_type(type), halign = "center", valign = "center");
 }
 
 function contact_width(type)      = type[1]; //! Width of the flat part