diff --git a/tutorials/v7/box.cxx b/tutorials/v7/box.cxx
index 8026b155a87f99107fb46f205b185e0303624160..b8ec15e7230c5acb9a51e4fcce2b3fdfcea72c1e 100644
--- a/tutorials/v7/box.cxx
+++ b/tutorials/v7/box.cxx
@@ -30,30 +30,30 @@ void box()
    RColor Color1(1., 0., 0., 0.5); // 50% opaque
    RColor Color2(0., 0., 1., 0.3); // 30% opaque
 
-   OptsBox1->Box().Border().SetColor(Color1).SetWidth(5);
+   OptsBox1->Border().SetColor(Color1).SetWidth(5);
    //OptsBox1->Fill().SetColor(Color2);
 
    auto OptsBox2 = canvas->Draw(RBox({0.4_normal, 0.2_normal}, {0.6_normal,0.7_normal}));
-   OptsBox2->Box().Border().SetColor(Color2).SetStyle(2).SetWidth(3);
+   OptsBox2->Border().SetColor(Color2).SetStyle(2).SetWidth(3);
    //OptsBox2->Fill().SetStyle(0);
 
    auto OptsBox3 = canvas->Draw(RBox({0.7_normal, 0.4_normal}, {0.9_normal,0.6_normal}));
    //OptsBox3->SetFillStyle(0);
    //OptsBox3->SetRoundWidth(50);
    //OptsBox3->SetRoundHeight(50);
-   OptsBox3->Box().Border().SetWidth(3);
+   OptsBox3->Border().SetWidth(3);
 
    auto OptsBox4 = canvas->Draw(RBox({0.7_normal, 0.7_normal}, {0.9_normal,0.9_normal}));
    //OptsBox4->SetFillStyle(0);
    //OptsBox4->SetRoundWidth(50);
    //OptsBox4->SetRoundHeight(25);
-   OptsBox4->Box().Border().SetWidth(3);
+   OptsBox4->Border().SetWidth(3);
 
    auto OptsBox5 = canvas->Draw(RBox({0.7_normal, 0.1_normal}, {0.9_normal,0.3_normal}));
    //OptsBox5->SetFillStyle(0);
    //OptsBox5->SetRoundWidth(25);
    //OptsBox5->SetRoundHeight(50);
-   OptsBox5->Box().Border().SetWidth(3);
+   OptsBox5->Border().SetWidth(3);
 
    canvas->Show();
 }
diff --git a/tutorials/v7/line.cxx b/tutorials/v7/line.cxx
index 8239df3d916c2ad6d0f63b575f03cb7f56bd893b..28184467bd3c7eaad72329589ef19f878f0336af 100644
--- a/tutorials/v7/line.cxx
+++ b/tutorials/v7/line.cxx
@@ -33,7 +33,7 @@ void line()
                  0.3_normal*TMath::Sin(angle) + 0.5_normal);
       auto opts = canvas->Draw(RLine({0.5_normal, 0.5_normal} , p));
       RColor col(0.0025*i, 0, 0);
-      opts->Line().SetColor(col);
+      opts->SetColor(col);
     }
 
    canvas->Draw(RLine({0.0_normal, 0.0_normal}, {1.0_normal,1.0_normal}));
diff --git a/tutorials/v7/lineStyle.cxx b/tutorials/v7/lineStyle.cxx
index 31cd3025ff44baa66c4ea67fc5b140d72f799c4f..9c2fcb478cb583b9804ad6efc4a23e4964626004 100644
--- a/tutorials/v7/lineStyle.cxx
+++ b/tutorials/v7/lineStyle.cxx
@@ -26,12 +26,12 @@ void lineStyle() {
 
       RPadPos pt(.3_normal, RPadLength::Normal(num));
       auto optts = canvas->Draw(RText(pt, std::to_string(i)));
-      optts->Text().SetSize(13).SetAlign(32).SetFont(52);
+      optts->SetSize(13).SetAlign(32).SetFont(52);
 
       RPadPos pl1(.32_normal, RPadLength::Normal(num));
       RPadPos pl2(.8_normal , RPadLength::Normal(num));
       auto optls = canvas->Draw(RLine(pl1, pl2));
-      optls->Line().SetStyle(i);
+      optls->SetStyle(i);
    }
 
    canvas->Show();
diff --git a/tutorials/v7/lineWidth.cxx b/tutorials/v7/lineWidth.cxx
index 28e760efc7b67f40caa7034a223b9f585da5f063..095ca350a51ab127d97f828f44647c124150ff39 100644
--- a/tutorials/v7/lineWidth.cxx
+++ b/tutorials/v7/lineWidth.cxx
@@ -26,12 +26,12 @@ void lineWidth() {
 
       RPadPos pt(.3_normal, RPadLength::Normal(num));
       auto optts = canvas->Draw(RText(pt, std::to_string(i)));
-      optts->Text().SetSize(13).SetAlign(32).SetFont(52);
+      optts->SetSize(13).SetAlign(32).SetFont(52);
 
       RPadPos pl1(.32_normal, RPadLength::Normal(num));
       RPadPos pl2(.8_normal , RPadLength::Normal(num));
       auto optls = canvas->Draw(RLine(pl1, pl2));
-      optls->Line().SetWidth(i);
+      optls->SetWidth(i);
    }
 
    canvas->Show();
diff --git a/tutorials/v7/markerStyle.cxx b/tutorials/v7/markerStyle.cxx
index 4945ad53d70f210bd1aa01697a6b66f99ccd63a5..6b34cef9fa14e9eb1d715015ecdc7eb14024b5c6 100644
--- a/tutorials/v7/markerStyle.cxx
+++ b/tutorials/v7/markerStyle.cxx
@@ -29,19 +29,19 @@ void markerStyle() {
       auto ot1 = canvas->Draw(RText(pt1, std::to_string(i)));
       RPadPos pm1(RPadLength::Normal(x), .25_normal);
       auto om1 = canvas->Draw(RMarker(pm1));
-      om1->Marker().SetStyle(i).SetSize(2.5);
+      om1->SetStyle(i).SetSize(2.5);
 
       RPadPos pt2(RPadLength::Normal(x), .42_normal);
       auto ot2 = canvas->Draw(RText(pt2, std::to_string(i+19)));
       RPadPos pm2(RPadLength::Normal(x), .55_normal);
       auto om2 = canvas->Draw(RMarker(pm2));
-      om2->Marker().SetStyle(i+19).SetSize(2.5);
+      om2->SetStyle(i+19).SetSize(2.5);
 
       RPadPos pt3(RPadLength::Normal(x), .72_normal);
       auto ot3 = canvas->Draw(RText(pt3, std::to_string(i+34)));
       RPadPos pm3(RPadLength::Normal(x), .85_normal);
       auto om3 = canvas->Draw(RMarker(pm3));
-      om3->Marker().SetStyle(i+34).SetSize(2.5);
+      om3->SetStyle(i+34).SetSize(2.5);
    }
 
    canvas->Show();
diff --git a/tutorials/v7/text.cxx b/tutorials/v7/text.cxx
index 638abe32bd1e66c98e24229c81181d0cf7796a3d..55de60ea5c9fe0fdba5aa53cd7f973036e4369d5 100644
--- a/tutorials/v7/text.cxx
+++ b/tutorials/v7/text.cxx
@@ -32,7 +32,7 @@ void text()
       auto opts = canvas->Draw(RText({0.5_normal, 0.6_normal}, "____  Hello World"));
 
       RColor col(0.0015*i, 0.0025*i ,0.003*i);
-      opts->Text().SetColor(col).SetSize(10+i/10).SetAngle(i).SetAlign(13).SetFont(42);
+      opts->SetColor(col).SetSize(10+i/10).SetAngle(i).SetAlign(13).SetFont(42);
    }
 
    canvas->Show();